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

3 files changed, 28 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dd201817c8b2..1edd731e290b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by makepkg 5.1.1
+# Tue Dec 25 15:33:18 UTC 2018
 pkgbase = vdr-suspendoutput
 	pkgdesc = Output device that does nothing
-	pkgver = 2.0.0
-	pkgrel = 10
+	pkgver = 2.1.0
+	pkgrel = 1
 	url = http://phivdr.dyndns.org/vdr/vdr-dummydevice/
 	arch = x86_64
 	arch = i686
@@ -11,19 +13,15 @@ pkgbase = vdr-suspendoutput
 	license = GPL2
 	makedepends = ffmpeg
 	depends = gcc-libs
-	depends = vdr-api=2.2.0
+	depends = vdr-api=2.4.0
 	backup = etc/vdr/conf.avail/50-suspendoutput.conf
-	source = http://phivdr.dyndns.org/vdr/vdr-suspendoutput/vdr-suspendoutput-2.0.0.tgz
-	source = 10_suspendoutput_vdr-2.1.x_compat.patch::http://www.minidvblinux.de/git/?a=blob&p=vdr-plugin-suspendoutput&h=e9f9bc511668b6d884a000db29b01d970bc5095d
-	source = 11_suspendoutput_svdrp.patch::http://www.minidvblinux.de/git/?a=blob&p=vdr-plugin-suspendoutput&h=045172a810e98bad784cdae4f22bcc305118b490
-	source = 12_suspendoutput_nooutput.patch::http://www.minidvblinux.de/git/?a=blob&p=vdr-plugin-suspendoutput&h=dda561c8a229804b2e9bef05a189be234b95246f
+	source = http://phivdr.dyndns.org/vdr/vdr-suspendoutput/vdr-suspendoutput-2.1.0.tgz
+	source = 12_suspendoutput_nooutput.patch::http://minidvblinux.de/git/?a=blob&p=vdr-plugin-suspendoutput&h=28fc94ae42381a1efb3f2e5ceb7165bdd8e56369
 	source = 13_suspendoutput_remove_template_redefine.patch
 	source = 50-suspendoutput.conf
-	md5sums = 4cbeaf9bf9c83e72ed3a8dee703caf39
-	md5sums = fb094cd51172345fec1d3d30684e6af3
-	md5sums = 4a7dda396e042ab2a5e47c3db06f8925
-	md5sums = 8e3fefbce7410be7c0d960e2eb59d2ce
-	md5sums = f5e5543022910a7eb4f36d888efaf363
+	md5sums = e9bbd583ea87a3809693f79e57fd63e6
+	md5sums = a9ab789cdbaa700fdb1f33db4a810d2e
+	md5sums = 5f554d7dedbddeae94a26eda3d066845
 	md5sums = 9b908b272a2f24e1c73b990b53fb5e76
 
 pkgname = vdr-suspendoutput
diff --git a/13_suspendoutput_remove_template_redefine.patch b/13_suspendoutput_remove_template_redefine.patch
index 4e99f98aadf6..1805f2883343 100644
--- a/13_suspendoutput_remove_template_redefine.patch
+++ b/13_suspendoutput_remove_template_redefine.patch
@@ -4,21 +4,21 @@
  }
  
  template<class TCLASS>
--cTimerEvent *CreateTimerEvent(TCLASS *c, void (TCLASS::*fp)(void), 
--			      unsigned int TimeoutMs, bool runOnce = true)
--{ 
--  return new cTimerFunctor0<TCLASS>(c,fp,TimeoutMs,runOnce); 
+-cTimerEvent *CreateTimerEvent(TCLASS *c, void (TCLASS::*fp)(void),
+-                              unsigned int TimeoutMs, bool runOnce = true)
+-{
+-  return new cTimerFunctor0<TCLASS>(c,fp,TimeoutMs,runOnce);
 -}
 -
 -template<class TCLASS, class TARG1>
--cTimerEvent *CreateTimerEvent(TCLASS *c, void (TCLASS::*fp)(TARG1), 
--			      TARG1 arg1, 
--			      unsigned int TimeoutMs, bool runOnce = true)
--{ 
--  return new cTimerFunctor1<TCLASS,TARG1>(c,fp,arg1,TimeoutMs,runOnce); 
+-cTimerEvent *CreateTimerEvent(TCLASS *c, void (TCLASS::*fp)(TARG1),
+-                              TARG1 arg1,
+-                              unsigned int TimeoutMs, bool runOnce = true)
+-{
+-  return new cTimerFunctor1<TCLASS,TARG1>(c,fp,arg1,TimeoutMs,runOnce);
 -}
 -
 -template<class TCLASS>
  void CancelTimerEvents(TCLASS *c)
- { 
-   cTimerEvent::CancelAll((void*)c); 
+ {
+   cTimerEvent::CancelAll((void*)c);
diff --git a/PKGBUILD b/PKGBUILD
index 477c093f5bc0..6e722e25f844 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-suspendoutput
-pkgver=2.0.0
-_vdrapi=2.2.0
-pkgrel=10
+pkgver=2.1.0
+_vdrapi=2.4.0
+pkgrel=1
 pkgdesc="Output device that does nothing"
 url="http://phivdr.dyndns.org/vdr/vdr-dummydevice/"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
@@ -13,23 +13,17 @@ depends=('gcc-libs' "vdr-api=${_vdrapi}")
 makedepends=('ffmpeg')
 _plugname=${pkgname//vdr-/}
 source=("http://phivdr.dyndns.org/vdr/$pkgname/$pkgname-$pkgver.tgz"
-        "10_suspendoutput_vdr-2.1.x_compat.patch::http://www.minidvblinux.de/git/?a=blob&p=vdr-plugin-suspendoutput&h=e9f9bc511668b6d884a000db29b01d970bc5095d"
-        "11_suspendoutput_svdrp.patch::http://www.minidvblinux.de/git/?a=blob&p=vdr-plugin-suspendoutput&h=045172a810e98bad784cdae4f22bcc305118b490"
-        "12_suspendoutput_nooutput.patch::http://www.minidvblinux.de/git/?a=blob&p=vdr-plugin-suspendoutput&h=dda561c8a229804b2e9bef05a189be234b95246f"
+        "12_suspendoutput_nooutput.patch::http://minidvblinux.de/git/?a=blob&p=vdr-plugin-suspendoutput&h=28fc94ae42381a1efb3f2e5ceb7165bdd8e56369"
         '13_suspendoutput_remove_template_redefine.patch'
         "50-$_plugname.conf")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
-md5sums=('4cbeaf9bf9c83e72ed3a8dee703caf39'
-         'fb094cd51172345fec1d3d30684e6af3'
-         '4a7dda396e042ab2a5e47c3db06f8925'
-         '8e3fefbce7410be7c0d960e2eb59d2ce'
-         'f5e5543022910a7eb4f36d888efaf363'
+md5sums=('e9bbd583ea87a3809693f79e57fd63e6'
+         'a9ab789cdbaa700fdb1f33db4a810d2e'
+         '5f554d7dedbddeae94a26eda3d066845'
          '9b908b272a2f24e1c73b990b53fb5e76')
 
 prepare() {
   cd "${srcdir}/${_plugname}-${pkgver}"
-  patch -p1 -i "$srcdir/10_suspendoutput_vdr-2.1.x_compat.patch"
-  patch -p1 -i "$srcdir/11_suspendoutput_svdrp.patch"
   patch -p1 -i "$srcdir/12_suspendoutput_nooutput.patch"
   patch -p1 -i "$srcdir/13_suspendoutput_remove_template_redefine.patch"