[49640] trunk/dports/multimedia/VLC

jeremyhu at macports.org jeremyhu at macports.org
Mon Apr 13 20:54:03 PDT 2009 

Revision: 49640
          http://trac.macports.org/changeset/49640
Author:   jeremyhu at macports.org
Date:     2009-04-13 20:54:01 -0700 (Mon, 13 Apr 2009)
Log Message:
-----------
VLC: Added a variant for the qt4 ui.

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

Added Paths:
-----------
    trunk/dports/multimedia/VLC/files/VLC-Makefile.am.patch
    trunk/dports/multimedia/VLC/files/qt4-x11.patch

Removed Paths:
-------------
    trunk/dports/multimedia/VLC/files/VLC-Makefile.in.diff

Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile	2009-04-14 02:52:58 UTC (rev 49639)
+++ trunk/dports/multimedia/VLC/Portfile	2009-04-14 03:54:01 UTC (rev 49640)
@@ -4,7 +4,7 @@
 
 name				VLC
 version				0.9.9a
-revision			0
+revision			1
 
 categories			multimedia
 
@@ -29,15 +29,19 @@
 
 # Remove LLVM for now. Only required for upcoming VLC 1.0.0
 #depends_build-append port:llvm-gcc42
-depends_lib-append	port:lame port:a52dec port:libogg port:flac \
-					port:libdca port:libcddb port:libcdio port:libmad \
-					port:libvorbis port:libmatroska port:libid3tag \
-					port:ncurses port:lua port:libpng port:jpeg \
-					port:libdvdplay port:libdvdnav port:ffmpeg \
-					port:gnutls port:taglib
+depends_build	port:autoconf port:automake port:libtool
+depends_lib	port:lame port:a52dec port:libogg port:flac \
+		port:libdca port:libcddb port:libcdio port:libmad \
+		port:libvorbis port:libmatroska port:libid3tag \
+		port:ncurses port:lua port:libpng port:jpeg \
+		port:libdvdplay port:libdvdnav port:ffmpeg \
+		port:gnutls port:taglib
 
-patchfiles			VLC-Makefile.in.diff 
+patchfiles			VLC-Makefile.am.patch
 
+use_autoreconf yes
+autoreconf.args -fvi
+
 # VLC needs to be compiled with llvm-gcc frontend
 #configure.cc		${prefix}/bin/llvm-gcc-4.2
 #configure.cpp		${prefix}/bin/llvm-cpp-4.2
@@ -54,7 +58,7 @@
 universal_variant no
 
 configure.args-append	--disable-macosx-defaults \
-	--disable-debug --disable-x11 --disable-xvideo --disable-glx \
+	--disable-debug --disable-x11 --disable-xvideo --disable-glx --disable-qt4 \
 	--disable-skins2 --disable-notify --disable-telepathy --disable-twolame \
 	--disable-speex --disable-theora --disable-x264 --disable-live555 --disable-dvbpsi \
 	--disable-vcdx  --disable-fontconfig --disable-freetype \
@@ -175,15 +179,34 @@
 }
 
 variant x11 description {Build support for X11} {
-    depends_lib-append 		port:mesa \
-							port:xorg-libXinerama \
-    						port:xorg-libXv \
-    						port:xorg-libXxf86vm
+    depends_lib-append \
+	port:mesa \
+	port:xorg-libXinerama \
+	port:xorg-libXv \
+	port:xorg-libXxf86vm
 
     configure.args-delete   --disable-x11 --disable-xvideo --disable-glx
     configure.args-append   --enable-x11 --enable-xvideo --enable-glx
 }
 
+variant qt4 description {Build using QT4 UI.  This will use qt4-x11 if +x11 and qt4-mac otherwise.} {
+    configure.args-delete --disable-qt4
+    configure.args-append --enable-qt4
+
+    if {[variant_isset x11]} {
+        depends_lib-append port:qt4-x11
+        patchfiles-append qt4-x11.patch
+        set qt_dir ${prefix}/libexec/qt4-x11
+        configure.cppflags-append -D__USE_WS_X11__
+    } else {
+        depends_lib-append port:qt4-mac
+        set qt_dir ${prefix}/libexec/qt4-mac
+    }
+    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"
+}
+
 variant aqua description {Install VLC.app} {
 	destroot.target-append  VLC.app
 }
@@ -192,16 +215,20 @@
 
 variant huge conflicts minimal \
 	requires svg vcd live555 speex dvb fribidi bonjour sdl shout \
-	description {Enable all variants except x11, smb and no_*} {}
+	description {Enable all variants except x11, qt4, smb and no_*} {}
 
-variant full requires huge x11 smb \
-	description {Enable all variants except no_*} {}
+variant full requires huge qt4 smb \
+	description {Enable all variants except x11 and no_*} {}
 
 # Unless minimal variant is set compile with default OSX configuration
 if {![variant_isset minimal]} {
 	default_variants +aqua +x264 +theora +twolame +mod +mpc +osd 
 }
 
+if {[variant_isset x11]} {
+	default_variants-append +qt4
+}
+
 post-destroot {
 	if {[variant_isset aqua]} {
 		file mkdir ${destroot}/${applications_dir}

Added: trunk/dports/multimedia/VLC/files/VLC-Makefile.am.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/VLC-Makefile.am.patch	                        (rev 0)
+++ trunk/dports/multimedia/VLC/files/VLC-Makefile.am.patch	2009-04-14 03:54:01 UTC (rev 49640)
@@ -0,0 +1,34 @@
+--- Makefile.am.orig	2009-04-13 18:30:56.000000000 -0700
++++ Makefile.am	2009-04-13 18:31:20.000000000 -0700
+@@ -398,13 +398,6 @@ vlc$(EXEEXT): Makefile.am
+ 	chmod +x vlc.tmp
+ 	mv -f -- vlc.tmp vlc
+ 
+-if HAVE_DARWIN
+-if BUILD_VLC
+-# Create the MacOS X app
+-noinst_DATA = VLC.app
+-endif
+-endif
+-
+ # VLC-release.app for packaging and giving it to your friends
+ # use package-macosx to get a nice dmg
+ VLC-release.app: vlc
+@@ -415,7 +408,7 @@ VLC-release.app: vlc
+ 	for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
+ 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+ 	done
+-	REVISION=`git describe` && \
++	REVISION="$(VERSION_REVISION)" && \
+ 	cat $(top_builddir)/extras/package/macosx/Info.plist | \
+ 	sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
+ 	cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
+@@ -582,7 +575,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/l
+ 	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+ 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
+ 	done
+-	REVISION=`git describe` && \
++	REVISION="$(VERSION_REVISION)" && \
+ 	cat $(top_builddir)/extras/package/macosx/Info.plist | \
+ 	sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
+ 	cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/

Deleted: trunk/dports/multimedia/VLC/files/VLC-Makefile.in.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/VLC-Makefile.in.diff	2009-04-14 02:52:58 UTC (rev 49639)
+++ trunk/dports/multimedia/VLC/files/VLC-Makefile.in.diff	2009-04-14 03:54:01 UTC (rev 49640)
@@ -1,29 +0,0 @@
---- Makefile.in.orig	2009-04-04 03:32:07.000000000 +0200
-+++ Makefile.in	2009-04-04 03:33:06.000000000 +0200
-@@ -928,7 +928,7 @@
- DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
- 
- # Create the MacOS X app
-- at BUILD_VLC_TRUE@@HAVE_DARWIN_TRUE at noinst_DATA = VLC.app
-+ at BUILD_VLC_TRUE@@HAVE_DARWIN_TRUE at noinst_DATA =
- @HAVE_BEOS_TRUE at noinst_DATA = vlc-bundle
- 
- ###############################################################################
-@@ -1539,7 +1539,7 @@
- 	for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
- 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
- 	done
--	REVISION=`git describe` && \
-+	REVISION="$(VERSION_REVISION)" && \
- 	cat $(top_builddir)/extras/package/macosx/Info.plist | \
- 	sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
- 	cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
-@@ -1706,7 +1706,7 @@
- 	for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
- 	  cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
- 	done
--	REVISION=`git describe` && \
-+	REVISION="$(VERSION_REVISION)" && \
- 	cat $(top_builddir)/extras/package/macosx/Info.plist | \
- 	sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
- 	cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/

Added: trunk/dports/multimedia/VLC/files/qt4-x11.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/qt4-x11.patch	                        (rev 0)
+++ trunk/dports/multimedia/VLC/files/qt4-x11.patch	2009-04-14 03:54:01 UTC (rev 49640)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2009-04-13 18:24:35.000000000 -0700
++++ configure.ac	2009-04-13 18:25:36.000000000 -0700
+@@ -4965,7 +4965,7 @@ AS_IF([test "${enable_qt4}" != "no"], [
+     VLC_ADD_PLUGIN([qt4])
+     AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
+     ALIASES="${ALIASES} qvlc"
+-    AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"], [
++    AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin"], [
+         VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11])
+     ], [
+         VLC_ADD_LIBS([qt4],[$QT4_LIBS -lqjpeg])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090413/b06e10b5/attachment.html>

More information about the macports-changes mailing list