<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/428a6a7dfe09452ce9c8f7c2c757d191998eaa13">https://github.com/macports/macports-ports/commit/428a6a7dfe09452ce9c8f7c2c757d191998eaa13</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 428a6a7 VLC : address more remaining (?) build issues on 10.11 (#5027)
</span>428a6a7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 428a6a7dfe09452ce9c8f7c2c757d191998eaa13
</span>Author: René Bertin <rjvbertin@gmail.com>
AuthorDate: Sun Aug 18 02:02:16 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> VLC : address more remaining (?) build issues on 10.11 (#5027)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also add a build_dep on port:realpath
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58816
</span>---
multimedia/VLC/Portfile | 9 ++++--
multimedia/VLC/files/patch-build-on-pre-1012.diff | 34 +++++++++++++++++++++--
2 files changed, 38 insertions(+), 5 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 8ddb5fc..baf193e 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;'>@@ -66,7 +66,8 @@ checksums rmd160 9ed6e0f890582efb455c6ff005233cff6c83fcf3 \
</span> sha256 0655804371096772f06104b75c21cde8a76e3b6c8a2fdadc97914f082c6264f5 \
size 26052372
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:realpath
</span>
depends_lib-append path:lib/libavcodec.diff:ffmpeg \
port:a52dec \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,10 +205,12 @@ autoreconf.pre_args
</span> autoreconf.args
depends_build-append port:libtool port:autoconf port:automake
if {[vercmp [macports_version] 2.5.99] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CPP=${configure.cc} -E" \
</span> "CXXCPP=${configure.cxx} -E"
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP="${configure.cc} -E" \
</span> CXXCPP="${configure.cxx} -E"
}
build.args-append DESTDIR=${worksrcpath}/dest_ignore V=1 -k
<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 5b4a013..26ba87a 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;'>@@ -302,11 +302,41 @@ index 816dcdac31fb1d5b74409f4e665343ce5fa05c9f..200c532a9d314fd528ab2d50027d8a60
</span> [self setSliderStyleLight];
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,13 +120,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)viewDidChangeEffectiveAppearance
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (@available(macOS 10_14, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([self.effectiveAppearance.name isEqualToString:NSAppearanceNameDarkAqua])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setSliderStyleDark];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setSliderStyleLight];
</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;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self setNeedsDisplay:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> diff --git modules/gui/macosx/VLCVolumeSlider.m modules/gui/macosx/VLCVolumeSlider.m
index bc30e4a86e737634f33e0a8830ff32010d99fb94..02c50a438a8f0592667b5e482882ccef17ffbb1d 100644
--- modules/gui/macosx/VLCVolumeSlider.m
+++ modules/gui/macosx/VLCVolumeSlider.m
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,6 +56,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,9 +34,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (self) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSAssert([self.cell isKindOfClass:[VLCVolumeSliderCell class]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @"VLCVolumeSlider cell is not VLCVolumeSliderCell");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MAC_OS_X_VERSION_10_13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (@available(macOS 10.14, *)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self viewDidChangeEffectiveAppearance];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [(VLCVolumeSliderCell*)self.cell setSliderStyleLight];
</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;'>+@@ -56,6 +59,7 @@
</span>
- (void)viewDidChangeEffectiveAppearance
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -314,7 +344,7 @@ index bc30e4a86e737634f33e0a8830ff32010d99fb94..02c50a438a8f0592667b5e482882ccef
</span> if (@available(macOS 10_14, *)) {
if ([self.effectiveAppearance.name isEqualToString:NSAppearanceNameDarkAqua]) {
[(VLCVolumeSliderCell*)self.cell setSliderStyleDark];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,6 +66,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +69,7 @@
</span>
[self setNeedsDisplay:YES];
}
</pre><pre style='margin:0'>
</pre>