[94341] trunk/dports/multimedia
jeremyhu at macports.org
jeremyhu at macports.org
Fri Jun 15 13:38:38 PDT 2012
Revision: 94341
https://trac.macports.org/changeset/94341
Author: jeremyhu at macports.org
Date: 2012-06-15 13:38:38 -0700 (Fri, 15 Jun 2012)
Log Message:
-----------
VLC-devel: New port tracking VLC master, for those of you who just want the very latest multimedia player... enjoy
Added Paths:
-----------
trunk/dports/multimedia/VLC-devel/
trunk/dports/multimedia/VLC-devel/Portfile
trunk/dports/multimedia/VLC-devel/files/
trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch
trunk/dports/multimedia/VLC-devel/files/buildfix-package.mak.patch
trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch
trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch
Added: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile (rev 0)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2012-06-15 20:38:38 UTC (rev 94341)
@@ -0,0 +1,362 @@
+# -*- coding: utf-8; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name VLC-devel
+version 2.0.99
+
+categories multimedia
+
+maintainers jeremyhu 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.
+license GPL
+
+platforms darwin
+conflicts VLC09 VLC
+
+homepage http://www.videolan.org
+
+# http://git.videolan.org/?p=vlc.git
+fetch.type git
+git.url git://git.videolan.org/vlc.git
+git.branch 112a32a00b30ed7bd07cc5f9b72b30883f590d6d
+
+#master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
+#distname vlc-${version}
+#use_xz yes
+#
+#checksums md5 5ad114755670e4881a2b35354e2f79bc \
+# sha1 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538 \
+# rmd160 9d932e1be72b65cf47057191d9e84deeedea282c
+
+depends_build port:pkgconfig
+
+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:gnutls port:taglib port:libxml2 port:faad2 \
+ port:x264 port:libtheora port:twolame \
+ port:libdvdnav port:libdvdread
+
+# 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"
+ return -code error "incompatible Mac OS X version"
+ }
+}
+
+patchfiles \
+ buildfix-package.mak.patch \
+ configure.ac-no-arch.patch \
+ PR-34741-no__clang_version__.patch \
+ no-sparkle.patch
+
+post-patch {
+ reinplace "s:librsvg-2/librsvg:librsvg:" \
+ ${worksrcpath}/modules/text_renderer/svg.c
+}
+
+pre-configure {
+ system "cd ${worksrcpath}/modules && find . -name Modules.am | sed 's|Modules.am||' | xargs ./genmf"
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
+configure.env-append CXXCPP="${configure.cxx} -E"
+build.args-append DESTDIR=${worksrcpath}/dest_ignore
+
+build.target all
+destroot.target install
+
+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
+
+platform darwin i386 {
+ # Older gcc fail at register allocation
+ if {[string match "*gcc*" ${configure.compiler}] && ![string match "*llvm*" ${configure.compiler}]} {
+ configure.compiler clang
+ if {![file exists ${configure.cc}]} {
+ depends_build-append port:clang-3.0
+ depends_skip_archcheck-append clang-3.0
+
+ #configure.compiler macports-clang-3.0
+ configure.cc ${prefix}/bin/clang-mp-3.0
+ configure.objc ${prefix}/bin/clang-mp-3.0
+ configure.cxx ${prefix}/bin/clang++-mp-3.0
+ }
+ }
+}
+
+# Other
+configure.args-append \
+ --with-contrib=${worksrcpath}/contrib \
+ --disable-debug --disable-update-check --enable-gnutls \
+ --disable-notify --disable-telepathy --disable-dbus \
+ --disable-growl --disable-macosx-vlc-app
+
+# Input Plugins
+configure.args-append \
+ --enable-dvdnav --enable-dvdread --disable-smb --disable-vcdx \
+ --disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
+ --enable-sftp
+
+# Mux/Demux Plugins
+configure.args-append \
+ --disable-dvbpsi --enable-ogg --enable-mux_ogg \
+ --enable-mkv --disable-mod --disable-mpc --disable-shout
+
+# Codec Plugins
+configure.args-append \
+ --enable-a52 --enable-faad --enable-flac --disable-live555 \
+ --enable-vorbis --enable-ogg --enable-mad --disable-libass \
+ --enable-dca --enable-png --disable-quicktime --enable-twolame \
+ --disable-speex --enable-theora --enable-x264 --disable-postproc \
+ --disable-avcodec --disable-avformat --disable-swscale
+
+# Video Plugins
+configure.args-append \
+ --disable-caca --disable-sdl --disable-macosx-vout \
+ --without-x --disable-xcb --disable-xvideo --disable-glx \
+ --disable-fontconfig --disable-freetype --disable-fribidi \
+ --disable-svg
+
+# Audio Plugins
+configure.args-append \
+ --disable-macosx-audio --disable-jack
+
+# Interface Plugins
+configure.args-append \
+ --disable-macosx --disable-macosx-dialog-provider \
+ --disable-qt4 --enable-ncurses --disable-skins2
+
+# Visualisations and Video Filter Plugins
+configure.args-append \
+ --disable-goom
+
+# Service Discovery Plugins
+configure.args-append \
+ --disable-bonjour
+
+variant jack description {Enable jack plugin for audio output} {
+ depends_lib-append port:jack
+ configure.args-delete --disable-jack
+ configure.args-append --enable-jack
+}
+
+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} {
+ configure.args-delete --disable-macosx-eyetv
+ configure.args-append --enable-macosx-eyetv
+}
+
+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
+}
+
+variant svg description {Enable SVG support} {
+ depends_lib-append port:librsvg
+ configure.args-delete --disable-svg
+ configure.args-append --enable-svg
+}
+
+variant shout description {Enable Shoutcast support} {
+ depends_lib-append port:libshout2
+ configure.args-delete --disable-shout
+ 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
+}
+
+variant mod description {Enable MOD demuxer support} {
+ 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
+}
+
+variant dvb description {enable DVB Program Specific Information support} {
+ 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} {
+ depends_lib-append port:fontconfig port:freetype
+ configure.args-delete --disable-freetype --disable-fontconfig
+ configure.args-append --enable-freetype --enable-fontconfig
+}
+
+variant fribidi requires osd description {Enable FriBidi Unicode support} {
+ depends_lib-append port:fribidi
+ configure.args-delete --disable-fribidi
+ configure.args-append --enable-fribidi
+}
+
+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
+}
+
+variant sdl description {Enable SDL/SDL-Image support} {
+ depends_lib-append path:lib/pkgconfig/sdl.pc: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
+}
+
+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 {
+ depends_lib-append \
+ port:mesa \
+ port:xorg-libXinerama \
+ port:xorg-libXv \
+ port:xorg-libXxf86vm \
+ port:xorg-xcb-util \
+ port:xorg-xcb-util-keysyms
+
+ 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-mac} {
+ configure.args-delete --disable-qt4
+ configure.args-append --enable-qt4
+
+ PortGroup qt4 1.0
+
+ post-activate {
+ if {![variant_isset quartz]} {
+ ui_info "The qt4 interface module for VLC is not very stable. If you encounter bugs with it, please file them with VLC and not MacPorts."
+ }
+ }
+}
+
+variant quartz {
+ depends_lib-append port:BGHUDAppKit
+ configure.args-delete --disable-macosx --disable-macosx-dialog-provider
+ configure.args-append --enable-macosx --enable-macosx-dialog-provider
+}
+
+default_variants +ffmpeg +mod +mpc +osd +quartz
+
+variant huge \
+ requires bonjour dvb eyetv ffmpeg fribidi jack mod mpc osd sdl shout speex svg vcd \
+ description {Enable all variants except quartz, qt4, smb, and x11} {}
+
+variant full \
+ requires huge qt4 quartz smb x11 \
+ description {Enable all variants} {}
+
+platform macosx {
+ if {${os.major} > 9} {
+ default_variants-append +qtkit
+ }
+
+ if {${os.major} == 9} {
+ # FIXME: x86_64 segfaults on Leopard on dlclose() ... not sure why
+ supported_archs i386 ppc
+ }
+
+ configure.args-delete \
+ --disable-macosx-vout --disable-macosx-audio \
+
+ configure.args-append \
+ --enable-macosx-vout --enable-macosx-audio \
+ --with-macosx-sdk=/
+
+ if {[variant_isset qt4] || [variant_isset quartz]} {
+ configure.args-delete --disable-macosx-vlc-app
+ configure.args-append --enable-macosx-vlc-app
+ }
+
+ post-patch {
+ 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 "/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
+
+ ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
+
+ # To trick configure
+ file mkdir "${worksrcpath}/contrib/lib"
+ }
+
+ post-destroot {
+ eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*.la]
+
+ if {[variant_isset qt4] || [variant_isset quartz]} {
+ file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
+
+ # 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/include
+ 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
+ }
+ }
+}
Property changes on: trunk/dports/multimedia/VLC-devel/Portfile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch (rev 0)
+++ trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch 2012-06-15 20:38:38 UTC (rev 94341)
@@ -0,0 +1,16 @@
+--- ./modules/gui/macosx/about.m.orig 2012-06-03 11:19:43.000000000 -0700
++++ ./modules/gui/macosx/about.m 2012-06-03 11:22:22.000000000 -0700
+@@ -94,9 +94,11 @@ static VLAboutBox *_o_sharedInstance = n
+
+ /* setup the creator / revision field */
+ NSString *compiler;
+-#ifdef __clang__
++#ifdef __clang_version__
+ compiler = [NSString stringWithFormat:@"clang %s", __clang_version__];
+-#elif __llvm__
++#elif defined(__clang__)
++ compiler = [NSString stringWithFormat:@"clang"];
++#elif defined(__llvm__)
+ compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__];
+ #else
+ compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__];
Added: trunk/dports/multimedia/VLC-devel/files/buildfix-package.mak.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/buildfix-package.mak.patch (rev 0)
+++ trunk/dports/multimedia/VLC-devel/files/buildfix-package.mak.patch 2012-06-15 20:38:38 UTC (rev 94341)
@@ -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-devel/files/configure.ac-no-arch.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch (rev 0)
+++ trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch 2012-06-15 20:38:38 UTC (rev 94341)
@@ -0,0 +1,42 @@
+--- configure.ac.orig 2012-05-03 18:38:38.000000000 -0700
++++ configure.ac 2012-05-03 18:40:40.000000000 -0700
+@@ -126,35 +126,11 @@ case "${host_os}" in
+ SYS=dragonfly
+ ;;
+ darwin*)
+-
+- dnl Force gcc "-arch" flag
+- ARCH_flag=""
+- case "${host}" in
+- i?86*)
+- ARCH_flag="-arch i386"
+- ;;
+- ppc64*)
+- ARCH_flag="-arch ppc64"
+- ;;
+- ppc*)
+- ARCH_flag="-arch ppc"
+- ;;
+- x86_64*)
+- ARCH_flag="-arch x86_64"
+- ;;
+- arm*)
+- ARCH_flag="-arch armv7"
+- ac_cv_c_bigendian="no"
+- ac_cv_c_attribute_packed="no"
+- ;;
+- esac
+-
+ SYS=darwin
+- CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
+- CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
+- CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
+- OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"
+- LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
++ CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS"
++ CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS"
++ OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99"
++ LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
+ VLC_ADD_LIBS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation])
+ VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup])
+ VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress])
Added: trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch (rev 0)
+++ trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch 2012-06-15 20:38:38 UTC (rev 94341)
@@ -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">
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120615/9f8371d7/attachment-0001.html>
More information about the macports-changes
mailing list