summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Reimer2018-12-25 16:37:47 +0100
committerManuel Reimer2018-12-25 16:37:47 +0100
commit09c4234e53bb71e07c5a61e2bad2594c0b2ce739 (patch)
tree688ba06fad95488f30e3170fa7a6c6c59ffc45bc
parent30aaa7a24a4529c0c2bce2bf842aed6dd656c906 (diff)
downloadaur-09c4234e53bb71e07c5a61e2bad2594c0b2ce739.tar.gz
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/34315935de97d2b83eb74b56ef02a73b797106e5)
-rw-r--r--.SRCINFO38
-rw-r--r--50-dvbsddevice.conf3
-rw-r--r--50-rcu.conf3
-rw-r--r--PKGBUILD50
4 files changed, 57 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 89578bf6bc7..17c6a5b55fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 5.0.2
-# Fri Sep 8 20:58:46 UTC 2017
+# Generated by makepkg 5.1.1
+# Tue Dec 25 15:37:46 UTC 2018
pkgbase = vdr
pkgdesc = 'open' digital satellite receiver and timer controlled video disk recorder
- pkgver = 2.2.0
- pkgrel = 3
+ pkgver = 2.4.0
+ pkgrel = 7
url = http://tvdr.de/
install = vdr.install
arch = x86_64
@@ -21,49 +21,57 @@ pkgbase = vdr
depends = ttf-font
optdepends = lirc-utils: remote control support
optdepends = ncurses: skincurses plugin
- optdepends = xlogin: To start X11
- provides = vdr-api=2.2.0
+ optdepends = vdr-xorg: To start X11
+ provides = vdr-api=2.4.0
conflicts = runvdr-extreme
replaces = runvdr-extreme
- backup = etc/vdr/conf.avail/50-dvbsddevice.conf
- backup = etc/vdr/conf.avail/50-dvbhddevice.conf
backup = etc/vdr/conf.avail/50-epgtableid0.conf
backup = etc/vdr/conf.avail/50-hello.conf
backup = etc/vdr/conf.avail/50-osddemo.conf
backup = etc/vdr/conf.avail/50-pictures.conf
- backup = etc/vdr/conf.avail/50-rcu.conf
backup = etc/vdr/conf.avail/50-skincurses.conf
backup = etc/vdr/conf.avail/50-status.conf
backup = etc/vdr/conf.avail/50-svdrpdemo.conf
backup = etc/vdr/conf.avail/50-svccli.conf
backup = etc/vdr/conf.avail/50-svcsvr.conf
backup = etc/vdr/conf.d/00-vdr.conf
+ backup = var/lib/vdr/camresponses.conf
backup = var/lib/vdr/channels.conf
backup = var/lib/vdr/diseqc.conf
backup = var/lib/vdr/keymacros.conf
backup = var/lib/vdr/scr.conf
backup = var/lib/vdr/sources.conf
backup = var/lib/vdr/svdrphosts.conf
- source = ftp://ftp.tvdr.de/vdr/vdr-2.2.0.tar.bz2
+ 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 = ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-03-fix-locking-channel-display.diff
+ source = ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-04-fix-locking-channel-display-2.diff
+ source = ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-05-fix-shutdown.diff
+ source = ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-06-fix-channel-switch.diff
+ source = ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-07-fix-disabling-mtd.diff
source = MainMenuHooks-v1_0_2.diff::https://www.vdr-portal.de/index.php?attachment/30330
source = 00-vdr.conf
- source = 50-dvbsddevice.conf
source = 50-hello.conf
source = 50-pictures.conf
- source = 50-rcu.conf
source = 60-create-dvb-device-units.rules
source = gen-sddropin
source = shutdown.sh
source = shutdown-wrapper.c
source = vdr.service
source = vdr.sysuser
- md5sums = 8853f64c0fc3d41ffd3b4bfc6f0a14b7
+ md5sums = 12c6a3abeadfa915fcfe736bb047a3ab
+ md5sums = b2f115b72cc98a031cecd00ab085a658
+ md5sums = d6df719874fbc276451db111d6393acb
+ md5sums = 7dc852d13089880911e0ffe15308c21d
+ md5sums = a0bb1d3e8fe3a864f138ba7e84798e43
+ md5sums = 881cf6a109d531800c6d48bca1ef4a7c
+ md5sums = e1a54547146639366512552311bd9df0
+ md5sums = f455271c9518498bffd2d1840a102868
md5sums = 301c9b9766ed5182b07f1debc79abc21
md5sums = de3dcdea1a4282211c6dac370019548b
- md5sums = 9cb821ebb6a25e603f9c32bafabde362
md5sums = fc450f75037b8712673db4969a1dd758
md5sums = f00583e3f5507b0ff935b4d5919e7df2
- md5sums = 1d637e4f97adc66ef84615897116f29a
md5sums = 23d6e1ca0a36cfdbd35d3b1a61f0a105
md5sums = 3565ca5ad9be5c75f66478f0796b120d
md5sums = dd20f932b846b5f50ac455b65e9432ad
diff --git a/50-dvbsddevice.conf b/50-dvbsddevice.conf
deleted file mode 100644
index 77d8122eec3..00000000000
--- a/50-dvbsddevice.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[dvbsddevice]
-#--outputonly
-# do not receive, just use as output device
diff --git a/50-rcu.conf b/50-rcu.conf
deleted file mode 100644
index ec3f2395e3d..00000000000
--- a/50-rcu.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[rcu]
-#--device=DEV
-# set the device to use (default is /dev/ttyS1) \ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 526b3b0b7f5..68d7d50be02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
pkgname=vdr
-pkgver=2.2.0
-pkgrel=3
+pkgver=2.4.0
+pkgrel=7
pkgdesc="'open' digital satellite receiver and timer controlled video disk recorder"
url="http://tvdr.de/"
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
@@ -12,37 +12,49 @@ depends=('fontconfig' 'libcap' 'libjpeg-turbo' 'libsystemd' 'perl' 'ttf-font')
makedepends=('systemd') #libsystemd should be enough but the pkg-config file is missing in the libsystemd package
optdepends=('lirc-utils: remote control support'
'ncurses: skincurses plugin'
- 'xlogin: To start X11')
+ 'vdr-xorg: To start X11')
replaces=('runvdr-extreme')
conflicts=('runvdr-extreme')
-provides=("vdr-api=2.2.0")
+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'
+ 'ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-03-fix-locking-channel-display.diff'
+ 'ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-04-fix-locking-channel-display-2.diff'
+ 'ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-05-fix-shutdown.diff'
+ 'ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-06-fix-channel-switch.diff'
+ 'ftp://ftp.tvdr.de/vdr/Developer/Patches/vdr-2.4/vdr-2.4.0-07-fix-disabling-mtd.diff'
'MainMenuHooks-v1_0_2.diff::https://www.vdr-portal.de/index.php?attachment/30330'
- '00-vdr.conf' '50-dvbsddevice.conf' '50-hello.conf' '50-pictures.conf' '50-rcu.conf'
+ '00-vdr.conf' '50-hello.conf' '50-pictures.conf'
'60-create-dvb-device-units.rules'
'gen-sddropin'
'shutdown.sh'
'shutdown-wrapper.c'
'vdr.service'
'vdr.sysuser')
-backup=("etc/vdr/conf.avail/"50-dvb{s,h}ddevice.conf
- "etc/vdr/conf.avail/"50-{epgtableid0,hello,osddemo,pictures,rcu,skincurses,status,svdrpdemo}.conf
+backup=("etc/vdr/conf.avail/"50-{epgtableid0,hello,osddemo,pictures,skincurses,status,svdrpdemo}.conf
"etc/vdr/conf.avail/"50-svc{cli,svr}.conf
'etc/vdr/conf.d/00-vdr.conf'
+ 'var/lib/vdr/camresponses.conf'
'var/lib/vdr/channels.conf'
'var/lib/vdr/diseqc.conf'
'var/lib/vdr/keymacros.conf'
'var/lib/vdr/scr.conf'
'var/lib/vdr/sources.conf'
'var/lib/vdr/svdrphosts.conf')
-md5sums=('8853f64c0fc3d41ffd3b4bfc6f0a14b7'
+md5sums=('12c6a3abeadfa915fcfe736bb047a3ab'
+ 'b2f115b72cc98a031cecd00ab085a658'
+ 'd6df719874fbc276451db111d6393acb'
+ '7dc852d13089880911e0ffe15308c21d'
+ 'a0bb1d3e8fe3a864f138ba7e84798e43'
+ '881cf6a109d531800c6d48bca1ef4a7c'
+ 'e1a54547146639366512552311bd9df0'
+ 'f455271c9518498bffd2d1840a102868'
'301c9b9766ed5182b07f1debc79abc21'
'de3dcdea1a4282211c6dac370019548b'
- '9cb821ebb6a25e603f9c32bafabde362'
'fc450f75037b8712673db4969a1dd758'
'f00583e3f5507b0ff935b4d5919e7df2'
- '1d637e4f97adc66ef84615897116f29a'
'23d6e1ca0a36cfdbd35d3b1a61f0a105'
'3565ca5ad9be5c75f66478f0796b120d'
'dd20f932b846b5f50ac455b65e9432ad'
@@ -61,12 +73,18 @@ prepare() {
echo 'SDNOTIFY = 1' >> Make.config
echo 'LIRC_DEVICE = /run/lirc/lircd' >> Make.config
+ # 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"
+ patch -p0 -i "$srcdir/vdr-2.4.0-03-fix-locking-channel-display.diff"
+ patch -p0 -i "$srcdir/vdr-2.4.0-04-fix-locking-channel-display-2.diff"
+ patch -p0 -i "$srcdir/vdr-2.4.0-05-fix-shutdown.diff"
+ patch -p0 -i "$srcdir/vdr-2.4.0-06-fix-channel-switch.diff"
+ patch -p0 -i "$srcdir/vdr-2.4.0-07-fix-disabling-mtd.diff"
+
+ # Custom extensions
sed -i 's/NULL, 0, true/NULL, 0, OpenSubMenus/g' "$srcdir/MainMenuHooks-v1_0_2.diff"
patch -p1 -i "$srcdir/MainMenuHooks-v1_0_2.diff"
-
- sed -i '/define DEPRECATED_VIDEOSYSTEM/d' device.h
- sed -i '/define DEPRECATED_VDR_CHARSET_OVERRIDE/d' vdr.c
- sed -i 's/libsystemd-daemon/libsystemd/g' Makefile
}
build() {
@@ -77,7 +95,7 @@ build() {
}
package() {
- for i in dvbsddevice hello pictures rcu; do
+ for i in hello pictures; do
install -Dm644 50-$i.conf "$pkgdir/etc/vdr/conf.avail/50-$i.conf"
done
@@ -95,7 +113,7 @@ package() {
#Install sysuser config
install -Dm644 ${srcdir}/$pkgname.sysuser "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
- for i in dvbhddevice epgtableid0 osddemo skincurses status svc{cli,svr} svdrpdemo; do
+ for i in epgtableid0 osddemo skincurses status svc{cli,svr} svdrpdemo; do
echo "[$i]" > "$pkgdir/etc/vdr/conf.avail/50-$i.conf"
done