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

1 files changed, 27 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7370cef5f662..6c2553c9eedc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,60 @@
 # This PKGBUILD is part of the VDR4Arch project [https://github.com/vdr4arch]
 pkgbase=vdr-softhdcuvid
 pkgname=(vdr-softhdcuvid vdr-softhdvaapi vdr-softhddrm)
-pkgver=3.2.4
-_gitver=184cc1aa0587cfdfb18f7ecd14d30254f4f05597
-_vdrapi=2.4.6
+pkgver=3.5
+_vdrapi=2.4.7
 pkgrel=1
 pkgdesc="VDR output plugin with CUDA and Opengl"
 url="https://github.com/jojo61/vdr-plugin-softhdcuvid"
 arch=('x86_64')
 license=('AGPL3')
-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"
+makedepends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'nvidia>=410.48' 'libplacebo>=3.120.0' 'glm' 'glu' 'vulkan-headers' 'ffnvcodec-headers')
+_plugname=${pkgbase//vdr-/}
+source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
         "50-$_plugname.conf")
-sha512sums=('SKIP'
-         '0b336e5d0c18e5a875389c52d498ce81db0a407c6a93e1e72e0d0faec41d2165b80e91e9787465bb2cb9923ca65e6ce50e4a086f0d26410059899fef2bbe87b0')
-
-# Commented out because: https://github.com/jojo61/vdr-plugin-softhdcuvid/issues/57
-#pkgver() {
-#  cd "${srcdir}/vdr-plugin-${_plugname}"
-#  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
-#}
+sha512sums=('b4ac7035c122695761e9d409a0f5e371fe8ccc41b49f96942384f70dd12bb41c7499cfe76aa54970145006d012be3bb9f5750ed414b59af8a99b7f11a788a70b'
+            'a6d038f645de6936487b18452bdda3ca17545d6168289fdd144f40e4eada37949c27a28a810108ad5e6e5cba63ee1b7c9f3891fd8ae53a5d7d0e4b3675327c58')
 
 prepare() {
-  cd "${srcdir}/vdr-plugin-${_plugname}"
+  cd "${srcdir}/vdr-plugin-${_plugname}-${pkgver}"
 
   # Disable OSS. Arch Linux doesn't ship OSS
   sed -i '/OSS /d' Makefile
+
+  # Don't clean built plugin binary
+  sed -i 's/\*\.so//' Makefile
 }
 
 build() {
-  export _CFLAGS="-fcommon"
-  cd "${srcdir}/vdr-plugin-${_plugname}"
+  cd "${srcdir}/vdr-plugin-${_plugname}-${pkgver}"
+  make CUVID=1 libvdr-softhdcuvid.so
   make clean
-  make CUVID=1
+  make VAAPI=1 libvdr-softhdvaapi.so
   make clean
-  make VAAPI=1
+  make DRM=1 LIBPLACEBO=0 libvdr-softhddrm.so
   make clean
-  make DRM=1
 }
 
 package_vdr-softhdcuvid() {
-  depends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'nvidia>=410.48' 'libplacebo>=1.7.0')
+  depends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'nvidia>=410.48' 'libplacebo>=3.120.0')
   optdepends=('vdr-xorg: Recommended way to start X.org server together with VDR')
   backup=("etc/vdr/conf.avail/50-$_plugname.conf")
 
-  cd "${srcdir}/vdr-plugin-${_plugname}"
-  make CUVID=1 DESTDIR="${pkgdir}" install
+  cd "${srcdir}/vdr-plugin-${_plugname}-${pkgver}"
+  install -Dm755 "lib${pkgname}.so" "${pkgdir}$(pkg-config --variable=libdir vdr)/lib${pkgname}.so.$(pkg-config --variable=apiversion vdr)"
+  make CUVID=1 DESTDIR="${pkgdir}" install-i18n
 
   install -Dm644 "$srcdir/50-$_plugname.conf" "$pkgdir/etc/vdr/conf.avail/50-softhdcuvid.conf"
 }
 
 package_vdr-softhdvaapi() {
-  depends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'libplacebo>=1.7.0')
+  depends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm' 'xorg-server' 'libplacebo>=3.120.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 VAAPI=1 DESTDIR="${pkgdir}" install
+  cd "${srcdir}/vdr-plugin-${_plugname}-${pkgver}"
+  install -Dm755 "lib${pkgname}.so" "${pkgdir}$(pkg-config --variable=libdir vdr)/lib${pkgname}.so.$(pkg-config --variable=apiversion vdr)"
+  make VAAPI=1 DESTDIR="${pkgdir}" install-i18n
 
   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"
@@ -65,10 +62,12 @@ package_vdr-softhdvaapi() {
 
 package_vdr-softhddrm() {
   depends=('ffmpeg' 'freeglut' 'glew' 'mesa' "vdr-api=${_vdrapi}" 'xcb-util-wm')
+  conflicts=('vdr-xorg')
   backup=("etc/vdr/conf.avail/50-softhddrm.conf")
 
-  cd "${srcdir}/vdr-plugin-${_plugname}"
-  make DRM=1 DESTDIR="${pkgdir}" install
+  cd "${srcdir}/vdr-plugin-${_plugname}-${pkgver}"
+  install -Dm755 "lib${pkgname}.so" "${pkgdir}$(pkg-config --variable=libdir vdr)/lib${pkgname}.so.$(pkg-config --variable=apiversion vdr)"
+  make DRM=1 LIBPLACEBO=0 DESTDIR="${pkgdir}" install-i18n
 
   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"