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

3 files changed, 104 insertions, 95 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a9b90cce48f..43a71c741ea1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by makepkg 5.2.2
-# Sun Jan  3 19:10:04 UTC 2021
+# Generated by makepkg 6.0.0
+# Sat Jun  5 11:43:55 UTC 2021
 pkgbase = vdr-softhdcuvid
 	pkgdesc = VDR output plugin with CUDA and Opengl
-	pkgver = 3.2.4
+	pkgver = 3.5
 	pkgrel = 1
 	url = https://github.com/jojo61/vdr-plugin-softhdcuvid
 	arch = x86_64
@@ -11,31 +11,30 @@ pkgbase = vdr-softhdcuvid
 	makedepends = freeglut
 	makedepends = glew
 	makedepends = mesa
-	makedepends = vdr-api=2.4.6
+	makedepends = vdr-api=2.4.7
 	makedepends = xcb-util-wm
 	makedepends = xorg-server
 	makedepends = nvidia>=410.48
-	makedepends = libplacebo>=1.7.0
-	makedepends = git
+	makedepends = libplacebo>=3.120.0
 	makedepends = glm
 	makedepends = glu
 	makedepends = vulkan-headers
 	makedepends = ffnvcodec-headers
-	source = vdr-plugin-softhdcuvid::git+https://github.com/jojo61/vdr-plugin-softhdcuvid#commit=184cc1aa0587cfdfb18f7ecd14d30254f4f05597
+	source = vdr-softhdcuvid-3.5.tar.gz::https://github.com/jojo61/vdr-plugin-softhdcuvid/archive/refs/tags/v3.5.tar.gz
 	source = 50-softhdcuvid.conf
-	sha512sums = SKIP
-	sha512sums = 0b336e5d0c18e5a875389c52d498ce81db0a407c6a93e1e72e0d0faec41d2165b80e91e9787465bb2cb9923ca65e6ce50e4a086f0d26410059899fef2bbe87b0
+	sha512sums = b4ac7035c122695761e9d409a0f5e371fe8ccc41b49f96942384f70dd12bb41c7499cfe76aa54970145006d012be3bb9f5750ed414b59af8a99b7f11a788a70b
+	sha512sums = a6d038f645de6936487b18452bdda3ca17545d6168289fdd144f40e4eada37949c27a28a810108ad5e6e5cba63ee1b7c9f3891fd8ae53a5d7d0e4b3675327c58
 
 pkgname = vdr-softhdcuvid
 	depends = ffmpeg
 	depends = freeglut
 	depends = glew
 	depends = mesa
-	depends = vdr-api=2.4.6
+	depends = vdr-api=2.4.7
 	depends = xcb-util-wm
 	depends = xorg-server
 	depends = nvidia>=410.48
-	depends = libplacebo>=1.7.0
+	depends = libplacebo>=3.120.0
 	optdepends = vdr-xorg: Recommended way to start X.org server together with VDR
 	backup = etc/vdr/conf.avail/50-softhdcuvid.conf
 
@@ -44,10 +43,10 @@ pkgname = vdr-softhdvaapi
 	depends = freeglut
 	depends = glew
 	depends = mesa
-	depends = vdr-api=2.4.6
+	depends = vdr-api=2.4.7
 	depends = xcb-util-wm
 	depends = xorg-server
-	depends = libplacebo>=1.7.0
+	depends = 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
 
@@ -56,7 +55,7 @@ pkgname = vdr-softhddrm
 	depends = freeglut
 	depends = glew
 	depends = mesa
-	depends = vdr-api=2.4.6
+	depends = vdr-api=2.4.7
 	depends = xcb-util-wm
+	conflicts = vdr-xorg
 	backup = etc/vdr/conf.avail/50-softhddrm.conf
-
diff --git a/50-softhdcuvid.conf b/50-softhdcuvid.conf
index 1fc659d7dbb5..4f00b13129a0 100644
--- a/50-softhdcuvid.conf
+++ b/50-softhdcuvid.conf
@@ -1,52 +1,63 @@
-[softhdcuvid]

-#-a device

-#    audio device (fe. alsa: hw:0,0)

-

-#-c channel

-#    audio mixer channel name (fe. PCM)

-

-#-d display

-#    display of x11 server (fe. :0.0)

-

-#-D

-#    start in detached mode

-

-#-f

-#    start with fullscreen window (only with window manager)

-

-#-g geometry

-#    x11 window geometry wxh+x+y

-

-#-p device

-#    audio device for pass-through (hw:0,1)

-

-#-s

-#    start in suspended mode

-

-#-v device

-#    video driver device (va-api, vdpau, noop)

-

-#-w workaround

-#    enable/disable workarounds

-#    no-hw-decoder

-#        disable hw decoder, use software decoder only

-#    no-mpeg-hw-decoder

-#        disable hw decoder for mpeg only

-#    still-hw-decoder

-#        enable hardware decoder for still-pictures

-#    still-h264-hw-decoder

-#        enable h264 hw decoder for still-pictures

-#    alsa-driver-broken

-#        disable broken alsa driver message

-#    alsa-no-close-open

-#        disable close open to fix alsa no sound bug

-#    alsa-close-open-delay

-#        enable close open delay to fix no sound bug

-#    ignore-repeat-pict

-#        disable repeat pict message

-

-#-x

-#    start x11 server, with -xx try to connect, if this fails

-

-#-X args

-#    X11 server arguments (f.e. -nocursor)

+[softhdcuvid]
+#-a device
+#    audio device (fe. alsa: hw:0,0)
+
+#-c channel
+#    audio mixer channel name (fe. PCM)
+
+#-C connector
+#    connector for DRM (default is current Connector)
+
+#-d display
+#    display of x11 server (fe. :0.0)
+
+#-D
+#    start in detached mode
+
+#-f
+#    start with fullscreen window (only with window manager)
+
+#-g geometry
+#    x11 window geometry wxh+x+y
+
+#-p device
+#    audio device for pass-through (hw:0,1)
+
+#-r refresh
+#    refresh rate for DRM (default is 50 Hz)
+
+#-s
+#    start in suspended mode
+
+#-S shader
+#    shader to use. Only with placebo. Can be repeated for more shaders
+
+#-v device
+#    video driver device (cuvid)
+
+#-w workaround
+#    enable/disable workarounds
+#    no-hw-decoder
+#        disable hw decoder, use software decoder only
+#    no-mpeg-hw-decoder
+#        disable hw decoder for mpeg only
+#    still-hw-decoder
+#        enable hardware decoder for still-pictures
+#    still-h264-hw-decoder
+#        enable h264 hw decoder for still-pictures
+#    alsa-driver-broken
+#        disable broken alsa driver message
+#    alsa-no-close-open
+#        disable close open to fix alsa no sound bug
+#    alsa-close-open-delay
+#        enable close open delay to fix no sound bug
+#    ignore-repeat-pict
+#        disable repeat pict message
+#    use-possible-defect-frames
+#        prefer faster channel switch
+
+#-x
+#    start x11 server, with -xx try to connect, if this fails
+
+#-X args
+#    X11 server arguments (f.e. -nocursor)
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"