Wed Nov 27 13:36:51 2019 UTC ()
libvdpau: Avoid mv hacks to install config files to the correct dir.

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


(nia)
diff -r1.14 -r1.15 pkgsrc/multimedia/libvdpau/Makefile
diff -r1.8 -r1.9 pkgsrc/multimedia/libvdpau/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/libvdpau/patches/patch-meson__options.txt
diff -r0 -r1.1 pkgsrc/multimedia/libvdpau/patches/patch-src_meson.build
cvs diff -r1.14 -r1.15 pkgsrc/multimedia/libvdpau/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libvdpau/Makefile 2019/11/14 10:38:07 1.14
+++ pkgsrc/multimedia/libvdpau/Makefile 2019/11/27 13:36:50 1.15
@@ -1,37 +1,34 @@ @@ -1,37 +1,34 @@
1# $NetBSD: Makefile,v 1.14 2019/11/14 10:38:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2019/11/27 13:36:50 nia Exp $
2 2
3DISTNAME= libvdpau-1.3 3DISTNAME= libvdpau-1.3
4CATEGORIES= multimedia 4CATEGORIES= multimedia
5MASTER_SITES= https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${PKGVERSION_NOREV}/ 5MASTER_SITES= https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${PKGVERSION_NOREV}/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= cheusov@NetBSD.org 8MAINTAINER= cheusov@NetBSD.org
9HOMEPAGE= http://http.download.nvidia.com/XFree86/vdpau/doxygen/html/index.html 9HOMEPAGE= http://http.download.nvidia.com/XFree86/vdpau/doxygen/html/index.html
10COMMENT= Video Decode and Presentation API for Unix 10COMMENT= Video Decode and Presentation API for Unix
11LICENSE= mit 11LICENSE= mit
12 12
13USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15 15
16#PKGCONFIG_OVERRIDE+= vdpau.pc.in 16#PKGCONFIG_OVERRIDE+= vdpau.pc.in
17 17
18EGDIR= ${PREFIX}/share/examples/libvdpau 18EGDIR= ${PREFIX}/share/examples/libvdpau
19CONF_FILES= ${EGDIR}/vdpau_wrapper.cfg \ 19CONF_FILES= ${EGDIR}/vdpau_wrapper.cfg \
20 ${PKG_SYSCONFDIR}/vdpau_wrapper.cfg 20 ${PKG_SYSCONFDIR}/vdpau_wrapper.cfg
21 21
22INSTALLATION_DIRS= ${EGDIR} 22MESON_ARGS+= -Degdir=${EGDIR}
23 23
24.include "available.mk" 24.include "available.mk"
25 25
26.if ${VDPAU_AVAILABLE} == no 26.if ${VDPAU_AVAILABLE} == no
27PKG_SKIP_REASON+= "VDPAU is not available on this platform" 27PKG_SKIP_REASON+= "VDPAU is not available on this platform"
28.endif 28.endif
29 29
30post-install: 
31 ${MV} ${DESTDIR}${PREFIX}/etc/vdpau_wrapper.cfg ${DESTDIR}${EGDIR} 
32 
33.include "../../x11/libX11/buildlink3.mk" 30.include "../../x11/libX11/buildlink3.mk"
34.include "../../x11/libXext/buildlink3.mk" 31.include "../../x11/libXext/buildlink3.mk"
35.include "../../x11/xorgproto/buildlink3.mk" 32.include "../../x11/xorgproto/buildlink3.mk"
36.include "../../devel/meson/build.mk" 33.include "../../devel/meson/build.mk"
37.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/multimedia/libvdpau/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libvdpau/distinfo 2019/11/14 10:38:07 1.8
+++ pkgsrc/multimedia/libvdpau/distinfo 2019/11/27 13:36:50 1.9
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.8 2019/11/14 10:38:07 wiz Exp $ 1$NetBSD: distinfo,v 1.9 2019/11/27 13:36:50 nia Exp $
2 2
3SHA1 (libvdpau-1.3.tar.bz2) = c8a3422e6a04ac23f8bfd4185b7b6b0903b627e9 3SHA1 (libvdpau-1.3.tar.bz2) = c8a3422e6a04ac23f8bfd4185b7b6b0903b627e9
4RMD160 (libvdpau-1.3.tar.bz2) = fa01066d6fbda721c1306ac581cdb3c55d9f41e5 4RMD160 (libvdpau-1.3.tar.bz2) = fa01066d6fbda721c1306ac581cdb3c55d9f41e5
5SHA512 (libvdpau-1.3.tar.bz2) = c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330 5SHA512 (libvdpau-1.3.tar.bz2) = c06c23062816e8b207d38d9d53df43a1b193bb9836b48bd6d79a63d76522e87d383c446285b9877fe9c99faa0d290da8a49ccbb58eefa138cc38d0929a8e1330
6Size (libvdpau-1.3.tar.bz2) = 139009 bytes 6Size (libvdpau-1.3.tar.bz2) = 139009 bytes
 7SHA1 (patch-meson__options.txt) = d1333ab76b8886f764012b07b29ba75b4e488d02
 8SHA1 (patch-src_meson.build) = 506ddaa08933957f1c0cb8f09a9f7d758c239e5f
File Added: pkgsrc/multimedia/libvdpau/patches/patch-meson__options.txt
$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')
File Added: pkgsrc/multimedia/libvdpau/patches/patch-src_meson.build
$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'))