<!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>[115396] trunk/dports/multimedia/VLC</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/115396">115396</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-01-01 00:58:55 -0800 (Wed, 01 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>VLC: Bump to 2.1.2</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCPortfile">trunk/dports/multimedia/VLC/Portfile</a></li>
<li><a href="#trunkdportsmultimediaVLCfilesnosparklepatch">trunk/dports/multimedia/VLC/files/no-sparkle.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaVLCfilespatchfreetype251diff">trunk/dports/multimedia/VLC/files/patch-freetype-2.5.1.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaVLCPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/Portfile (115395 => 115396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/Portfile 2014-01-01 08:49:14 UTC (rev 115395)
+++ trunk/dports/multimedia/VLC/Portfile 2014-01-01 08:58:55 UTC (rev 115396)
</span><span class="lines">@@ -5,8 +5,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name VLC
</span><del>-version 2.1.0
-revision 4
</del><ins>+version 2.1.2
</ins><span class="cx"> categories multimedia
</span><span class="cx">
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -34,9 +33,9 @@
</span><span class="cx"> distname vlc-${version}
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums md5 8c77bda671821f5b9ede96b6816e2ade \
- sha1 f6bdf3971f764a9a192f44e4b6363ac482919dc2 \
- rmd160 b8f3240eb6941d3eb4b2fc21c8b279b80f4cd026
</del><ins>+checksums md5 fb6787ad749aadcfaeab3471939b3426 \
+ sha1 2b0ef3a3767c56d64a2815c772c8b3f865018e70 \
+ rmd160 8e952218c2be5cb3ed0333ba776bd87477468a63
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -74,12 +73,30 @@
</span><span class="cx"> class_struct.patch \
</span><span class="cx"> qtkit.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 +106,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="trunkdportsmultimediaVLCfilesnosparklepatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/VLC/files/no-sparkle.patch (115395 => 115396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/no-sparkle.patch 2014-01-01 08:49:14 UTC (rev 115395)
+++ trunk/dports/multimedia/VLC/files/no-sparkle.patch 2014-01-01 08:58:55 UTC (rev 115396)
</span><span class="lines">@@ -105,10 +105,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_itemIde
</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 +116,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(v
</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>
<a id="trunkdportsmultimediaVLCfilespatchfreetype251diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/multimedia/VLC/files/patch-freetype-2.5.1.diff (115395 => 115396)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/VLC/files/patch-freetype-2.5.1.diff 2014-01-01 08:49:14 UTC (rev 115395)
+++ trunk/dports/multimedia/VLC/files/patch-freetype-2.5.1.diff 2014-01-01 08:58:55 UTC (rev 115396)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-From c5b2b0a284ba6b544646f3a205aa1a2e1117d431 Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb@videolan.org>
-Date: Mon, 2 Dec 2013 17:32:07 +0100
-Subject: [PATCH 1/1] Freetype: fix compilation with 2.5.1
-
-Close #10019
----
- modules/text_renderer/freetype.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
-index bd78c0d..baeeb96 100644
---- modules/text_renderer/freetype.c
-+++ modules/text_renderer/freetype.c
-@@ -88,10 +88,11 @@
- #endif
-
- /* Freetype */
--#include <freetype/ftsynth.h>
-+#include <ft2build.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- #include FT_STROKER_H
-+#include FT_SYNTHESIS_H
-
- #define FT_FLOOR(X) ((X & -64) >> 6)
- #define FT_CEIL(X) (((X + 63) & -64) >> 6)
---
-1.7.10.4
-
</del></span></pre>
</div>
</div>
</body>
</html>