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

5 files changed, 12 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74b5a595069a..b00a883062d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by makepkg 5.2.2
-# Wed Dec 23 12:04:32 UTC 2020
+# Sat Jan 23 15:35:16 UTC 2021
 pkgbase = vdr-bgprocess
 	pkgdesc = Displays information about background processes
-	pkgver = 0.1.0
-	pkgrel = 26
-	url = http://www.vdr-wiki.de/wiki/index.php/Bgprocess-plugin
+	pkgver = 0.1.1
+	pkgrel = 1
+	url = https://github.com/vdr-projects/vdr-plugin-bgprocess
 	arch = x86_64
 	arch = i686
 	arch = arm
@@ -14,14 +14,8 @@ pkgbase = vdr-bgprocess
 	depends = gcc-libs
 	depends = vdr-api=2.4.6
 	backup = etc/vdr/conf.avail/50-bgprocess.conf
-	source = http://ftp.uni-kl.de/pub/linux/gentoo/distfiles/vdr-bgprocess-0.1.0.tgz
-	source = vdr-bgprocess-01_locale.patch
-	source = vdr-bgprocess-03_tlphrases.patch
-	source = vdr-bgprocess-04_osditem.patch
-	sha256sums = 79612020bda0cf59265ceea9898a3a73179ee8caed44fbb9b259d0e52f7fa91f
-	sha256sums = c5e6260d26a169d8d37dc9226b79b6e00806ad5ebda5227f1466f243f9d940a6
-	sha256sums = 344622c47c7e995b19431fb14bb2ca986a1635ed4b0522a814771e53d9c52590
-	sha256sums = 9305299e91a0ba3b655fe5c452f2d36fc36a211fa67a3101313cc6e3241e5d90
+	source = vdr-bgprocess-0.1.1.tar.gz::https://github.com/vdr-projects/vdr-plugin-bgprocess/archive/0.1.1.tar.gz
+	sha256sums = 9fb77f79e6f1f1b831dbc672ac459b6664bcd7c72597d0d91ac02bdf8ef5a4d7
 
 pkgname = vdr-bgprocess
 
diff --git a/PKGBUILD b/PKGBUILD
index df1e4898349d..c4c55b201c08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,35 +2,21 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-bgprocess
-pkgver=0.1.0
+pkgver=0.1.1
 _vdrapi=2.4.6
-pkgrel=26
+pkgrel=1
 pkgdesc="Displays information about background processes"
-url="http://www.vdr-wiki.de/wiki/index.php/Bgprocess-plugin"
+url="https://github.com/vdr-projects/vdr-plugin-bgprocess"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
 depends=('gcc-libs' "vdr-api=${_vdrapi}")
 _plugname=${pkgname//vdr-/}
-source=("http://ftp.uni-kl.de/pub/linux/gentoo/distfiles/$pkgname-$pkgver.tgz"
-        "$pkgname-01_locale.patch"
-        "$pkgname-03_tlphrases.patch"
-        "$pkgname-04_osditem.patch")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/vdr-projects/vdr-plugin-bgprocess/archive/0.1.1.tar.gz")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
-sha256sums=('79612020bda0cf59265ceea9898a3a73179ee8caed44fbb9b259d0e52f7fa91f'
-            'c5e6260d26a169d8d37dc9226b79b6e00806ad5ebda5227f1466f243f9d940a6'
-            '344622c47c7e995b19431fb14bb2ca986a1635ed4b0522a814771e53d9c52590'
-            '9305299e91a0ba3b655fe5c452f2d36fc36a211fa67a3101313cc6e3241e5d90')
-
-prepare() {
-  cd "${srcdir}/${_plugname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/$pkgname-01_locale.patch"
-  patch -p1 -i "${srcdir}/$pkgname-03_tlphrases.patch" #By Holger Schvestka (yaVDR)
-  patch -p1 -i "${srcdir}/$pkgname-04_osditem.patch" #By Holger Schestka (yaVDR)
-}
+sha256sums=('9fb77f79e6f1f1b831dbc672ac459b6664bcd7c72597d0d91ac02bdf8ef5a4d7')
 
 package() {
-  cd "${srcdir}/${_plugname}-${pkgver}"
+  cd "${srcdir}/vdr-plugin-${_plugname}-${pkgver}"
 
   mkdir -p "$pkgdir/usr/lib/vdr/plugins"
   make CFLAGS="$(pkg-config vdr --variable=cflags)" \
diff --git a/vdr-bgprocess-01_locale.patch b/vdr-bgprocess-01_locale.patch
deleted file mode 100644
index ec14b8391062..000000000000
--- a/vdr-bgprocess-01_locale.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad bgprocess-0.1.0~/Makefile bgprocess-0.1.0/Makefile
---- bgprocess-0.1.0~/Makefile	2009-10-01 00:17:28.000000000 +0200
-+++ bgprocess-0.1.0/Makefile	2009-10-01 00:20:59.820122611 +0200
-@@ -29,7 +29,7 @@
- -include $(VDRDIR)/Make.config
- 
- ### Test whether VDR has locale support
--VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
-+VDRLOCALE = $(shell grep 'I18N_DEFAULT_LOCALE' $(VDRDIR)/i18n.h)
- 
- ### The version number of VDR's plugin API (taken from VDR's "config.h"):
- 
diff --git a/vdr-bgprocess-03_tlphrases.patch b/vdr-bgprocess-03_tlphrases.patch
deleted file mode 100644
index 01e5cc7f124a..000000000000
--- a/vdr-bgprocess-03_tlphrases.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/bgprocess.c b/bgprocess.c
-index 69206bb..126c09e 100644
---- a/bgprocess.c
-+++ b/bgprocess.c
-@@ -152,7 +152,9 @@ bool cPluginBgprocess::ProcessArgs(int argc, char *argv[])
- bool cPluginBgprocess::Initialize(void)
- {
-   // Initialize any background activities the plugin shall perform.
--  RegisterI18n(tlPhrases);
-+#if VDRVERSNUM < 10507
-+RegisterI18n(tlPhrases);
-+#endif
-   return true;
- }
- 
-diff --git a/i18n.h b/i18n.h
-index ee84e4c..c625a5e 100644
---- a/i18n.h
-+++ b/i18n.h
-@@ -13,6 +13,8 @@
- #include <vdr/i18n.h>
- #include <vdr/config.h>         // for VDRVERSNUM define only
- 
-+#if VDRVERSNUM < 10507
- extern const tI18nPhrase tlPhrases[];
-+#endif
- 
- #endif //_I18N__H
diff --git a/vdr-bgprocess-04_osditem.patch b/vdr-bgprocess-04_osditem.patch
deleted file mode 100644
index 56b91f7cde92..000000000000
--- a/vdr-bgprocess-04_osditem.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/bgprocess.c b/bgprocess.c
-index 69206bb..eff2a10 100644
---- a/bgprocess.c
-+++ b/bgprocess.c
-@@ -330,7 +330,7 @@ void BgProcessMenu::ShowBgProcesses()
-  Clear();
-  if (iter == bgProcessList.end() && CompletedList.size()==0)
-    {
--    Add(new cOsdItem(" "),osUnknown,false);
-+    Add(new cOsdItem(" ",osUnknown,false));
-     Add(new cOsdItem(tr(" No background process running"),osUnknown,false));
-    }
-  for (; iter != bgProcessList.end(); iter++)