Revision: 117415 https://trac.macports.org/changeset/117415 Author: jeremyhu@macports.org Date: 2014-02-25 13:11:36 -0800 (Tue, 25 Feb 2014) Log Message: ----------- VLC-devel: Update to current git Modified Paths: -------------- trunk/dports/multimedia/VLC-devel/Portfile trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch Modified: trunk/dports/multimedia/VLC-devel/Portfile =================================================================== --- trunk/dports/multimedia/VLC-devel/Portfile 2014-02-25 20:31:16 UTC (rev 117414) +++ trunk/dports/multimedia/VLC-devel/Portfile 2014-02-25 21:11:36 UTC (rev 117415) @@ -6,7 +6,7 @@ name VLC-devel version 2.1.99 -revision 6 +revision 7 categories multimedia @@ -29,7 +29,7 @@ fetch.type git #git.url git://git.videolan.org/vlc/vlc-2.1.git git.url git://git.videolan.org/vlc.git -git.branch 050a16328dac1d3573326c43d47376d08210604d +git.branch ee6b5cefbc89b56b9688698e1e03eb178b653762 #master_sites http://download.videolan.org/pub/videolan/vlc/${version}/ #distname vlc-${version} Modified: trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch =================================================================== --- trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch 2014-02-25 20:31:16 UTC (rev 117414) +++ trunk/dports/multimedia/VLC-devel/files/PR-34741-no__clang_version__.patch 2014-02-25 21:11:36 UTC (rev 117415) @@ -1,16 +1,19 @@ ---- ./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 +--- modules/gui/macosx/about.m.orig 2014-02-25 11:36:09.000000000 -0800 ++++ modules/gui/macosx/about.m 2014-02-25 12:06:29.000000000 -0800 +@@ -101,10 +101,14 @@ 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__ +-#else +#elif defined(__clang__) + compiler = [NSString stringWithFormat:@"clang"]; +#elif defined(__llvm__) compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__]; - #else - compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__]; ++#else ++ compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__]; + #endif + [o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]]; + Modified: trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch =================================================================== --- trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch 2014-02-25 20:31:16 UTC (rev 117414) +++ trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch 2014-02-25 21:11:36 UTC (rev 117415) @@ -70,18 +70,27 @@ index c5fced6..da7d001 100644 --- modules/gui/macosx/intf.m +++ modules/gui/macosx/intf.m -@@ -69,8 +69,6 @@ +@@ -67,8 +67,6 @@ #import "VideoEffects.h" #import "AudioEffects.h" -#import <Sparkle/Sparkle.h> /* we're the update delegate */ - #import "iTunes.h" + #import "Spotify.h" - /***************************************************************************** -@@ -916,16 +915,6 @@ static VLCMain *_o_sharedMainInstance = nil; +@@ -736,8 +736,6 @@ static VLCMain *_o_sharedMainInstance = + + [NSBundle loadNibNamed:@"MainWindow" owner: self]; + [o_mainwindow makeKeyAndOrderFront:nil]; +- +- [[SUUpdater sharedUpdater] setDelegate:self]; } + - (void)applicationDidFinishLaunching:(NSNotification *)aNotification +@@ -917,25 +915,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 */ @@ -92,6 +101,15 @@ - [[VLCCoreInteraction sharedInstance] stop]; -} - +-/* don't be enthusiastic about an update if we currently play a video */ +-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle +-{ +- if ([self activeVideoPlayback]) +- return NO; +- +- return YES; +-} +- -#pragma mark - #pragma mark Media Key support