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

2 files changed, 23 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4990d131e621..ae9720f25589 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
-# Generated by makepkg 5.2.0
-# Sat Nov  9 18:01:00 UTC 2019
+# Generated by makepkg 5.2.1
+# Sat Mar 14 09:39:23 UTC 2020
 pkgbase = linuxtv-dvb-apps
 	pkgdesc = Linux DVB API applications and utilities
 	pkgver = 1505
@@ -15,14 +15,16 @@ pkgbase = linuxtv-dvb-apps
 	makedepends = mercurial
 	depends = glibc
 	optdepends = dtv-scan-tables-git: initial tuning data necessary for scanning utils
-	source = hg+https://linuxtv.org/hg/dvb-apps/#revision=3d43b280298c
+	source = hg+https://linuxtv.org/hg/dvb-apps/#revision=3d43b280298c39a67d1d889e01e173f52c12da35
 	source = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch
 	source = https://git.busybox.net/buildroot/plain/package/dvb-apps/0003-handle-static-shared-only-build.patch
 	source = https://git.busybox.net/buildroot/plain/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch
+	source = https://git.openembedded.org/meta-openembedded/plain/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch
 	sha256sums = SKIP
 	sha256sums = 4460c9c8f4474fcc776b8d02d1c527584a81dbc84b69db9ed9a8b43ca24d49c5
 	sha256sums = ea5915194b00b7275eaac6902f9a4aa07a61c17e14010b9ea453c0e53c57612a
 	sha256sums = f9793b4e490f43e1cefbb94f44db3d8799c5a6ca51168cb7e79a518e3efbb7ad
+	sha256sums = b1a61020aa8658b100efd32ae5abc43915c9e62a33f3ac171f1c7c65b870cbac
 
 pkgname = linuxtv-dvb-apps
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ed6d2746b0c..6344044c0dcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=linuxtv-dvb-apps
 pkgver=1505
 pkgrel=2
-_hgrev=3d43b280298c
+_hgrev=3d43b280298c39a67d1d889e01e173f52c12da35
 pkgdesc='Linux DVB API applications and utilities'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url='https://www.linuxtv.org'
@@ -17,32 +17,35 @@ optdepends=('dtv-scan-tables-git: initial tuning data necessary for scanning uti
 source=("hg+https://linuxtv.org/hg/dvb-apps/#revision=${_hgrev}"
         'https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch'
         'https://git.busybox.net/buildroot/plain/package/dvb-apps/0003-handle-static-shared-only-build.patch'
-        'https://git.busybox.net/buildroot/plain/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch')
+        'https://git.busybox.net/buildroot/plain/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch'
+        'https://git.openembedded.org/meta-openembedded/plain/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch')
 sha256sums=('SKIP'
             '4460c9c8f4474fcc776b8d02d1c527584a81dbc84b69db9ed9a8b43ca24d49c5'
             'ea5915194b00b7275eaac6902f9a4aa07a61c17e14010b9ea453c0e53c57612a'
-            'f9793b4e490f43e1cefbb94f44db3d8799c5a6ca51168cb7e79a518e3efbb7ad')
+            'f9793b4e490f43e1cefbb94f44db3d8799c5a6ca51168cb7e79a518e3efbb7ad'
+            'b1a61020aa8658b100efd32ae5abc43915c9e62a33f3ac171f1c7c65b870cbac')
 
 prepare() {
-	cd ${srcdir}/dvb-apps
-	patch -p1 -i ${srcdir}/0003-handle-static-shared-only-build.patch
-	patch -p1 -i ${srcdir}/0005-utils-fix-build-with-kernel-headers-4.14.patch
-	patch -p1 -i ${srcdir}/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch
+  cd ${srcdir}/dvb-apps
+  patch -p1 -i ${srcdir}/0003-handle-static-shared-only-build.patch
+  patch -p1 -i ${srcdir}/0005-utils-fix-build-with-kernel-headers-4.14.patch
+  patch -p1 -i ${srcdir}/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch
+  patch -p1 -i ${srcdir}/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch
 }
 
 pkgver() {
-	cd ${srcdir}/dvb-apps
-	echo $(hg identify -n | sed 's/+//')
+  cd ${srcdir}/dvb-apps
+  echo $(hg identify -n | sed 's/+//')
 }
 
 build() {
-	cd ${srcdir}/dvb-apps
-	make
+  cd ${srcdir}/dvb-apps
+  make
 }
 
 package() {
-	cd ${srcdir}/dvb-apps
-	make DESTDIR="${pkgdir}" install
-	# Remove conflict with xbase (FS#37862)
-	mv ${pkgdir}/usr/bin/{zap,dvbzap}
+  cd ${srcdir}/dvb-apps
+  make DESTDIR="${pkgdir}" install
+  # Remove conflict with xbase (FS#37862)
+  mv ${pkgdir}/usr/bin/{zap,dvbzap}
 }