summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Reimer2021-01-03 20:10:50 +0100
committerManuel Reimer2021-01-03 20:10:50 +0100
commit703b7f109314446ecfe6e27d9039506ac7be2dff (patch)
treeb78176e4c6080263f6451e5e94366f69dc69bdc3
parent740e8f883770a9a734c90f953c28f95438123c15 (diff)
downloadaur-703b7f109314446ecfe6e27d9039506ac7be2dff.tar.gz
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/699a462e966d579c1cee2e0df131a86d6189e973)
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--vdr-2.4.6-clre-crash-fix.patch18
3 files changed, 28 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 98953055b29..a2d522cc224 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by makepkg 5.2.2
-# Wed Dec 23 12:34:41 UTC 2020
+# Sun Jan 3 19:10:49 UTC 2021
pkgbase = vdr
pkgver = 2.4.6
- pkgrel = 1
+ pkgrel = 2
url = http://tvdr.de/
arch = x86_64
arch = i686
@@ -19,6 +19,7 @@ pkgbase = vdr
makedepends = systemd
makedepends = ncurses
source = http://www.tvdr.de/ftp/vdr-2.4.6.tar.bz2
+ source = vdr-2.4.6-clre-crash-fix.patch
source = vdr-MainMenuHooks.patch
source = 00-vdr.conf
source = 50-hello.conf
@@ -30,6 +31,7 @@ pkgbase = vdr
source = vdr.service
source = vdr.sysuser
sha256sums = c8993babf2a878a0fba84558de1e35f042c3c66f7c1ec569eea00a3af1014e4b
+ sha256sums = d95115c3fb89d17be9367f882cf7581cb0cea3401fc6dcc5a0b25714ca43dac6
sha256sums = 4c553065d24ee4dc001c06ff588494db44982b7debe9a1e6cd1a8903beb7c87b
sha256sums = 86f2469f459e2aabfc0ab703fc8435e458e89c4879376e900160d083924097b3
sha256sums = 423656cb6ba39af52d379dee697c52e6f435c098daa8c2ba429c1247b757af50
diff --git a/PKGBUILD b/PKGBUILD
index c2b01b4bc72..6099cc913d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,13 @@ pkgbase=vdr
pkgname=(vdr vdr-examples)
pkgver=2.4.6
_vdrapi=2.4.6
-pkgrel=1
+pkgrel=2
url="http://tvdr.de/"
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
license=('GPL2')
makedepends=('fontconfig' 'libcap' 'libjpeg-turbo' 'libsystemd' 'perl' 'ttf-font' 'systemd' 'ncurses')
source=("http://www.tvdr.de/ftp/${pkgbase}-${pkgver}.tar.bz2"
+ "$pkgbase-$pkgver-clre-crash-fix.patch"
'vdr-MainMenuHooks.patch'
'00-vdr.conf' '50-hello.conf' '50-pictures.conf'
'60-create-dvb-device-units.rules'
@@ -20,6 +21,7 @@ source=("http://www.tvdr.de/ftp/${pkgbase}-${pkgver}.tar.bz2"
'vdr.service'
'vdr.sysuser')
sha256sums=('c8993babf2a878a0fba84558de1e35f042c3c66f7c1ec569eea00a3af1014e4b'
+ 'd95115c3fb89d17be9367f882cf7581cb0cea3401fc6dcc5a0b25714ca43dac6'
'4c553065d24ee4dc001c06ff588494db44982b7debe9a1e6cd1a8903beb7c87b'
'86f2469f459e2aabfc0ab703fc8435e458e89c4879376e900160d083924097b3'
'423656cb6ba39af52d379dee697c52e6f435c098daa8c2ba429c1247b757af50'
@@ -45,6 +47,9 @@ prepare() {
# Custom extensions
patch -p1 -i "$srcdir/vdr-MainMenuHooks.patch"
+ # Upstream fixes
+ patch -i "$srcdir/$pkgbase-$pkgver-clre-crash-fix.patch"
+
# Don't install plugins with VDR
sed -i '/^install: /s/install-plugins //' Makefile
}
diff --git a/vdr-2.4.6-clre-crash-fix.patch b/vdr-2.4.6-clre-crash-fix.patch
new file mode 100644
index 00000000000..fab0cd9dd57
--- /dev/null
+++ b/vdr-2.4.6-clre-crash-fix.patch
@@ -0,0 +1,18 @@
+Author: kls
+Source: https://www.vdr-portal.de/forum/index.php?thread/134018-vdr-crasht-f%C3%BCr-clre-bei-unbekannter-kanalnummer/&postID=1332903#post1332903
+
+--- svdrp.c 2020/12/26 15:49:01 5.1
++++ svdrp.c 2021/01/01 19:02:09
+@@ -1301,8 +1301,10 @@
+ tChannelID ChannelID = tChannelID::InvalidID;
+ if (isnumber(Option)) {
+ int o = strtol(Option, NULL, 10);
+- if (o >= 1 && o <= cChannels::MaxNumber())
+- ChannelID = Channels->GetByNumber(o)->GetChannelID();
++ if (o >= 1 && o <= cChannels::MaxNumber()) {
++ if (const cChannel *Channel = Channels->GetByNumber(o))
++ ChannelID = Channel->GetChannelID();
++ }
+ }
+ else {
+ ChannelID = tChannelID::FromString(Option);