[76933] trunk/dports/multimedia/VLC

[jeremyhu at macports.org]

Revision: 76933
          http://trac.macports.org/changeset/76933
Author:   jeremyhu at macports.org
Date:     2011-03-13 17:13:12 -0700 (Sun, 13 Mar 2011)
Log Message:
-----------
VLC: More XCode4 cleanup

Add jacks and portaudio variants for audio output
Add qtcapture and auhal variants for Leopard and prior
Add portaudio to default set

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

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

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2011-03-13 23:42:52 UTC (rev 76932)
+++ trunk/dports/multimedia/VLC/Portfile	2011-03-14 00:13:12 UTC (rev 76933)
@@ -6,7 +6,7 @@
 
 name                VLC
 version             1.0.6
-revision            3
+revision            4
 
 categories          multimedia
 
@@ -46,7 +46,7 @@
     }
 }
 
-patchfiles      patch-Makefile.am.diff patch-configure.ac-xcb.diff patch-png.c.diff patch-configure.ac-no_qtcapture.diff
+patchfiles      patch-Makefile.am.diff patch-configure.ac-xcb.diff patch-png.c.diff patch-configure.ac-no_qtcapture.diff patch-configure.ac-macosx_audio.diff
 
 use_parallel_build no
 use_autoreconf yes
@@ -66,11 +66,12 @@
 universal_variant   no
 
 configure.args-append   --disable-macosx-defaults \
-    --enable-release --enable-macosx --enable-macosx-audio --enable-a52 --enable-cddax \
+    --enable-release --enable-macosx --disable-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-live555-tree=${prefix}/lib/live \
+    --disable-jack --disable-portaudio \
     --disable-debug --disable-x11 --disable-xvideo --disable-glx --disable-xinerama \
     --disable-xcb --disable-xvmc --disable-qt4 --disable-quicktime \
     --disable-skins2 --disable-notify --disable-telepathy --disable-twolame \
@@ -80,6 +81,27 @@
     --disable-growl --disable-sdl --disable-caca --disable-smb \
     --disable-update-check --without-x
 
+variant jack description {Enable jack plugin for audio output} {
+    depends_lib-append      port:jack
+    configure.args-delete   --disable-jack
+    configure.args-append   --enable-jack
+}
+
+variant jack description {Enable portaudio module for audio output} {
+    depends_lib-append      port:portaudio
+    configure.args-delete   --disable-portaudio
+    configure.args-append   --enable-portaudio
+}
+
+variant auhal description {Enable CoreAudio module for audio output (doesn't work on Snow Leopard)} {
+    configure.args-delete   --disable-macosx-audio
+    configure.args-append   --enable-macosx-audio
+}
+
+variant qtcapture description {Enable qtcapture module (doesn't work on Snow Leopard)} {
+    patchfiles-delete       patch-configure.ac-no_qtcapture.diff
+}
+
 variant x264 description {Enable H.264 en/decoding} {
     depends_lib-append      port:x264
     configure.args-delete   --disable-x264
@@ -213,21 +235,10 @@
     }
 }
 
-platform macosx {
-    destroot.target-append  VLC.app
-    post-destroot {
-        file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
-    }
-}
-
-platform darwin 10 {
-    patchfiles-append patch-fdatasync_sl.diff
-}
-
 variant minimal description {VLC Mac OS X minimal configuration} {}
 
 variant huge conflicts minimal \
-    requires svg vcd speex dvb fribidi sdl shout \
+    requires svg vcd speex dvb fribidi sdl shout jack \
     description {Enable all variants except x11, qt4, smb and no_*} {}
 
 variant full requires huge qt4 smb \
@@ -235,9 +246,32 @@
 
 # Unless minimal variant is set compile with default Mac OS X configuration
 if {![variant_isset minimal]} {
-    default_variants +x264 +theora +twolame +mod +mpc +osd
+    default_variants +x264 +theora +twolame +mod +mpc +osd +portaudio
 }
 
 if {[variant_isset x11]} {
     default_variants-append +qt4
 }
+
+platform macosx {
+    destroot.target-append  VLC.app
+    post-destroot {
+        file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
+    }
+}
+
+platform darwin 8 {
+    if {![variant_isset minimal]} {
+        default_variants-append qtcapture auhal
+    }
+}
+
+platform darwin 9 {
+    if {![variant_isset minimal]} {
+        default_variants-append qtcapture auhal
+    }
+}
+
+platform darwin 10 {
+    patchfiles-append patch-fdatasync_sl.diff
+}

Added: trunk/dports/multimedia/VLC/files/patch-configure.ac-macosx_audio.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-configure.ac-macosx_audio.diff	                        (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-configure.ac-macosx_audio.diff	2011-03-14 00:13:12 UTC (rev 76933)
@@ -0,0 +1,13 @@
+--- configure.ac.orig	2011-03-13 17:04:22.000000000 -0700
++++ configure.ac	2011-03-13 17:04:41.000000000 -0700
+@@ -4817,8 +4817,8 @@ dnl  CoreAudio plugin
+ dnl
+ AC_ARG_ENABLE(macosx-audio,
+   [  --enable-macosx-audio   Mac OS X audio module (default enabled on MacOS X)])
+-if test "${enable_macosx-audio}" != "no" &&
+-  (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes")
++if test "${enable_macosx_audio}" != "no" &&
++  (test "${SYS}" = "darwin" || test "${enable_macosx_audio}" = "yes")
+ then
+   AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
+     [ VLC_ADD_PLUGIN([auhal])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110313/0bff8107/attachment.html>