summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Reimer2021-01-07 16:34:45 +0100
committerManuel Reimer2021-01-07 16:34:45 +0100
commit13bc9260495756d9e790685d88784eb706a1675c (patch)
tree5cc6c00f0a1fe9cd694cf73fdf462d03e75cc4f6
parent703b7f109314446ecfe6e27d9039506ac7be2dff (diff)
downloadaur-13bc9260495756d9e790685d88784eb706a1675c.tar.gz
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/9758a1d3680e9fd263f468a533cd9ddd9295a210)
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD5
-rw-r--r--vdr-2.4.6-pute-epg-loading-fix.patch20
3 files changed, 28 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a2d522cc224..d42e22fb08b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by makepkg 5.2.2
-# Sun Jan 3 19:10:49 UTC 2021
+# Thu Jan 7 15:34:42 UTC 2021
pkgbase = vdr
pkgver = 2.4.6
- pkgrel = 2
+ pkgrel = 3
url = http://tvdr.de/
arch = x86_64
arch = i686
@@ -20,6 +20,7 @@ pkgbase = vdr
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-2.4.6-pute-epg-loading-fix.patch
source = vdr-MainMenuHooks.patch
source = 00-vdr.conf
source = 50-hello.conf
@@ -32,6 +33,7 @@ pkgbase = vdr
source = vdr.sysuser
sha256sums = c8993babf2a878a0fba84558de1e35f042c3c66f7c1ec569eea00a3af1014e4b
sha256sums = d95115c3fb89d17be9367f882cf7581cb0cea3401fc6dcc5a0b25714ca43dac6
+ sha256sums = 779b93c4700639c022718dabde6f5a740edb3c0c9650eee2e469e8e1cfb4247f
sha256sums = 4c553065d24ee4dc001c06ff588494db44982b7debe9a1e6cd1a8903beb7c87b
sha256sums = 86f2469f459e2aabfc0ab703fc8435e458e89c4879376e900160d083924097b3
sha256sums = 423656cb6ba39af52d379dee697c52e6f435c098daa8c2ba429c1247b757af50
diff --git a/PKGBUILD b/PKGBUILD
index 6099cc913d1..a3942c4af5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,14 @@ pkgbase=vdr
pkgname=(vdr vdr-examples)
pkgver=2.4.6
_vdrapi=2.4.6
-pkgrel=2
+pkgrel=3
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"
+ "$pkgbase-$pkgver-pute-epg-loading-fix.patch"
'vdr-MainMenuHooks.patch'
'00-vdr.conf' '50-hello.conf' '50-pictures.conf'
'60-create-dvb-device-units.rules'
@@ -22,6 +23,7 @@ source=("http://www.tvdr.de/ftp/${pkgbase}-${pkgver}.tar.bz2"
'vdr.sysuser')
sha256sums=('c8993babf2a878a0fba84558de1e35f042c3c66f7c1ec569eea00a3af1014e4b'
'd95115c3fb89d17be9367f882cf7581cb0cea3401fc6dcc5a0b25714ca43dac6'
+ '779b93c4700639c022718dabde6f5a740edb3c0c9650eee2e469e8e1cfb4247f'
'4c553065d24ee4dc001c06ff588494db44982b7debe9a1e6cd1a8903beb7c87b'
'86f2469f459e2aabfc0ab703fc8435e458e89c4879376e900160d083924097b3'
'423656cb6ba39af52d379dee697c52e6f435c098daa8c2ba429c1247b757af50'
@@ -49,6 +51,7 @@ prepare() {
# Upstream fixes
patch -i "$srcdir/$pkgbase-$pkgver-clre-crash-fix.patch"
+ patch -i "$srcdir/$pkgbase-$pkgver-pute-epg-loading-fix.patch"
# Don't install plugins with VDR
sed -i '/^install: /s/install-plugins //' Makefile
diff --git a/vdr-2.4.6-pute-epg-loading-fix.patch b/vdr-2.4.6-pute-epg-loading-fix.patch
new file mode 100644
index 00000000000..1190281c4b1
--- /dev/null
+++ b/vdr-2.4.6-pute-epg-loading-fix.patch
@@ -0,0 +1,20 @@
+Author: kls
+Source: https://www.vdr-portal.de/forum/index.php?thread/134030-vdr-kennt-via-pute-gesendetes-epg-erst-nach-neustart/&postID=1333102#post1333102
+
+--- epg.c 2019/05/20 09:55:22 5.0
++++ epg.c 2021/01/04 09:05:26
+@@ -1311,8 +1311,13 @@
+ fclose(f);
+ if (result) {
+ // Initialize the channels' schedule pointers, so that the first WhatsOn menu will come up faster:
+- for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel))
++ for (cChannel *Channel = Channels->First(); Channel; Channel = Channels->Next(Channel)) {
++ if (const cSchedule *Schedule = Channel->schedule) {
++ if (!Schedule->ChannelID().Valid()) // this is the DummySchedule
++ Channel->schedule = NULL;
++ }
+ Schedules->GetSchedule(Channel);
++ }
+ }
+ return result;
+ }