<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[135603] trunk/dports/multimedia/VLC-devel</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/135603">135603</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-04-27 15:23:32 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>VLC-devel: update to vlc-2.2 git maintenance fork as of 20150427, remove obsolete configuration options, cleanup comments.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCdevelPortfile">trunk/dports/multimedia/VLC-devel/Portfile</a></li>
<li><a href="#trunkdportsmultimediaVLCdevelfilesnosparklepatch">trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaVLCdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC-devel/Portfile (135602 => 135603)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name VLC-devel
</span><del>-version 2.1.99
-revision 19
</del><ins>+set commit_date 20150427
+version 2.2.2-${commit_date}
</ins><span class="cx">
</span><span class="cx"> categories multimedia
</span><span class="cx">
</span><span class="lines">@@ -27,19 +27,9 @@
</span><span class="cx"> # http://git.videolan.org/?p=vlc.git
</span><span class="cx"> # http://git.videolan.org/?p=vlc.git;a=forks
</span><span class="cx"> fetch.type git
</span><del>-#git.url git://git.videolan.org/vlc/vlc-2.1.git
</del><span class="cx"> git.url git://git.videolan.org/vlc/vlc-2.2.git
</span><del>-#git.url git://git.videolan.org/vlc.git
-git.branch 70d70ee0460d3e4fedc98428de9d539ec9352a34
</del><ins>+git.branch 25028749dc5f86c04a67ae47fccc7d6ad672ee8a
</ins><span class="cx">
</span><del>-#master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
-#distname vlc-${version}
-#use_xz yes
-#
-#checksums md5 5ad114755670e4881a2b35354e2f79bc \
-# sha1 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538 \
-# rmd160 9d932e1be72b65cf47057191d9e84deeedea282c
-
</del><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="cx"> depends_lib \
</span><span class="lines">@@ -203,14 +193,14 @@
</span><span class="cx">
</span><span class="cx"> # Video Plugins
</span><span class="cx"> configure.args-append \
</span><del>- --disable-caca --enable-sdl --enable-sdl-image --disable-macosx-vout \
- --without-x --disable-xcb --disable-xvideo --disable-glx \
</del><ins>+ --disable-caca --enable-sdl --enable-sdl-image \
+ --without-x --disable-xcb --disable-xvideo \
</ins><span class="cx"> --enable-freetype --enable-fontconfig --enable-fribidi \
</span><span class="cx"> --disable-svg
</span><span class="cx">
</span><span class="cx"> # Audio Plugins
</span><span class="cx"> configure.args-append \
</span><del>- --disable-macosx-audio --disable-jack --enable-samplerate
</del><ins>+ --disable-jack --enable-samplerate
</ins><span class="cx">
</span><span class="cx"> # Interface Plugins
</span><span class="cx"> configure.args-append \
</span></span></pre></div>
<a id="trunkdportsmultimediaVLCdevelfilesnosparklepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch (135602 => 135603)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> index fd31f16..af37c4c 100644
</span><span class="cx"> --- configure.ac
</span><span class="cx"> +++ configure.ac
</span><del>-@@ -3685,13 +3685,6 @@ then
</del><ins>+@@ -3834,13 +3834,6 @@ then
</ins><span class="cx">
</span><span class="cx"> 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])
</span><span class="cx">
</span><span class="lines">@@ -16,11 +16,55 @@
</span><span class="cx"> if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
</span><span class="cx"> then
</span><span class="cx"> AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
</span><del>-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>
</del><ins>+--- 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 @@
</ins><span class="cx"> <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
</span><span class="cx"> <bool key="NSWindowIsRestorable">YES</bool>
</span><span class="cx"> </object>
</span><span class="lines">@@ -30,7 +74,7 @@
</span><span class="cx"> <object class="NSWindowTemplate" id="898680423">
</span><span class="cx"> <int key="NSWindowStyleMask">15</int>
</span><span class="cx"> <int key="NSWindowBacking">2</int>
</span><del>-@@ -6833,22 +6830,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</del><ins>+@@ -6899,22 +6896,6 @@
</ins><span class="cx"> <int key="connectionID">3554</int>
</span><span class="cx"> </object>
</span><span class="cx"> <object class="IBConnectionRecord">
</span><span class="lines">@@ -53,7 +97,7 @@
</span><span class="cx"> <object class="IBOutletConnection" key="connection">
</span><span class="cx"> <string key="label">o_intf_update_ckb</string>
</span><span class="cx"> <reference key="source" ref="150917409"/>
</span><del>-@@ -9560,12 +9541,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</del><ins>+@@ -9582,12 +9563,6 @@
</ins><span class="cx"> <reference key="parent" ref="492678965"/>
</span><span class="cx"> </object>
</span><span class="cx"> <object class="IBObjectRecord">
</span><span class="lines">@@ -66,58 +110,8 @@
</span><span class="cx"> <int key="objectID">3556</int>
</span><span class="cx"> <reference key="object" ref="243384014"/>
</span><span class="cx"> <object class="NSMutableArray" key="children">
</span><del>-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
</del><ins>+--- 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
</ins><span class="cx"> @@ -38,8 +38,6 @@
</span><span class="cx"> #import "AppleRemote.h"
</span><span class="cx"> #import "CoreInteraction.h"
</span><span class="lines">@@ -127,15 +121,15 @@
</span><span class="cx"> static const char *const ppsz_language[] =
</span><span class="cx"> {
</span><span class="cx"> "auto",
</span><del>-@@ -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")];
</del><ins>+@@ -386,7 +384,6 @@
</ins><span class="cx"> [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
</span><ins>+ [o_intf_art_ckb setTitle: _NS("Allow metadata network access")];
</ins><span class="cx"> [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
</span><span class="cx"> - [o_intf_last_update_lbl setStringValue: @""];
</span><span class="cx"> [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
</span><span class="cx"> [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")];
</span><span class="cx"> [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
</span><del>-@@ -585,10 +582,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
</del><ins>+@@ -598,10 +595,6 @@
</ins><span class="cx"> [self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
</span><span class="cx">
</span><span class="cx"> [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
</span></span></pre>
</div>
</div>
</body>
</html>