<!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>[115392] 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/115392">115392</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-01-01 00:13:16 -0800 (Wed, 01 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>VLC-devel: Bump to current git</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCdevelPortfile">trunk/dports/multimedia/VLC-devel/Portfile</a></li>
<li><a href="#trunkdportsmultimediaVLCdevelfilesconfigureacnoarchpatch">trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch</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 (115391 => 115392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC-devel/Portfile 2014-01-01 07:13:35 UTC (rev 115391)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2014-01-01 08:13:16 UTC (rev 115392)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name VLC-devel
</span><span class="cx"> version 2.1.99
</span><del>-revision 3
</del><ins>+revision 4
</ins><span class="cx">
</span><span class="cx"> categories multimedia
</span><span class="cx">
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> fetch.type git
</span><span class="cx"> #git.url git://git.videolan.org/vlc/vlc-2.1.git
</span><span class="cx"> git.url git://git.videolan.org/vlc.git
</span><del>-git.branch 18cbe9639c57d5d3cc676909c64acd89997bcac3
</del><ins>+git.branch 050a16328dac1d3573326c43d47376d08210604d
</ins><span class="cx">
</span><span class="cx"> #master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
</span><span class="cx"> #distname vlc-${version}
</span><span class="lines">@@ -74,12 +74,30 @@
</span><span class="cx"> PR-34741-no__clang_version__.patch \
</span><span class="cx"> class_struct.patch \
</span><span class="cx"> static_assert.patch \
</span><del>- no-sparkle.patch \
- patch-freetype-2.5.1.diff
</del><ins>+ no-sparkle.patch
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s:librsvg-2/librsvg:librsvg:" \
</span><span class="cx"> ${worksrcpath}/modules/text_renderer/svg.c
</span><ins>+
+ set cxxstdlib {}
+
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxxstdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxxstdlib libc++
+ } else {
+ set cxxstdlib libstdc++
+ }
+
+ if {${cxxstdlib} == "libc++"} {
+ reinplace "s:-lstdc\+\+:-lc++:" \
+ ${worksrcpath}/configure.ac \
+ ${worksrcpath}/modules/access/Makefile.am
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_autoreconf yes
</span><span class="lines">@@ -89,7 +107,7 @@
</span><span class="cx"> depends_build-append port:libtool port:autoconf port:automake
</span><span class="cx">
</span><span class="cx"> configure.env-append CXXCPP="${configure.cxx} -E"
</span><del>-build.args-append DESTDIR=${worksrcpath}/dest_ignore
</del><ins>+build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1
</ins><span class="cx">
</span><span class="cx"> # gl.c:121:3: error: Platform not recognized.
</span><span class="cx"> configure.cppflags-append -D__unix__=1
</span></span></pre></div>
<a id="trunkdportsmultimediaVLCdevelfilesconfigureacnoarchpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch (115391 => 115392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch 2014-01-01 07:13:35 UTC (rev 115391)
+++ trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch 2014-01-01 08:13:16 UTC (rev 115392)
</span><span class="lines">@@ -1,41 +1,31 @@
</span><del>-commit 4d48f24e928d4c81d544f1ab232462577dd3e933
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Fri Sep 27 13:38:02 2013 -0700
-
- Use arch flags from environment
-
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-
-diff --git a/configure.ac b/configure.ac
-index 417bfdb..f305a44 100644
---- configure.ac
-+++ configure.ac
-@@ -125,34 +125,12 @@ case "${host_os}" in
</del><ins>+--- configure.ac.orig 2013-12-31 23:26:06.000000000 -0800
++++ configure.ac 2013-12-31 23:35:58.000000000 -0800
+@@ -138,22 +138,11 @@ case "${host_os}" in
</ins><span class="cx"> SYS=dragonfly
</span><span class="cx"> ;;
</span><span class="cx"> darwin*)
</span><span class="cx"> -
</span><span class="cx"> - dnl Force gcc "-arch" flag
</span><span class="cx"> - ARCH_flag=""
</span><del>-- case "${host}" in
-- i?86*)
</del><ins>+ case "${host}" in
+ i?86*)
</ins><span class="cx"> - ARCH_flag="-arch i386"
</span><del>-- ;;
</del><ins>+ YASMFLAGS="-f macho32"
+ ;;
</ins><span class="cx"> - ppc64*)
</span><span class="cx"> - ARCH_flag="-arch ppc64"
</span><span class="cx"> - ;;
</span><span class="cx"> - ppc*)
</span><span class="cx"> - ARCH_flag="-arch ppc"
</span><span class="cx"> - ;;
</span><del>-- x86_64*)
</del><ins>+ x86_64*)
</ins><span class="cx"> - ARCH_flag="-arch x86_64"
</span><del>-- ;;
-- arm*)
-- ac_cv_c_bigendian="no"
-- ac_cv_c_attribute_packed="no"
-- ;;
-- esac
--
</del><ins>+ YASMFLAGS="-f macho64"
+ ;;
+ arm*)
+@@ -163,11 +152,10 @@ case "${host_os}" in
+ esac
+
</ins><span class="cx"> SYS=darwin
</span><span class="cx"> - CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
</span><span class="cx"> - CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
</span><span class="lines">@@ -44,9 +34,8 @@
</span><span class="cx"> - LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
</span><span class="cx"> + CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS"
</span><span class="cx"> + CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS"
</span><del>-+ CPPFLAGS="${CPPFLAGS}"
</del><span class="cx"> + OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99"
</span><span class="cx"> + LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
</span><span class="cx"> VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
</span><span class="cx"> VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x262 x264 x26410b],[-Wl,-read_only_relocs,suppress])
</span><del>- VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,SystemConfiguration])
</del><ins>+ VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices])
</ins></span></pre></div>
<a id="trunkdportsmultimediaVLCdevelfilesnosparklepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch (115391 => 115392)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch 2014-01-01 07:13:35 UTC (rev 115391)
+++ trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch 2014-01-01 08:13:16 UTC (rev 115392)
</span><span class="lines">@@ -70,14 +70,15 @@
</span><span class="cx"> index c5fced6..da7d001 100644
</span><span class="cx"> --- modules/gui/macosx/intf.m
</span><span class="cx"> +++ modules/gui/macosx/intf.m
</span><del>-@@ -69,7 +69,6 @@
</del><ins>+@@ -69,8 +69,6 @@
+ #import "VideoEffects.h"
</ins><span class="cx"> #import "AudioEffects.h"
</span><span class="cx">
</span><del>- #import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
</del><span class="cx"> -#import <Sparkle/Sparkle.h> /* we're the update delegate */
</span><del>-
</del><ins>+-
</ins><span class="cx"> #import "iTunes.h"
</span><span class="cx">
</span><ins>+ /*****************************************************************************
</ins><span class="cx"> @@ -916,16 +915,6 @@ static VLCMain *_o_sharedMainInstance = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -105,10 +106,10 @@
</span><span class="cx">
</span><span class="cx"> -#import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
</span><span class="cx"> -
</span><del>- 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
</del><ins>+ static const char *const ppsz_language[] =
+ {
+ "auto",
+@@ -365,7 +363,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
</ins><span class="cx"> [o_intf_appleremote_sysvol_ckb setTitle: _NS("Control system volume with the Apple Remote")];
</span><span class="cx"> [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
</span><span class="cx"> [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
</span><span class="lines">@@ -116,7 +117,7 @@
</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>-@@ -440,10 +437,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
</del><ins>+@@ -585,10 +582,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
</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>