[148747] trunk/dports/multimedia/mpv
ionic at macports.org
ionic at macports.org
Mon May 16 16:26:54 PDT 2016
Revision: 148747
https://trac.macports.org/changeset/148747
Author: ionic at macports.org
Date: 2016-05-16 16:26:54 -0700 (Mon, 16 May 2016)
Log Message:
-----------
mpv: update to 0.17.0. Fixes: #50660.
- No changes in dependencies.
- VDA has been removed, only VTB is available anymore.
No hardware decoding support on 10.6 or 10.7 any longer!
- Force at least one python variant to be enabled.
- Misc. changes in the destroot section.
Modified Paths:
--------------
trunk/dports/multimedia/mpv/Portfile
trunk/dports/multimedia/mpv/files/patch-misc-add-strnlen.diff
trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff
trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff
trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff
trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff
Added Paths:
-----------
trunk/dports/multimedia/mpv/files/config-maintainer
trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.h-fix-YES-NO-macro-warnings.diff
trunk/dports/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL320-section.diff
trunk/dports/multimedia/mpv/files/patch-video_out_opengl_common.h-guard-GL3-stuff.diff
trunk/dports/multimedia/mpv/files/patch-video_out_opengl_context_cocoa.c-hardcode-OpenGL-2.diff
trunk/dports/multimedia/mpv/files/patch-video_out_vo_opengl.c-guard-GL3-and-backport-old-behavior.diff
Removed Paths:
-------------
trunk/dports/multimedia/mpv/files/config-maintainer-vda
trunk/dports/multimedia/mpv/files/config-maintainer-vtb
trunk/dports/multimedia/mpv/files/patch-video_decode_vda.c-disable-HAVE_VDA_DEFAULT_INIT2.diff
trunk/dports/multimedia/mpv/files/patch-video_out_opengl_cocoa.c-hardcode-OpenGL-2.diff
trunk/dports/multimedia/mpv/files/patch-video_out_opengl_hwdec_vda.c-disable-NV12.diff
Modified: trunk/dports/multimedia/mpv/Portfile
===================================================================
--- trunk/dports/multimedia/mpv/Portfile 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/Portfile 2016-05-16 23:26:54 UTC (rev 148747)
@@ -6,8 +6,8 @@
PortGroup waf 1.0
# Please revbump mpv whenever ffmpeg{,-devel} is updated!
-github.setup mpv-player mpv 0.11.0 v
-revision 3
+github.setup mpv-player mpv 0.17.0 v
+revision 0
categories multimedia
license GPL-2+
maintainers ionic
@@ -31,8 +31,8 @@
extract.only-delete ${waf_distfile}
checksums ${mpv_distfile} \
- rmd160 47d625b899b7bbe3867845e9710fef14d41d5249 \
- sha256 7d0598a0f5f5825143e2678f058d6305683c82ff36702235703e8d54048132fe \
+ rmd160 67eba1820d4dc287bbdcba344aa5278417922c12 \
+ sha256 9c3a6f35153e270066299d70cb0049a9868b9e2b6631dcaeb80d1ce255152042 \
${waf_distfile} \
rmd160 bb1dcd10a0c336a5497bb1247a301c27f997078c \
sha256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b
@@ -61,10 +61,11 @@
--enable-libass \
--enable-coreaudio \
--enable-cocoa \
- --disable-vda-hwaccel \
+ --disable-html-build \
--disable-videotoolbox-hwaccel \
- --disable-vda-gl \
- --disable-videotoolbox-gl
+ --disable-videotoolbox-gl \
+ --disable-opensles \
+ --disable-egl-drm
# mpv autodetects many support libs. To prevent undeclared
# dependencies, explicitly disable everything optional first.
@@ -120,7 +121,7 @@
# it is.
# Could "emulate" the same behavior by using MacPort's clang
# and appending -L/usr/lib/arc/ to CFLAGS/CXXFLAGS on 10.7,
- # but I don't particularily like that idea (yet.)
+ # but I don't particularly like that idea (yet.)
# Keep using the "system compiler" for now. Also means one less
# dependency on recent systems, so yay.
PortGroup xcodeversion 1.0
@@ -129,8 +130,14 @@
# Force clang compiler as installed by Xcode's CLT's... hopefully.
compiler.blacklist-append *gcc* cc macports-*
} else {
- # clang is required to build mpv. The newer, the merrier.
+ # clang is required to build mpv.
# Part of getting mpv to work on SL -- c.f. #44662
+ # We'll keep this at clang 3.4, because this is the last version
+ # not requiring a C++11 ABI. Older systems will need this
+ # port to bootstrap a newer clang version in a somewhat
+ # complicated process. Hence, let's assume clang 3.4 will be
+ # available for quite some time and only pull that in. It
+ # should be new enough for compiling mpv (for now.)
compiler.blacklist-append *gcc* cc
compiler.fallback-delete macports-clang-3.4
@@ -145,9 +152,6 @@
--enable-apple-remote
}
-set has_vda 0
-set has_vtb 0
-
platform darwin {
notes-append [subst {
The maintainer ships his personal config file in
@@ -159,44 +163,20 @@
and adjust it to your needs.
}]
- # Note: VDA support has already been removed on master. The next update will probably not include it anymore.
-
- # VDA (video hardware acceleration, mostly H264) is only supported on 10.6.3+ up to (excluding) 10.11.
- #if {(${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)) && (${os.major} < 15)}
- # Due to a bug in ffmpeg(?), we have to enable VDA on 10.11 as well, even though it shouldn't be supported.
- # More information: https://github.com/mpv-player/mpv/issues/2299
- if {${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)} {
- set has_vda 1
- configure.args-delete --disable-vda-hwaccel \
- --disable-vda-gl
- configure.args-append --enable-vda-hwaccel \
- --enable-vda-gl
- }
-
# VideotoolBox, a new hardware acceleration framework, is supported on 10.8+ and "here to stay".
# It provides support for H264, H263, MPEG1, MPEG2 and MPEG4.
if {${os.major} > 11} {
- set has_vtb 1
configure.args-delete --disable-videotoolbox-hwaccel \
--disable-videotoolbox-gl
configure.args-append --enable-videotoolbox-hwaccel \
--enable-videotoolbox-gl
}
- if {(${has_vtb}) || (${has_vda})} {
+ if {${os.major} > 11} {
notes-append {
This config file already defines the necessary video output settings to make \
use of the hardware acceleration features provided by your operating system.
}
-
- if {(${has_vtb}) && (${has_vda})} {
- notes-append [subst {
- While the default configuration file makes use of the newer and preferred \
- VideoToolBox framework, a separate config file set up for the old VDA \
- framework has been installed as
- * ${prefix}/share/examples/${name}/config-maintainer-vda.
- }]
- }
} else {
notes-append {
Sadly, your system is incapable of utilizing mpv's hardware decoding features.
@@ -226,11 +206,13 @@
patch-video_out_cocoa_window.m-fullscreen-fixes.diff \
patch-video_out_cocoa_common.m-define-constants.diff \
patch-video_out_cocoa_common.m-port-lightsensor.diff \
- patch-video_out_opengl_cocoa.c-hardcode-OpenGL-2.diff \
+ patch-video_out_opengl_context_cocoa.c-hardcode-OpenGL-2.diff \
+ patch-osdep_macosx_compat.h-fix-YES-NO-macro-warnings.diff \
patch-osdep_macosx_compat.m-add-subscripting-implementation.diff \
patch-audio_out_ao_coreaudio_utils.c-add-missing-header-for-getpid.diff \
- patch-video_decode_vda.c-disable-HAVE_VDA_DEFAULT_INIT2.diff \
- patch-video_out_opengl_hwdec_vda.c-disable-NV12.diff
+ patch-video_out_opengl_common.h-guard-GL3-stuff.diff \
+ patch-video_out_vo_opengl.c-guard-GL3-and-backport-old-behavior.diff \
+ patch-video_out_opengl_common.c-hide-GL320-section.diff
# Let's hope this is actually unneeded...
#patch-video_out_cocoa_common.m-use-deprecated-ColorSync-functions.diff
@@ -246,16 +228,14 @@
}
post-extract {
- xinstall -m 0644 -W "${filespath}" config-maintainer-vda config-maintainer-vtb "${worksrcpath}/TOOLS/"
+ xinstall -m 0644 -W "${filespath}" config-maintainer "${worksrcpath}/TOOLS/"
}
pre-configure {
if {[variant_isset network]} {
- reinplace -W "${worksrcpath}/TOOLS" "s|@@NETWORK@@||" config-maintainer-vda
- reinplace -W "${worksrcpath}/TOOLS" "s|@@NETWORK@@||" config-maintainer-vtb
+ reinplace -W "${worksrcpath}/TOOLS" "s|@@NETWORK@@||" config-maintainer
} else {
- reinplace -W "${worksrcpath}/TOOLS" "|@@NETWORK@@|d" config-maintainer-vda
- reinplace -W "${worksrcpath}/TOOLS" "|@@NETWORK@@|d" config-maintainer-vtb
+ reinplace -W "${worksrcpath}/TOOLS" "|@@NETWORK@@|d" config-maintainer
}
}
}
@@ -264,6 +244,7 @@
# Shameless copy from ipe-tools.
set python.versions {27 35}
set python.default_version 27
+set python.version ""
# Create python variants.
foreach ver ${python.versions} {
@@ -301,6 +282,11 @@
}
}
+if {[string length ${python.version}] == 0} {
+ ui_error "No python variant selected. You must select at least one. The highest value will be used."
+ error "Select a python variant."
+}
+
post-patch {
set python_ver_dot [join [split ${python.version} {}] "."]
reinplace -W "${worksrcpath}" "s|'rst2man'|'rst2man-${python_ver_dot}'|" wscript
@@ -312,7 +298,7 @@
post-destroot {
xinstall -d -m 0755 ${destroot}${prefix}/etc/${name}
- foreach etcfile {encoding-profiles.conf example.conf input.conf} {
+ foreach etcfile {encoding-profiles.conf mpv.conf input.conf} {
xinstall -m 0644 ${worksrcpath}/etc/${etcfile} \
${destroot}${prefix}/etc/${name}/${etcfile}
}
@@ -323,18 +309,8 @@
${destroot}${prefix}/share/examples/${name}
if {${os.platform} eq "darwin"} {
- if {(${has_vtb})} {
- xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer-vtb \
- ${destroot}${prefix}/share/examples/${name}/config-maintainer
-
- if {(${has_vda})} {
- xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer-vda \
- ${destroot}${prefix}/share/examples/${name}/
- }
- } else {
- xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer-vda \
- ${destroot}${prefix}/share/examples/${name}/config-maintainer
- }
+ xinstall -m 0644 ${worksrcpath}/TOOLS/config-maintainer \
+ ${destroot}${prefix}/share/examples/${name}/
}
}
@@ -457,6 +433,7 @@
configure.args-replace --disable-gl-x11 \
--enable-gl-x11
# FIXME: add EGL? Leave it disabled? Test!
+ # As far as testing went, EGL is not available on OS X yet.
#configure.args-replace --disable-egl-x11 \
# --enable-egl-x11
}
Copied: trunk/dports/multimedia/mpv/files/config-maintainer (from rev 148746, trunk/dports/multimedia/mpv/files/config-maintainer-vtb)
===================================================================
--- trunk/dports/multimedia/mpv/files/config-maintainer (rev 0)
+++ trunk/dports/multimedia/mpv/files/config-maintainer 2016-05-16 23:26:54 UTC (rev 148747)
@@ -0,0 +1,23 @@
+# Write your default config options here!
+[default]
+
+vo=opengl-hq:backend=cocoa
+ao=coreaudio
+
+sub-scale=3
+
+af=scaletempo
+
+softvol=yes
+softvol-max=800
+
+framedrop=vo
+
+hwdec=videotoolbox
+
+#alang=en,eng,de,ger
+
+cache=50700
+
+@@NETWORK@@ytdl
+@@NETWORK@@ytdl-format=best
Deleted: trunk/dports/multimedia/mpv/files/config-maintainer-vda
===================================================================
--- trunk/dports/multimedia/mpv/files/config-maintainer-vda 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/files/config-maintainer-vda 2016-05-16 23:26:54 UTC (rev 148747)
@@ -1,23 +0,0 @@
-# Write your default config options here!
-[default]
-
-vo=opengl-hq:backend=cocoa
-ao=coreaudio
-
-sub-scale=3
-
-af=scaletempo
-
-softvol=yes
-softvol-max=800
-
-framedrop=vo
-
-hwdec=vda
-
-#alang=en,eng,de,ger
-
-cache=50700
-
-@@NETWORK@@ytdl
-@@NETWORK@@ytdl-format=best
Deleted: trunk/dports/multimedia/mpv/files/config-maintainer-vtb
===================================================================
--- trunk/dports/multimedia/mpv/files/config-maintainer-vtb 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/files/config-maintainer-vtb 2016-05-16 23:26:54 UTC (rev 148747)
@@ -1,23 +0,0 @@
-# Write your default config options here!
-[default]
-
-vo=opengl-hq:backend=cocoa
-ao=coreaudio
-
-sub-scale=3
-
-af=scaletempo
-
-softvol=yes
-softvol-max=800
-
-framedrop=vo
-
-hwdec=videotoolbox
-
-#alang=en,eng,de,ger
-
-cache=50700
-
-@@NETWORK@@ytdl
-@@NETWORK@@ytdl-format=best
Modified: trunk/dports/multimedia/mpv/files/patch-misc-add-strnlen.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-misc-add-strnlen.diff 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/files/patch-misc-add-strnlen.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -3,7 +3,7 @@
@@ -25,6 +25,7 @@
#include "osdep/compiler.h"
- #include "talloc.h"
+ #include "mpv_talloc.h"
+#include "common/compat.h"
// double should be able to represent this exactly
Added: trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.h-fix-YES-NO-macro-warnings.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.h-fix-YES-NO-macro-warnings.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.h-fix-YES-NO-macro-warnings.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -0,0 +1,18 @@
+--- osdep/macosx_compat.h.orig
++++ osdep/macosx_compat.h
+@@ -41,6 +41,15 @@
+ - (void)setObject: (id)object forKeyedSubscript:(id)key;
+ @end
+
++/* Don't blindly redefine YES and NO, undefine them first. */
++#ifdef YES
++ #undef YES
++#endif
++
++#ifdef NO
++ #undef NO
++#endif
++
+ #if __has_feature(objc_bool)
+ #define YES __objc_yes
+ #define NO __objc_no
Modified: trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/files/patch-osdep_macosx_compat.m-add-subscripting-implementation.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -57,7 +57,7 @@
+#endif
--- wscript_build.py.orig
+++ wscript_build.py
-@@ -364,6 +364,7 @@ def build(ctx):
+@@ -394,6 +394,7 @@ def build(ctx):
( "osdep/ar/HIDRemote.m", "apple-remote" ),
( "osdep/macosx_application.m", "cocoa" ),
( "osdep/macosx_events.m", "cocoa" ),
Deleted: trunk/dports/multimedia/mpv/files/patch-video_decode_vda.c-disable-HAVE_VDA_DEFAULT_INIT2.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-video_decode_vda.c-disable-HAVE_VDA_DEFAULT_INIT2.diff 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/files/patch-video_decode_vda.c-disable-HAVE_VDA_DEFAULT_INIT2.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -1,28 +0,0 @@
---- video/decode/vda.c.orig
-+++ video/decode/vda.c
-@@ -19,6 +19,7 @@
-
- #include <libavcodec/version.h>
- #include <libavcodec/vda.h>
-+#include <AvailabilityMacros.h>
-
- #include "common/av_common.h"
- #include "common/msg.h"
-@@ -76,6 +77,7 @@ static void print_vda_error(struct mp_lo
- static int init_decoder(struct lavc_ctx *ctx, int w, int h)
- {
- av_vda_default_free(ctx->avctx);
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- #if HAVE_VDA_DEFAULT_INIT2
- AVVDAContext *vdactx = av_vda_alloc_context();
- vdactx->cv_pix_fmt_type = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
-@@ -83,6 +85,9 @@ static int init_decoder(struct lavc_ctx
- #else
- int err = av_vda_default_init(ctx->avctx);
- #endif
-+#else
-+ int err = av_vda_default_init(ctx->avctx);
-+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 */
-
- if (err < 0) {
- print_vda_error(ctx->log, MSGL_ERR, "failed to init VDA decoder", err);
Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-define-constants.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -11,4 +11,4 @@
+
static int vo_cocoa_fullscreen(struct vo *vo);
static void cocoa_rm_fs_screen_profile_observer(struct vo_cocoa_state *s);
-
+ static void cocoa_add_screen_reconfiguration_observer(struct vo *vo);
Modified: trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_cocoa_common.m-port-lightsensor.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -8,7 +8,7 @@
#import "cocoa_common.h"
#import "video/out/cocoa/window.h"
-@@ -85,6 +86,7 @@ struct vo_cocoa_state {
+@@ -87,6 +88,7 @@ struct vo_cocoa_state {
uint64_t last_lmuvalue;
int last_lux;
IONotificationPortRef light_sensor_io_port;
@@ -16,7 +16,7 @@
struct mp_log *log;
-@@ -226,8 +228,18 @@ static void cocoa_init_light_sensor(stru
+@@ -230,8 +232,18 @@ static void cocoa_init_light_sensor(stru
// subscribe to notifications from the light sensor driver
s->light_sensor_io_port = IONotificationPortCreate(kIOMasterPortDefault);
@@ -35,7 +35,7 @@
io_object_t n;
IOServiceAddInterestNotification(
-@@ -249,6 +261,11 @@ static void cocoa_init_light_sensor(stru
+@@ -253,6 +265,11 @@ static void cocoa_init_light_sensor(stru
static void cocoa_uninit_light_sensor(struct vo_cocoa_state *s)
{
if (s->light_sensor_io_port) {
Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_opengl_cocoa.c-hardcode-OpenGL-2.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-video_out_opengl_cocoa.c-hardcode-OpenGL-2.diff 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_opengl_cocoa.c-hardcode-OpenGL-2.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -1,138 +0,0 @@
---- video/out/opengl/cocoa.c.orig
-+++ video/out/opengl/cocoa.c
-@@ -61,12 +61,17 @@ static void *cocoa_glgetaddr(const char
-
- static CGLError test_gl_version(struct vo *vo,
- CGLContextObj *ctx,
-- CGLPixelFormatObj *pix,
-- CGLOpenGLProfile version)
-+ CGLPixelFormatObj *pix
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-+ , CGLOpenGLProfile version
-+#endif
-+ )
- {
- CGLPixelFormatAttribute attrs[] = {
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- kCGLPFAOpenGLProfile,
- (CGLPixelFormatAttribute) version,
-+#endif
- kCGLPFADoubleBuffer,
- kCGLPFAAccelerated,
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
-@@ -104,16 +109,22 @@ static bool create_gl_context(struct MPG
- struct cgl_context *p = ctx->priv;
- CGLError err;
-
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- CGLOpenGLProfile gl_versions[] = {
- kCGLOGLPVersion_3_2_Core,
- kCGLOGLPVersion_Legacy,
- };
-+#endif
-
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- for (int n = 0; n < MP_ARRAY_SIZE(gl_versions); n++) {
- err = test_gl_version(ctx->vo, &p->ctx, &p->pix, gl_versions[n]);
- if (err == kCGLNoError)
- break;
- }
-+#else
-+ err = test_gl_version(ctx->vo, &p->ctx, &p->pix);
-+#endif
-
- if (err != kCGLNoError) {
- MP_FATAL(ctx->vo, "error creating CGL context: %s (%d)\n",
---- video/out/opengl/common.c.orig
-+++ video/out/opengl/common.c
-@@ -356,6 +356,7 @@ void mpgl_load_functions2(GL *gl, void *
- if (shader)
- mp_verbose(log, "GL_SHADING_LANGUAGE_VERSION='%s'\n", shader);
-
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- if (gl->version >= 300) {
- gl->GetStringi = get_fn(fn_ctx, "glGetStringi");
- gl->GetIntegerv = get_fn(fn_ctx, "glGetIntegerv");
-@@ -370,7 +371,9 @@ void mpgl_load_functions2(GL *gl, void *
- gl->extensions = talloc_asprintf_append(gl->extensions, " %s", ext);
- }
-
-- } else {
-+ } else
-+#endif
-+ {
- const char *ext = (char*)gl->GetString(GL_EXTENSIONS);
- gl->extensions = talloc_asprintf_append(gl->extensions, " %s", ext);
- }
---- video/out/opengl/common.h.orig
-+++ video/out/opengl/common.h
-@@ -39,7 +39,6 @@
- #if HAVE_GL_COCOA
- #define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED 1
- #include <OpenGL/gl.h>
--#include <OpenGL/gl3.h>
- #include <OpenGL/glext.h>
- #else
- #include <GL/gl.h>
---- video/out/opengl/utils.c.orig
-+++ video/out/opengl/utils.c
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <stdarg.h>
- #include <assert.h>
-+#include <AvailabilityMacros.h>
-
- #include "stream/stream.h"
- #include "common/common.h"
-@@ -85,14 +86,20 @@ int glFmt2bpp(GLenum format, GLenum type
- return 2;
- case GL_RGB:
- case GL_BGR:
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- case GL_RGB_INTEGER:
-+#endif
- return 3 * component_size;
- case GL_RGBA:
- case GL_BGRA:
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- case GL_RGBA_INTEGER:
-+#endif
- return 4 * component_size;
- case GL_RED:
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- case GL_RED_INTEGER:
-+#endif
- return component_size;
- case GL_RG:
- case GL_LUMINANCE_ALPHA:
---- video/out/opengl/video.c.orig
-+++ video/out/opengl/video.c
-@@ -264,10 +264,10 @@ static const struct fmt_entry gl_byte_fo
- };
-
- static const struct fmt_entry gl_float16_formats[] = {
-- {0, GL_R16F, GL_RED, GL_FLOAT}, // 1 x f
-- {0, GL_RG16F, GL_RG, GL_FLOAT}, // 2 x f
-- {0, GL_RGB16F, GL_RGB, GL_FLOAT}, // 3 x f
-- {0, GL_RGBA16F, GL_RGBA, GL_FLOAT}, // 4 x f
-+ {0, 0, GL_RED, GL_FLOAT}, // 1 x f
-+ {0, 0, GL_RG, GL_FLOAT}, // 2 x f
-+ {0, 0, GL_RGB, GL_FLOAT}, // 3 x f
-+ {0, 0, GL_RGBA, GL_FLOAT}, // 4 x f
- };
-
- static const struct fmt_entry gl_apple_formats[] = {
-@@ -389,12 +389,8 @@ const struct m_sub_options gl_video_conf
- {"rgb10", GL_RGB10},
- {"rgb10_a2", GL_RGB10_A2},
- {"rgb16", GL_RGB16},
-- {"rgb16f", GL_RGB16F},
-- {"rgb32f", GL_RGB32F},
- {"rgba12", GL_RGBA12},
-- {"rgba16", GL_RGBA16},
-- {"rgba16f", GL_RGBA16F},
-- {"rgba32f", GL_RGBA32F})),
-+ {"rgba16", GL_RGBA16})),
- OPT_CHOICE_OR_INT("dither-depth", dither_depth, 0, -1, 16,
- ({"no", -1}, {"auto", 0})),
- OPT_CHOICE("dither", dither_algo, 0,
Added: trunk/dports/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL320-section.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL320-section.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_opengl_common.c-hide-GL320-section.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -0,0 +1,18 @@
+--- video/out/opengl/common.c.orig
++++ video/out/opengl/common.c
+@@ -227,6 +227,7 @@ static const struct gl_functions gl_func
+ .extension = "GL_ARB_texture_rg",
+ .provides = MPGL_CAP_TEX_RG,
+ },
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ {
+ .ver_core = 320,
+ .extension = "GL_ARB_sync",
+@@ -237,6 +238,7 @@ static const struct gl_functions gl_func
+ {0}
+ },
+ },
++#endif
+ // Swap control, always an OS specific extension
+ // The OSX code loads this manually.
+ {
Added: trunk/dports/multimedia/mpv/files/patch-video_out_opengl_common.h-guard-GL3-stuff.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-video_out_opengl_common.h-guard-GL3-stuff.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_opengl_common.h-guard-GL3-stuff.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -0,0 +1,23 @@
+--- video/out/opengl/common.h.orig
++++ video/out/opengl/common.h
+@@ -22,6 +22,8 @@
+ #include <stdint.h>
+ #include <stdbool.h>
+
++#include <AvailabilityMacros.h>
++
+ #include "config.h"
+ #include "common/msg.h"
+ #include "misc/bstr.h"
+@@ -176,9 +178,11 @@ struct GL {
+ void (GLAPIENTRY *UniformMatrix3fv)(GLint, GLsizei, GLboolean,
+ const GLfloat *);
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ GLsync (GLAPIENTRY *FenceSync)(GLenum, GLbitfield);
+ GLenum (GLAPIENTRY *ClientWaitSync)(GLsync, GLbitfield, GLuint64);
+ void (GLAPIENTRY *DeleteSync)(GLsync sync);
++#endif
+
+ void (GLAPIENTRY *VDPAUInitNV)(const GLvoid *, const GLvoid *);
+ void (GLAPIENTRY *VDPAUFiniNV)(void);
Added: trunk/dports/multimedia/mpv/files/patch-video_out_opengl_context_cocoa.c-hardcode-OpenGL-2.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-video_out_opengl_context_cocoa.c-hardcode-OpenGL-2.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_opengl_context_cocoa.c-hardcode-OpenGL-2.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -0,0 +1,228 @@
+--- video/out/opengl/common.c.orig
++++ video/out/opengl/common.c
+@@ -28,6 +28,7 @@
+ #include <stdbool.h>
+ #include <math.h>
+ #include <assert.h>
++#include <AvailabilityMacros.h>
+
+ #include "common.h"
+ #include "common/common.h"
+@@ -399,6 +400,7 @@ void mpgl_load_functions2(GL *gl, void *
+ if (shader)
+ mp_verbose(log, "GL_SHADING_LANGUAGE_VERSION='%s'\n", shader);
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ if (gl->version >= 300) {
+ gl->GetStringi = get_fn(fn_ctx, "glGetStringi");
+ gl->GetIntegerv = get_fn(fn_ctx, "glGetIntegerv");
+@@ -413,7 +415,9 @@ void mpgl_load_functions2(GL *gl, void *
+ gl->extensions = talloc_asprintf_append(gl->extensions, " %s", ext);
+ }
+
+- } else {
++ } else
++#endif
++ {
+ const char *ext = (char*)gl->GetString(GL_EXTENSIONS);
+ gl->extensions = talloc_asprintf_append(gl->extensions, " %s", ext);
+ }
+--- video/out/opengl/common.h.orig
++++ video/out/opengl/common.h
+@@ -34,7 +34,6 @@
+ #if HAVE_GL_COCOA
+ #define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED 1
+ #include <OpenGL/gl.h>
+-#include <OpenGL/gl3.h>
+ #include <OpenGL/glext.h>
+ #elif HAVE_ANDROID_GL
+ #include <GLES3/gl3.h>
+--- video/out/opengl/utils.c.orig
++++ video/out/opengl/utils.c
+@@ -22,6 +22,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <assert.h>
++#include <AvailabilityMacros.h>
+
+ #include "common/common.h"
+ #include "utils.h"
+@@ -79,14 +80,20 @@ int glFmt2bpp(GLenum format, GLenum type
+ return 2;
+ case GL_RGB:
+ case GL_BGR:
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ case GL_RGB_INTEGER:
++#endif
+ return 3 * component_size;
+ case GL_RGBA:
+ case GL_BGRA:
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ case GL_RGBA_INTEGER:
++#endif
+ return 4 * component_size;
+ case GL_RED:
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ case GL_RED_INTEGER:
++#endif
+ return component_size;
+ case GL_RG:
+ case GL_LUMINANCE_ALPHA:
+@@ -322,10 +329,12 @@ static const struct gl_format gl_formats
+ {GL_RGB, GL_UNSIGNED_SHORT, GL_RGB16},
+ {GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, GL_RGB10_A2},
+ // not texture filterable in GLES 3.0
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ {GL_RGB, GL_FLOAT, GL_RGB16F},
+ {GL_RGBA, GL_FLOAT, GL_RGBA16F},
+ {GL_RGB, GL_FLOAT, GL_RGB32F},
+ {GL_RGBA, GL_FLOAT, GL_RGBA32F},
++#endif
+ // Desktop GL
+ {GL_RGB, GL_UNSIGNED_SHORT, GL_RGB10},
+ {GL_RGBA, GL_UNSIGNED_SHORT, GL_RGBA12},
+--- video/out/opengl/video.c.orig
++++ video/out/opengl/video.c
+@@ -20,6 +20,7 @@
+ #include <stdbool.h>
+ #include <string.h>
+ #include <assert.h>
++#include <AvailabilityMacros.h>
+
+ #include <libavutil/common.h>
+ #include <libavutil/lfg.h>
+@@ -284,6 +285,7 @@ static const struct fmt_entry gl_byte_fo
+ {0, 0, 0, 0}, // 4 x 16
+ };
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ static const struct fmt_entry gl_ui_byte_formats_gles3[] = {
+ {0, GL_R8UI, GL_RED_INTEGER, GL_UNSIGNED_BYTE}, // 1 x 8
+ {0, GL_RG8UI, GL_RG_INTEGER, GL_UNSIGNED_BYTE}, // 2 x 8
+@@ -294,6 +296,7 @@ static const struct fmt_entry gl_ui_byte
+ {0, GL_RGB16UI, GL_RGB_INTEGER, GL_UNSIGNED_SHORT}, // 3 x 16
+ {0, GL_RGBA16UI, GL_RGBA_INTEGER, GL_UNSIGNED_SHORT}, // 4 x 16
+ };
++#endif
+
+ static const struct fmt_entry gl_byte_formats_gles2[] = {
+ {0, GL_LUMINANCE, GL_LUMINANCE, GL_UNSIGNED_BYTE}, // 1 x 8
+@@ -318,10 +321,10 @@ static const struct fmt_entry gl_byte_fo
+ };
+
+ static const struct fmt_entry gl_float16_formats[] = {
+- {0, GL_R16F, GL_RED, GL_FLOAT}, // 1 x f
+- {0, GL_RG16F, GL_RG, GL_FLOAT}, // 2 x f
+- {0, GL_RGB16F, GL_RGB, GL_FLOAT}, // 3 x f
+- {0, GL_RGBA16F, GL_RGBA, GL_FLOAT}, // 4 x f
++ {0, 0, GL_RED, GL_FLOAT}, // 1 x f
++ {0, 0, GL_RG, GL_FLOAT}, // 2 x f
++ {0, 0, GL_RGB, GL_FLOAT}, // 3 x f
++ {0, 0, GL_RGBA, GL_FLOAT}, // 4 x f
+ };
+
+ static const struct fmt_entry gl_apple_formats[] = {
+@@ -456,12 +459,7 @@ const struct m_sub_options gl_video_conf
+ {"rgb10", GL_RGB10},
+ {"rgb10_a2", GL_RGB10_A2},
+ {"rgb16", GL_RGB16},
+- {"rgb16f", GL_RGB16F},
+- {"rgb32f", GL_RGB32F},
+ {"rgba12", GL_RGBA12},
+- {"rgba16", GL_RGBA16},
+- {"rgba16f", GL_RGBA16F},
+- {"rgba32f", GL_RGBA32F},
+ {"auto", 0})),
+ OPT_CHOICE_OR_INT("dither-depth", dither_depth, 0, -1, 16,
+ ({"no", -1}, {"auto", 0})),
+@@ -565,10 +563,14 @@ static bool is_integer_format(const stru
+ {
+ // Tests only the formats which we actually declare somewhere.
+ switch (fmt->format) {
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ case GL_RED_INTEGER:
++#endif
+ case GL_RG_INTEGER:
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ case GL_RGB_INTEGER:
+ case GL_RGBA_INTEGER:
++#endif
+ return true;
+ }
+ return false;
+@@ -1003,7 +1005,7 @@ static void pass_prepare_src_tex(struct
+ static void render_pass_quad(struct gl_video *p, int vp_w, int vp_h,
+ const struct mp_rect *dst)
+ {
+- struct vertex va[4] = {0};
++ struct vertex va[4] = {{{0}}};
+
+ struct gl_transform t;
+ gl_transform_ortho(&t, 0, vp_w, 0, vp_h);
+@@ -2636,7 +2638,11 @@ static void check_gl_features(struct gl_
+ if (!p->opts.fbo_format) {
+ p->opts.fbo_format = GL_RGBA16;
+ if (gl->es)
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ p->opts.fbo_format = have_float_tex ? GL_RGBA16F : GL_RGB10_A2;
++#else
++ p->opts.fbo_format = GL_RGB10_A2;
++#endif
+ }
+ have_fbo = test_fbo(p);
+ }
+@@ -2855,7 +2861,9 @@ static const struct fmt_entry *find_plan
+ const struct fmt_entry *e = find_tex_format(gl, bytes_per_comp, n_channels);
+ if (e->format || gl->es < 300)
+ return e;
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ return &gl_ui_byte_formats_gles3[n_channels - 1 + (bytes_per_comp - 1) * 4];
++#endif
+ }
+
+ static bool init_format(int fmt, struct gl_video *init)
+--- video/out/opengl/context_cocoa.c.orig
++++ video/out/opengl/context_cocoa.c
+@@ -56,12 +56,17 @@ static void *cocoa_glgetaddr(const char
+
+ static CGLError test_gl_version(struct vo *vo,
+ CGLContextObj *ctx,
+- CGLPixelFormatObj *pix,
+- CGLOpenGLProfile version)
++ CGLPixelFormatObj *pix
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
++ , CGLOpenGLProfile version
++#endif
++ )
+ {
+ CGLPixelFormatAttribute attrs[] = {
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ kCGLPFAOpenGLProfile,
+ (CGLPixelFormatAttribute) version,
++#endif
+ kCGLPFADoubleBuffer,
+ kCGLPFAAccelerated,
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
+@@ -99,16 +104,22 @@ static bool create_gl_context(struct MPG
+ struct cgl_context *p = ctx->priv;
+ CGLError err;
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ CGLOpenGLProfile gl_versions[] = {
+ kCGLOGLPVersion_3_2_Core,
+ kCGLOGLPVersion_Legacy,
+ };
++#endif
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ for (int n = 0; n < MP_ARRAY_SIZE(gl_versions); n++) {
+ err = test_gl_version(ctx->vo, &p->ctx, &p->pix, gl_versions[n]);
+ if (err == kCGLNoError)
+ break;
+ }
++#else
++ err = test_gl_version(ctx->vo, &p->ctx, &p->pix);
++#endif
+
+ if (err != kCGLNoError) {
+ MP_FATAL(ctx->vo, "error creating CGL context: %s (%d)\n",
Deleted: trunk/dports/multimedia/mpv/files/patch-video_out_opengl_hwdec_vda.c-disable-NV12.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-video_out_opengl_hwdec_vda.c-disable-NV12.diff 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_opengl_hwdec_vda.c-disable-NV12.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -1,45 +0,0 @@
---- video/out/opengl/hwdec_vda.c.orig
-+++ video/out/opengl/hwdec_vda.c
-@@ -23,6 +23,7 @@
- #include <CoreVideo/CoreVideo.h>
- #include <OpenGL/OpenGL.h>
- #include <OpenGL/CGLIOSurface.h>
-+#include <AvailabilityMacros.h>
-
- #include "video/mp_image_pool.h"
- #include "hwdec.h"
-@@ -54,7 +55,9 @@ static struct vda_format vda_formats[] =
- .gl = {
- { GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, GL_RGB }
- }
-- }, {
-+ }
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-+ , {
- .cvpixfmt = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange,
- .imgfmt = IMGFMT_NV12,
- .planes = 2,
-@@ -63,6 +66,7 @@ static struct vda_format vda_formats[] =
- { GL_RG, GL_UNSIGNED_BYTE, GL_RG } ,
- }
- }
-+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 */
- };
-
- static struct vda_format *vda_get_gl_format(uint32_t cvpixfmt)
-@@ -159,11 +163,15 @@ static int create_common(struct gl_hwdec
- static int create(struct gl_hwdec *hw)
- {
- // For videotoolbox, we always request NV12.
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
- #if HAVE_VDA_DEFAULT_INIT2
- struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_NV12);
- #else
- struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_UYVY);
- #endif
-+#else
-+ struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_UYVY);
-+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 */
- if (create_common(hw, f))
- return -1;
-
Added: trunk/dports/multimedia/mpv/files/patch-video_out_vo_opengl.c-guard-GL3-and-backport-old-behavior.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-video_out_vo_opengl.c-guard-GL3-and-backport-old-behavior.diff (rev 0)
+++ trunk/dports/multimedia/mpv/files/patch-video_out_vo_opengl.c-guard-GL3-and-backport-old-behavior.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -0,0 +1,59 @@
+--- video/out/vo_opengl.c.orig
++++ video/out/vo_opengl.c
+@@ -69,6 +69,9 @@ struct gl_priv {
+ int use_gl_debug;
+ int allow_sw;
+ int swap_interval;
++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
++ int current_swap_interval;
++#endif
+ int dwm_flush;
+ int opt_vsync_fences;
+
+@@ -83,8 +86,10 @@ struct gl_priv {
+ int last_pattern;
+ int matches, mismatches;
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ GLsync vsync_fences[NUM_VSYNC_FENCES];
+ int num_vsync_fences;
++#endif
+ };
+
+ static void resize(struct gl_priv *p)
+@@ -124,13 +129,21 @@ static void draw_frame(struct vo *vo, st
+ struct gl_priv *p = vo->priv;
+ GL *gl = p->gl;
+
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ if (gl->FenceSync && p->num_vsync_fences < p->opt_vsync_fences) {
+ GLsync fence = gl->FenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);;
+ if (fence)
+ p->vsync_fences[p->num_vsync_fences++] = fence;
+ }
++#endif
+
+ gl_video_render_frame(p->renderer, frame, 0);
++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
++ // The playloop calls this last before waiting some time until it decides
++ // to call flip_page(). Tell OpenGL to start execution of the GPU commands
++ // while we sleep (this happens asynchronously).
++ gl->Flush();
++#endif
+
+ if (p->use_glFinish)
+ gl->Finish();
+@@ -167,11 +180,13 @@ static void flip_page(struct vo *vo)
+ p->opt_pattern[0] = 0;
+ }
+ }
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ while (p->opt_vsync_fences > 0 && p->num_vsync_fences >= p->opt_vsync_fences) {
+ gl->ClientWaitSync(p->vsync_fences[0], GL_SYNC_FLUSH_COMMANDS_BIT, 1e9);
+ gl->DeleteSync(p->vsync_fences[0]);
+ MP_TARRAY_REMOVE_AT(p->vsync_fences, p->num_vsync_fences, 0);
+ }
++#endif
+ }
+
+ static int query_format(struct vo *vo, int format)
Modified: trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff
===================================================================
--- trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff 2016-05-16 21:47:43 UTC (rev 148746)
+++ trunk/dports/multimedia/mpv/files/patch-waftools_checks_custom.py-disable-libarclite.diff 2016-05-16 23:26:54 UTC (rev 148747)
@@ -1,6 +1,6 @@
--- waftools/checks/custom.py.orig
+++ waftools/checks/custom.py
-@@ -107,7 +107,6 @@ def check_cocoa(ctx, dependency_identifi
+@@ -112,7 +112,6 @@ def check_cocoa(ctx, dependency_identifi
fragment = load_fragment('cocoa.m'),
compile_filename = 'test.m',
framework_name = ['Cocoa', 'IOKit', 'OpenGL', 'QuartzCore'],
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160516/8e71a6dc/attachment-0001.html>
More information about the macports-changes
mailing list