[115396] trunk/dports/multimedia/VLC
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jan 1 00:58:55 PST 2014
Revision: 115396
https://trac.macports.org/changeset/115396
Author: jeremyhu at macports.org
Date: 2014-01-01 00:58:55 -0800 (Wed, 01 Jan 2014)
Log Message:
-----------
VLC: Bump to 2.1.2
Modified Paths:
--------------
trunk/dports/multimedia/VLC/Portfile
trunk/dports/multimedia/VLC/files/no-sparkle.patch
Removed Paths:
-------------
trunk/dports/multimedia/VLC/files/patch-freetype-2.5.1.diff
Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- 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)
@@ -5,8 +5,7 @@
PortGroup compiler_blacklist_versions 1.0
name VLC
-version 2.1.0
-revision 4
+version 2.1.2
categories multimedia
maintainers jeremyhu openmaintainer
@@ -34,9 +33,9 @@
distname vlc-${version}
use_xz yes
-checksums md5 8c77bda671821f5b9ede96b6816e2ade \
- sha1 f6bdf3971f764a9a192f44e4b6363ac482919dc2 \
- rmd160 b8f3240eb6941d3eb4b2fc21c8b279b80f4cd026
+checksums md5 fb6787ad749aadcfaeab3471939b3426 \
+ sha1 2b0ef3a3767c56d64a2815c772c8b3f865018e70 \
+ rmd160 8e952218c2be5cb3ed0333ba776bd87477468a63
depends_build port:pkgconfig
@@ -74,12 +73,30 @@
class_struct.patch \
qtkit.patch \
static_assert.patch \
- no-sparkle.patch \
- patch-freetype-2.5.1.diff
+ no-sparkle.patch
post-patch {
reinplace "s:librsvg-2/librsvg:librsvg:" \
${worksrcpath}/modules/text_renderer/svg.c
+
+ 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
+ }
}
use_autoreconf yes
@@ -89,7 +106,7 @@
depends_build-append port:libtool port:autoconf port:automake
configure.env-append CXXCPP="${configure.cxx} -E"
-build.args-append DESTDIR=${worksrcpath}/dest_ignore
+build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1
# gl.c:121:3: error: Platform not recognized.
configure.cppflags-append -D__unix__=1
Modified: trunk/dports/multimedia/VLC/files/no-sparkle.patch
===================================================================
--- 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)
@@ -105,10 +105,10 @@
-#import <Sparkle/Sparkle.h> //for o_intf_last_update_lbl
-
- 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
+ static const char *const ppsz_language[] =
+ {
+ "auto",
+@@ -365,7 +363,6 @@ create_toolbar_item(NSString * o_itemIde
[o_intf_appleremote_sysvol_ckb setTitle: _NS("Control system volume with the Apple Remote")];
[o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
[o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
@@ -116,7 +116,7 @@
[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")];
-@@ -440,10 +437,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
+@@ -585,10 +582,6 @@ static inline char * __config_GetLabel(v
[self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
[self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];
Deleted: trunk/dports/multimedia/VLC/files/patch-freetype-2.5.1.diff
===================================================================
--- 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)
@@ -1,30 +0,0 @@
-From c5b2b0a284ba6b544646f3a205aa1a2e1117d431 Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Kempf <jb at 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
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140101/01e08c17/attachment.html>
More information about the macports-changes
mailing list