CVS commit: pkgsrc/multimedia/libvdpau

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Nov 27 13:36:51 UTC 2019

Modified Files:
        pkgsrc/multimedia/libvdpau: Makefile distinfo
Added Files:
        pkgsrc/multimedia/libvdpau/patches: patch-meson__options.txt
            patch-src_meson.build

Log Message:
libvdpau: Avoid mv hacks to install config files to the correct dir.

This doesn't work when the configuration file directory is outside PREFIX


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/multimedia/libvdpau/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/libvdpau/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/libvdpau/patches/patch-meson__options.txt \
    pkgsrc/multimedia/libvdpau/patches/patch-src_meson.build

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

Modified files:

Index: pkgsrc/multimedia/libvdpau/Makefile
diff -u pkgsrc/multimedia/libvdpau/Makefile:1.14 pkgsrc/multimedia/libvdpau/Makefile:1.15
--- pkgsrc/multimedia/libvdpau/Makefile:1.14    Thu Nov 14 10:38:07 2019
+++ pkgsrc/multimedia/libvdpau/Makefile Wed Nov 27 13:36:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/11/14 10:38:07 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/27 13:36:50 nia Exp $
 
 DISTNAME=      libvdpau-1.3
 CATEGORIES=    multimedia
@@ -10,8 +10,8 @@ HOMEPAGE=     http://http.download.nvidia.co
 COMMENT=       Video Decode and Presentation API for Unix
 LICENSE=       mit
 
-USE_TOOLS+=            pkg-config
-USE_LANGUAGES=         c c++
+USE_TOOLS+=    pkg-config
+USE_LANGUAGES= c c++
 
 #PKGCONFIG_OVERRIDE+=  vdpau.pc.in
 
@@ -19,7 +19,7 @@ EGDIR=                ${PREFIX}/share/examples/libvdpa
 CONF_FILES=    ${EGDIR}/vdpau_wrapper.cfg \
                ${PKG_SYSCONFDIR}/vdpau_wrapper.cfg
 
-INSTALLATION_DIRS=     ${EGDIR}
+MESON_ARGS+=   -Degdir=${EGDIR}
 
 .include "available.mk"
 
@@ -27,9 +27,6 @@ INSTALLATION_DIRS=    ${EGDIR}
 PKG_SKIP_REASON+=      "VDPAU is not available on this platform"
 .endif
 
-post-install:
-       ${MV} ${DESTDIR}${PREFIX}/etc/vdpau_wrapper.cfg ${DESTDIR}${EGDIR}
-
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"

Index: pkgsrc/multimedia/libvdpau/distinfo
diff -u pkgsrc/multimedia/libvdpau/distinfo:1.8 pkgsrc/multimedia/libvdpau/distinfo:1.9
--- pkgsrc/multimedia/libvdpau/distinfo:1.8     Thu Nov 14 10:38:07 2019
+++ pkgsrc/multimedia/libvdpau/distinfo Wed Nov 27 13:36:50 2019
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.8 2019/11/14 10:38:07 wiz Exp $
+$NetBSD: distinfo,v 1.9 2019/11/27 13:36:50 nia Exp $
 
 SHA1 (libvdpau-1.3.tar.bz2) = c8a3422e6a04ac23f8bfd4185b7b6b0903b627e9
 RMD160 (libvdpau-1.3.tar.bz2) = fa01066d6fbda721c1306ac581cdb3c55d9f41e5
 SHA512 (libvdpau-1.3.tar.bz2) = c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330
 Size (libvdpau-1.3.tar.bz2) = 139009 bytes
+SHA1 (patch-meson__options.txt) = d1333ab76b8886f764012b07b29ba75b4e488d02
+SHA1 (patch-src_meson.build) = 506ddaa08933957f1c0cb8f09a9f7d758c239e5f

Added files:

Index: pkgsrc/multimedia/libvdpau/patches/patch-meson__options.txt
diff -u /dev/null pkgsrc/multimedia/libvdpau/patches/patch-meson__options.txt:1.1
--- /dev/null   Wed Nov 27 13:36:51 2019
+++ pkgsrc/multimedia/libvdpau/patches/patch-meson__options.txt Wed Nov 27 13:36:51 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-meson__options.txt,v 1.1 2019/11/27 13:36:51 nia Exp $
+
+Install configuration file to examples directory.
+
+--- meson_options.txt.orig     2019-08-28 17:57:55.000000000 +0000
++++ meson_options.txt
+@@ -11,3 +11,6 @@ option('dri2',
+ option('moduledir',
+     type : 'string',
+     description : 'Module directory')
++option('egdir',
++    type : 'string',
++    description : 'Example configuration file directory')
Index: pkgsrc/multimedia/libvdpau/patches/patch-src_meson.build
diff -u /dev/null pkgsrc/multimedia/libvdpau/patches/patch-src_meson.build:1.1
--- /dev/null   Wed Nov 27 13:36:51 2019
+++ pkgsrc/multimedia/libvdpau/patches/patch-src_meson.build    Wed Nov 27 13:36:51 2019
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_meson.build,v 1.1 2019/11/27 13:36:51 nia Exp $
+
+Install configuration file to examples directory.
+
+--- src/meson.build.orig       2019-08-28 17:57:55.000000000 +0000
++++ src/meson.build
+@@ -16,4 +16,4 @@ vdpau = shared_library('vdpau',
+     install : true,
+ )
+ 
+-install_data('vdpau_wrapper.cfg', install_dir : get_option('sysconfdir'))
++install_data('vdpau_wrapper.cfg', install_dir : get_option('egdir'))