[92694] trunk/dports/multimedia/VLC/Portfile

[jeremyhu at macports.org]

Revision: 92694
          https://trac.macports.org/changeset/92694
Author:   jeremyhu at macports.org
Date:     2012-05-03 18:35:25 -0700 (Thu, 03 May 2012)
Log Message:
-----------
VLC: Fix a typo and disable qtkit on Leopard (#34321)

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

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2012-05-04 01:23:03 UTC (rev 92693)
+++ trunk/dports/multimedia/VLC/Portfile	2012-05-04 01:35:25 UTC (rev 92694)
@@ -69,6 +69,14 @@
     reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
         ${worksrcpath}/Makefile.am 
 
+    reinplace "/argv/s/environ/*_NSGetEnviron()/" \
+        ${worksrcpath}/modules/misc/inhibit/xdg.c \
+        ${worksrcpath}/modules/misc/inhibit/xscreensaver.c
+
+    reinplace "s/extern char \\*\\*environ;/#include <crt_externs.h>/" \
+        ${worksrcpath}/modules/misc/inhibit/xdg.c \
+        ${worksrcpath}/modules/misc/inhibit/xscreensaver.c
+
     reinplace "s:librsvg-2/librsvg:librsvg:" \
         ${worksrcpath}/modules/text_renderer/svg.c
 
@@ -102,7 +110,7 @@
     --with-contrib=${worksrcpath}/contrib \
     --disable-debug --disable-update-check --enable-gnutls \
     --disable-notify --disable-telepathy --disable-dbus \
-    --disable-grow --disable-macosx-vlc-app
+    --disable-growl --disable-macosx-vlc-app
 
 # Input Plugins
 configure.args-append \
@@ -156,6 +164,11 @@
 variant qtkit description {Enable qtcapture and qtaudio} {
     configure.args-delete   --disable-macosx-qtkit
     configure.args-append   --enable-macosx-qtkit
+
+    if {${os.major} < 10} {
+        ui_error "The +qtkit variant requires Snow Leopard or greater"
+        return -code error "incompatible Mac OS X version"
+    }
 }
 
 variant eyetv description {Enable eyetv plugin} {
@@ -304,7 +317,7 @@
 default_variants +dvd +ffmpeg +mod +mpc +osd +theora +twolame +x264 +quartz
 
 variant huge \
-    requires bonjour dvb dvd ffmpeg fribidi jack mod mpc osd qtkit sdl shout speex svg theora twolame vcd x264 \
+    requires bonjour dvb dvd ffmpeg fribidi jack mod mpc osd sdl shout speex svg theora twolame vcd x264 \
     description {Enable all variants except quartz, qt4, smb, and x11} {}
 
 variant full \
@@ -312,6 +325,10 @@
     description {Enable all variants} {}
 
 platform macosx {
+    if {${os.major} > 9} {
+        default_variants-append +qtkit
+    }
+
     configure.args-delete \
         --disable-macosx-vout --disable-macosx-audio \
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120503/f77984bc/attachment-0001.html>