Attachment 170584 Details for Bug 209722 – Work around atomic redeclarations in vlc

[patch] Work around atomic redeclarations in vlc

multimedia__vlc-fix-atomic-1.diff (text/plain), 4.27 KB, created by Dimitry Andric on 2016-05-23 23:15:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2016-05-23 23:15:24 UTC

Size: 4.27 KB

patch

obsolete

>Index: multimedia/vlc/files/patch-include_vlc__atomic.h
>===================================================================
>--- multimedia/vlc/files/patch-include_vlc__atomic.h	(nonexistent)
>+++ multimedia/vlc/files/patch-include_vlc__atomic.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- include/vlc_atomic.h.orig	2014-08-14 07:20:03 UTC
>++++ include/vlc_atomic.h
>+@@ -32,6 +32,14 @@
>+ /*** Native C11 atomics ***/
>+ #  include <stdatomic.h>
>+ 
>++# elif defined (__cplusplus) && defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 3800
>++
>++#  include <atomic>
>++
>++using std::atomic_uint_least32_t;
>++using std::atomic_uintptr_t;
>++using std::atomic_int;
>++
>+ # else
>+ 
>+ #  define ATOMIC_FLAG_INIT false
>
>Property changes on: multimedia/vlc/files/patch-include_vlc__atomic.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: multimedia/vlc/files/patch-include_vlc__playlist.h
>===================================================================
>--- multimedia/vlc/files/patch-include_vlc__playlist.h	(nonexistent)
>+++ multimedia/vlc/files/patch-include_vlc__playlist.h	(working copy)
>@@ -0,0 +1,19 @@
>+--- include/vlc_playlist.h.orig	2014-11-16 18:57:58 UTC
>++++ include/vlc_playlist.h
>+@@ -24,13 +24,13 @@
>+ #ifndef VLC_PLAYLIST_H_
>+ #define VLC_PLAYLIST_H_
>+ 
>++#include <vlc_input.h>
>++#include <vlc_events.h>
>++
>+ # ifdef __cplusplus
>+ extern "C" {
>+ # endif
>+ 
>+-#include <vlc_input.h>
>+-#include <vlc_events.h>
>+-
>+ TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t)
>+ 
>+ struct intf_thread_t;
>
>Property changes on: multimedia/vlc/files/patch-include_vlc__playlist.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: multimedia/vlc/files/patch-include_vlc__sout.h
>===================================================================
>--- multimedia/vlc/files/patch-include_vlc__sout.h	(nonexistent)
>+++ multimedia/vlc/files/patch-include_vlc__sout.h	(working copy)
>@@ -0,0 +1,22 @@
>+--- include/vlc_sout.h.orig	2014-11-16 18:57:58 UTC
>++++ include/vlc_sout.h
>+@@ -28,6 +28,9 @@
>+ #ifndef VLC_SOUT_H_
>+ #define VLC_SOUT_H_
>+ 
>++#include <sys/types.h>
>++#include <vlc_es.h>
>++
>+ /**
>+  * \file
>+  * This file defines structures and functions for stream output in vlc
>+@@ -37,9 +40,6 @@
>+ extern "C" {
>+ #endif
>+ 
>+-#include <sys/types.h>
>+-#include <vlc_es.h>
>+-
>+ /** Stream output instance (FIXME: should be private to src/ to avoid
>+  * invalid unsynchronized access) */
>+ struct sout_instance_t
>
>Property changes on: multimedia/vlc/files/patch-include_vlc__sout.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp
>===================================================================
>--- multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp	(nonexistent)
>+++ multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- modules/gui/qt4/dialogs/messages.hpp.orig	2014-08-14 07:20:04 UTC
>++++ modules/gui/qt4/dialogs/messages.hpp
>+@@ -55,7 +55,7 @@ private:
>+     void sinkMessage( const MsgEvent * );
>+     bool matchFilter( const QString& );
>+ 
>+-    atomic_uint verbosity;
>++    atomic_int verbosity;
>+     static void MsgCallback( void *, int, const vlc_log_t *, const char *,
>+                              va_list );
>+ 
>
>Property changes on: multimedia/vlc/files/patch-modules_gui_qt4_dialogs_messages.hpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 209722: 170584