[111592] trunk/dports/multimedia/VLC
jeremyhu at macports.org
jeremyhu at macports.org
Thu Sep 26 08:47:00 PDT 2013
Revision: 111592
https://trac.macports.org/changeset/111592
Author: jeremyhu at macports.org
Date: 2013-09-26 08:47:00 -0700 (Thu, 26 Sep 2013)
Log Message:
-----------
VLC: Bump to 2.1.0
Modified Paths:
--------------
trunk/dports/multimedia/VLC/Portfile
trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch
trunk/dports/multimedia/VLC/files/no-sparkle.patch
trunk/dports/multimedia/VLC/files/qtkit.patch
Added Paths:
-----------
trunk/dports/multimedia/VLC/files/class_struct.patch
trunk/dports/multimedia/VLC/files/static_assert.patch
Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile 2013-09-26 14:44:02 UTC (rev 111591)
+++ trunk/dports/multimedia/VLC/Portfile 2013-09-26 15:47:00 UTC (rev 111592)
@@ -2,10 +2,11 @@
# $Id$
PortSystem 1.0
+PortGroup compiler_blacklist_versions 1.0
name VLC
-version 2.0.8
-revision 2
+version 2.1.0
+revision 0
categories multimedia
maintainers jeremyhu openmaintainer
@@ -22,23 +23,25 @@
homepage http://www.videolan.org
+# http://git.videolan.org/?p=vlc.git
# http://git.videolan.org/?p=vlc.git;a=forks
#fetch.type git
-#git.url git://git.videolan.org/vlc/vlc-2.0.git
-#git.branch a4e92ec8b5ed0cd01478111a80c8f2be19503e92
+#git.url git://git.videolan.org/vlc/vlc-2.1.git
+#git.url git://git.videolan.org/vlc.git
+#git.branch edd88358218f273fddde646a172a2104796d46c2
master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
distname vlc-${version}
use_xz yes
-checksums md5 6445eb55aa087f30abe27423535e1ab8 \
- sha1 8937ed30412bef49db77d2187a9e4734866f8ab7 \
- rmd160 cd2483e4447b8bc4a91dbcf95ff1213244dcf40f
+checksums md5 8c77bda671821f5b9ede96b6816e2ade \
+ sha1 f6bdf3971f764a9a192f44e4b6363ac482919dc2 \
+ rmd160 b8f3240eb6941d3eb4b2fc21c8b279b80f4cd026
depends_build port:pkgconfig
depends_lib port:lame port:a52dec port:libogg port:flac \
- port:libdca port:libcddb port:libcdio port:libmad \
+ port:libdca port:libcddb port:libcdio port:libgcrypt port:libmad \
port:libopus port:libvorbis port:libmatroska port:libid3tag \
port:ncurses port:lua port:libpng port:jpeg port:tiff port:libebml \
port:gnutls port:taglib port:libxml2 port:faad2 \
@@ -48,11 +51,17 @@
port:avahi path:lib/libavcodec.dylib:ffmpeg \
port:openjpeg15 port:libbluray port:libgcrypt
-# TODO: port:live555
+# TODO: live555 opencv FreeRDP
+# VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
+universal_variant no
+supported_archs x86_64
+
+compiler.blacklist gcc-4.2 llvm-gcc-4.2 {clang < 300}
+
pre-fetch {
- if {"darwin" == ${os.platform} && ${os.major} < 9} {
- ui_error "${name} ${version} requires Mac OS X 10.5 or greater."
+ if {"darwin" == ${os.platform} && ${os.major} < 10} {
+ ui_error "${name} ${version} requires Mac OS X 10.6 or greater."
return -code error "incompatible Mac OS X version"
}
}
@@ -61,7 +70,9 @@
buildfix-package.mak.patch \
configure.ac-no-arch.patch \
PR-34741-no__clang_version__.patch \
+ class_struct.patch \
qtkit.patch \
+ static_assert.patch \
no-sparkle.patch
post-patch {
@@ -74,13 +85,13 @@
}
use_autoreconf yes
-autoreconf.args -fvi
+autoreconf.args -fi
configure.env-append CXXCPP="${configure.cxx} -E"
build.args-append DESTDIR=${worksrcpath}/dest_ignore
-# Fix a build error in modules/lua due to deprecated functionality
-configure.cppflags-append -DLUA_COMPAT_ALL
+# gl.c:121:3: error: Platform not recognized.
+configure.cppflags-append -D__unix__=1
build.target all
destroot.target install
@@ -88,17 +99,8 @@
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
-
-# Older gcc fail at register allocation
-if {[lsearch [get_canonical_archs] i386] != -1} {
- compiler.blacklist gcc-4.0 gcc-4.2 llvm-gcc-4.2 apple-gcc-4.2 macports-llvm-gcc-4.2
-}
-
# Other
configure.args-append \
- --with-macosx-version-min=$macosx_deployment_target \
--with-contrib=${worksrcpath}/contrib \
--disable-debug --disable-update-check --enable-gnutls \
--disable-notify --disable-telepathy --disable-dbus \
@@ -106,9 +108,12 @@
--enable-libproxy --enable-lua
# Input Plugins
+# build fails when FreeRDP is installed
+# build fails when opencv is installed
configure.args-append \
--enable-dvdnav --enable-dvdread --disable-smb --disable-vcdx \
--disable-macosx-qtkit --disable-macosx-eyetv --disable-realrtsp \
+ --disable-libfreerdp --disable-opencv \
--enable-sftp
# Mux/Demux Plugins
@@ -158,11 +163,6 @@
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} {
@@ -281,15 +281,8 @@
description {Enable all variants} {}
platform macosx {
- if {${os.major} > 9} {
- default_variants-append +qtkit
- }
+ 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 \
@@ -303,6 +296,7 @@
}
post-patch {
+ reinplace "s/Appkit/AppKit/" ${worksrcpath}/configure.ac
reinplace "/Sparkle.framework/d" \
${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
reinplace "/SDKROOT/d" \
@@ -315,11 +309,11 @@
reinplace "/argv/s/environ/*_NSGetEnviron()/" \
${worksrcpath}/modules/misc/inhibit/xdg.c \
- ${worksrcpath}/modules/misc/inhibit/xscreensaver.c
+ ${worksrcpath}/modules/stream_filter/decomp.c
reinplace "s/extern char \\*\\*environ;/#include <crt_externs.h>/" \
${worksrcpath}/modules/misc/inhibit/xdg.c \
- ${worksrcpath}/modules/misc/inhibit/xscreensaver.c
+ ${worksrcpath}/modules/stream_filter/decomp.c
ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
Added: trunk/dports/multimedia/VLC/files/class_struct.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/class_struct.patch (rev 0)
+++ trunk/dports/multimedia/VLC/files/class_struct.patch 2013-09-26 15:47:00 UTC (rev 111592)
@@ -0,0 +1,39 @@
+diff --git a/modules/demux/mkv/chapter_command.hpp b/modules/demux/mkv/chapter_command.hpp
+index 7c8a3c1..80b3e45 100644
+--- modules/demux/mkv/chapter_command.hpp
++++ modules/demux/mkv/chapter_command.hpp
+@@ -35,7 +35,7 @@ const binary MATROSKA_DVD_LEVEL_PG = 0x18;
+ const binary MATROSKA_DVD_LEVEL_PTT = 0x10;
+ const binary MATROSKA_DVD_LEVEL_CN = 0x08;
+
+-class demux_sys_t;
++struct demux_sys_t;
+
+ class chapter_codec_cmds_c
+ {
+diff --git a/modules/demux/mkv/demux.hpp b/modules/demux/mkv/demux.hpp
+index 3cb5f60..4412044 100644
+--- modules/demux/mkv/demux.hpp
++++ modules/demux/mkv/demux.hpp
+@@ -326,7 +326,7 @@ private:
+ };
+
+
+-class demux_sys_t
++struct demux_sys_t
+ {
+ public:
+ demux_sys_t( demux_t & demux )
+diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
+index c2d5478..6086f17 100644
+--- modules/demux/mkv/mkv.cpp
++++ modules/demux/mkv/mkv.cpp
+@@ -73,7 +73,7 @@ vlc_module_begin ()
+ add_shortcut( "mka", "mkv" )
+ vlc_module_end ()
+
+-class demux_sys_t;
++struct demux_sys_t;
+
+ static int Demux ( demux_t * );
+ static int Control( demux_t *, int, va_list );
Modified: trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch 2013-09-26 14:44:02 UTC (rev 111591)
+++ trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch 2013-09-26 15:47:00 UTC (rev 111592)
@@ -1,10 +1,9 @@
---- configure.ac.orig 2012-05-04 00:32:07.000000000 -0700
-+++ configure.ac 2012-05-04 00:37:57.000000000 -0700
-@@ -134,30 +134,12 @@ case "${host_os}" in
- SYS=dragonfly
+--- configure.ac.orig 2013-03-31 16:51:03.000000000 -0700
++++ configure.ac 2013-03-31 16:51:47.000000000 -0700
+@@ -127,33 +127,12 @@ case "${host_os}" in
;;
darwin*)
--
+
- dnl Force gcc "-arch" flag
- ARCH_flag=""
- case "${host}" in
@@ -20,19 +19,23 @@
- x86_64*)
- ARCH_flag="-arch x86_64"
- ;;
+- arm*)
+- ac_cv_c_bigendian="no"
+- ac_cv_c_attribute_packed="no"
+- ;;
- esac
-
SYS=darwin
-- CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"; CFLAGS="${CFLAGS_save}"
-- CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"; CXXFLAGS="${CXXFLAGS_save}"
-- CPPFLAGS_save="${CPPFLAGS_save} ${ARCH_flag}"; CPPFLAGS="${CPPFLAGS_save}"
-- OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"; OBJCFLAGS="${OBJCFLAGS_save}"
-- LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names ${ARCH_flag}"; LDFLAGS="${LDFLAGS_save}"
-+ CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}"
-+ CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
-+ CPPFLAGS_save="${CPPFLAGS_save}"; CPPFLAGS="${CPPFLAGS_save}"
-+ OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}"
-+ LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names"; LDFLAGS="${LDFLAGS_save}"
- 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],[-Wl,-read_only_relocs,suppress])
+- 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"
++ CPPFLAGS="${CPPFLAGS}"
++ OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99"
++ LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
+ VLC_ADD_LIBS([motion rotate], [-Wl,-framework,IOKit,-framework,CoreFoundation])
+ VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
+ VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress])
Modified: trunk/dports/multimedia/VLC/files/no-sparkle.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/no-sparkle.patch 2013-09-26 14:44:02 UTC (rev 111591)
+++ trunk/dports/multimedia/VLC/files/no-sparkle.patch 2013-09-26 15:47:00 UTC (rev 111592)
@@ -1,9 +1,10 @@
-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
+diff --git configure.ac configure.ac
+index fd31f16..af37c4c 100644
+--- configure.ac
++++ configure.ac
+@@ -3685,13 +3685,6 @@ then
- VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit])
+ VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge])
- if test ! -d ${CONTRIB_DIR}/Sparkle.framework
- then
@@ -15,72 +16,21 @@
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
+diff --git extras/package/macosx/Resources/English.lproj/Preferences.xib extras/package/macosx/Resources/English.lproj/Preferences.xib
+index a932b0e..5f58bbd 100644
--- extras/package/macosx/Resources/English.lproj/Preferences.xib
+++ extras/package/macosx/Resources/English.lproj/Preferences.xib
-@@ -4423,9 +4423,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+@@ -4682,9 +4682,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>
+ <object class="NSWindowTemplate" id="898680423">
+ <int key="NSWindowStyleMask">15</int>
+ <int key="NSWindowBacking">2</int>
+@@ -6833,22 +6830,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="connectionID">3554</int>
</object>
<object class="IBConnectionRecord">
@@ -103,7 +53,7 @@
<object class="IBOutletConnection" key="connection">
<string key="label">o_intf_update_ckb</string>
<reference key="source" ref="150917409"/>
-@@ -8373,12 +8354,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+@@ -9560,12 +9541,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="parent" ref="492678965"/>
</object>
<object class="IBObjectRecord">
@@ -116,3 +66,64 @@
<int key="objectID">3556</int>
<reference key="object" ref="243384014"/>
<object class="NSMutableArray" key="children">
+diff --git modules/gui/macosx/intf.m modules/gui/macosx/intf.m
+index c5fced6..da7d001 100644
+--- modules/gui/macosx/intf.m
++++ modules/gui/macosx/intf.m
+@@ -69,7 +69,6 @@
+ #import "AudioEffects.h"
+
+ #import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
+-#import <Sparkle/Sparkle.h> /* we're the update delegate */
+
+ #import "iTunes.h"
+
+@@ -916,16 +915,6 @@ static VLCMain *_o_sharedMainInstance = nil;
+ }
+
+ #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 --git modules/gui/macosx/simple_prefs.m modules/gui/macosx/simple_prefs.m
+index a91fe3a..4407d25 100644
+--- modules/gui/macosx/simple_prefs.m
++++ modules/gui/macosx/simple_prefs.m
+@@ -38,8 +38,6 @@
+ #import "AppleRemote.h"
+ #import "CoreInteraction.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";
+@@ -235,7 +233,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
+ [o_intf_appleremote_sysvol_ckb setTitle: _NS("Control system volume with the Apple Remote")];
+ [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
+ [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
+- [o_intf_last_update_lbl setStringValue: @""];
+ [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
+ [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")];
+ [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
+@@ -440,10 +437,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
+ [self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
+
+ [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")];
Modified: trunk/dports/multimedia/VLC/files/qtkit.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/qtkit.patch 2013-09-26 14:44:02 UTC (rev 111591)
+++ trunk/dports/multimedia/VLC/files/qtkit.patch 2013-09-26 15:47:00 UTC (rev 111592)
@@ -1,3 +1,11 @@
+--- modules/access/Modules.am
++++ modules/access/Modules.am
+@@ -1,3 +1,5 @@
++AM_LIBTOOLFLAGS=--tag=CC
++
+ SUBDIRS = rtp
+ noinst_LTLIBRARIES =
+
--- modules/access/qtsound.m
+++ modules/access/qtsound.m
@@ -40,7 +40,7 @@
Added: trunk/dports/multimedia/VLC/files/static_assert.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/static_assert.patch (rev 0)
+++ trunk/dports/multimedia/VLC/files/static_assert.patch 2013-09-26 15:47:00 UTC (rev 111592)
@@ -0,0 +1,15 @@
+diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
+index 9d20a2d..4c99329 100644
+--- include/vlc_fixups.h
++++ include/vlc_fixups.h
+@@ -241,8 +241,8 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
+ }
+ #endif
+
+-#if !defined (HAVE_STATIC_ASSERT)
+-# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
++#if !defined (HAVE_STATIC_ASSERT) && !defined (static_assert)
++# define _Static_assert(x, s) ((void) sizeof (struct { unsigned a[(x) ? 1 : -1];}))
+ # define static_assert _Static_assert
+ #endif
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130926/19763667/attachment.html>
More information about the macports-changes
mailing list