[92654] trunk/dports/multimedia/VLC
jeremyhu at macports.org
jeremyhu at macports.org
Wed May 2 17:58:20 PDT 2012
Revision: 92654
https://trac.macports.org/changeset/92654
Author: jeremyhu at macports.org
Date: 2012-05-02 17:58:20 -0700 (Wed, 02 May 2012)
Log Message:
-----------
VLC: Bump version to post-2.0.1 git (#284010)
Modified Paths:
--------------
trunk/dports/multimedia/VLC/Portfile
Added Paths:
-----------
trunk/dports/multimedia/VLC/files/buildfix-package.mak.patch
trunk/dports/multimedia/VLC/files/no-sparkle.patch
Removed Paths:
-------------
trunk/dports/multimedia/VLC/files/patch-Makefile.am.diff
trunk/dports/multimedia/VLC/files/patch-compat.diff
trunk/dports/multimedia/VLC/files/patch-configure.ac-macosx_audio.diff
trunk/dports/multimedia/VLC/files/patch-configure.ac-no_qtcapture.diff
trunk/dports/multimedia/VLC/files/patch-configure.ac-xcb.diff
trunk/dports/multimedia/VLC/files/patch-fdatasync_sl.diff
trunk/dports/multimedia/VLC/files/patch-noKaxTagMulti.diff
trunk/dports/multimedia/VLC/files/patch-png.c.diff
trunk/dports/multimedia/VLC/files/patch-qt4-x11.diff
trunk/dports/multimedia/VLC/files/patch-yadif.diff
Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/Portfile 2012-05-03 00:58:20 UTC (rev 92654)
@@ -5,12 +5,11 @@
PortSystem 1.0
name VLC
-version 1.0.6
-revision 9
+version 2.0.1
categories multimedia
-maintainers mnick openmaintainer
+maintainers nomaintainer
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, \
@@ -23,22 +22,30 @@
conflicts VLC09
homepage http://www.videolan.org
-master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
-distname vlc-${version}
-use_bzip2 yes
-checksums md5 246a3865ec037f8f5757ef6b973a80fc \
- sha1 834346a84a71d915440b7741e04b6e02de451786 \
- rmd160 2185eb418748f2aadfce5e61b7a9de66a62ef2d1
+# The tarball is missing a bunch of files
+# https://trac.videolan.org/vlc/ticket/6739
+# https://trac.videolan.org/vlc/ticket/6743
+fetch.type git
+git.url git://git.videolan.org/vlc.git
+git.branch 2eab05e34ae0f580c25fde33c183bd9737c8aa3f
-depends_lib port:lame port:a52dec port:libogg port:flac \
+#master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
+#distname vlc-${version}
+#use_xz yes
+#
+#checksums md5 5ad114755670e4881a2b35354e2f79bc \
+# sha1 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538 \
+# rmd160 9d932e1be72b65cf47057191d9e84deeedea282c
+
+depends_lib port:lame port:a52dec port:libogg port:flac port:BGHUDAppKit \
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 path:lib/libavcodec.dylib:ffmpeg \
- port:gnutls port:taglib port:libxml2 port:faad2 \
- port:live555
+ port:gnutls port:taglib port:libxml2 port:faad2
+# TODO: port:live555
+
pre-fetch {
if {"darwin" == ${os.platform} && ${os.major} < 9} {
ui_error "${name} ${version} requires Mac OS X 10.5 or greater, use port 'VLC09' instead"
@@ -46,20 +53,41 @@
}
}
-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 patch-noKaxTagMulti.diff patch-yadif.diff patch-compat.diff
+patchfiles \
+ buildfix-package.mak.patch \
+ no-sparkle.patch
post-patch {
- reinplace "s:librsvg-2/librsvg:librsvg:" ${worksrcpath}/modules/misc/svg.c
- reinplace "s:HOST_NAME_MAX:_POSIX_HOST_NAME_MAX:" ${worksrcpath}/modules/video_output/xcb/window.c
+ reinplace "/Sparkle.framework/d" \
+ ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+ reinplace "/SDKROOT/d" \
+ ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+ reinplace "/Growl.framework/d" \
+ ${worksrcpath}/extras/package/macosx/package.mak
+
+ reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
+ ${worksrcpath}/Makefile.am
+
+ 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
+
+ # To trick configure
+ file mkdir "${worksrcpath}/contrib/lib"
}
-use_parallel_build no
+pre-configure {
+ system "cd ${worksrcpath}/modules && find . -name Modules.am | sed 's|Modules.am||' | xargs ./genmf"
+}
+
use_autoreconf yes
autoreconf.args -fvi
-# VLC needs to be compiled with llvm-gcc frontend
-configure.compiler llvm-gcc-4.2
configure.env-append CXXCPP="${configure.cxx} -E"
+build.args-append DESTDIR=${worksrcpath}/dest_ignore
build.target all
destroot.target install
@@ -70,21 +98,23 @@
# live555 and possibly others are not universal, so disabling for now
universal_variant no
-configure.args-append --disable-macosx-defaults \
- --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 \
+configure.args-append \
+ --enable-macosx --disable-macosx-audio --enable-a52 \
+ --enable-faad --enable-flac --disable-live555 \
+ --enable-vorbis --enable-ogg --enable-mad --disable-libass \
--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-debug --disable-xvideo --disable-glx \
+ --disable-xcb --disable-qt4 --disable-quicktime \
--disable-skins2 --disable-notify --disable-telepathy --disable-twolame \
+ --disable-dvdnav --disable-dvdread \
+ --disable-avcodec --disable-avformat --disable-postproc --disable-swscale \
--disable-speex --disable-theora --disable-x264 --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
+ --disable-update-check --without-x --with-contrib=${worksrcpath}/contrib \
+ --with-macosx-sdk=/
variant jack description {Enable jack plugin for audio output} {
depends_lib-append port:jack
@@ -98,13 +128,14 @@
configure.args-append --enable-portaudio
}
-variant auhal description {Enable CoreAudio module for audio output (doesn't work on Snow Leopard)} {
+variant auhal description {Enable CoreAudio module for audio output} {
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 qtkit description {Enable qtcapture and qtaudio} {
+ configure.args-delete --disable-macosx-qtkit
+ configure.args-append --enable-macosx-qtkit
}
variant x264 description {Enable H.264 en/decoding} {
@@ -178,8 +209,6 @@
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
@@ -199,15 +228,18 @@
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
+variant dvd description {Enable DVD and DeCSS support} {
+ depends_lib-append port:libdvdnav port:libdvdread
+ configure.args-delete --disable-dvdnav --disable-dvdread
+ configure.args-append --enable-dvdnav --enable-dvdread
}
-variant no_ffmpeg description {disable FFmpeg support} {
- depends_lib-delete path:lib/libavcodec.dylib:ffmpeg
- configure.args-append --disable-avcodec --disable-avformat \
+variant ffmpeg description {Enable FFmpeg support} {
+ depends_lib-append path:lib/libavcodec.dylib:ffmpeg
+ configure.args-delete --disable-avcodec --disable-avformat \
--disable-postproc --disable-swscale
+ configure.args-append --enable-avcodec --enable-avformat \
+ --enable-postproc --enable-swscale
}
variant x11 {
@@ -219,9 +251,9 @@
port:xorg-xcb-util \
port:xorg-xcb-util-keysyms
- 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
+ configure.args-delete --without-x --disable-xvideo --disable-glx --disable-xcb
+ configure.args-append --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib \
+ --enable-xvideo --enable-glx --enable-xcb
}
variant qt4 description {Build using QT4 UI. This will use qt4-x11 if +x11 and qt4-mac otherwise.} {
@@ -230,7 +262,6 @@
if {[variant_isset x11]} {
depends_lib-append port:qt4-x11
- patchfiles-append patch-qt4-x11.diff
set qt_dir ${prefix}/libexec/qt4-x11
configure.cppflags-append -D__USE_WS_X11__
configure.env-append QTDIR=${qt_dir}
@@ -241,18 +272,20 @@
}
}
+default_variants +ffmpeg +dvd +auhal
+
variant minimal description {VLC Mac OS X minimal configuration} {}
variant huge conflicts minimal \
- requires svg vcd speex dvb fribidi sdl shout jack \
- description {Enable all variants except x11, qt4, smb and no_*} {}
+ requires auhal bonjour dvb dvd ffmpeg fribidi jack mod mpc osd portaudio qtkit sdl shout speex svg theora twolame vcd x264
+ description {Enable all variants except x11, qt4, and smb} {}
variant full requires huge qt4 smb \
- description {Enable all variants except x11 and no_*} {}
+ description {Enable all variants except x11} {}
# Unless minimal variant is set compile with default Mac OS X configuration
if {![variant_isset minimal]} {
- default_variants +x264 +theora +twolame +mod +mpc +osd +portaudio
+ default_variants-append +x264 +theora +twolame +mod +mpc +osd +qtkit
}
if {[variant_isset x11]} {
@@ -260,25 +293,16 @@
}
platform macosx {
- # The VLC.app target is not well-written, so we need to do it during destroot
- destroot.target-append VLC.app
post-destroot {
file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
- }
-}
-platform darwin 9 {
- if {![variant_isset minimal]} {
- default_variants-append +qtcapture +auhal
+ # These are already in ${prefix}, so we don't need to bundle them as well
+ file delete -force ${destroot}${applications_dir}/VLC.app/Contents/Frameworks
+ file delete -force ${destroot}${applications_dir}/VLC.app/Contents/lib
+
+ # There's no need to install these into the bundle and the prefix
+ file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/lib
+ file delete -force ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
+ ln -s ${prefix}/lib/vlc/plugins ${destroot}${applications_dir}/VLC.app/Contents/MacOS/plugins
}
}
-
-# The real fix is to add a fdatasync prototype since it's the
-# *prototype* that is missing ... but this will do for now.
-platform darwin 10 {
- patchfiles-append patch-fdatasync_sl.diff
-}
-
-platform darwin 11 {
- patchfiles-append patch-fdatasync_sl.diff
-}
Added: trunk/dports/multimedia/VLC/files/buildfix-package.mak.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/buildfix-package.mak.patch (rev 0)
+++ trunk/dports/multimedia/VLC/files/buildfix-package.mak.patch 2012-05-03 00:58:20 UTC (rev 92654)
@@ -0,0 +1,34 @@
+commit 5c374517726f0fd16e4bdbb46227d2633130dd4c
+Author: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Wed May 2 15:37:28 2012 -0700
+
+ Don't make install during make
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+
+diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak
+index f7abcd2..77e1c20 100644
+--- extras/package/macosx/package.mak
++++ extras/package/macosx/package.mak
+@@ -25,10 +25,10 @@ VLC.app: VLC-tmp
+
+
+ VLC-tmp: vlc
++ rm -Rf "$(top_builddir)/tmp" "$@"
+ $(AM_V_GEN)for i in src lib share; do \
+- (cd $$i && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd)); \
++ (cd $$i && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) DESTDIR=$(abs_top_builddir)/tmp/destdir); \
+ done
+- rm -Rf "$(top_builddir)/tmp" "$@"
+ mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
+ cd $(srcdir)/extras/package/macosx; cp -R Resources README.MacOSX.rtf $(abs_top_builddir)/tmp/extras/package/macosx/
+ mkdir -p $(abs_top_builddir)/tmp/extras/package/macosx/vlc.xcodeproj/
+@@ -47,7 +47,7 @@ VLC-tmp: vlc
+ cp -R -L $(top_builddir)/tmp/build/Default/VLC.bundle $@
+ mkdir -p $@/Contents/Frameworks && cp -R -L $(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/
+ mkdir -p $@/Contents/MacOS/share/locale/
+- cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
++ cp -r "$(top_builddir)/tmp/destdir$(prefix)/lib/vlc/lua" "$(top_builddir)/tmp/destdir$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
+ mkdir -p $@/Contents/MacOS/include/
+ cp -r "$(srcdir)/include/vlc" $@/Contents/MacOS/include/
+ $(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $@/Contents/MacOS/share/vlc512x512.png
Added: trunk/dports/multimedia/VLC/files/no-sparkle.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/no-sparkle.patch (rev 0)
+++ trunk/dports/multimedia/VLC/files/no-sparkle.patch 2012-05-03 00:58:20 UTC (rev 92654)
@@ -0,0 +1,118 @@
+diff -Naurp vlc-2.0.1.orig/configure.ac vlc-2.0.1/configure.ac
+--- configure.ac 2012-03-08 04:18:41.000000000 -0800
++++ configure.ac 2012-05-01 23:51:46.000000000 -0700
+@@ -3766,13 +3766,6 @@ then
+
+ VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit])
+
+- if test ! -d ${CONTRIB_DIR}/Sparkle.framework
+- then
+- AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}])
+- fi
+- VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
+- VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
+-
+ if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
+ then
+ AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
+diff -Naurp vlc-2.0.1.orig/modules/gui/macosx/intf.m vlc-2.0.1/modules/gui/macosx/intf.m
+--- modules/gui/macosx/intf.m 2012-03-14 04:07:48.000000000 -0700
++++ modules/gui/macosx/intf.m 2012-05-01 23:53:28.000000000 -0700
+@@ -62,7 +62,6 @@
+ #import "TrackSynchronization.h"
+
+ #import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
+-#import <Sparkle/Sparkle.h> /* we're the update delegate */
+
+ /*****************************************************************************
+ * Local prototypes.
+@@ -788,16 +787,6 @@ static VLCMain *_o_sharedMainInstance =
+ }
+
+ #pragma mark -
+-#pragma mark Sparkle delegate
+-/* received directly before the update gets installed, so let's shut down a bit */
+-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
+-{
+- [NSApp activateIgnoringOtherApps:YES];
+- [o_remote stopListening: self];
+- [[VLCCoreInteraction sharedInstance] stop];
+-}
+-
+-#pragma mark -
+ #pragma mark Media Key support
+
+ -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
+diff -Naurp vlc-2.0.1.orig/modules/gui/macosx/simple_prefs.m vlc-2.0.1/modules/gui/macosx/simple_prefs.m
+--- modules/gui/macosx/simple_prefs.m 2012-03-15 16:55:17.000000000 -0700
++++ modules/gui/macosx/simple_prefs.m 2012-05-01 23:54:38.000000000 -0700
+@@ -36,8 +36,6 @@
+ #import "intf.h"
+ #import "AppleRemote.h"
+
+-#import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
+-
+ static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
+ static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
+ static NSString* VLCAudioSettingToolbarIdentifier = @"Audio Settings Item Identifier";
+@@ -483,10 +481,6 @@ static inline char * __config_GetLabel(
+ [self setupButton: o_intf_appleremote_ckb forBoolValue: "macosx-appleremote"];
+
+ [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
+- if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL )
+- [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]];
+- else
+- [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")];
+ psz_tmp = config_GetPsz( p_intf, "control" );
+ if (psz_tmp) {
+ [o_intf_enableGrowl_ckb setState: (NSInteger)strstr( psz_tmp, "growl")];
+diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.xib b/extras/package/macosx/Resources/English.lproj/Preferences.xib
+index 8682829..29e653a 100644
+--- extras/package/macosx/Resources/English.lproj/Preferences.xib
++++ extras/package/macosx/Resources/English.lproj/Preferences.xib
+@@ -4423,9 +4423,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+ <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
+ <bool key="NSWindowIsRestorable">YES</bool>
+ </object>
+- <object class="NSCustomObject" id="761483302">
+- <string key="NSClassName">SUUpdater</string>
+- </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+@@ -5783,22 +5780,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+ <int key="connectionID">3554</int>
+ </object>
+ <object class="IBConnectionRecord">
+- <object class="IBBindingConnection" key="connection">
+- <string key="label">value: automaticallyChecksForUpdates</string>
+- <reference key="source" ref="243384014"/>
+- <reference key="destination" ref="761483302"/>
+- <object class="NSNibBindingConnector" key="connector">
+- <reference key="NSSource" ref="243384014"/>
+- <reference key="NSDestination" ref="761483302"/>
+- <string key="NSLabel">value: automaticallyChecksForUpdates</string>
+- <string key="NSBinding">value</string>
+- <string key="NSKeyPath">automaticallyChecksForUpdates</string>
+- <int key="NSNibBindingConnectorVersion">2</int>
+- </object>
+- </object>
+- <int key="connectionID">3559</int>
+- </object>
+- <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">o_intf_update_ckb</string>
+ <reference key="source" ref="150917409"/>
+@@ -8373,12 +8354,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+ <reference key="parent" ref="492678965"/>
+ </object>
+ <object class="IBObjectRecord">
+- <int key="objectID">3555</int>
+- <reference key="object" ref="761483302"/>
+- <reference key="parent" ref="0"/>
+- <string key="objectName">Sparkle Updater</string>
+- </object>
+- <object class="IBObjectRecord">
+ <int key="objectID">3556</int>
+ <reference key="object" ref="243384014"/>
+ <object class="NSMutableArray" key="children">
Deleted: trunk/dports/multimedia/VLC/files/patch-Makefile.am.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-Makefile.am.diff 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/files/patch-Makefile.am.diff 2012-05-03 00:58:20 UTC (rev 92654)
@@ -1,34 +0,0 @@
---- 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/
Deleted: trunk/dports/multimedia/VLC/files/patch-compat.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-compat.diff 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/files/patch-compat.diff 2012-05-03 00:58:20 UTC (rev 92654)
@@ -1,14 +0,0 @@
-diff -Naurp vlc-1.0.6.orig/compat/Makefile.am vlc-1.0.6/compat/Makefile.am
---- compat/Makefile.am 2010-03-07 10:38:01.000000000 -0800
-+++ compat/Makefile.am 2011-06-24 23:41:05.000000000 -0700
-@@ -1,4 +1,4 @@
- noinst_LTLIBRARIES = libcompat.la
--libcompat_la_SOURCES =
-+libcompat_la_SOURCES = empty.c
- libcompat_la_LIBADD = $(LTLIBOBJS)
- libcompat_la_LDFLAGS = -no-undefined
-diff -Naurp vlc-1.0.6.orig/compat/empty.c vlc-1.0.6/compat/empty.c
---- compat/empty.c 1969-12-31 16:00:00.000000000 -0800
-+++ compat/empty.c 2011-06-24 23:37:59.000000000 -0700
-@@ -0,0 +1 @@
-+static int __ar_fails_with_no_files;
Deleted: trunk/dports/multimedia/VLC/files/patch-configure.ac-macosx_audio.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-configure.ac-macosx_audio.diff 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/files/patch-configure.ac-macosx_audio.diff 2012-05-03 00:58:20 UTC (rev 92654)
@@ -1,13 +0,0 @@
---- 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])
Deleted: trunk/dports/multimedia/VLC/files/patch-configure.ac-no_qtcapture.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-configure.ac-no_qtcapture.diff 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/files/patch-configure.ac-no_qtcapture.diff 2012-05-03 00:58:20 UTC (rev 92654)
@@ -1,10 +0,0 @@
---- configure.ac.orig 2011-03-13 16:30:41.000000000 -0700
-+++ configure.ac 2011-03-13 16:31:04.000000000 -0700
-@@ -5176,7 +5176,6 @@ then
- VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] )
-
- VLC_ADD_PLUGIN([access_eyetv])
-- VLC_ADD_PLUGIN([qtcapture])
- VLC_ADD_PLUGIN([macosx])
- VLC_ADD_PLUGIN([minimal_macosx])
-
Deleted: trunk/dports/multimedia/VLC/files/patch-configure.ac-xcb.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-configure.ac-xcb.diff 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/files/patch-configure.ac-xcb.diff 2012-05-03 00:58:20 UTC (rev 92654)
@@ -1,22 +0,0 @@
---- 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
Deleted: trunk/dports/multimedia/VLC/files/patch-fdatasync_sl.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-fdatasync_sl.diff 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/files/patch-fdatasync_sl.diff 2012-05-03 00:58:20 UTC (rev 92654)
@@ -1,13 +0,0 @@
---- configure.ac.orig.sl 2009-09-19 15:25:24.000000000 +0200
-+++ configure.ac 2009-09-19 15:25:47.000000000 +0200
-@@ -567,9 +567,7 @@
- AC_CHECK_FUNCS(fcntl)
- AC_REPLACE_FUNCS([asprintf atof atoll getcwd gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
- AC_CHECK_FUNCS([stricmp strnicmp])
--AC_CHECK_FUNCS(fdatasync,,
-- [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
--])
-+AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
-
- dnl Check for Linux system calls
- AC_CHECK_FUNCS([vmsplice])
Deleted: trunk/dports/multimedia/VLC/files/patch-noKaxTagMulti.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-noKaxTagMulti.diff 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/files/patch-noKaxTagMulti.diff 2012-05-03 00:58:20 UTC (rev 92654)
@@ -1,87 +0,0 @@
---- modules/demux/mkv/matroska_segment.cpp.orig 2011-03-13 17:17:07.000000000 -0700
-+++ modules/demux/mkv/matroska_segment.cpp 2011-03-13 17:17:31.000000000 -0700
-@@ -215,74 +215,6 @@ void matroska_segment_c::LoadTags( KaxTa
- }
- ep->Up();
- }
-- else if( MKV_IS_ID( el, KaxTagGeneral ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + General" );
-- ep->Down();
-- while( ( el = ep->Get() ) != NULL )
-- {
-- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() );
-- }
-- ep->Up();
-- }
-- else if( MKV_IS_ID( el, KaxTagGenres ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + Genres" );
-- ep->Down();
-- while( ( el = ep->Get() ) != NULL )
-- {
-- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() );
-- }
-- ep->Up();
-- }
-- else if( MKV_IS_ID( el, KaxTagAudioSpecific ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + Audio Specific" );
-- ep->Down();
-- while( ( el = ep->Get() ) != NULL )
-- {
-- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() );
-- }
-- ep->Up();
-- }
-- else if( MKV_IS_ID( el, KaxTagImageSpecific ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + Images Specific" );
-- ep->Down();
-- while( ( el = ep->Get() ) != NULL )
-- {
-- msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() );
-- }
-- ep->Up();
-- }
-- else if( MKV_IS_ID( el, KaxTagMultiComment ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + Multi Comment" );
-- }
-- else if( MKV_IS_ID( el, KaxTagMultiCommercial ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + Multi Commercial" );
-- }
-- else if( MKV_IS_ID( el, KaxTagMultiDate ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + Multi Date" );
-- }
-- else if( MKV_IS_ID( el, KaxTagMultiEntity ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + Multi Entity" );
-- }
-- else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + Multi Identifier" );
-- }
-- else if( MKV_IS_ID( el, KaxTagMultiLegal ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + Multi Legal" );
-- }
-- else if( MKV_IS_ID( el, KaxTagMultiTitle ) )
-- {
-- msg_Dbg( &sys.demuxer, "| + Multi Title" );
-- }
- else
- {
- msg_Dbg( &sys.demuxer, "| + LoadTag Unknown (%s)", typeid( *el ).name() );
---- modules/demux/mkv/mkv.hpp.orig 2011-03-13 17:17:39.000000000 -0700
-+++ modules/demux/mkv/mkv.hpp 2011-03-13 17:17:49.000000000 -0700
-@@ -93,7 +93,6 @@
- #include "matroska/KaxSegment.h"
- #include "matroska/KaxTag.h"
- #include "matroska/KaxTags.h"
--#include "matroska/KaxTagMulti.h"
- #include "matroska/KaxTracks.h"
- #include "matroska/KaxTrackAudio.h"
- #include "matroska/KaxTrackVideo.h"
Deleted: trunk/dports/multimedia/VLC/files/patch-png.c.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-png.c.diff 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/files/patch-png.c.diff 2012-05-03 00:58:20 UTC (rev 92654)
@@ -1,20 +0,0 @@
---- modules/codec/png.c.orig 2011-01-17 18:13:50.000000000 -0500
-+++ modules/codec/png.c 2011-01-17 18:13:56.000000000 -0500
-@@ -155,7 +155,7 @@
- p_info = png_create_info_struct( p_png );
- if( p_info == NULL )
- {
-- png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
-+ png_destroy_read_struct( &p_png, (png_infopp) NULL, (png_infopp) NULL );
- block_Release( p_block ); *pp_block = NULL;
- return NULL;
- }
-@@ -163,7 +163,7 @@
- p_end_info = png_create_info_struct( p_png );
- if( p_end_info == NULL )
- {
-- png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
-+ png_destroy_read_struct( &p_png, &p_info, (png_infopp) NULL );
- block_Release( p_block ); *pp_block = NULL;
- return NULL;
- }
Deleted: trunk/dports/multimedia/VLC/files/patch-qt4-x11.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-qt4-x11.diff 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/files/patch-qt4-x11.diff 2012-05-03 00:58:20 UTC (rev 92654)
@@ -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])
Deleted: trunk/dports/multimedia/VLC/files/patch-yadif.diff
===================================================================
--- trunk/dports/multimedia/VLC/files/patch-yadif.diff 2012-05-03 00:31:31 UTC (rev 92653)
+++ trunk/dports/multimedia/VLC/files/patch-yadif.diff 2012-05-03 00:58:20 UTC (rev 92654)
@@ -1,11 +0,0 @@
---- modules/video_filter/yadif.h 2010-03-07 10:38:02.000000000 -0800
-+++ modules/video_filter/yadif.h 2011-05-25 04:00:19.000000000 -0700
-@@ -154,7 +154,7 @@ static void yadif_filter_line_mmx2(struc
- \
- /* if(p->mode<2) ... */\
- "movq %[tmp3], %%mm6 \n\t" /* diff */\
-- "cmp $2, %[mode] \n\t"\
-+ "cmpl $2, %[mode] \n\t"\
- "jge 1f \n\t"\
- LOAD4("(%["prev2"],%[mrefs],2)", %%mm2) /* prev2[x-2*refs] */\
- LOAD4("(%["next2"],%[mrefs],2)", %%mm4) /* next2[x-2*refs] */\
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120502/f703ae0a/attachment-0001.html>
More information about the macports-changes
mailing list