vlc/vlc-2.2.4-qt5-5.7.0-atomic.patch

diff -ru vlc-2.2.4/modules/gui/qt4/actions_manager.cpp vlc-2.2.4.patched/modules/gui/qt4/actions_manager.cpp
--- vlc-2.2.4/modules/gui/qt4/actions_manager.cpp	2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/actions_manager.cpp	2016-07-13 01:29:46.334802354 +0200
@@ -25,10 +25,11 @@
 # include "config.h"
 #endif
 
+#include "actions_manager.hpp"
+
 #include <vlc_vout.h>
 #include <vlc_keys.h>
 
-#include "actions_manager.hpp"
 
 #include "dialogs_provider.hpp"      /* Opening Dialogs */
 #include "input_manager.hpp"         /* THEMIM */
diff -ru vlc-2.2.4/modules/gui/qt4/adapters/seekpoints.hpp vlc-2.2.4.patched/modules/gui/qt4/adapters/seekpoints.hpp
--- vlc-2.2.4/modules/gui/qt4/adapters/seekpoints.hpp	2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/adapters/seekpoints.hpp	2016-07-13 01:36:11.476820842 +0200
@@ -26,14 +26,14 @@
 #include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_interface.h>
-#include <vlc_input.h>
-
 #include <QObject>
 #include <QList>
 #include <QMutex>
 
+#include <vlc_common.h>
+#include <vlc_interface.h>
+#include <vlc_input.h>
+
 class SeekPoint
 {
 public:
diff -ru vlc-2.2.4/modules/gui/qt4/components/controller.cpp vlc-2.2.4.patched/modules/gui/qt4/components/controller.cpp
--- vlc-2.2.4/modules/gui/qt4/components/controller.cpp	2016-04-25 18:02:43.000000000 +0200
+++ vlc-2.2.4.patched/modules/gui/qt4/components/controller.cpp	2016-07-13 01:34:10.335122301 +0200
@@ -26,6 +26,12 @@
 # include "config.h"
 #endif
 
+#include <QToolButton>
+#include <QHBoxLayout>
+#include <QRegion>
+#include <QSignalMapper>
+#include <QTimer>
+
 #include <vlc_vout.h>                       /* vout_thread_t for FSC */
 
 /* Widgets */
diff -ru vlc-2.2.4/modules/gui/qt4/components/playlist/playlist_model.hpp vlc-2.2.4.patched/modules/gui/qt4/components/playlist/playlist_model.hpp
--- vlc-2.2.4/modules/gui/qt4/components/playlist/playlist_model.hpp	2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/components/playlist/playlist_model.hpp	2016-07-13 01:38:39.097459814 +0200
@@ -29,11 +29,6 @@
 # include "config.h"
 #endif
 
-#include <vlc_input.h>
-#include <vlc_playlist.h>
-#include "vlc_model.hpp"
-#include "playlist_item.hpp"
-
 #include <QObject>
 #include <QEvent>
 #include <QSignalMapper>
@@ -43,6 +38,12 @@
 #include <QModelIndex>
 #include <QAction>
 
+#include <vlc_input.h>
+#include <vlc_playlist.h>
+#include "vlc_model.hpp"
+#include "playlist_item.hpp"
+
+
 class PLItem;
 class PLSelector;
 class PlMimeData;
diff -ru vlc-2.2.4/modules/gui/qt4/dialogs/messages.hpp vlc-2.2.4.patched/modules/gui/qt4/dialogs/messages.hpp
--- vlc-2.2.4/modules/gui/qt4/dialogs/messages.hpp	2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/dialogs/messages.hpp	2016-07-13 01:27:12.000220784 +0200
@@ -55,7 +55,7 @@
     void sinkMessage( const MsgEvent * );
     bool matchFilter( const QString& );
 
-    atomic_uint verbosity;
+    unsigned int verbosity;
     static void MsgCallback( void *, int, const vlc_log_t *, const char *,
                              va_list );
 
diff -ru vlc-2.2.4/modules/gui/qt4/dialogs/vlm.hpp vlc-2.2.4.patched/modules/gui/qt4/dialogs/vlm.hpp
--- vlc-2.2.4/modules/gui/qt4/dialogs/vlm.hpp	2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/dialogs/vlm.hpp	2016-07-13 01:32:18.019407147 +0200
@@ -31,12 +31,13 @@
 
 #ifdef ENABLE_VLM
 
+#include <QDateTime>
+
 #include <vlc_vlm.h>
 
 #include "ui/vlm.h"
 #include "util/qvlcframe.hpp"
 #include "util/singleton.hpp"
-#include <QDateTime>
 
 enum{
     QVLM_Broadcast,
diff -ru vlc-2.2.4/modules/gui/qt4/input_manager.hpp vlc-2.2.4.patched/modules/gui/qt4/input_manager.hpp
--- vlc-2.2.4/modules/gui/qt4/input_manager.hpp	2016-04-25 18:02:43.000000000 +0200
+++ vlc-2.2.4.patched/modules/gui/qt4/input_manager.hpp	2016-07-13 01:28:09.437062815 +0200
@@ -29,9 +29,10 @@
 # include "config.h"
 #endif
 
+#include "qt4.hpp"
+
 #include <vlc_input.h>
 
-#include "qt4.hpp"
 #include "util/singleton.hpp"
 #include "adapters/variables.hpp"
 
diff -ru vlc-2.2.4/modules/gui/qt4/menus.cpp vlc-2.2.4.patched/modules/gui/qt4/menus.cpp
--- vlc-2.2.4/modules/gui/qt4/menus.cpp	2015-10-29 19:18:32.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/menus.cpp	2016-07-13 01:21:30.256823693 +0200
@@ -34,12 +34,13 @@
 # include "config.h"
 #endif
 
+#include "menus.hpp"
+
 #include <vlc_common.h>
 #include <vlc_intf_strings.h>
 #include <vlc_vout.h>                             /* vout_thread_t */
 #include <vlc_aout.h>                             /* audio_output_t */
 
-#include "menus.hpp"
 
 #include "main_interface.hpp"                     /* View modifications */
 #include "dialogs_provider.hpp"                   /* Dialogs display */
diff -ru vlc-2.2.4/modules/gui/qt4/qt4.hpp vlc-2.2.4.patched/modules/gui/qt4/qt4.hpp
--- vlc-2.2.4/modules/gui/qt4/qt4.hpp	2015-02-02 20:42:29.000000000 +0100
+++ vlc-2.2.4.patched/modules/gui/qt4/qt4.hpp	2016-07-13 01:22:29.520717970 +0200
@@ -29,12 +29,13 @@
 # include "config.h"
 #endif
 
+#define QT_NO_CAST_TO_ASCII
+#include <QString>
+
 #include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
 #include <vlc_interface.h> /* intf_thread_t */
 #include <vlc_playlist.h>  /* playlist_t */
 
-#define QT_NO_CAST_TO_ASCII
-#include <QString>
 
 #if ( QT_VERSION < 0x040600 )
 # error Update your Qt version to at least 4.6.0
--- vlc-2.2.4/modules/visualization/projectm.cpp.orig	2016-07-13 02:11:35.900475637 +0200
+++ vlc-2.2.4/modules/visualization/projectm.cpp	2016-07-13 02:11:25.897492411 +0200
@@ -31,6 +31,8 @@
 
 #include <assert.h>
 
+#include <libprojectM/projectM.hpp>
+
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
@@ -40,7 +42,6 @@
 #include <vlc_filter.h>
 #include <vlc_rand.h>
 
-#include <libprojectM/projectM.hpp>
 
 /*****************************************************************************
  * Module descriptor