diff options
author | Manuel Reimer | 2021-01-02 13:42:28 +0100 |
---|---|---|
committer | Manuel Reimer | 2021-01-02 13:42:28 +0100 |
commit | a27623c8547f6cd23530eb4c731bce490a6bfca7 (patch) | |
tree | 0d6e56a42aefea210683a0e423dc39be0e06910b | |
parent | 206e6d4a0653b764e335afb42abe9d1ba0a6a139 (diff) | |
download | aur-a27623c8547f6cd23530eb4c731bce490a6bfca7.tar.gz |
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/b776b5c2e72570d7a4928edcffb6d0aa313a2f6c)
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | 13_suspendoutput_remove_template_redefine.patch | 24 | ||||
-rw-r--r-- | PKGBUILD | 20 | ||||
-rw-r--r-- | vdr-suspendoutput-nooutput.patch | 69 | ||||
-rw-r--r-- | vdr-suspendoutput-timer_fix_vdr2.4.patch | 22 |
5 files changed, 111 insertions, 44 deletions
@@ -1,9 +1,9 @@ -# Generated by makepkg 5.1.3 -# Mon Jul 8 17:09:36 UTC 2019 +# Generated by makepkg 5.2.2 +# Sat Jan 2 12:42:27 UTC 2021 pkgbase = vdr-suspendoutput pkgdesc = Output device that does nothing pkgver = 2.1.0 - pkgrel = 2 + pkgrel = 3 url = http://phivdr.dyndns.org/vdr/vdr-dummydevice/ arch = x86_64 arch = i686 @@ -13,16 +13,16 @@ pkgbase = vdr-suspendoutput license = GPL2 makedepends = ffmpeg depends = gcc-libs - depends = vdr-api=2.4.1 + depends = vdr-api=2.4.6 backup = etc/vdr/conf.avail/50-suspendoutput.conf 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 = vdr-suspendoutput-nooutput.patch + source = vdr-suspendoutput-timer_fix_vdr2.4.patch source = 50-suspendoutput.conf - md5sums = e9bbd583ea87a3809693f79e57fd63e6 - md5sums = a9ab789cdbaa700fdb1f33db4a810d2e - md5sums = 5f554d7dedbddeae94a26eda3d066845 - md5sums = 9b908b272a2f24e1c73b990b53fb5e76 + sha256sums = 3109de8b18431613b8ebd5d9a2dd8b6b730a8efd321beb2b13508ae1825c80ed + sha256sums = 23bfb82b24555fd936538cfc33d232bc8833547182d5429996abf486023ab4b6 + sha256sums = 681cade0debc9c22df507a816d3137635b03243dd76f18df648a6df7d3bf7b77 + sha256sums = df5a85dd056e5dd99c723bb96ec5f822df3beed97e232a33378542e2e686d8de pkgname = vdr-suspendoutput diff --git a/13_suspendoutput_remove_template_redefine.patch b/13_suspendoutput_remove_template_redefine.patch deleted file mode 100644 index 1805f2883343..000000000000 --- a/13_suspendoutput_remove_template_redefine.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/timer.h -+++ b/timer.h -@@ -242,21 +242,6 @@ - } - - 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); --} -- --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); --} -- --template<class TCLASS> - void CancelTimerEvents(TCLASS *c) - { - cTimerEvent::CancelAll((void*)c); @@ -3,8 +3,8 @@ # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de> pkgname=vdr-suspendoutput pkgver=2.1.0 -_vdrapi=2.4.1 -pkgrel=2 +_vdrapi=2.4.6 +pkgrel=3 pkgdesc="Output device that does nothing" url="http://phivdr.dyndns.org/vdr/vdr-dummydevice/" arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h') @@ -13,19 +13,19 @@ depends=('gcc-libs' "vdr-api=${_vdrapi}") makedepends=('ffmpeg') _plugname=${pkgname//vdr-/} source=("http://phivdr.dyndns.org/vdr/$pkgname/$pkgname-$pkgver.tgz" - "12_suspendoutput_nooutput.patch::http://minidvblinux.de/git/?a=blob&p=vdr-plugin-suspendoutput&h=28fc94ae42381a1efb3f2e5ceb7165bdd8e56369" - '13_suspendoutput_remove_template_redefine.patch' + "$pkgname-nooutput.patch" + "$pkgname-timer_fix_vdr2.4.patch" "50-$_plugname.conf") backup=("etc/vdr/conf.avail/50-$_plugname.conf") -md5sums=('e9bbd583ea87a3809693f79e57fd63e6' - 'a9ab789cdbaa700fdb1f33db4a810d2e' - '5f554d7dedbddeae94a26eda3d066845' - '9b908b272a2f24e1c73b990b53fb5e76') +sha256sums=('3109de8b18431613b8ebd5d9a2dd8b6b730a8efd321beb2b13508ae1825c80ed' + '23bfb82b24555fd936538cfc33d232bc8833547182d5429996abf486023ab4b6' + '681cade0debc9c22df507a816d3137635b03243dd76f18df648a6df7d3bf7b77' + 'df5a85dd056e5dd99c723bb96ec5f822df3beed97e232a33378542e2e686d8de') prepare() { cd "${srcdir}/${_plugname}-${pkgver}" - patch -p1 -i "$srcdir/12_suspendoutput_nooutput.patch" - patch -p1 -i "$srcdir/13_suspendoutput_remove_template_redefine.patch" + patch -p1 -i "$srcdir/$pkgname-nooutput.patch" + patch -p1 -i "$srcdir/$pkgname-timer_fix_vdr2.4.patch" # http://www.vdr-wiki.de/wiki/index.php/Kategorie:Raspbian_VDR_Streaming_Client_mittels_Streamdev_und_rpihddevice#Installation_vorbereiten for i in *.mpg; do diff --git a/vdr-suspendoutput-nooutput.patch b/vdr-suspendoutput-nooutput.patch new file mode 100644 index 000000000000..4533709c3e62 --- /dev/null +++ b/vdr-suspendoutput-nooutput.patch @@ -0,0 +1,69 @@ +Index: vdr-plugin-suspendoutput-2.1.0/suspendoutput.c +=================================================================== +--- vdr-plugin-suspendoutput-2.1.0.orig/suspendoutput.c 2019-03-21 19:44:07.951290374 +0100 ++++ vdr-plugin-suspendoutput-2.1.0/suspendoutput.c 2019-03-21 19:44:07.903288589 +0100 +@@ -191,6 +191,7 @@ + " -p --paused Allow suspend when replay is paused\n" + " -l --logo Show VDR logo when suspended\n" + " -b --blank Blank screen when suspended\n" ++ " -n --nooutput No output when blank screen\n" + ; + + return CmdLineHelp; +@@ -206,11 +207,12 @@ + { "paused", no_argument, NULL, 'p' }, + { "logo", no_argument, NULL, 'l' }, + { "blank", no_argument, NULL, 'b' }, ++ { "nooutput", no_argument, NULL, 'n' }, + { NULL } + }; + + int c; +- while ((c = getopt_long(argc, argv, "mMt:T", long_options, NULL)) != -1) { ++ while ((c = getopt_long(argc, argv, "mMt:Tplbn", long_options, NULL)) != -1) { + switch (c) { + case 'm': m_bMenu = true; + isyslog("suspendoutput: main menu entry enabled"); +@@ -238,6 +240,9 @@ + case 'b': cDummyPlayerControl::UseBlankImage = true; + SetupStore("ShowLogo", 0); + break; ++ case 'n': cDummyPlayerControl::NoOutputImage = true; ++ SetupStore("ShowLogo", 0); ++ break; + default: return false; + } + } +Index: vdr-plugin-suspendoutput-2.1.0/dummy_player.c +=================================================================== +--- vdr-plugin-suspendoutput-2.1.0.orig/dummy_player.c 2019-03-21 19:44:07.951290374 +0100 ++++ vdr-plugin-suspendoutput-2.1.0/dummy_player.c 2019-03-21 19:44:07.907288738 +0100 +@@ -41,7 +41,7 @@ + { + if(! cDummyPlayerControl::UseBlankImage) + DeviceStillPicture(v_mpg_vdrlogo, v_mpg_vdrlogo_length); +- else ++ else if (! cDummyPlayerControl::NoOutputImage) + DeviceStillPicture(v_mpg_black, v_mpg_black_length); + //DeviceStillPicture(v_mpg_nosignal, v_mpg_nosignal_length); + return true; +@@ -61,6 +61,7 @@ + cDummyPlayer *cDummyPlayerControl::m_Player = NULL; + cMutex cDummyPlayerControl::m_Lock; + bool cDummyPlayerControl::UseBlankImage = false; ++bool cDummyPlayerControl::NoOutputImage = false; + + cDummyPlayerControl::cDummyPlayerControl(void) : + cControl(OpenPlayer()) +Index: vdr-plugin-suspendoutput-2.1.0/dummy_player.h +=================================================================== +--- vdr-plugin-suspendoutput-2.1.0.orig/dummy_player.h 2019-03-21 19:44:07.951290374 +0100 ++++ vdr-plugin-suspendoutput-2.1.0/dummy_player.h 2019-03-21 19:44:07.911288887 +0100 +@@ -32,6 +32,7 @@ + static bool IsOpen(void) { return m_Player != NULL; } + + static bool UseBlankImage; ++ static bool NoOutputImage; + }; + + #endif //__DUMMY_PLAYER_H diff --git a/vdr-suspendoutput-timer_fix_vdr2.4.patch b/vdr-suspendoutput-timer_fix_vdr2.4.patch new file mode 100644 index 000000000000..8ff7df68556c --- /dev/null +++ b/vdr-suspendoutput-timer_fix_vdr2.4.patch @@ -0,0 +1,22 @@ +Index: vdr-plugin-suspendoutput-2.1.0/timer.h +=================================================================== +--- vdr-plugin-suspendoutput-2.1.0.orig/timer.h 2016-06-08 21:20:37.000000000 +0200 ++++ vdr-plugin-suspendoutput-2.1.0/timer.h 2019-03-21 19:57:50.709724606 +0100 +@@ -243,7 +243,7 @@ + + template<class TCLASS> + cTimerEvent *CreateTimerEvent(TCLASS *c, void (TCLASS::*fp)(void), +- unsigned int TimeoutMs, bool runOnce = true) ++ unsigned int TimeoutMs, bool runOnce) + { + return new cTimerFunctor0<TCLASS>(c,fp,TimeoutMs,runOnce); + } +@@ -251,7 +251,7 @@ + template<class TCLASS, class TARG1> + cTimerEvent *CreateTimerEvent(TCLASS *c, void (TCLASS::*fp)(TARG1), + TARG1 arg1, +- unsigned int TimeoutMs, bool runOnce = true) ++ unsigned int TimeoutMs, bool runOnce) + { + return new cTimerFunctor1<TCLASS,TARG1>(c,fp,arg1,TimeoutMs,runOnce); + } |