summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Reimer2019-06-23 11:28:44 +0200
committerManuel Reimer2019-06-23 11:28:44 +0200
commitd2bef446ea4cd97092f005be3e1fb4de9b1dcba8 (patch)
tree91d5da6c44005bda19cf0d6d902edd14ff5324db
parent2aaffeab837469eec20e8f4da568c5ebe3cd727b (diff)
downloadaur-d2bef446ea4cd97092f005be3e1fb4de9b1dcba8.tar.gz
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/d09e73a0efd6440ffc435a5471737a4810d0dde0)
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
2 files changed, 8 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 34e022abd3b..3aac4c3a7cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by makepkg 5.1.3
-# Fri Jun 21 17:37:38 UTC 2019
+# Sun Jun 23 09:28:42 UTC 2019
pkgbase = vdr
pkgver = 2.4.1
- pkgrel = 13
+ pkgrel = 14
url = http://tvdr.de/
arch = x86_64
arch = i686
@@ -55,6 +55,7 @@ pkgname = vdr
provides = vdr-api=2.4.1
conflicts = runvdr-extreme
replaces = runvdr-extreme
+ options = emptydirs
backup = etc/vdr/conf.d/00-vdr.conf
backup = var/lib/vdr/camresponses.conf
backup = var/lib/vdr/channels.conf
diff --git a/PKGBUILD b/PKGBUILD
index e85417c87bc..79ee34a0984 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=vdr
pkgname=(vdr vdr-examples)
pkgver=2.4.1
_vdrapi=2.4.1
-pkgrel=13
+pkgrel=14
url="http://tvdr.de/"
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
license=('GPL2')
@@ -65,6 +65,7 @@ package_vdr() {
conflicts=('runvdr-extreme')
provides=("vdr-api=$_vdrapi")
install='vdr.install'
+ options=(emptydirs)
backup=('etc/vdr/conf.d/00-vdr.conf'
'var/lib/vdr/camresponses.conf'
'var/lib/vdr/channels.conf'
@@ -74,7 +75,10 @@ package_vdr() {
'var/lib/vdr/sources.conf'
'var/lib/vdr/svdrphosts.conf')
+ # Ship this one empty so it's there even without plugin packages installed
mkdir -p "$pkgdir/etc/vdr/conf.avail"
+ # This one has to be shipped empty or some plugins (streamdev) fail to build
+ mkdir -p "$pkgdir/usr/lib/vdr/plugins"
install -Dm644 00-vdr.conf "$pkgdir/etc/vdr/conf.d/00-vdr.conf"
install -Dm644 60-create-dvb-device-units.rules "$pkgdir/usr/lib/udev/rules.d/60-create-dvb-device-units.rules"