[53864] trunk/dports/multimedia/VLC
snc at macports.org
snc at macports.org
Wed Jul 15 17:20:44 PDT 2009
Revision: 53864
http://trac.macports.org/changeset/53864
Author: snc at macports.org
Date: 2009-07-15 17:20:43 -0700 (Wed, 15 Jul 2009)
Log Message:
-----------
updated VLC, ticket #20272
Modified Paths:
--------------
trunk/dports/multimedia/VLC/Portfile
Added Paths:
-----------
trunk/dports/multimedia/VLC/files/patch-Makefile.am.diff
trunk/dports/multimedia/VLC/files/patch-configure.ac-xcb.diff
trunk/dports/multimedia/VLC/files/patch-qt4-x11.diff
Removed Paths:
-------------
trunk/dports/multimedia/VLC/files/VLC-Makefile.am.patch
trunk/dports/multimedia/VLC/files/qt4-x11.patch
Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile 2009-07-16 00:05:44 UTC (rev 53863)
+++ trunk/dports/multimedia/VLC/Portfile 2009-07-16 00:20:43 UTC (rev 53864)
@@ -1,79 +1,80 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id $
-PortSystem 1.0
+PortSystem 1.0
-name VLC
-version 0.9.9a
-revision 1
+name VLC
+version 1.0.0
-categories multimedia
+categories multimedia
-maintainers inmachina.com:max openmaintainer
-description VLC is a cross-platform media player and streaming server
-long_description VLC media player is a highly portable multimedia player for \
- various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, \
- mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols. \
- It can also be used as a server to stream in unicast or multicast \
- in IPv4 or IPv6 on a high-bandwidth network.
+maintainers inmachina.com:max openmaintainer
+description VLC is a cross-platform media player and streaming server
+long_description VLC media player is a highly portable multimedia player for \
+ various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, \
+ mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols. \
+ It can also be used as a server to stream in unicast or multicast \
+ in IPv4 or IPv6 on a high-bandwidth network.
-platforms darwin
+platforms darwin
-homepage http://www.videolan.org
-master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
-distname vlc-${version}
-use_bzip2 yes
+homepage http://www.videolan.org
+master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
+distname vlc-${version}
+use_bzip2 yes
-checksums md5 c8d832deeef7f4072a73506f8d033198 \
- sha1 c72a3aa7854292356c0c5149cbb732da7d46b163 \
- rmd160 c185b5e8dae8e8aacb6e1c03f14eae24cb805648
+checksums md5 fc78904ab5fa73f518d8fe4e852e7f67 \
+ sha1 fff08528d97d26f6f7faeafba94b445e0e3562e8 \
+ rmd160 7d0ed52c580c75d09003788f5a2d27b7de18b410
-# Remove LLVM for now. Only required for upcoming VLC 1.0.0
-#depends_build-append port:llvm-gcc42
-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 port:libxml2
+depends_build port:autoconf port:automake port:libtool \
+ port:llvm-gcc42
+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 port:libxml2
-patchfiles VLC-Makefile.am.patch
+patchfiles patch-Makefile.am.diff patch-configure.ac-xcb.diff
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
-#configure.cxx ${prefix}/bin/llvm-g++-4.2
-#configure.objc ${prefix}/bin/llvm-gcc-4.2
+configure.cc ${prefix}/bin/llvm-gcc-4.2
+configure.cpp ${prefix}/bin/llvm-cpp-4.2
+configure.cxx ${prefix}/bin/llvm-g++-4.2
+configure.objc ${prefix}/bin/llvm-gcc-4.2
-build.target all
-destroot.target install VLC.app
+build.target all
+destroot.target install
-livecheck.url http://download.videolan.org/pub/videolan/vlc/
-livecheck.regex <a href=\"(\\d\[\\d|\.|\\w\]+).*/\">
+livecheck.url http://download.videolan.org/pub/videolan/vlc/
+livecheck.regex <a href=\"(\\d\[\\d|\.|\\w\]+).*/\">
# live555 and possibly others are not universal, so disabling for now
-universal_variant no
+universal_variant no
-configure.args-append --disable-macosx-defaults \
- --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 \
- --disable-dbus --disable-bonjour --disable-fribidi --disable-goom \
- --disable-growl --disable-sdl --disable-caca --disable-smb \
- --enable-release --enable-macosx --enable-a52 --enable-cddax \
- --enable-dvdnav --enable-dvdread --enable-faad --enable-flac \
- --enable-vorbis --enable-ogg --enable-mad --enable-libass --enable-asademux \
- --enable-dca --enable-gnutls --enable-ncurses --enable-png --enable-realrtsp \
- --with-macosx-version-min=10.4
+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-quicktime \
+ --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 \
+ --disable-debug --disable-x11 --disable-xvideo --disable-glx --disable-xinerama \
+ --disable-xcb --disable-xvmc --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 \
+ --disable-dbus --disable-bonjour --disable-fribidi --disable-goom \
+ --disable-growl --disable-sdl --disable-caca --disable-smb \
+ --disable-update-check --without-x
variant x264 description {Enable H.264 en/decoding} {
- depends_lib-append port:x264
- configure.args-delete --disable-x264
- configure.args-append --enable-x264
+ depends_lib-append port:x264
+ configure.args-delete --disable-x264
+ configure.args-append --enable-x264
}
variant theora description {Enable OggTheora support} {
@@ -83,56 +84,56 @@
}
variant twolame description {Enable MPEG Audio Layer 2 encoding} {
- depends_lib-append port:twolame
- configure.args-delete --disable-twolame
- configure.args-append --enable-twolame
+ depends_lib-append port:twolame
+ configure.args-delete --disable-twolame
+ configure.args-append --enable-twolame
}
variant live555 description {Enable Live555 streaming media support} {
- depends_lib-append port:live555
- configure.args-delete --disable-live555
- configure.args-append --enable-live555 \
- --with-live555-tree=${prefix}/lib/live
+ depends_lib-append port:live555
+ configure.args-delete --disable-live555
+ configure.args-append --enable-live555 \
+ --with-live555-tree=${prefix}/lib/live
}
variant speex description {Enable Speex decoder support} {
- depends_lib-append path:lib/libspeex.dylib:speex
- configure.args-delete --disable-speex
- configure.args-append --enable-speex
+ depends_lib-append path:lib/libspeex.dylib:speex
+ configure.args-delete --disable-speex
+ configure.args-append --enable-speex
}
variant svg description {Enable SVG support} {
- depends_lib-append port:librsvg
- configure.args-append --enable-svg
+ depends_lib-append port:librsvg
+ configure.args-append --enable-svg
}
variant shout description {Enable Shoutcast support} {
- depends_lib-append port:libshout2
- configure.args-append --enable-shout
+ depends_lib-append port:libshout2
+ configure.args-append --enable-shout
}
variant vcd description {Enable VCD support} {
- depends_lib-append port:vcdimager
- configure.args-delete --disable-vcdx
- configure.args-append --enable-vcdx
+ depends_lib-append port:vcdimager
+ configure.args-delete --disable-vcdx
+ configure.args-append --enable-vcdx
}
variant mod description {Enable MOD demuxer support} {
- depends_lib-append port:libmodplug
- configure.args-delete --disable-mod
- configure.args-append --enable-mod
+ depends_lib-append port:libmodplug
+ configure.args-delete --disable-mod
+ configure.args-append --enable-mod
}
variant mpc description {enable Musepack Decoder library support} {
- depends_lib-append port:libmpcdec
- configure.args-delete --disable-mpc
- configure.args-append --enable-mpc
+ depends_lib-append port:libmpcdec
+ configure.args-delete --disable-mpc
+ configure.args-append --enable-mpc
}
variant dvb description {enable DVB Program Specific Information support} {
- depends_lib-append port:libdvbpsi
- configure.args-delete --disable-dvbpsi
- configure.args-append --enable-dvbpsi
+ depends_lib-append port:libdvbpsi
+ configure.args-delete --disable-dvbpsi
+ configure.args-append --enable-dvbpsi
}
variant osd description {Enable onscreen display and TrueType font support} {
@@ -148,45 +149,48 @@
configure.args-append --enable-fribidi
}
+# avahi port is currently broken, so this variant is removed
+# from +huge
variant bonjour description {Enable Bonjour support} {
- depends_lib-append port:avahi
- configure.args-delete --disable-dbus --disable-bonjour
- configure.args-append --enable-dbus --enable-bonjour
+ depends_lib-append port:avahi
+ configure.args-delete --disable-dbus --disable-bonjour
+ configure.args-append --enable-dbus --enable-bonjour
}
variant sdl description {Enable SDL/SDL-Image support} {
- depends_lib-append port:libsdl port:libsdl_image
- configure.args-delete --disable-sdl
- configure.args-append --enable-sdl
+ depends_lib-append port:libsdl port:libsdl_image
+ configure.args-delete --disable-sdl
+ configure.args-append --enable-sdl
}
variant smb description {Enable Samba 3 support} {
- depends_lib-append port:samba3
- configure.args-delete --disable-smb
- configure.args-append --enable-smb
- configure.ldflags-append -L${prefix}/lib/samba3
+ depends_lib-append port:samba3
+ configure.args-delete --disable-smb
+ configure.args-append --enable-smb
+ configure.ldflags-append -L${prefix}/lib/samba3
}
variant no_dvd description {disable DVD and DeCSS support} {
- depends_lib-delete port:libdvdnav port:libdvdread
- configure.args-append --disable-dvdnav --disable-dvdread
+ depends_lib-delete port:libdvdnav port:libdvdread
+ configure.args-append --disable-dvdnav --disable-dvdread
}
variant no_ffmpeg description {disable FFmpeg support} {
- depends_lib-delete port:ffmpeg
- configure.args-append --disable-avcodec --disable-avformat \
- --disable-postproc
+ depends_lib-delete port:ffmpeg
+ configure.args-append --disable-avcodec --disable-avformat \
+ --disable-postproc --disable-swscale
}
variant x11 description {Build support for X11} {
depends_lib-append \
- port:mesa \
- port:xorg-libXinerama \
- port:xorg-libXv \
- port:xorg-libXxf86vm
+ 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
+ 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
+ patchfiles-delete patch-configure.ac-xcb.diff
}
variant qt4 description {Build using QT4 UI. This will use qt4-x11 if +x11 and qt4-mac otherwise.} {
@@ -195,7 +199,7 @@
if {[variant_isset x11]} {
depends_lib-append port:qt4-x11
- patchfiles-append qt4-x11.patch
+ patchfiles-append patch-qt4-x11.diff
set qt_dir ${prefix}/libexec/qt4-x11
configure.cppflags-append -D__USE_WS_X11__
} else {
@@ -207,31 +211,31 @@
configure.pkg_config_path "${configure.pkg_config_path}:${qt_dir}/lib/pkgconfig"
}
-variant aqua description {Install VLC.app} {
- destroot.target-append VLC.app
+platform macosx {
+ destroot.target-append VLC.app
}
variant minimal description {VLC OSX minimal configuration} {}
variant huge conflicts minimal \
- requires svg vcd live555 speex dvb fribidi bonjour sdl shout \
- description {Enable all variants except x11, qt4, smb and no_*} {}
+ requires svg vcd live555 speex dvb fribidi sdl shout \
+ description {Enable all variants except x11, qt4, smb and no_*} {}
variant full requires huge qt4 smb \
- description {Enable all variants except x11 and no_*} {}
+ 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
+ default_variants +x264 +theora +twolame +mod +mpc +osd
}
if {[variant_isset x11]} {
- default_variants-append +qt4
+ default_variants-append +qt4
}
post-destroot {
- if {[variant_isset aqua]} {
- file mkdir ${destroot}/${applications_dir}
- file rename ${worksrcpath}/VLC.app ${destroot}/${applications_dir}/VLC.app
- }
+ if {[variant_isset aqua]} {
+ file mkdir ${destroot}/${applications_dir}
+ file rename ${worksrcpath}/VLC.app ${destroot}/${applications_dir}/VLC.app
+ }
}
Deleted: trunk/dports/multimedia/VLC/files/VLC-Makefile.am.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/VLC-Makefile.am.patch 2009-07-16 00:05:44 UTC (rev 53863)
+++ trunk/dports/multimedia/VLC/files/VLC-Makefile.am.patch 2009-07-16 00:20:43 UTC (rev 53864)
@@ -1,34 +0,0 @@
---- 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/
Added: trunk/dports/multimedia/VLC/files/patch-Makefile.am.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-Makefile.am.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-Makefile.am.diff 2009-07-16 00:20:43 UTC (rev 53864)
@@ -0,0 +1,34 @@
+--- Makefile.am.orig 2009-07-07 17:34:22.000000000 +0200
++++ Makefile.am 2009-07-07 17:38:50.000000000 +0200
+@@ -411,13 +411,6 @@
+ vlc$(EXEEXT):
+ ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
+
+-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
+@@ -428,7 +421,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 --always` && \
++ REVISION="$(VERISON_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 @@
+ 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 --always` && \
++ 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/patch-configure.ac-xcb.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-configure.ac-xcb.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-configure.ac-xcb.diff 2009-07-16 00:20:43 UTC (rev 53864)
@@ -0,0 +1,22 @@
+--- configure.ac.orig 2009-07-12 12:31:28.000000000 +0200
++++ configure.ac 2009-07-12 12:32:23.000000000 +0200
+@@ -5362,19 +5362,6 @@
+ fi
+ fi
+
+-dnl
+-dnl Global hotkeys using XCB
+-dnl
+-PKG_CHECK_MODULES(XCB, [xcb], [
+- PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms], [
+- PKG_CHECK_MODULES(XPROTO, [xproto], [
+- VLC_ADD_PLUGIN([globalhotkeys])
+- VLC_ADD_CFLAGS([globalhotkeys],[${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}] )
+- VLC_ADD_LIBS([globalhotkeys],[${XCB_KEYSYMS_LIBS} ${XCB_LIBS}] )
+- ], [ AC_MSG_WARN( [Xproto not found] ) ])
+- ], [ AC_MSG_WARN( [XCB keysyms was not found]) ])
+-], [ AC_MSG_WARN( [XCB was not found]) ])
+-
+ AC_ARG_WITH(,[Misc options:])
+
+ dnl
Added: trunk/dports/multimedia/VLC/files/patch-qt4-x11.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-qt4-x11.diff (rev 0)
+++ trunk/dports/multimedia/VLC/files/patch-qt4-x11.diff 2009-07-16 00:20:43 UTC (rev 53864)
@@ -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])
Deleted: trunk/dports/multimedia/VLC/files/qt4-x11.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/qt4-x11.patch 2009-07-16 00:05:44 UTC (rev 53863)
+++ trunk/dports/multimedia/VLC/files/qt4-x11.patch 2009-07-16 00:20:43 UTC (rev 53864)
@@ -1,11 +0,0 @@
---- 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/20090715/2bfdb30e/attachment-0001.html>
More information about the macports-changes
mailing list