Subject: [alpine-aports] [PATCH] testing/vdr: new plugin: vaapidevice, fix streamdev install path, grand config files to video group, cosmetics

From: Taner Tas <[email-masked]>
Date: Sat, 3 Mar 2018 13:07:13 +0000

---
 testing/vdr/APKBUILD                 | 74 +++++++++++++++++++++++++-----------
 testing/vdr/Make.config              | 25 ++++++------
 testing/vdr/streamdev-fix-path.patch | 10 +++++
 3 files changed, 74 insertions(+), 35 deletions(-)
 create mode 100644 testing/vdr/streamdev-fix-path.patch

diff --git a/testing/vdr/APKBUILD b/testing/vdr/APKBUILD
index 644244e..2722f9a 100644
--- a/testing/vdr/APKBUILD
+++ b/testing/vdr/APKBUILD
@@ -2,35 +2,38 @@
 # Maintainer: Taner Tas <[email-masked]>
 pkgname=vdr
 pkgver=2.3.8
-pkgrel=3
+pkgrel=4
 pkgdesc="Video Disk Recorder"
 url="http://www.tvdr.de/"
 arch="all"
-license="GPL-2.0"
-depends=""
-depends_dev="libexecinfo-dev fontconfig-dev freetype-dev gettext-dev libjpeg-turbo-dev fribidi-dev
+license="GPL-2.0-only"
+makedepends="coreutils libexecinfo-dev fontconfig-dev freetype-dev gettext-dev libjpeg-turbo-dev fribidi-dev
 	libcap-dev alsa-lib-dev libvdpau-dev libva-dev libx11-dev xcb-util-dev xcb-util-wm-dev
 	ffmpeg-dev libcdio-dev mpv"
-makedepends="$depends_dev coreutils"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-softhddevice $pkgname-femon $pkgname-mpv"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-softhddevice $pkgname-femon $pkgname-mpv
+	$pkgname-streamdev $pkgname-vnsiserver $pkgname-vaapidevice"
+#install="$pkgname.post-install"
 options="!check"
 
 _femon_ver=28e4fb8de8578a1b8a36eb38d2e710dc60be7e3f
-_softhddevice_ver=4e5da1ac3df6b7c387e1bf666327d2cd3f807048
+_softhddevice_ver=6fc9d749521d358d24bd06cb3d2a0068f18f0079
 _mpv_ver=87543f7058b88a3ace8550551bb3982cc304720e
-_vnsiserver_ver=02f1631e482002da38f4df4d067cfe2e4c44d255
+_vnsiserver_ver=31c8f71538ddb9aeff23578e7464328576ef3a2b
 _streamdev_ver=e2a9b979d3fb92967c7a6a8221e674eb7e55c813
+_vaapidevice_ver=6372704835b62bee882feed92686edc75e70b55f
 
 source="ftp://ftp.tvdr.de/vdr/Developer/vdr-${pkgver}.tar.bz2
 	vdr-plugin-femon-${_femon_ver}.tar.gz::https://github.com/rofafor/vdr-plugin-femon/archive/${_femon_ver}.tar.gz
-	vdr-plugin-softhddevice-${_softhddevice_ver}.tar.gz::https://github.com/rofafor/vdr-plugin-softhddevice/archive/${_softhddevice_ver}.tar.gz
+	vdr-plugin-softhddevice-${_softhddevice_ver}.tar.gz::https://github.com/jojo61/vdr-plugin-softhddevice/archive/${_softhddevice_ver}.tar.gz
 	vdr-plugin-mpv-${_mpv_ver}.tar.gz::https://github.com/chriszero/vdr-plugin-mpv/archive/${_mpv_ver}.tar.gz
 	vdr-plugin-vnsiserver-${_vnsiserver_ver}.tar.gz::https://github.com/FernetMenta/vdr-plugin-vnsiserver/archive/${_vnsiserver_ver}.tar.gz
 	vdr-plugin-streamdev-${_streamdev_ver}.tar.gz::https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git/snapshot/vdr-plugin-streamdev-${_streamdev_ver}.tar.gz
+	vdr-plugin-vaapidevice-${_vaapidevice_ver}.tar.gz::https://github.com/pesintta/vdr-plugin-vaapidevice/archive/${_vaapidevice_ver}.tar.gz
 	musl-compat.patch
 	softhddevice-musl.patch
 	Make.config
-	include-missing-limits-ppc64le.patch"
+	include-missing-limits-ppc64le.patch
+	streamdev-fix-path.patch"
 
 builddir="$srcdir/$pkgname-$pkgver"
 
@@ -38,19 +41,31 @@ prepare() {
 	rm -rf ${builddir}/PLUGINS/src/skincurses
 	cp -aP $srcdir/vdr-plugin-femon-${_femon_ver} ${builddir}/PLUGINS/src/femon
 	cp -aP $srcdir/vdr-plugin-softhddevice-${_softhddevice_ver} ${builddir}/PLUGINS/src/softhddevice
+	cp -aP $srcdir/vdr-plugin-vaapidevice-${_vaapidevice_ver} ${builddir}/PLUGINS/src/vaapidevice
 	cp -aP $srcdir/vdr-plugin-mpv-${_mpv_ver} ${builddir}/PLUGINS/src/mpv
 	cp -aP $srcdir/vdr-plugin-vnsiserver-${_vnsiserver_ver} ${builddir}/PLUGINS/src/vnsiserver
 	cp -aP $srcdir/vdr-plugin-streamdev-${_streamdev_ver} ${builddir}/PLUGINS/src/streamdev
 	cd "$builddir"
+	cp "$srcdir"/Make.config "$builddir"
 	default_prepare
 }
 
 build() {
 	cd "$builddir"
-	cp $srcdir/Make.config $builddir
+	sed -i -e 's/LIBS      =/LIBS=-lintl -lexecinfo/' Makefile
 	make
 }
 
+package() {
+	cd "$builddir"
+	source "$builddir"/Make.config
+	make -j1 DESTDIR="$pkgdir" install
+	mkdir -p "$pkgdir"/var/lib/vdr/video
+	find "$pkgdir"/etc -exec chgrp video {} \;
+	find "$pkgdir"/etc -type d -exec chmod 775 {} \;
+	find "$pkgdir"/etc -type f -exec chmod 664 {} \;
+}
+
 softhddevice() {
 	depends="${pkgname}=$pkgver-r$pkgrel"
 	cd "$pkgdir"
@@ -58,6 +73,13 @@ softhddevice() {
 	mv usr/lib/vdr/lib${subpkgname}.so.${pkgver} ${subpkgdir}/usr/lib/vdr
 }
 
+vaapidevice() {
+	depends="${pkgname}=$pkgver-r$pkgrel"
+	cd "$pkgdir"
+	mkdir -p ${subpkgdir}/usr/lib/vdr
+	mv usr/lib/vdr/lib${subpkgname}.so.${pkgver} ${subpkgdir}/usr/lib/vdr
+}
+
 femon() {
 	depends="${pkgname}=$pkgver-r$pkgrel"
 	cd "$pkgdir"
@@ -76,28 +98,36 @@ vnsiserver() {
 	depends="${pkgname}=$pkgver-r$pkgrel"
 	cd "$pkgdir"
 	mkdir -p ${subpkgdir}/usr/lib/vdr
+	install -D -m664 ${builddir}/PLUGINS/src/vnsiserver/vnsiserver/allowed_hosts.conf \
+	${subpkgdir}/etc/vdr/plugins/vnsiserver/allowed_hosts.conf
 	mv usr/lib/vdr/lib${subpkgname}.so.${pkgver} ${subpkgdir}/usr/lib/vdr
+	find "$subpkgdir"/etc -exec chgrp video {} \;
+	find "$subpkgdir"/etc -type d -exec chmod 775 {} \;
+	find "$subpkgdir"/etc -type f -exec chmod 664 {} \;
+
 }
 
 streamdev() {
 	depends="${pkgname}=$pkgver-r$pkgrel"
 	cd "$pkgdir"
 	mkdir -p ${subpkgdir}/usr/lib/vdr
-	mv lib${subpkgname}-server.so.${pkgver} ${subpkgdir}/usr/lib/vdr
-	mv lib${subpkgname}-client.so.${pkgver} ${subpkgdir}/usr/lib/vdr
-}
-
-package() {
-	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install
+	install -D -m664  ${builddir}/PLUGINS/src/streamdev/streamdev-server/streamdevhosts.conf \
+		${subpkgdir}/etc/vdr/plugins/streamdev-server/streamdevhosts.conf
+	mv usr/lib/vdr/lib${subpkgname}-server.so.${pkgver} ${subpkgdir}/usr/lib/vdr
+	mv usr/lib/vdr/lib${subpkgname}-client.so.${pkgver} ${subpkgdir}/usr/lib/vdr
+	find "$subpkgdir"/etc -exec chgrp video {} \;
+	find "$subpkgdir"/etc -type d -exec chmod 775 {} \;
+	find "$subpkgdir"/etc -type f -exec chmod 664 {} \;
 }
 sha512sums="9dd8d90b365c255bfdf334f6f20a65671dbaf02da68dffdba003fe59243fc0636213b9df47bd6d350046fe4c6b3cb7568f2d9fd5ccdbff534328bc82e5a18d0b  vdr-2.3.8.tar.bz2
 4f09246b0293617ee959ea768f215724c3996e10d7ee09399ce7c571d30e34da062df84d44465142261ea06069b09bac8b4a683a8dee54713385cc73f485c426  vdr-plugin-femon-28e4fb8de8578a1b8a36eb38d2e710dc60be7e3f.tar.gz
-bf8ee08c8b61ae5acf13b8b50c12f4022347960adb94cb5c7b4a477866b7241bc9e2b8496d5a0ffe702df0cd825d2c5dc0ee6a11b3c75cd3628d76692c199610  vdr-plugin-softhddevice-4e5da1ac3df6b7c387e1bf666327d2cd3f807048.tar.gz
+3786018786ad600be6c2614bfe2b78a710465cae8d5eaf1e9d80f52fc37c1e540837a1c99d7350a718a9be3659bca2b7f2245569d97616c07aec3d7f55cd99e3  vdr-plugin-softhddevice-6fc9d749521d358d24bd06cb3d2a0068f18f0079.tar.gz
 a9047da75cc11e675123d418c15a9712ac019658836630c7949699e39a0ade555dd2d52845abffd2cce0857e2c810f4bb5a7bf8b80dbc1a3c1b75002392dece3  vdr-plugin-mpv-87543f7058b88a3ace8550551bb3982cc304720e.tar.gz
-49bde576df4266d1c27d2372cf81739faccd106a50cd236970fd7fc438b5daf6a42689bfba3bb0066e18fc0a64bcae602fb1f438173029dfc28178d5e9a15707  vdr-plugin-vnsiserver-02f1631e482002da38f4df4d067cfe2e4c44d255.tar.gz
+e45266cab68cedf8825c9837fbf7a4c7b4cf2000ad0269b1d2274685673c15e6ddc657ed5597bb039065ccddecb6e0206d39d7085f2255a8a82ec0bc1e8d3c2d  vdr-plugin-vnsiserver-31c8f71538ddb9aeff23578e7464328576ef3a2b.tar.gz
 4bd1cb3115ec6d9e91b1ff38f761fb7cd95d314f96ec00e619a993afc8422f2dc5b30f2638e9fbf27afe20fbd9597318aa8e347efca29d4cabeff7e2e4f3c25c  vdr-plugin-streamdev-e2a9b979d3fb92967c7a6a8221e674eb7e55c813.tar.gz
+9ffa0b232f87db96115aee80dbd9cb8400b72ae65ff2ab556d1f6cb0507ed1b93103e4e69c6d8bc9706c7807803bcbfed0456d708fc9889adfefe1989e249d32  vdr-plugin-vaapidevice-6372704835b62bee882feed92686edc75e70b55f.tar.gz
 f47461445515e44f5cdb9c6d3b1bcae323bb83ba3de7c77a3be4d9ac99ed9e76ebe2ee720660c5593fa4b6995366b9d98bf1683f7b8786518a444de7754731ca  musl-compat.patch
 c6f89ba45bf02c0d85963797ff579f3ae0616a827f2b883685b44241bddea7916c3d6da21790553d161884c39d12ee21fc10f7d9d5aee9767cdde10cde02baac  softhddevice-musl.patch
-0add913727ebc2ab290211354e2310573f7ece14fcad8636b0a1d7cff49e32027e2d5a6aab3050e577f62387efff8aecc73dfc16e0f876ae28c5257fc9b6c67f  Make.config
-b77b705601f583eda11f72d9f5e55f5d9af447f4a0d5d80c01dc10cbb4a5e3c3a1c457cd07f276dbcd907b321e607fec26efdae79bc3bddc7d89184edf7febfc  include-missing-limits-ppc64le.patch"
+62d67bb88aba25821873519831f37c1a8a600a459e13c74a607e53a78e625103bcfdd4f44514bd301d394ec4afcddf12647f62acb4d28b0ec4bffaddfa6c3755  Make.config
+b77b705601f583eda11f72d9f5e55f5d9af447f4a0d5d80c01dc10cbb4a5e3c3a1c457cd07f276dbcd907b321e607fec26efdae79bc3bddc7d89184edf7febfc  include-missing-limits-ppc64le.patch
+5c57971c0e2df34644c343ab635bbdd6af4a0ae5988d42f20a91de4c8ba34d375cdc2c33091bb92c86c4ff6ea782143c745324bc35b6c4c73831ec61d6590c7a  streamdev-fix-path.patch"
diff --git a/testing/vdr/Make.config b/testing/vdr/Make.config
index bc519ae..4f693f2 100644
--- a/testing/vdr/Make.config
+++ b/testing/vdr/Make.config
@@ -1,13 +1,12 @@
-PREFIX    = /usr
-VARDIR    = /var
-CONFDIR   = /etc/vdr
-BINDIR    = $(PREFIX)/bin
-INCDIR    = $(PREFIX)/include
-LIBDIR    = $(PREFIX)/lib/vdr
-LOCDIR    = $(PREFIX)/share/locale
-MANDIR    = $(PREFIX)/share/man
-PCDIR     = $(PREFIX)/lib/pkgconfig
-RESDIR    = $(PREFIX)/share/vdr
-VIDEODIR  = $(VARDIR)/lib/vdr/video
-CACHEDIR  = $(VARDIR)/cache/vdr
-LIBS+=-lintl -lexecinfo
+PREFIX=/usr
+VARDIR=/var
+CONFDIR=/etc/vdr
+BINDIR=${PREFIX}/bin
+INCDIR=${PREFIX}/include
+LIBDIR=${PREFIX}/lib/vdr
+LOCDIR=${PREFIX}/share/locale
+MANDIR=${PREFIX}/share/man
+PCDIR=${PREFIX}/lib/pkgconfig
+RESDIR=${PREFIX}/share/vdr
+VIDEODIR=${VARDIR}/lib/vdr/video
+CACHEDIR=${VARDIR}/cache/vdr
diff --git a/testing/vdr/streamdev-fix-path.patch b/testing/vdr/streamdev-fix-path.patch
new file mode 100644
index 0000000..00bd3e8
--- /dev/null
+++ b/testing/vdr/streamdev-fix-path.patch
@@ -0,0 +1,10 @@
+--- a/PLUGINS/src/streamdev/Makefile   2018-01-01 08:28:38.951672521 +0000
++++ b/PLUGINS/src/streamdev/Makefile   2018-01-01 08:29:51.088660400 +0000
+@@ -37,8 +37,6 @@
+ -include $(PLGCFG)
+ 
+ ### export all vars for sub-makes, using absolute paths
+-LIBDIR := $(shell cd $(LIBDIR) >/dev/null 2>&1 && pwd)
+-LOCDIR := $(shell cd $(LOCDIR) >/dev/null 2>&1 && pwd)
+ export
+ unexport PLUGIN 
-- 
2.16.2

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Leonardo Arena <[email-masked]>
Date: Tue, 20 Mar 2018 11:41:31 +0100

Hi,

sorry for the late review:

>  create mode 100644 testing/vdr/streamdev-fix-path.patch
 [snip]

> +       sed -i -e 's/LIBS      =/LIBS=-lintl -lexecinfo/' Makefile

This should go into prepare(). Also a patch is preferable instead of
dynamic editing.

> +       make -j1 DESTDIR="$pkgdir" install

Would be nice to fix parallel building, but it's okay for pushing as is.

Thanks!

/eo