[pkgsrc/trunk]: pkgsrc/multimedia/libvdpau libvdpau: Avoid mv hacks to instal...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b4397f1405e
branches:  trunk
changeset: 344883:2b4397f1405e
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Nov 27 13:36:50 2019 +0000

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

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

diffstat:

 multimedia/libvdpau/Makefile                         |  11 ++++-------
 multimedia/libvdpau/distinfo                         |   4 +++-
 multimedia/libvdpau/patches/patch-meson__options.txt |  13 +++++++++++++
 multimedia/libvdpau/patches/patch-src_meson.build    |  12 ++++++++++++
 4 files changed, 32 insertions(+), 8 deletions(-)

diffs (85 lines):

diff -r 56c527439517 -r 2b4397f1405e multimedia/libvdpau/Makefile
--- a/multimedia/libvdpau/Makefile      Wed Nov 27 13:31:16 2019 +0000
+++ b/multimedia/libvdpau/Makefile      Wed Nov 27 13:36:50 2019 +0000
@@ -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 @@
 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 @@
 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 @@
 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"
diff -r 56c527439517 -r 2b4397f1405e multimedia/libvdpau/distinfo
--- a/multimedia/libvdpau/distinfo      Wed Nov 27 13:31:16 2019 +0000
+++ b/multimedia/libvdpau/distinfo      Wed Nov 27 13:36:50 2019 +0000
@@ -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
diff -r 56c527439517 -r 2b4397f1405e multimedia/libvdpau/patches/patch-meson__options.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libvdpau/patches/patch-meson__options.txt      Wed Nov 27 13:36:50 2019 +0000
@@ -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')
diff -r 56c527439517 -r 2b4397f1405e multimedia/libvdpau/patches/patch-src_meson.build
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libvdpau/patches/patch-src_meson.build Wed Nov 27 13:36:50 2019 +0000
@@ -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'))