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

4 files changed, 12 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d42e22fb08bf..0fc84a034bea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.2.2
-# Thu Jan  7 15:34:42 UTC 2021
+# Sat May  1 09:49:01 UTC 2021
 pkgbase = vdr
-	pkgver = 2.4.6
-	pkgrel = 3
+	pkgver = 2.4.7
+	pkgrel = 1
 	url = http://tvdr.de/
 	arch = x86_64
 	arch = i686
@@ -18,9 +18,7 @@ pkgbase = vdr
 	makedepends = ttf-font
 	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-2.4.6-pute-epg-loading-fix.patch
+	source = vdr-2.4.7.tar.bz2::http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/2.4.7;sf=tbz2
 	source = vdr-MainMenuHooks.patch
 	source = 00-vdr.conf
 	source = 50-hello.conf
@@ -31,9 +29,7 @@ pkgbase = vdr
 	source = shutdown-wrapper.c
 	source = vdr.service
 	source = vdr.sysuser
-	sha256sums = c8993babf2a878a0fba84558de1e35f042c3c66f7c1ec569eea00a3af1014e4b
-	sha256sums = d95115c3fb89d17be9367f882cf7581cb0cea3401fc6dcc5a0b25714ca43dac6
-	sha256sums = 779b93c4700639c022718dabde6f5a740edb3c0c9650eee2e469e8e1cfb4247f
+	sha256sums = 8d2b34ea3b1139d1d92826477c4afe8db7c7bf4a0cc67ab34062480aaca443cf
 	sha256sums = 4c553065d24ee4dc001c06ff588494db44982b7debe9a1e6cd1a8903beb7c87b
 	sha256sums = 86f2469f459e2aabfc0ab703fc8435e458e89c4879376e900160d083924097b3
 	sha256sums = 423656cb6ba39af52d379dee697c52e6f435c098daa8c2ba429c1247b757af50
@@ -56,7 +52,7 @@ pkgname = vdr
 	depends = ttf-font
 	optdepends = lirc-utils: remote control support
 	optdepends = vdr-xorg: To start X11
-	provides = vdr-api=2.4.6
+	provides = vdr-api=2.4.7
 	conflicts = runvdr-extreme
 	replaces = runvdr-extreme
 	options = emptydirs
@@ -71,7 +67,7 @@ pkgname = vdr
 
 pkgname = vdr-examples
 	pkgdesc = Plugins for vdr to show some possible features
-	depends = vdr-api=2.4.6
+	depends = vdr-api=2.4.7
 	depends = gcc-libs
 	depends = ncurses
 	backup = etc/vdr/conf.avail/50-epgtableid0.conf
diff --git a/PKGBUILD b/PKGBUILD
index a3942c4af5ee..eddc8895732a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,14 @@
 # Maintainer: Manuel Reimer <manuel.reimer@gmx.de>
 pkgbase=vdr
 pkgname=(vdr vdr-examples)
-pkgver=2.4.6
-_vdrapi=2.4.6
-pkgrel=3
+pkgver=2.4.7
+_vdrapi=2.4.7
+pkgrel=1
 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"
+source=("$pkgname-$pkgver.tar.bz2::http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/$pkgver;sf=tbz2"
         'vdr-MainMenuHooks.patch'
         '00-vdr.conf' '50-hello.conf' '50-pictures.conf'
         '60-create-dvb-device-units.rules'
@@ -21,9 +19,7 @@ source=("http://www.tvdr.de/ftp/${pkgbase}-${pkgver}.tar.bz2"
         'shutdown-wrapper.c'
         'vdr.service'
         'vdr.sysuser')
-sha256sums=('c8993babf2a878a0fba84558de1e35f042c3c66f7c1ec569eea00a3af1014e4b'
-            'd95115c3fb89d17be9367f882cf7581cb0cea3401fc6dcc5a0b25714ca43dac6'
-            '779b93c4700639c022718dabde6f5a740edb3c0c9650eee2e469e8e1cfb4247f'
+sha256sums=('8d2b34ea3b1139d1d92826477c4afe8db7c7bf4a0cc67ab34062480aaca443cf'
             '4c553065d24ee4dc001c06ff588494db44982b7debe9a1e6cd1a8903beb7c87b'
             '86f2469f459e2aabfc0ab703fc8435e458e89c4879376e900160d083924097b3'
             '423656cb6ba39af52d379dee697c52e6f435c098daa8c2ba429c1247b757af50'
@@ -49,10 +45,6 @@ prepare() {
   # Custom extensions
   patch -p1 -i "$srcdir/vdr-MainMenuHooks.patch"
 
-  # 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-clre-crash-fix.patch b/vdr-2.4.6-clre-crash-fix.patch
deleted file mode 100644
index fab0cd9dd57a..000000000000
--- a/vdr-2.4.6-clre-crash-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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);
diff --git a/vdr-2.4.6-pute-epg-loading-fix.patch b/vdr-2.4.6-pute-epg-loading-fix.patch
deleted file mode 100644
index 1190281c4b10..000000000000
--- a/vdr-2.4.6-pute-epg-loading-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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;
- }