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

3 files changed, 20 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c96998bfc3a2..f24b1cd7841d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 5.2.2
-# Sat May  1 09:30:17 UTC 2021
+# Generated by makepkg 6.0.0
+# Sat Jun  5 11:43:27 UTC 2021
 pkgbase = vdr-mp3
-	pkgver = 0.10.2
-	pkgrel = 21
-	url = http://www.muempf.de/
+	pkgver = 0.10.4
+	pkgrel = 1
+	url = https://github.com/vdr-projects/vdr-plugin-mp3
 	arch = x86_64
 	arch = i686
 	arch = arm
@@ -15,14 +15,12 @@ pkgbase = vdr-mp3
 	depends = libmad
 	depends = libsndfile
 	depends = vdr-api=2.4.7
-	source = http://www.muempf.de/down/vdr-mp3-0.10.2.tar.gz
-	source = mp3-vdr2.1.2compat.diff
+	source = vdr-mp3-0.10.4.tar.gz::https://github.com/vdr-projects/vdr-plugin-mp3/archive/refs/tags/0.10.4.tar.gz
 	source = 50-mp3.conf
 	source = 50-mplayer.conf
-	md5sums = 66fd37827326776c223a0fdd0ad3811e
-	md5sums = 8615c6b0f3c5eba39e8e2ce37c5c10a4
-	md5sums = 16d931040572e628e01a6f6774c8ff27
-	md5sums = be1ce6311b271b29306a96ec664c40d4
+	sha256sums = 76c1af908b588b46a18f8f3a0f3db77f5859ef318654a7ee242d7a8e5db1ca2a
+	sha256sums = 20e317563665dde7d87e947199218a8ae818e266dfc8708fd02f183b2e544e10
+	sha256sums = af37a97a79d9ec79b50d59d45e8f7e0c7660a71090162d69610d13469260d804
 
 pkgname = vdr-mp3
 	pkgdesc = Allows playback of MP3 and other audio files.
@@ -33,4 +31,3 @@ pkgname = vdr-mplayer
 	pkgdesc = Call MPlayer for playback of video
 	backup = var/lib/vdr/plugins/mp3sources.conf
 	backup = etc/vdr/conf.avail/50-mp3.conf
-
diff --git a/PKGBUILD b/PKGBUILD
index 6e5d5e85120c..6d989435c9db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,34 +3,28 @@
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgbase=vdr-mp3
 pkgname=('vdr-mp3' 'vdr-mplayer')
-pkgver=0.10.2
+pkgver=0.10.4
 _vdrapi=2.4.7
-pkgrel=21
-url="http://www.muempf.de/"
+pkgrel=1
+url="https://github.com/vdr-projects/vdr-plugin-mp3"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
 depends=('gcc-libs' 'libid3tag' 'libmad' 'libsndfile' "vdr-api=${_vdrapi}")
 _plugname=${pkgname//vdr-/}
-source=("http://www.muempf.de/down/$pkgbase-$pkgver.tar.gz"
-        'mp3-vdr2.1.2compat.diff'
+source=("$pkgname-$pkgver.tar.gz::https://github.com/vdr-projects/vdr-plugin-mp3/archive/refs/tags/$pkgver.tar.gz"
         "50-mp3.conf"
         "50-mplayer.conf")
-md5sums=('66fd37827326776c223a0fdd0ad3811e'
-         '8615c6b0f3c5eba39e8e2ce37c5c10a4'
-         '16d931040572e628e01a6f6774c8ff27'
-         'be1ce6311b271b29306a96ec664c40d4')
-
-prepare() {
-  cd "$srcdir/$_plugname-$pkgver"
-  patch -p1 -i "$srcdir/mp3-vdr2.1.2compat.diff"
-}
+sha256sums=('76c1af908b588b46a18f8f3a0f3db77f5859ef318654a7ee242d7a8e5db1ca2a'
+            '20e317563665dde7d87e947199218a8ae818e266dfc8708fd02f183b2e544e10'
+            'af37a97a79d9ec79b50d59d45e8f7e0c7660a71090162d69610d13469260d804')
 
 package_vdr-mp3() {
   pkgdesc="Allows playback of MP3 and other audio files."
   _plugname=$(echo $pkgname | sed 's/vdr-//g')
   backup=("var/lib/vdr/plugins/${_plugname}sources.conf"
           "etc/vdr/conf.avail/50-$_plugname.conf")
-  cd "$srcdir/$_plugname-$pkgver"
+
+  cd "$srcdir/vdr-plugin-$_plugname-$pkgver"
 
   mkdir -p "$pkgdir/usr/lib/vdr/plugins"
   make CFLAGS="$(pkg-config vdr --variable=cflags)" \
@@ -51,7 +45,8 @@ package_vdr-mplayer() {
   _plugname=$(echo $pkgname | sed 's/vdr-//g')
   backup=("var/lib/vdr/plugins/${_plugname}sources.conf"
           "etc/vdr/conf.avail/50-$_plugname.conf")
-  cd "$srcdir/mp3-$pkgver"
+
+  cd "$srcdir/vdr-plugin-mp3-$pkgver"
 
   mkdir -p "$pkgdir/usr/lib/vdr/plugins"
   make CFLAGS="$(pkg-config vdr --variable=cflags)" \
diff --git a/mp3-vdr2.1.2compat.diff b/mp3-vdr2.1.2compat.diff
deleted file mode 100644
index 5ba27e1ff4b9..000000000000
--- a/mp3-vdr2.1.2compat.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ruN mp3-0.10.2/decoder.c mp3-0.10.2.edit/decoder.c
---- mp3-0.10.2/decoder.c	2009-11-29 04:09:45.000000000 +0100
-+++ mp3-0.10.2.edit/decoder.c	2013-10-20 18:54:04.001276261 +0200
-@@ -632,7 +632,11 @@
- 
- char *cInfoCache::CacheFile(void)
- {
-+#if APIVERSNUM > 20101
-+  return AddPath(cachedir?cachedir:cVideoDirectory::Name(),CACHEFILENAME);
-+#else
-   return AddPath(cachedir?cachedir:VideoDirectory,CACHEFILENAME);
-+#endif
- }
- 
- void cInfoCache::Save(bool force)
-diff -ruN mp3-0.10.2/player-mplayer.c mp3-0.10.2.edit/player-mplayer.c
---- mp3-0.10.2/player-mplayer.c	2009-10-14 00:18:18.000000000 +0200
-+++ mp3-0.10.2.edit/player-mplayer.c	2013-10-20 18:57:18.783130016 +0200
-@@ -185,7 +185,11 @@
-     if(MPlayerSetup.ResumeMode==1 || 
-        (access(s,W_OK) && (errno==EACCES || errno==EROFS))) {
-       global=true;
-+#if APIVERSNUM > 20101
-+      resfile=AddPath(globalResumeDir?globalResumeDir:cVideoDirectory::Name(),GLOBAL_RESUME_FILE);
-+#else
-       resfile=AddPath(globalResumeDir?globalResumeDir:VideoDirectory,GLOBAL_RESUME_FILE);
-+#endif
-       d(printf("resume: using global file\n"))
-       }
-     else {