Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/e0f04ba84c363873740f6ec904f5768a9bedf1ca)

2 files changed, 83 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5fcef3084ed0..84ee7b38b579 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,32 @@
-# Generated by makepkg 5.1.3
-# Mon Jul  8 17:09:28 UTC 2019
+# Generated by makepkg 5.2.1
+# Mon Mar  9 18:17:29 UTC 2020
 pkgbase = vdr-softhdcuvid
 	pkgdesc = VDR output plugin with CUDA and Opengl
-	pkgver = 1.1.0.r10.g8682ab0
-	pkgrel = 3
+	pkgver = 3.0.1.r20.g4dbf2dc
+	pkgrel = 1
 	url = https://github.com/jojo61/vdr-plugin-softhdcuvid
 	arch = x86_64
 	license = AGPL3
+	makedepends = ffmpeg
+	makedepends = freeglut
+	makedepends = glew
+	makedepends = mesa
+	makedepends = vdr-api=2.4.1
+	makedepends = xcb-util-wm
+	makedepends = xorg-server
+	makedepends = nvidia>=410.48
+	makedepends = libplacebo>=1.7.0
 	makedepends = git
 	makedepends = glm
 	makedepends = glu
 	makedepends = vulkan-headers
-	makedepends = cuda
+	makedepends = ffnvcodec-headers
+	source = vdr-plugin-softhdcuvid::git+https://github.com/jojo61/vdr-plugin-softhdcuvid#commit=4dbf2dcc84245f66e7aff94e2080a52d8cb38cfa
+	source = 50-softhdcuvid.conf
+	sha512sums = SKIP
+	sha512sums = 0b336e5d0c18e5a875389c52d498ce81db0a407c6a93e1e72e0d0faec41d2165b80e91e9787465bb2cb9923ca65e6ce50e4a086f0d26410059899fef2bbe87b0
+
+pkgname = vdr-softhdcuvid
 	depends = ffmpeg
 	depends = freeglut
 	depends = glew
@@ -23,10 +38,27 @@ pkgbase = vdr-softhdcuvid
 	depends = libplacebo>=1.7.0
 	optdepends = vdr-xorg: Recommended way to start X.org server together with VDR
 	backup = etc/vdr/conf.avail/50-softhdcuvid.conf
-	source = vdr-plugin-softhdcuvid::git+https://github.com/jojo61/vdr-plugin-softhdcuvid#commit=8682ab01c440346212d65a91c5c4639a65d6473d
-	source = 50-softhdcuvid.conf
-	sha512sums = SKIP
-	sha512sums = 0b336e5d0c18e5a875389c52d498ce81db0a407c6a93e1e72e0d0faec41d2165b80e91e9787465bb2cb9923ca65e6ce50e4a086f0d26410059899fef2bbe87b0
 
-pkgname = vdr-softhdcuvid
+pkgname = vdr-softhdvaapi
+	depends = ffmpeg
+	depends = freeglut
+	depends = glew
+	depends = mesa
+	depends = vdr-api=2.4.1
+	depends = xcb-util-wm
+	depends = xorg-server
+	depends = libplacebo>=1.7.0
+	optdepends = vdr-xorg: Recommended way to start X.org server together with VDR
+	backup = etc/vdr/conf.avail/50-softhdvaapi.conf
+
+pkgname = vdr-softhddrm
+	depends = ffmpeg
+	depends = freeglut
+	depends = glew
+	depends = mesa
+	depends = vdr-api=2.4.1
+	depends = xcb-util-wm
+	depends = xorg-server
+	depends = libplacebo>=1.7.0
+	backup = etc/vdr/conf.avail/50-softhddrm.conf
 
diff --git a/PKGBUILD b/PKGBUILD
index 7ceba7b0e50f..a61aac638b18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,18 @@
 # This PKGBUILD is part of the VDR4Arch project [https://github.com/vdr4arch]
-pkgname=vdr-softhdcuvid
-pkgver=1.1.0.r10.g8682ab0
-_gitver=8682ab01c440346212d65a91c5c4639a65d6473d
+pkgbase=vdr-softhdcuvid
+pkgname=(vdr-softhdcuvid vdr-softhdvaapi vdr-softhddrm)
+pkgver=3.0.1.r20.g4dbf2dc
+_gitver=4dbf2dcc84245f66e7aff94e2080a52d8cb38cfa
 _vdrapi=2.4.1
-pkgrel=3
+pkgrel=1
 pkgdesc="VDR output plugin with CUDA and Opengl"
 url="https://github.com/jojo61/vdr-plugin-softhdcuvid"
 arch=('x86_64')
 license=('AGPL3')
-depends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'nvidia>=410.48' 'libplacebo>=1.7.0')
-optdepends=('vdr-xorg: Recommended way to start X.org server together with VDR')
-makedepends=('git' 'glm' 'glu' 'vulkan-headers' 'cuda')
+makedepends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'nvidia>=410.48' 'libplacebo>=1.7.0' 'git' 'glm' 'glu' 'vulkan-headers' 'ffnvcodec-headers')
 _plugname=${pkgname//vdr-/}
 source=("vdr-plugin-${_plugname}::git+https://github.com/jojo61/vdr-plugin-softhdcuvid#commit=$_gitver"
         "50-$_plugname.conf")
-backup=("etc/vdr/conf.avail/50-$_plugname.conf")
 sha512sums=('SKIP'
          '0b336e5d0c18e5a875389c52d498ce81db0a407c6a93e1e72e0d0faec41d2165b80e91e9787465bb2cb9923ca65e6ce50e4a086f0d26410059899fef2bbe87b0')
 
@@ -31,22 +29,48 @@ prepare() {
 
   # Enable libplacebo
   sed -i 's/LIBPLACEBO=0/LIBPLACEBO=1/' Makefile
+}
+
+build() {
+  cd "${srcdir}/vdr-plugin-${_plugname}"
+  make CUVID=1 clean
+  make CUVID=1
+  make VAAPI=1 clean
+  make VAAPI=1
+  make DRM=1 clean
+  make DRM=1
+}
 
-  # Adapt path to cuda headers, in arch they are installed in /opt/cuda/include
-  sed -i 's%/usr/local/cuda/include%/opt/cuda/include%' Makefile
+package_vdr-softhdcuvid() {
+  depends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'nvidia>=410.48' 'libplacebo>=1.7.0')
+  optdepends=('vdr-xorg: Recommended way to start X.org server together with VDR')
+  backup=("etc/vdr/conf.avail/50-$_plugname.conf")
 
-  # Adapt path to cuda libraries, in arch the are installed in /opt/cuda/lib64
-  sed -i 's%-L/usr/local/cuda/targets/x86_64-linux/lib%-L/opt/cuda/lib64%' Makefile
+  cd "${srcdir}/vdr-plugin-${_plugname}"
+  make CUVID=1 DESTDIR="${pkgdir}" install
+
+  install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-softhdcuvid.conf"
 }
 
-build() {
+package_vdr-softhdvaapi() {
+  depends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'libplacebo>=1.7.0')
+  optdepends=('vdr-xorg: Recommended way to start X.org server together with VDR')
+  backup=("etc/vdr/conf.avail/50-softhdvaapi.conf")
+
   cd "${srcdir}/vdr-plugin-${_plugname}"
-  make
+  make VAAPI=1 DESTDIR="${pkgdir}" install
+
+  install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-softhdvaapi.conf"
+  sed -i 's/softhdcuvid/softhdvaapi/' "$pkgdir/etc/vdr/conf.avail/50-softhdvaapi.conf"
 }
 
-package() {
+package_vdr-softhddrm() {
+  depends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'libplacebo>=1.7.0')
+  backup=("etc/vdr/conf.avail/50-softhddrm.conf")
+
   cd "${srcdir}/vdr-plugin-${_plugname}"
-  make DESTDIR="${pkgdir}" install
+  make DRM=1 DESTDIR="${pkgdir}" install
 
-  install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-$_plugname.conf"
+  install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-softhddrm.conf"
+  sed -i 's/softhdcuvid/softhddrm/' "$pkgdir/etc/vdr/conf.avail/50-softhddrm.conf"
 }