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

[jeremyhu at macports.org]

Revision: 92675
          https://trac.macports.org/changeset/92675
Author:   jeremyhu at macports.org
Date:     2012-05-03 12:19:52 -0700 (Thu, 03 May 2012)
Log Message:
-----------
VLC: Fix building the +x11 variant, don't use qt4-x11.

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

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2012-05-03 18:51:26 UTC (rev 92674)
+++ trunk/dports/multimedia/VLC/Portfile	2012-05-03 19:19:52 UTC (rev 92675)
@@ -72,8 +72,6 @@
 
     reinplace "s:librsvg-2/librsvg:librsvg:" \
         ${worksrcpath}/modules/text_renderer/svg.c
-    reinplace "s:HOST_NAME_MAX:_POSIX_HOST_NAME_MAX:" \
-        ${worksrcpath}/modules/video_output/xcb/window.c
 
     ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
 
@@ -258,20 +256,11 @@
                             --enable-xvideo --enable-glx --enable-xcb
 }
 
-variant qt4 description {Build using QT4 UI.  This will use qt4-x11 if +x11 and qt4-mac otherwise.} {
+variant qt4 description {Build using QT4 UI.  This will use qt4-mac} {
     configure.args-delete --disable-qt4
     configure.args-append --enable-qt4
 
-    if {[variant_isset x11]} {
-        depends_lib-append port:qt4-x11
-        set qt_dir ${prefix}/libexec/qt4-x11
-        configure.cppflags-append -D__USE_WS_X11__
-        configure.env-append QTDIR=${qt_dir}
-        set env(PATH) "${qt_dir}/bin:$env(PATH)"
-        configure.pkg_config_path "${configure.pkg_config_path}:${qt_dir}/lib/pkgconfig"
-    } else {
-        PortGroup qt4 1.0
-    }
+    PortGroup qt4 1.0
 }
 
 default_variants +ffmpeg +dvd +auhal
@@ -290,10 +279,6 @@
     default_variants-append +x264 +theora +twolame +mod +mpc +osd +qtkit
 }
 
-if {[variant_isset x11]} {
-    default_variants-append +qt4
-}
-
 platform macosx {
     post-destroot {
         file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120503/8f7194b9/attachment-0001.html>