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

2 files changed, 42 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84bef56c5937..1e9decb9ce97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-# Generated by makepkg 5.2.2
-# Sat Aug  8 09:15:33 UTC 2020
+# Generated by makepkg 6.0.0
+# Fri Jul 16 09:46:37 UTC 2021
 pkgbase = vdr-git
-	pkgver = 2.4.4.r0.g16fb796
+	pkgver = 2.5.6.r0.g0d50ec5
 	pkgrel = 1
 	url = http://tvdr.de/
 	arch = x86_64
@@ -19,27 +19,27 @@ pkgbase = vdr-git
 	makedepends = systemd
 	makedepends = ncurses
 	source = vdr-git::git+http://git.tvdr.de/vdr.git
-	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/vdr-MainMenuHooks.patch
-	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/00-vdr.conf
-	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/50-hello.conf
-	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/50-pictures.conf
-	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/60-create-dvb-device-units.rules
-	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/gen-sddropin
-	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/shutdown.sh
-	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/shutdown-wrapper.c
-	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/vdr.service
-	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/vdr.sysuser
-	md5sums = SKIP
-	md5sums = 292e065582d97ed1ae4977a2a7b6091d
-	md5sums = de3dcdea1a4282211c6dac370019548b
-	md5sums = fc450f75037b8712673db4969a1dd758
-	md5sums = f00583e3f5507b0ff935b4d5919e7df2
-	md5sums = 23d6e1ca0a36cfdbd35d3b1a61f0a105
-	md5sums = 3565ca5ad9be5c75f66478f0796b120d
-	md5sums = dd20f932b846b5f50ac455b65e9432ad
-	md5sums = 7cad811b4ac5ee6c0b5496d006f1e0ee
-	md5sums = 6c021358f299dca9ef7bbeb163312690
-	md5sums = 59ce04d1d01bf92bf6cfc0b74223191c
+	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr/vdr-MainMenuHooks.patch
+	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr/00-vdr.conf
+	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr/50-hello.conf
+	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr/50-pictures.conf
+	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr/60-create-dvb-device-units.rules
+	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr/gen-sddropin
+	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr/shutdown.sh
+	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr/shutdown-wrapper.c
+	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr/vdr.service
+	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr/vdr.sysuser
+	sha256sums = SKIP
+	sha256sums = 4c553065d24ee4dc001c06ff588494db44982b7debe9a1e6cd1a8903beb7c87b
+	sha256sums = 86f2469f459e2aabfc0ab703fc8435e458e89c4879376e900160d083924097b3
+	sha256sums = 423656cb6ba39af52d379dee697c52e6f435c098daa8c2ba429c1247b757af50
+	sha256sums = 39f4c2886328dc947dbef70dbc37d42504dc5c9d6a2ad81bf0c41d26fa3a5d6a
+	sha256sums = 1d914d6308a2b79ede34b7670788e5dfd3a8fab24156353555a66c9ef0bb41d7
+	sha256sums = 54a901d735d200ba3e2df4d9f45e1e537832a868c6ae5ae42ed3ff1a4c2c3f05
+	sha256sums = 7313a8db29693fa84d19be7b715b3ab04fd77eddcb52682588cc0a094764b6ba
+	sha256sums = 17b82fd995e9a39ad8d73d46b586d6c1934a6747c2859bd6d6df22ed254b5c4b
+	sha256sums = f33f42a77bd93f00e7aa18f22667f0097468de76a0269c6e35fdc0fd2e30f6e6
+	sha256sums = 7ca24fe1df90ffc20ae7fc6578193874b21ef8f303d7aac421d394a6106eef2a
 
 pkgname = vdr-git
 	pkgdesc = 'open' digital satellite receiver and timer controlled video disk recorder
@@ -52,7 +52,7 @@ pkgname = vdr-git
 	depends = ttf-font
 	optdepends = lirc-utils: remote control support
 	optdepends = vdr-xorg: To start X11
-	provides = vdr-api=2.4.3
+	provides = vdr-api=2.4.7
 	provides = vdr
 	conflicts = runvdr-extreme
 	conflicts = vdr
@@ -69,7 +69,7 @@ pkgname = vdr-git
 
 pkgname = vdr-examples-git
 	pkgdesc = Plugins for vdr to show some possible features
-	depends = vdr-api=2.4.3
+	depends = vdr-api=2.4.7
 	depends = gcc-libs
 	depends = ncurses
 	provides = vdr-examples
@@ -83,4 +83,3 @@ pkgname = vdr-examples-git
 	backup = etc/vdr/conf.avail/50-svdrpdemo.conf
 	backup = etc/vdr/conf.avail/50-svccli.conf
 	backup = etc/vdr/conf.avail/50-svcsvr.conf
-
diff --git a/PKGBUILD b/PKGBUILD
index f01cc7917b53..a6156ad8f505 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
 # Maintainer: Manuel Reimer <manuel.reimer@gmx.de>
 pkgbase=vdr-git
 pkgname=(vdr-git vdr-examples-git)
-pkgver=2.4.4.r0.g16fb796
-_vdrapi=2.4.3
+pkgver=2.5.6.r0.g0d50ec5
+_vdrapi=2.4.7
 pkgrel=1
 url="http://tvdr.de/"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
 makedepends=('fontconfig' 'libcap' 'libjpeg-turbo' 'libsystemd' 'perl' 'ttf-font' 'systemd' 'ncurses')
-_vdrrepo="https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr"
+_vdrrepo="https://raw.githubusercontent.com/VDR4Arch/vdr4arch/c71d217dd54c21d97bed2c3806e0453787f8598a/vdr"
 source=("$pkgbase::git+http://git.tvdr.de/vdr.git"
         "$_vdrrepo/vdr-MainMenuHooks.patch"
         "$_vdrrepo/00-vdr.conf"
@@ -22,21 +22,21 @@ source=("$pkgbase::git+http://git.tvdr.de/vdr.git"
         "$_vdrrepo/shutdown-wrapper.c"
         "$_vdrrepo/vdr.service"
         "$_vdrrepo/vdr.sysuser")
-md5sums=('SKIP'
-         '292e065582d97ed1ae4977a2a7b6091d'
-         'de3dcdea1a4282211c6dac370019548b'
-         'fc450f75037b8712673db4969a1dd758'
-         'f00583e3f5507b0ff935b4d5919e7df2'
-         '23d6e1ca0a36cfdbd35d3b1a61f0a105'
-         '3565ca5ad9be5c75f66478f0796b120d'
-         'dd20f932b846b5f50ac455b65e9432ad'
-         '7cad811b4ac5ee6c0b5496d006f1e0ee'
-         '6c021358f299dca9ef7bbeb163312690'
-         '59ce04d1d01bf92bf6cfc0b74223191c')
+sha256sums=('SKIP'
+            '4c553065d24ee4dc001c06ff588494db44982b7debe9a1e6cd1a8903beb7c87b'
+            '86f2469f459e2aabfc0ab703fc8435e458e89c4879376e900160d083924097b3'
+            '423656cb6ba39af52d379dee697c52e6f435c098daa8c2ba429c1247b757af50'
+            '39f4c2886328dc947dbef70dbc37d42504dc5c9d6a2ad81bf0c41d26fa3a5d6a'
+            '1d914d6308a2b79ede34b7670788e5dfd3a8fab24156353555a66c9ef0bb41d7'
+            '54a901d735d200ba3e2df4d9f45e1e537832a868c6ae5ae42ed3ff1a4c2c3f05'
+            '7313a8db29693fa84d19be7b715b3ab04fd77eddcb52682588cc0a094764b6ba'
+            '17b82fd995e9a39ad8d73d46b586d6c1934a6747c2859bd6d6df22ed254b5c4b'
+            'f33f42a77bd93f00e7aa18f22667f0097468de76a0269c6e35fdc0fd2e30f6e6'
+            '7ca24fe1df90ffc20ae7fc6578193874b21ef8f303d7aac421d394a6106eef2a')
 
 pkgver() {
-  cd "${srcdir}/${pkgbase}"
-  git describe --long --tags | sed -r 's/^V(.)(..)(..)/\1.\2.\3/;s/\.0/./g;s/([^-]*-g)/r\1/;s/-/./g'
+  cd "$pkgname"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {