[101439] trunk/dports/multimedia/VLC-devel

[jeremyhu at macports.org]

Revision: 101439
          https://trac.macports.org/changeset/101439
Author:   jeremyhu at macports.org
Date:     2013-01-10 18:00:02 -0800 (Thu, 10 Jan 2013)
Log Message:
-----------
VLC-devel: Fix some build failures

Modified Paths:
--------------
    trunk/dports/multimedia/VLC-devel/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/VLC-devel/files/class_struct.patch
    trunk/dports/multimedia/VLC-devel/files/qtkit.patch
    trunk/dports/multimedia/VLC-devel/files/static_assert.patch

Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile	2013-01-11 01:38:53 UTC (rev 101438)
+++ trunk/dports/multimedia/VLC-devel/Portfile	2013-01-11 02:00:02 UTC (rev 101439)
@@ -65,6 +65,9 @@
     buildfix-package.mak.patch \
     configure.ac-no-arch.patch \
     PR-34741-no__clang_version__.patch \
+    class_struct.patch \
+    qtkit.patch \
+    static_assert.patch \
     no-sparkle.patch
 
 post-patch {

Added: trunk/dports/multimedia/VLC-devel/files/class_struct.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/class_struct.patch	                        (rev 0)
+++ trunk/dports/multimedia/VLC-devel/files/class_struct.patch	2013-01-11 02:00:02 UTC (rev 101439)
@@ -0,0 +1,39 @@
+diff --git a/modules/demux/mkv/chapter_command.hpp b/modules/demux/mkv/chapter_command.hpp
+index 7c8a3c1..80b3e45 100644
+--- modules/demux/mkv/chapter_command.hpp
++++ modules/demux/mkv/chapter_command.hpp
+@@ -35,7 +35,7 @@ const binary MATROSKA_DVD_LEVEL_PG   = 0x18;
+ const binary MATROSKA_DVD_LEVEL_PTT  = 0x10;
+ const binary MATROSKA_DVD_LEVEL_CN   = 0x08;
+ 
+-class demux_sys_t;
++struct demux_sys_t;
+ 
+ class chapter_codec_cmds_c
+ {
+diff --git a/modules/demux/mkv/demux.hpp b/modules/demux/mkv/demux.hpp
+index 3cb5f60..4412044 100644
+--- modules/demux/mkv/demux.hpp
++++ modules/demux/mkv/demux.hpp
+@@ -326,7 +326,7 @@ private:
+ };
+ 
+ 
+-class demux_sys_t
++struct demux_sys_t
+ {
+ public:
+     demux_sys_t( demux_t & demux )
+diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
+index c2d5478..6086f17 100644
+--- modules/demux/mkv/mkv.cpp
++++ modules/demux/mkv/mkv.cpp
+@@ -73,7 +73,7 @@ vlc_module_begin ()
+     add_shortcut( "mka", "mkv" )
+ vlc_module_end ()
+ 
+-class demux_sys_t;
++struct demux_sys_t;
+ 
+ static int  Demux  ( demux_t * );
+ static int  Control( demux_t *, int, va_list );

Added: trunk/dports/multimedia/VLC-devel/files/qtkit.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/qtkit.patch	                        (rev 0)
+++ trunk/dports/multimedia/VLC-devel/files/qtkit.patch	2013-01-11 02:00:02 UTC (rev 101439)
@@ -0,0 +1,13 @@
+diff --git a/modules/access/qtsound.m b/modules/access/qtsound.m
+index 4ff1230..01c7894 100644
+--- modules/access/qtsound.m
++++ modules/access/qtsound.m
+@@ -40,7 +40,7 @@
+ #include <vlc_dialog.h>
+ 
+ //#define QTKIT_VERSION_MIN_REQUIRED 70603
+-#define QTKIT_VERSION_MAX_ALLOWED 70700
++//#define QTKIT_VERSION_MAX_ALLOWED 70700
+ 
+ #import <QTKit/QTKit.h>
+ 

Added: trunk/dports/multimedia/VLC-devel/files/static_assert.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/static_assert.patch	                        (rev 0)
+++ trunk/dports/multimedia/VLC-devel/files/static_assert.patch	2013-01-11 02:00:02 UTC (rev 101439)
@@ -0,0 +1,15 @@
+diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
+index 9d20a2d..4c99329 100644
+--- include/vlc_fixups.h
++++ include/vlc_fixups.h
+@@ -241,8 +241,8 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
+ }
+ #endif
+ 
+-#if !defined (HAVE_STATIC_ASSERT)
+-# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
++#if !defined (HAVE_STATIC_ASSERT) && !defined (static_assert)
++# define _Static_assert(x, s) ((void) sizeof (struct { unsigned a[(x) ? 1 : -1];}))
+ # define static_assert _Static_assert
+ #endif
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130110/7bedb3ce/attachment-0001.html>