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

3 files changed, 12 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b256fe1a3ad..3f4ac83b04a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 5.2.2
-# Wed Dec 23 12:11:24 UTC 2020
+# Sun Jan 31 12:52:02 UTC 2021
 pkgbase = vdr-externalplayer
 	pkgdesc = use external players in VDR
-	pkgver = 0.3.2
-	pkgrel = 21
+	pkgver = 0.3.4
+	pkgrel = 1
 	url = http://www.uli-eckhardt.de/vdr/external.en.shtml
 	arch = x86_64
 	arch = i686
@@ -15,12 +15,10 @@ pkgbase = vdr-externalplayer
 	depends = vdr-api=2.4.6
 	backup = etc/vdr/conf.avail/50-externalplayer.conf
 	backup = var/lib/vdr/plugins/externalplayer.conf
-	source = https://www.uli-eckhardt.de/vdr/download/vdr-externalplayer-0.3.2.tgz
+	source = https://www.uli-eckhardt.de/vdr/download/vdr-externalplayer-0.3.4.tgz
 	source = 50-externalplayer.conf
-	source = externalplayer-fix-operator-mismatch.diff
-	md5sums = fe51ca255507db0ea4d4bc45ee43aee9
-	md5sums = 4e40f42e1d1f54ea98dc8004fe79033f
-	md5sums = 1d9b87cd833d24d0a5b415779288934b
+	sha256sums = 6b9ad94a9a659854a93016ef1694fb43fec57103c93ae6f4247a2ce91382ffc6
+	sha256sums = 743dcfe9caa98289634c6020b8b9de4011e2d8946630b37b68edea5428058359
 
 pkgname = vdr-externalplayer
 
diff --git a/PKGBUILD b/PKGBUILD
index 7776222b3a11..3782729d6d62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-externalplayer
-pkgver=0.3.2
+pkgver=0.3.4
 _vdrapi=2.4.6
-pkgrel=21
+pkgrel=1
 pkgdesc="use external players in VDR"
 url="http://www.uli-eckhardt.de/vdr/external.en.shtml"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
@@ -13,23 +13,17 @@ depends=('gcc-libs' "vdr-api=${_vdrapi}")
 backup=('var/lib/vdr/plugins/externalplayer.conf')
 _plugname=${pkgname//vdr-/}
 source=("https://www.uli-eckhardt.de/vdr/download/$pkgname-$pkgver.tgz"
-        "50-$_plugname.conf"
-        'externalplayer-fix-operator-mismatch.diff')
+        "50-$_plugname.conf")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf"
         "var/lib/vdr/plugins/$_plugname.conf")
-md5sums=('fe51ca255507db0ea4d4bc45ee43aee9'
-         '4e40f42e1d1f54ea98dc8004fe79033f'
-         '1d9b87cd833d24d0a5b415779288934b')
-
-prepare() {
-  cd "${srcdir}/${_plugname}-${pkgver}"
-  patch -i "$srcdir/externalplayer-fix-operator-mismatch.diff"
-}
+sha256sums=('6b9ad94a9a659854a93016ef1694fb43fec57103c93ae6f4247a2ce91382ffc6'
+            '743dcfe9caa98289634c6020b8b9de4011e2d8946630b37b68edea5428058359')
 
 build() {
   cd "${srcdir}/${_plugname}-${pkgver}"
   make
 }
+
 package() {
   cd "${srcdir}/${_plugname}-${pkgver}"
   make DESTDIR="${pkgdir}" \
diff --git a/externalplayer-fix-operator-mismatch.diff b/externalplayer-fix-operator-mismatch.diff
deleted file mode 100644
index 196cac4ecc90..000000000000
--- a/externalplayer-fix-operator-mismatch.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- externalplayer-config.c.orig	2016-08-15 00:34:15.782468108 +0200
-+++ externalplayer-config.c	2016-08-15 00:35:02.141143092 +0200
-@@ -131,9 +131,10 @@
- 
- string cExternalplayerConfig::ReadConfigFile(const string &filename) {
-   ifstream playerConfigStream;
--  playerConfigStream.open(filename.c_str(), ios::in);
--
--  if (playerConfigStream == NULL) {
-+  try {
-+    playerConfigStream.open(filename.c_str(), ios::in);
-+  }
-+  catch (ifstream::failure e) {
-     throw FileNotFoundException(filename);
-   }
-