<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d16d4f80882fa56c5b97f704cbdd3645d168d1a4">https://github.com/macports/macports-ports/commit/d16d4f80882fa56c5b97f704cbdd3645d168d1a4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d16d4f8 VLC : upgrade to 3.0.8
</span>d16d4f8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d16d4f80882fa56c5b97f704cbdd3645d168d1a4
</span>Author: René Bertin <rjvbertin@gmail.com>
AuthorDate: Thu Oct 24 10:44:34 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> VLC : upgrade to 3.0.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fixes building problems on 10.15 (#59393) as well as (hopefully)
</span><span style='display:block; white-space:pre;color:#404040;'> the current build problems on 10.12 and earlier.
</span>---
multimedia/VLC/Portfile | 24 ++++++-----
multimedia/VLC/files/patch-build-on-post-1014.diff | 50 ++++++++++++++++++++++
multimedia/VLC/files/patch-build-on-pre-1012.diff | 39 +++++++++--------
3 files changed, 84 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/Portfile b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f39e6e..699e2d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,6 @@ long_description VLC media player is a highly portable multimedia player for
</span> homepage https://www.videolan.org
subport lib${name} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span> description the core engine and interface to VLC's multimedia framework
long_description \
libVLC is the core engine and the interface to the multimedia \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +28,7 @@ subport lib${name} {
</span> conflicts ${name} VLC2
homepage https://www.videolan.org/vlc/libvlc.html
# libVLC builds on 10.9 (Darwin 13)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span> replaced_by libVLC2
PortGroup obsolete 1.0
patch {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,8 +36,7 @@ subport lib${name} {
</span> }
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 14} {
</span> replaced_by VLC2
PortGroup obsolete 1.0
# given the Portfile design it's easier to shunt the entire patch phase
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +50,7 @@ if {${subport} eq ${name}} {
</span> universal_variant no
supported_archs x86_64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.8
</span> license GPL-2
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,9 +60,9 @@ dist_subdir VLC
</span> distname vlc-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9ed6e0f890582efb455c6ff005233cff6c83fcf3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0655804371096772f06104b75c21cde8a76e3b6c8a2fdadc97914f082c6264f5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 26052372
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ccb9cf848ba3aa3d57e1dc6a4ccec9f59002883c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e0149ef4a20a19b9ecd87309c2d27787ee3f47dfd47c6639644bc1f6fd95bdf6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 26041520
</span>
depends_build port:pkgconfig \
port:realpath
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,13 +165,15 @@ platform darwin {
</span> patchfiles-append \
patch-build-on-pre-1012.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-build-on-post-1014.diff
</span> }
depends_lib-append port:lua
# VLC doesn't currently build for me using port:clang-3.8
compiler.blacklist-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc-4.2 llvm-gcc-4.2 {clang < 300}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc-4.2 llvm-gcc-4.2 macports-clang-3.8 {clang < 300}
</span>
patchfiles-append configure.ac-no-arch.patch \
patch-soundfont-path.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,7 +206,9 @@ autoreconf.args
</span> depends_build-append port:libtool port:autoconf port:automake
configure.env-append \
"CPP=${configure.cc} -E" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXCPP=${configure.cxx} -E"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CXXCPP=${configure.cxx} -E" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "MATROSKA_CFLAGS=${prefix}/include/ebml" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "MATROSKA_LIBS=-lmatroska -lebml"
</span> build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1 -k
# gl.c:121:3: error: Platform not recognized.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -325,7 +327,7 @@ variant shout description {Enable Shoutcast/Icecast streaming output support} {
</span> }
variant smb description {Enable Samba 3 input support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:samba3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:${prefix}/bin/smbclient:samba3
</span> configure.args-replace --disable-smbclient --enable-smbclient
configure.ldflags-append -L${prefix}/lib/samba3
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-build-on-post-1014.diff b/multimedia/VLC/files/patch-build-on-post-1014.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fc24f99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-build-on-post-1014.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/gui/macosx/VLCPlaylistInfo.h modules/gui/macosx/VLCPlaylistInfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e7e1ffd4a5a6e9f9917c7afb526d4c795ede6935..048b08b4a0a0cff72116991c2d0b83b3ab85da84 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/gui/macosx/VLCPlaylistInfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/gui/macosx/VLCPlaylistInfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,8 +106,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @interface VLCInfoTreeItem : NSObject
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@property (readwrite) NSString *name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@property (readwrite) NSString *value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@property (readwrite) NSString *propertyName;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@property (readwrite) NSString *propertyValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property (readwrite) NSArray *children;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/gui/macosx/VLCPlaylistInfo.m modules/gui/macosx/VLCPlaylistInfo.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6d5c8c2906b9d0eb45cdad64a705bcdae0091fe0..eb4e481a666c70c48087ae707405a87529ec9b2b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/gui/macosx/VLCPlaylistInfo.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/gui/macosx/VLCPlaylistInfo.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -303,15 +303,15 @@ FREENULL( psz_##foo );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ info_category_t *cat = p_item->pp_categories[i];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VLCInfoTreeItem *subItem = [[VLCInfoTreeItem alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- subItem.name = toNSStr(cat->psz_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ subItem.propertyName = toNSStr(cat->psz_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Build list of codec details
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSMutableArray *infos = [NSMutableArray array];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int j = 0; j < cat->i_infos; j++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VLCInfoTreeItem *infoItem = [[VLCInfoTreeItem alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- infoItem.name = toNSStr(cat->pp_infos[j]->psz_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- infoItem.value = toNSStr(cat->pp_infos[j]->psz_value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ infoItem.propertyName = toNSStr(cat->pp_infos[j]->psz_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ infoItem.propertyValue = toNSStr(cat->pp_infos[j]->psz_value);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [infos addObject:infoItem];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -397,9 +397,9 @@ FREENULL( psz_##foo );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return @"";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([[tableColumn identifier] isEqualToString:@"0"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return [item name];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return [item propertyName];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return [item value];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return [item propertyValue];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @end
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-build-on-pre-1012.diff b/multimedia/VLC/files/patch-build-on-pre-1012.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 26ba87a..9a05430 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-build-on-pre-1012.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC/files/patch-build-on-pre-1012.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,35 +34,38 @@ index af190d1..3f0fc4f 100644
</span>
audioInput = [[QTCaptureDeviceInput alloc] initWithDevice: p_sys->audiodevice];
if(!audioInput) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --get modules/access/avcapture.m modules/access/avcapture.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index af190d1..3f0fc4f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/access/orig.avcapture.m 2018-10-28 12:11:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/access/avcapture.m 2019-02-18 00:27:36.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,6 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/access/avcapture.m modules/access/avcapture.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 38777226cfe56211aa0bd1efc9623ac7ca4cf650..d31f2168885b9b2d68d7dc562ea7a4849edbfb6e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/access/avcapture.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/access/avcapture.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,14 +43,6 @@
</span> #import <AVFoundation/AVFoundation.h>
#import <CoreMedia/CoreMedia.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef MAC_OS_X_VERSION_10_14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @interface AVCaptureDevice (AVCaptureDeviceAuthorizationSince10_14)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,6 +51,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef MAC_OS_X_VERSION_10_14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@interface AVCaptureDevice (AVCaptureDeviceAuthorizationSince10_14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-+ (void)requestAccessForMediaType:(AVMediaType)mediaType completionHandler:(void (^)(BOOL granted))handler API_AVAILABLE(macos(10.14), ios(7.0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> /*****************************************************************************
* Local prototypes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -334,6 +336,7 @@ static int Open(vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *****************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,6 +326,11 @@ static int Open(vlc_object_t *p_this)
</span> goto error;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// only compile this block if the requestAccessForMediaType method is supported;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// the code inside `if (@available(foo)) {}` is only *executed* when foo is true but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// it is always parsed at compile time; @available is not an #ifdef that protects against
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// undefined types or functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MAC_OS_X_VERSION_10_14
</span> if (@available(macOS 10.14, *)) {
msg_Dbg(p_demux, "Check user consent for access to the video device");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -350,6 +353,7 @@ static int Open(vlc_object_t *p_this)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -350,6 +347,7 @@ static int Open(vlc_object_t *p_this)
</span> goto error;
}
}
</pre><pre style='margin:0'>
</pre>