CVS commit: pkgsrc/multimedia/mpv

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Tue Feb  5 11:14:59 UTC 2019

Modified Files:
        pkgsrc/multimedia/mpv: Makefile distinfo
Added Files:
        pkgsrc/multimedia/mpv/patches: patch-video_out_drm__common.c
            patch-wscript

Log Message:
mpv: enable support for DRM on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/multimedia/mpv/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c \
    pkgsrc/multimedia/mpv/patches/patch-wscript

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/mpv/Makefile
diff -u pkgsrc/multimedia/mpv/Makefile:1.78 pkgsrc/multimedia/mpv/Makefile:1.79
--- pkgsrc/multimedia/mpv/Makefile:1.78 Mon Nov 26 12:24:47 2018
+++ pkgsrc/multimedia/mpv/Makefile      Tue Feb  5 11:14:59 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2018/11/26 12:24:47 abs Exp $
+# $NetBSD: Makefile,v 1.79 2019/02/05 11:14:59 jmcneill Exp $
 
 DISTNAME=      mpv-0.29.1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mpv-player/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -72,5 +72,6 @@ post-install:
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/libdrm/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/multimedia/mpv/distinfo
diff -u pkgsrc/multimedia/mpv/distinfo:1.49 pkgsrc/multimedia/mpv/distinfo:1.50
--- pkgsrc/multimedia/mpv/distinfo:1.49 Mon Nov 26 14:33:43 2018
+++ pkgsrc/multimedia/mpv/distinfo      Tue Feb  5 11:14:59 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2018/11/26 14:33:43 leot Exp $
+$NetBSD: distinfo,v 1.50 2019/02/05 11:14:59 jmcneill Exp $
 
 SHA1 (mpv-0.29.1.tar.gz) = 83f2bc0eb5a8bec9a9d5efc7de0e19a442238ac5
 RMD160 (mpv-0.29.1.tar.gz) = 72a4fda3a72ac4fd37ed04435833fa2cf378a012
@@ -6,3 +6,5 @@ SHA512 (mpv-0.29.1.tar.gz) = ec57c9ceaaf
 Size (mpv-0.29.1.tar.gz) = 3059503 bytes
 SHA1 (patch-audio_out_ao__oss.c) = 824c214d0d4464b94e46a922ede4045ae537a534
 SHA1 (patch-player_main.c) = e794199990059cc95050032194bca70557c381d7
+SHA1 (patch-video_out_drm__common.c) = 47fb9ce36c36618c2fdee99333dce698f5d2a455
+SHA1 (patch-wscript) = 65a58f5f186ae377f8532342d53f7cad07bf2eb2

Added files:

Index: pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c
diff -u /dev/null pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c:1.1
--- /dev/null   Tue Feb  5 11:14:59 2019
+++ pkgsrc/multimedia/mpv/patches/patch-video_out_drm__common.c Tue Feb  5 11:14:59 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-video_out_drm__common.c,v 1.1 2019/02/05 11:14:59 jmcneill Exp $
+
+--- video/out/drm_common.c.orig        2018-10-02 19:03:41.000000000 +0000
++++ video/out/drm_common.c
+@@ -21,7 +21,12 @@
+ #include <sys/ioctl.h>
+ #include <poll.h>
+ #include <sys/stat.h>
++#if defined(__NetBSD__)
++#include <sys/types.h>
++#include <dev/wscons/wsdisplay_usl_io.h>
++#else
+ #include <sys/vt.h>
++#endif
+ #include <unistd.h>
+ 
+ #include "drm_common.h"
Index: pkgsrc/multimedia/mpv/patches/patch-wscript
diff -u /dev/null pkgsrc/multimedia/mpv/patches/patch-wscript:1.1
--- /dev/null   Tue Feb  5 11:14:59 2019
+++ pkgsrc/multimedia/mpv/patches/patch-wscript Tue Feb  5 11:14:59 2019
@@ -0,0 +1,27 @@
+$NetBSD: patch-wscript,v 1.1 2019/02/05 11:14:59 jmcneill Exp $
+
+--- wscript.orig       2018-10-02 19:03:41.000000000 +0000
++++ wscript
+@@ -276,6 +276,11 @@ iconv support use --disable-iconv.",
+         'func': check_statement(['sys/vt.h', 'sys/ioctl.h'],
+                                 'int m; ioctl(0, VT_GETMODE, &m)'),
+     }, {
++        'name': 'wsdisplay_usl_io.h',
++        'desc': 'wsdisplay_usl_io.h',
++        'func': check_statement(['sys/types.h', 'dev/wscons/wsdisplay_usl_io.h', 'sys/ioctl.h'],
++                                'int m; ioctl(0, VT_GETMODE, &m)'),
++    }, {
+         'name': 'gbm.h',
+         'desc': 'gbm.h',
+         'func': check_cc(header_name=['stdio.h', 'gbm.h']),
+@@ -550,8 +555,8 @@ video_output_features = [
+     }, {
+         'name': '--drm',
+         'desc': 'DRM',
+-        'deps': 'vt.h',
+-        'func': check_pkg_config('libdrm'),
++        'deps': 'vt.h || wsdisplay_usl_io.h',
++        'func': check_pkg_config('libdrm')
+     }, {
+         'name': '--drmprime',
+         'desc': 'DRM Prime ffmpeg support',