<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/27e5dd9d00b13a7f9c208344ec2ccf9442a16ed6">https://github.com/macports/macports-ports/commit/27e5dd9d00b13a7f9c208344ec2ccf9442a16ed6</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 27e5dd9 VLC: address some issues with the pre1014 patch and building on 10.11
</span>27e5dd9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 27e5dd9d00b13a7f9c208344ec2ccf9442a16ed6
</span>Author: René Bertin <rjvbertin@gmail.com>
AuthorDate: Sun Jun 23 13:28:59 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> VLC: address some issues with the pre1014 patch and building on 10.11
</span>---
multimedia/VLC/Portfile | 5 ++--
...-pre-1014.diff => patch-build-on-pre-1012.diff} | 29 ++++++++++++++++++----
2 files changed, 27 insertions(+), 7 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 94f86d7..ca93834 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;'>@@ -160,9 +160,10 @@ platform darwin {
</span> xinstall -m 755 -d ${worksrcpath}/include/os
xinstall -m 755 ${filespath}/lock.h ${worksrcpath}/include/os/lock.h
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make the code build on 10.11 and earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-build-on-pre-1012.diff
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build-on-pre-1014.diff
</span> }
depends_lib-append port:lua
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC/files/patch-build-on-pre-1014.diff b/multimedia/VLC/files/patch-build-on-pre-1012.diff
</span>similarity index 62%
rename from multimedia/VLC/files/patch-build-on-pre-1014.diff
rename to multimedia/VLC/files/patch-build-on-pre-1012.diff
<span style='display:block; white-space:pre;color:#808080;'>index 6e1c0eb..f95ed73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC/files/patch-build-on-pre-1014.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;'>@@ -38,7 +38,7 @@ diff --get modules/access/avcapture.m modules/access/avcapture.m
</span> index af190d1..3f0fc4f 100644
--- modules/access/orig.avcapture.m 2018-10-28 12:11:19.000000000 +0100
+++ modules/access/avcapture.m 2019-02-18 00:27:36.000000000 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,13 +43,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,7 @@
</span> #import <AVFoundation/AVFoundation.h>
#import <CoreMedia/CoreMedia.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ index af190d1..3f0fc4f 100644
</span> #ifndef MAC_OS_X_VERSION_10_14
@interface AVCaptureDevice (AVCaptureDeviceAuthorizationSince10_14)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- + (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;'>+@@ -50,6 +51,7 @@
</span>
@end
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ index af190d1..3f0fc4f 100644
</span>
/*****************************************************************************
* Local prototypes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -334,6 +336,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -334,6 +336,7 @@ static int Open(vlc_object_t *p_this)
</span> goto error;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ index af190d1..3f0fc4f 100644
</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 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -350,6 +353,7 @@ static int Open(vlc_object_t *p_this)
</span> goto error;
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,4 +70,23 @@ index af190d1..3f0fc4f 100644
</span>
input = [AVCaptureDeviceInput deviceInputWithDevice:(__bridge AVCaptureDevice *)p_sys->device error:&o_returnedError];
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git modules/video_output/macosx.m modules/video_output/macosx.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 20aedfc63e440cbb16ec3d0078d7d433434b8131..26ca20e4b449a52b7650a3ef7f2c1337f824bc1e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/video_output/macosx.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/video_output/macosx.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -339,6 +339,7 @@ static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *su
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [sys->glView setVoutFlushing:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (vlc_gl_MakeCurrent(sys->gl) == VLC_SUCCESS)
</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;'>+ vout_display_place_t place;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vout_display_PlacePicture(&place, &vd->source, vd->cfg, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -346,6 +347,7 @@ static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *su
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vd->cfg->display.height - (place.y + place.height),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ place.width, place.height);
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vout_display_opengl_Display (sys->vgl, &vd->source);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vlc_gl_ReleaseCurrent(sys->gl);
</span></pre><pre style='margin:0'>
</pre>