pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/mpv mpv: enable support for DRM on NetBSD.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d80b0ed70cc9
branches:  trunk
changeset: 329334:d80b0ed70cc9
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Tue Feb 05 11:14:59 2019 +0000

description:
mpv: enable support for DRM on NetBSD.

diffstat:

 multimedia/mpv/Makefile                              |   5 ++-
 multimedia/mpv/distinfo                              |   4 ++-
 multimedia/mpv/patches/patch-video_out_drm__common.c |  17 ++++++++++++
 multimedia/mpv/patches/patch-wscript                 |  27 ++++++++++++++++++++
 4 files changed, 50 insertions(+), 3 deletions(-)

diffs (87 lines):

diff -r 25ee52096236 -r d80b0ed70cc9 multimedia/mpv/Makefile
--- a/multimedia/mpv/Makefile   Tue Feb 05 09:52:40 2019 +0000
+++ b/multimedia/mpv/Makefile   Tue Feb 05 11:14:59 2019 +0000
@@ -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 @@
 .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"
diff -r 25ee52096236 -r d80b0ed70cc9 multimedia/mpv/distinfo
--- a/multimedia/mpv/distinfo   Tue Feb 05 09:52:40 2019 +0000
+++ b/multimedia/mpv/distinfo   Tue Feb 05 11:14:59 2019 +0000
@@ -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 @@
 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
diff -r 25ee52096236 -r d80b0ed70cc9 multimedia/mpv/patches/patch-video_out_drm__common.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mpv/patches/patch-video_out_drm__common.c      Tue Feb 05 11:14:59 2019 +0000
@@ -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"
diff -r 25ee52096236 -r d80b0ed70cc9 multimedia/mpv/patches/patch-wscript
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mpv/patches/patch-wscript      Tue Feb 05 11:14:59 2019 +0000
@@ -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',



Home | Main Index | Thread Index | Old Index