update patch set

rename scan to dvb-scan
rename zap to dvb-zap

2 files changed, 60 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9647b2df52aa..1d4e59c266bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = linuxtv-dvb-apps
 	pkgdesc = Linux DVB API applications and utilities
 	pkgver = 1505
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.linuxtv.org
 	arch = x86_64
 	arch = i686
@@ -13,15 +13,21 @@ 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=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
+	source = dvb-apps::hg+https://linuxtv.org/hg/dvb-apps/#revision=3d43b280298c39a67d1d889e01e173f52c12da35
+	source = 0001-glibc-2.31.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-glibc-2.31.patch
+	source = 0002-no-ca_set_pid.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-no-ca_set_pid.patch
+	source = 0003-alevt.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch
+	source = 0004-ldflags.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch
+	source = 0005-perl526.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch
+	source = 0006-dvbdate.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-dvbdate.patch
+	source = 0007-gcc10.patch::https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch
 	sha256sums = SKIP
+	sha256sums = cd26db2922605b82fdf370d1d06557b600072ba20b3900b71b3da21a79963a9f
+	sha256sums = 58773c592c064eb85df2cbb64aef9d03ae0ce421065f974baa22c428db2f6d78
+	sha256sums = 1707ddbdac648059c84837fdabdcb2fa2d73661748f82163023a187d0ecc9ffd
+	sha256sums = 8eb444d72c922db4166c5f926ae80537c56e1087ef792be34749caa6629f7e94
 	sha256sums = 4460c9c8f4474fcc776b8d02d1c527584a81dbc84b69db9ed9a8b43ca24d49c5
-	sha256sums = ea5915194b00b7275eaac6902f9a4aa07a61c17e14010b9ea453c0e53c57612a
-	sha256sums = f9793b4e490f43e1cefbb94f44db3d8799c5a6ca51168cb7e79a518e3efbb7ad
-	sha256sums = ec99693a472723a9ad94137162fa7f0ca153b02750bac4ad755b9230b0735872
+	sha256sums = 74b3e5b1c74339decaabedac121809fcf058d7337fd3f7e1dd353a24e10b698c
+	sha256sums = 10d18f1ceb311a7a247548e8a942e46381a976ee089c8073549ef78ab1fe05c6
 
 pkgname = linuxtv-dvb-apps
diff --git a/PKGBUILD b/PKGBUILD
index d2e7bb801a07..050a4c642d1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,11 @@
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Camille Moncelier <pix@devlife.org>
 
-pkgname=linuxtv-dvb-apps
+_gitname="dvb-apps"
+_pkgname="linuxtv-dvb-apps"
+pkgname="$_pkgname"
 pkgver=1505
-pkgrel=3
+pkgrel=4
 _hgrev=3d43b280298c39a67d1d889e01e173f52c12da35
 pkgdesc='Linux DVB API applications and utilities'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -17,42 +19,64 @@ makedepends=('mercurial')
 optdepends=(
   'dtv-scan-tables-git: initial tuning data necessary for scanning utils'
 )
+
+# patch sources
+#_patch_url_1='https://git.busybox.net/buildroot/plain/package/dvb-apps'
+_patch_url_2='https://gitweb.gentoo.org/repo/gentoo.git/plain/media-tv/linuxtv-dvb-apps/files'
+#_patch_url_3='https://git.openembedded.org/meta-openembedded/plain/meta-multimedia/recipes-multimedia/dvb-apps/files'
+
 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.openembedded.org/meta-openembedded/plain/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch'
+  "$_gitname"::"hg+https://linuxtv.org/hg/dvb-apps/#revision=${_hgrev}"
+
+  "0001-glibc-2.31.patch"::"$_patch_url_2/linuxtv-dvb-apps-glibc-2.31.patch"
+  "0002-no-ca_set_pid.patch"::"$_patch_url_2/linuxtv-dvb-apps-no-ca_set_pid.patch"
+  "0003-alevt.patch"::"$_patch_url_2/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch"
+  "0004-ldflags.patch"::"$_patch_url_2/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch"
+  "0005-perl526.patch"::"$_patch_url_2/linuxtv-dvb-apps-1.1.1.20100223-perl526.patch"
+  "0006-dvbdate.patch"::"$_patch_url_2/linuxtv-dvb-apps-1.1.1.20140321-dvbdate.patch"
+  "0007-gcc10.patch"::"$_patch_url_2/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch"
 )
 sha256sums=(
   'SKIP'
+
+  'cd26db2922605b82fdf370d1d06557b600072ba20b3900b71b3da21a79963a9f'
+  '58773c592c064eb85df2cbb64aef9d03ae0ce421065f974baa22c428db2f6d78'
+  '1707ddbdac648059c84837fdabdcb2fa2d73661748f82163023a187d0ecc9ffd'
+  '8eb444d72c922db4166c5f926ae80537c56e1087ef792be34749caa6629f7e94'
   '4460c9c8f4474fcc776b8d02d1c527584a81dbc84b69db9ed9a8b43ca24d49c5'
-  'ea5915194b00b7275eaac6902f9a4aa07a61c17e14010b9ea453c0e53c57612a'
-  'f9793b4e490f43e1cefbb94f44db3d8799c5a6ca51168cb7e79a518e3efbb7ad'
-  'ec99693a472723a9ad94137162fa7f0ca153b02750bac4ad755b9230b0735872'
+  '74b3e5b1c74339decaabedac121809fcf058d7337fd3f7e1dd353a24e10b698c'
+  '10d18f1ceb311a7a247548e8a942e46381a976ee089c8073549ef78ab1fe05c6'
 )
 
+_pkgsrc="$_gitname"
 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
-  patch -p1 -i ${srcdir}/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch
+  cd "$srcdir/$_pkgsrc"
+
+  for patch in "$srcdir"/*.patch ; do
+    if [ -f "$patch" ] ; then
+      printf 'Applying patch: %s\n' "${patch##*/}"
+      patch -Np1 -F100 -i "$patch"
+    fi
+  done
 }
 
 pkgver() {
-  cd ${srcdir}/dvb-apps
+  cd "$srcdir/$_pkgsrc"
   echo $(hg identify -n | sed 's/+//')
 }
 
 build() {
-  cd ${srcdir}/dvb-apps
+  cd "$srcdir/$_pkgsrc"
   make
 }
 
 package() {
-  cd ${srcdir}/dvb-apps
-  make DESTDIR="${pkgdir}" install
-  # Remove conflict with xbase (FS#37862)
-  mv ${pkgdir}/usr/bin/{zap,dvbzap}
+  cd "$srcdir/$_pkgsrc"
+  make DESTDIR="$pkgdir" install
+
+  # Avoid conflict with xbase (FS#37862)
+  mv "$pkgdir/usr/bin"/{zap,dvb-zap}
+
+  # Avoid conflict with sane-scan-pdf-git
+  mv "$pkgdir/usr/bin"/{scan,dvb-scan}
 }