diff options
| author | abs <abs@pkgsrc.org> | 2018-11-26 11:25:40 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2018-11-26 11:25:40 +0000 |
| commit | 1c2d9b187daae078de9e148283d4c115990c1b16 (patch) | |
| tree | 4b649a4713d44aa52b5160f07a1c29a1cf3be027 /multimedia | |
| parent | 89ce121f1dafeafc233556d512afe0efef331f67 (diff) | |
| download | pkgsrc-1c2d9b187daae078de9e148283d4c115990c1b16.tar.gz | |
Explicitly pass --disable-egl-x11 to configure to ensure consistent builds
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mpv/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/mpv/patches/patch-video_out_opengl_hwdec__vaegl.c | 44 |
2 files changed, 3 insertions, 46 deletions
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index a1ee9a78451..24fe53b80d1 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.76 2018/11/23 08:06:32 ryoon Exp $ +# $NetBSD: Makefile,v 1.77 2018/11/26 11:25:40 abs Exp $ DISTNAME= mpv-0.29.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -23,6 +23,7 @@ TOOL_DEPENDS+= waf>=2.0.9:../../devel/waf WAF_CONFIGURE_ARGS+= --bindir=${PREFIX}/bin WAF_CONFIGURE_ARGS+= --enable-dvdnav WAF_CONFIGURE_ARGS+= --enable-dvdread +WAF_CONFIGURE_ARGS+= --disable-egl-x11 PYTHON_FOR_BUILD_ONLY= yes diff --git a/multimedia/mpv/patches/patch-video_out_opengl_hwdec__vaegl.c b/multimedia/mpv/patches/patch-video_out_opengl_hwdec__vaegl.c deleted file mode 100644 index a04bc38615b..00000000000 --- a/multimedia/mpv/patches/patch-video_out_opengl_hwdec__vaegl.c +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-video_out_opengl_hwdec__vaegl.c,v 1.1 2018/11/25 19:26:29 abs Exp $ - -Provide extension definitions in case of older Mesa EGL - -Taken from https://github.com/mpv-player/mpv/issues/5599 - ---- video/out/opengl/hwdec_vaegl.c.orig 2018-10-02 19:03:41.000000000 +0000 -+++ video/out/opengl/hwdec_vaegl.c -@@ -53,6 +53,35 @@ typedef void *EGLImageKHR; - #define EGL_DMA_BUF_PLANE0_PITCH_EXT 0x3274 - #endif - -+/* Provide extension definitions in case of older Mesa EGL */ -+#ifndef EGL_EXT_image_dma_buf_import_modifiers -+#define EGL_EXT_image_dma_buf_import_modifiers 1 -+#define EGL_DMA_BUF_PLANE3_FD_EXT 0x3440 -+#define EGL_DMA_BUF_PLANE3_OFFSET_EXT 0x3441 -+#define EGL_DMA_BUF_PLANE3_PITCH_EXT 0x3442 -+#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT 0x3443 -+#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT 0x3444 -+#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT 0x3445 -+#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT 0x3446 -+#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT 0x3447 -+#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT 0x3448 -+#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT 0x3449 -+#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT 0x344A -+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDMABUFFORMATSEXTPROC) (EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats); -+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDMABUFMODIFIERSEXTPROC) (EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); -+#ifdef EGL_EGLEXT_PROTOTYPES -+EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufFormatsEXT (EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats); -+EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufModifiersEXT (EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); -+#endif -+#endif /* EGL_EXT_image_dma_buf_import_modifiers */ -+ -+#ifndef EGL_EXT_image_implicit_sync_control -+#define EGL_EXT_image_implicit_sync_control 1 -+#define EGL_IMPORT_SYNC_TYPE_EXT 0x3470 -+#define EGL_IMPORT_IMPLICIT_SYNC_EXT 0x3471 -+#define EGL_IMPORT_EXPLICIT_SYNC_EXT 0x3472 -+#endif /* EGL_EXT_image_implicit_sync_control */ -+ - #if HAVE_VAAPI_X11 - #include <va/va_x11.h> - |