[76932] trunk/dports/multimedia/VLC

[jeremyhu at macports.org]

Revision: 76932
          http://trac.macports.org/changeset/76932
Author:   jeremyhu at macports.org
Date:     2011-03-13 16:42:52 -0700 (Sun, 13 Mar 2011)
Log Message:
-----------
VLC: Steps towards XCode4 support

Don't build qtcapture plugin which uses deprecated/crufty APIs.
Don't force the 10.5 SDK (which was a workaround for above).
Correctly depend on xorg-xcb-util for +x11 variant.

There are still other problems, but this is a good step forward.

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

Added Paths:
-----------
    trunk/dports/multimedia/VLC/files/patch-configure.ac-no_qtcapture.diff

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2011-03-13 22:19:00 UTC (rev 76931)
+++ trunk/dports/multimedia/VLC/Portfile	2011-03-13 23:42:52 UTC (rev 76932)
@@ -46,7 +46,7 @@
     }
 }
 
-patchfiles      patch-Makefile.am.diff patch-configure.ac-xcb.diff patch-png.c.diff
+patchfiles      patch-Makefile.am.diff patch-configure.ac-xcb.diff patch-png.c.diff patch-configure.ac-no_qtcapture.diff
 
 use_parallel_build no
 use_autoreconf yes
@@ -54,6 +54,7 @@
 
 # VLC needs to be compiled with llvm-gcc frontend
 configure.compiler llvm-gcc-4.2
+configure.env-append CXXCPP="${configure.cxx} -E"
 
 build.target    all
 destroot.target install
@@ -64,14 +65,11 @@
 # live555 and possibly others are not universal, so disabling for now
 universal_variant   no
 
-# VLC currently doesn't build with 10.6sdk, force 10.5sdk (#21487)
 configure.args-append   --disable-macosx-defaults \
     --enable-release --enable-macosx --enable-macosx-audio --enable-a52 --enable-cddax \
     --enable-dvdnav --enable-dvdread --enable-faad --enable-flac --enable-live555 \
     --enable-vorbis --enable-ogg --enable-mad --disable-libass --enable-asademux \
     --enable-dca --enable-gnutls --enable-ncurses --enable-png --enable-realrtsp \
-    --with-macosx-version-min=10.5 \
-    --with-macosx-sdk=/Developer/SDKs/MacOSX10.5.sdk \
     --with-live555-tree=${prefix}/lib/live \
     --disable-debug --disable-x11 --disable-xvideo --disable-glx --disable-xinerama \
     --disable-xcb --disable-xvmc --disable-qt4 --disable-quicktime \
@@ -190,7 +188,8 @@
     port:mesa \
     port:xorg-libXinerama \
     port:xorg-libXv \
-    port:xorg-libXxf86vm
+    port:xorg-libXxf86vm \
+    port:xorg-xcb-util
 
     configure.args-delete   --disable-x11 --disable-xvideo --disable-glx --disable-xinerama --disable-xcb
     configure.args-append   --enable-x11 --enable-xvideo --enable-glx --enable-xinerama --enable-xcb

Added: trunk/dports/multimedia/VLC/files/patch-configure.ac-no_qtcapture.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-configure.ac-no_qtcapture.diff	                        (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-configure.ac-no_qtcapture.diff	2011-03-13 23:42:52 UTC (rev 76932)
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2011-03-13 16:30:41.000000000 -0700
++++ configure.ac	2011-03-13 16:31:04.000000000 -0700
+@@ -5176,7 +5176,6 @@ then
+   VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] )
+ 
+   VLC_ADD_PLUGIN([access_eyetv])
+-  VLC_ADD_PLUGIN([qtcapture])
+   VLC_ADD_PLUGIN([macosx])
+   VLC_ADD_PLUGIN([minimal_macosx])
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110313/c93ee8ab/attachment-0001.html>