From 4aabd0b765b1bc7fbd089ddd504dbec680a1f190 Mon Sep 17 00:00:00 2001 From: Christopher Reimer Date: Mon, 30 Apr 2018 15:44:36 +0200 Subject: [PATCH] vdr: Add another upstream patch (Fixes #188) --- vdr/.SRCINFO | 4 +++- vdr/PKGBUILD | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/vdr/.SRCINFO b/vdr/.SRCINFO index bed8daee0..4fe153015 100644 --- a/vdr/.SRCINFO +++ b/vdr/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = vdr pkgdesc = 'open' digital satellite receiver and timer controlled video disk recorder pkgver = 2.4.0 - pkgrel = 2 + pkgrel = 3 url = http://tvdr.de/ install = vdr.install arch = x86_64 @@ -42,6 +42,7 @@ pkgbase = vdr backup = var/lib/vdr/svdrphosts.conf source = ftp://ftp.tvdr.de/vdr/vdr-2.4.0.tar.bz2 source = ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-01-fix-svdrp-modt-recflag.diff + source = ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-02-fix-invalid-locking-sequence.diff source = MainMenuHooks-v1_0_2.diff::https://www.vdr-portal.de/index.php?attachment/30330 source = 00-vdr.conf source = 50-hello.conf @@ -54,6 +55,7 @@ pkgbase = vdr source = vdr.sysuser md5sums = 12c6a3abeadfa915fcfe736bb047a3ab md5sums = b2f115b72cc98a031cecd00ab085a658 + md5sums = d6df719874fbc276451db111d6393acb md5sums = 301c9b9766ed5182b07f1debc79abc21 md5sums = de3dcdea1a4282211c6dac370019548b md5sums = fc450f75037b8712673db4969a1dd758 diff --git a/vdr/PKGBUILD b/vdr/PKGBUILD index 64f4d164f..fbbe34e71 100644 --- a/vdr/PKGBUILD +++ b/vdr/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Christopher Reimer pkgname=vdr pkgver=2.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="'open' digital satellite receiver and timer controlled video disk recorder" url="http://tvdr.de/" arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h') @@ -19,6 +19,7 @@ provides=("vdr-api=2.4.0") install='vdr.install' source=("ftp://ftp.tvdr.de/vdr/${pkgname}-${pkgver}.tar.bz2" 'ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-01-fix-svdrp-modt-recflag.diff' + 'ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-02-fix-invalid-locking-sequence.diff' 'MainMenuHooks-v1_0_2.diff::https://www.vdr-portal.de/index.php?attachment/30330' '00-vdr.conf' '50-hello.conf' '50-pictures.conf' '60-create-dvb-device-units.rules' @@ -39,6 +40,7 @@ backup=("etc/vdr/conf.avail/"50-{epgtableid0,hello,osddemo,pictures,skincurses,s 'var/lib/vdr/svdrphosts.conf') md5sums=('12c6a3abeadfa915fcfe736bb047a3ab' 'b2f115b72cc98a031cecd00ab085a658' + 'd6df719874fbc276451db111d6393acb' '301c9b9766ed5182b07f1debc79abc21' 'de3dcdea1a4282211c6dac370019548b' 'fc450f75037b8712673db4969a1dd758' @@ -63,6 +65,7 @@ prepare() { # Upstream fixes patch -p0 -i "$srcdir/vdr-2.4.0-01-fix-svdrp-modt-recflag.diff" + patch -p0 -i "$srcdir/vdr-2.4.0-02-fix-invalid-locking-sequence.diff" # Custom extensions sed -i 's/NULL, 0, true/NULL, 0, OpenSubMenus/g' "$srcdir/MainMenuHooks-v1_0_2.diff"