fix build with clang

4 files changed, 53 insertions, 1 deletions

diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 1ef2b1ae45d..5440bc519ab 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2015/10/25 11:00:18 wiz Exp $
+$NetBSD: distinfo,v 1.67 2015/11/01 20:15:06 tnn Exp $
 
 SHA1 (vlc-2.2.1.tar.xz) = ee8535c5966217bc2069a74c1d4e8c32609656e9
 RMD160 (vlc-2.2.1.tar.xz) = 3b199e3555e8aa52a760a9ed7b89874c782e0dff
@@ -8,6 +8,7 @@ SHA1 (patch-compat_Makefile.am) = 983e9e29380702326d114274db99af72b5bdb3dd
 SHA1 (patch-compat_Makefile.in) = 809b1b00f14a5d85a17cd81b0385529ae24f39ee
 SHA1 (patch-include_vlc__common.h) = 26ab2c96230e3fbe26dd4bce60db7c5331eb3f6c
 SHA1 (patch-include_vlc__fixups.h) = 277cc7985f66fe3e8e94c75003e25aabd2f1bbfc
+SHA1 (patch-include_vlc_atomic.h) = 682ad69ece0267d41b62ef85429a8de312c17688
 SHA1 (patch-modules_access_directory.c) = 95bc95cb7eb0bf44684c04d2cecc2c4e8339f0f7
 SHA1 (patch-modules_access_file.c) = 22eb568aa5a1fea765e65a770432282024baaaf1
 SHA1 (patch-modules_access_rtp_Makefile.am) = cd2c1bcbde8fc04c15f4030ff8708e32b800dd53
@@ -15,10 +16,12 @@ SHA1 (patch-modules_gui_qt4_components_controller.cpp) = 5822f018f910d1b0e441782
 SHA1 (patch-modules_gui_qt4_components_extended__panels.cpp) = eaa7a4732fa5a462d5769fc71e097366e5bc2f70
 SHA1 (patch-modules_gui_qt4_components_interface__widgets.cpp) = b630de531ec90afd1f2aecc769f34952780b6ddb
 SHA1 (patch-modules_gui_qt4_components_interface__widgets.hpp) = 9ac2782bcb1a306123662fd3e4f44b82149c111a
+SHA1 (patch-modules_gui_qt4_dialogs_messages.cpp) = 8f4abf85ecd435bb1d2964e5ac16fc09ecaa5ab0
 SHA1 (patch-modules_gui_qt4_input__manager.cpp) = 81c09ba0d042f0a0684092255f322b6aeaad08be
 SHA1 (patch-modules_gui_qt4_input__manager.hpp) = ccc5f5fd53942f168e95d472731ee3f6a4d8ddb0
 SHA1 (patch-modules_gui_qt4_main__interface.cpp) = 11b9600a6e3c11268afc7c38859c5b62a1e8ee0d
 SHA1 (patch-modules_gui_qt4_main__interface.hpp) = 1c3028519662d99c023375c5ee74e9f490c16f3c
+SHA1 (patch-modules_gui_qt4_qt4.hpp) = 7189de990c0eb30850458e156da950eccb0a558f
 SHA1 (patch-modules_gui_qt4_util_input__slider.cpp) = 17aa058d6a7fd5b006b063bdf78cee3302733811
 SHA1 (patch-modules_gui_qt4_util_input__slider.hpp) = 146f2a2e5a9fc70b7aaefefd859a59cb39555e6a
 SHA1 (patch-modules_gui_skins2_src_theme__loader.cpp) = cbf1dfa33aa89bbb9382b789d77f6eea69d85b04
diff --git a/multimedia/vlc/patches/patch-include_vlc_atomic.h b/multimedia/vlc/patches/patch-include_vlc_atomic.h
new file mode 100644
index 00000000000..1df31322ad8
--- /dev/null
+++ b/multimedia/vlc/patches/patch-include_vlc_atomic.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-include_vlc_atomic.h,v 1.1 2015/11/01 20:15:06 tnn Exp $
+
+clang ships everything we need, just use <atomic> instead of the
+vlc_atomic.h #ifdef maze.
+
+--- include/vlc_atomic.h.orig	2014-08-14 07:20:03.000000000 +0000
++++ include/vlc_atomic.h
+@@ -32,6 +32,11 @@
+ /*** Native C11 atomics ***/
+ #  include <stdatomic.h>
+ 
++#elif defined(__cplusplus) && defined(__clang__)
++#include <atomic>
++using std::atomic_uint_least32_t;
++using std::atomic_uintptr_t;
++using std::atomic_uint;
+ # else
+ 
+ #  define ATOMIC_FLAG_INIT false
diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_dialogs_messages.cpp b/multimedia/vlc/patches/patch-modules_gui_qt4_dialogs_messages.cpp
new file mode 100644
index 00000000000..1107207a541
--- /dev/null
+++ b/multimedia/vlc/patches/patch-modules_gui_qt4_dialogs_messages.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_gui_qt4_dialogs_messages.cpp,v 1.1 2015/11/01 20:15:06 tnn Exp $
+
+Fix build with clang. &this->verbosity is unsigned.
+
+--- modules/gui/qt4/dialogs/messages.cpp.orig	2014-11-16 18:57:59.000000000 +0000
++++ modules/gui/qt4/dialogs/messages.cpp
+@@ -143,7 +143,7 @@ MessagesDialog::~MessagesDialog()
+ 
+ void MessagesDialog::changeVerbosity( int i_verbosity )
+ {
+-    atomic_store( &this->verbosity, i_verbosity );
++    atomic_store( &this->verbosity, (unsigned int)i_verbosity );
+ }
+ 
+ void MessagesDialog::updateConfig()
diff --git a/multimedia/vlc/patches/patch-modules_gui_qt4_qt4.hpp b/multimedia/vlc/patches/patch-modules_gui_qt4_qt4.hpp
new file mode 100644
index 00000000000..8e93ce9a10d
--- /dev/null
+++ b/multimedia/vlc/patches/patch-modules_gui_qt4_qt4.hpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-modules_gui_qt4_qt4.hpp,v 1.1 2015/11/01 20:15:06 tnn Exp $
+
+We need to include vlc_atomic.h early. Something pulls it in later with
+C linkage and that makes clang sad (#include <atomic> needs C++ linkage).
+
+--- modules/gui/qt4/qt4.hpp.orig	2014-11-16 18:57:59.000000000 +0000
++++ modules/gui/qt4/qt4.hpp
+@@ -29,6 +29,7 @@
+ # include "config.h"
+ #endif
+ 
++#include <vlc_atomic.h>
+ #include <vlc_common.h>    /* VLC_COMMON_MEMBERS for vlc_interface.h */
+ #include <vlc_interface.h> /* intf_thread_t */
+ #include <vlc_playlist.h>  /* playlist_t */