[135603] trunk/dports/multimedia/VLC-devel
devans at macports.org
devans at macports.org
Mon Apr 27 15:23:32 PDT 2015
Revision: 135603
https://trac.macports.org/changeset/135603
Author: devans at macports.org
Date: 2015-04-27 15:23:32 -0700 (Mon, 27 Apr 2015)
Log Message:
-----------
VLC-devel: update to vlc-2.2 git maintenance fork as of 20150427, remove obsolete configuration options, cleanup comments.
Modified Paths:
--------------
trunk/dports/multimedia/VLC-devel/Portfile
trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch
Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile 2015-04-27 21:57:45 UTC (rev 135602)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2015-04-27 22:23:32 UTC (rev 135603)
@@ -5,8 +5,8 @@
PortGroup compiler_blacklist_versions 1.0
name VLC-devel
-version 2.1.99
-revision 19
+set commit_date 20150427
+version 2.2.2-${commit_date}
categories multimedia
@@ -27,19 +27,9 @@
# 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.1.git
git.url git://git.videolan.org/vlc/vlc-2.2.git
-#git.url git://git.videolan.org/vlc.git
-git.branch 70d70ee0460d3e4fedc98428de9d539ec9352a34
+git.branch 25028749dc5f86c04a67ae47fccc7d6ad672ee8a
-#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 \
@@ -203,14 +193,14 @@
# Video Plugins
configure.args-append \
- --disable-caca --enable-sdl --enable-sdl-image --disable-macosx-vout \
- --without-x --disable-xcb --disable-xvideo --disable-glx \
+ --disable-caca --enable-sdl --enable-sdl-image \
+ --without-x --disable-xcb --disable-xvideo \
--enable-freetype --enable-fontconfig --enable-fribidi \
--disable-svg
# Audio Plugins
configure.args-append \
- --disable-macosx-audio --disable-jack --enable-samplerate
+ --disable-jack --enable-samplerate
# Interface Plugins
configure.args-append \
Modified: trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch 2015-04-27 21:57:45 UTC (rev 135602)
+++ trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch 2015-04-27 22:23:32 UTC (rev 135603)
@@ -2,7 +2,7 @@
index fd31f16..af37c4c 100644
--- configure.ac
+++ configure.ac
-@@ -3685,13 +3685,6 @@ then
+@@ -3834,13 +3834,6 @@ then
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])
@@ -16,11 +16,55 @@
if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
then
AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
-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
-@@ -4682,9 +4682,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+--- modules/gui/macosx/intf.m.orig 2015-04-27 14:18:18.000000000 -0700
++++ modules/gui/macosx/intf.m 2015-04-27 14:25:03.000000000 -0700
+@@ -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"
+
+@@ -787,8 +785,6 @@
+ // This cannot be called directly here, as the main loop is not running yet so it would have no effect.
+ // So lets enqueue it into the loop for later execution.
+ [o_mainwindow performSelector:@selector(makeKeyAndOrderFront:) withObject:nil afterDelay:0];
+-
+- [[SUUpdater sharedUpdater] setDelegate:self];
+ }
+
+ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+@@ -974,25 +970,6 @@
+ }
+
+ #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];
+-}
+-
+-/* 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
+
+ -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
+--- extras/package/macosx/Resources/English.lproj/Preferences.xib.orig 2015-04-27 14:40:56.000000000 -0700
++++ extras/package/macosx/Resources/English.lproj/Preferences.xib 2015-04-27 14:41:00.000000000 -0700
+@@ -4865,9 +4865,6 @@
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -30,7 +74,7 @@
<object class="NSWindowTemplate" id="898680423">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
-@@ -6833,22 +6830,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+@@ -6899,22 +6896,6 @@
<int key="connectionID">3554</int>
</object>
<object class="IBConnectionRecord">
@@ -53,7 +97,7 @@
<object class="IBOutletConnection" key="connection">
<string key="label">o_intf_update_ckb</string>
<reference key="source" ref="150917409"/>
-@@ -9560,12 +9541,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+@@ -9582,12 +9563,6 @@
<reference key="parent" ref="492678965"/>
</object>
<object class="IBObjectRecord">
@@ -66,58 +110,8 @@
<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
-@@ -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"
-
-@@ -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 */
--- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
--{
-- [NSApp activateIgnoringOtherApps:YES];
-- [o_remote stopListening: self];
-- [[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
-
- -(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
+--- modules/gui/macosx/simple_prefs.m.orig 2015-04-27 14:40:57.000000000 -0700
++++ modules/gui/macosx/simple_prefs.m 2015-04-27 14:41:00.000000000 -0700
@@ -38,8 +38,6 @@
#import "AppleRemote.h"
#import "CoreInteraction.h"
@@ -127,15 +121,15 @@
static const char *const ppsz_language[] =
{
"auto",
-@@ -365,7 +363,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")];
+@@ -386,7 +384,6 @@
[o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
+ [o_intf_art_ckb setTitle: _NS("Allow metadata network access")];
[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")];
-@@ -585,10 +582,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
+@@ -598,10 +595,6 @@
[self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
[self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150427/678c05db/attachment.html>
More information about the macports-changes
mailing list