Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/27deb6929dc54a18156c48be125fc17caee579fd)

2 files changed, 20 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b248307e9e1d..d6de8373ec4f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 5.1.1
-# Tue Dec 25 15:27:11 UTC 2018
+# Generated by makepkg 5.1.3
+# Thu Apr  4 13:44:46 UTC 2019
 pkgbase = vdr-live
 	pkgdesc = Adds the possibility to control VDR and some of it's plugins by a web interface.
 	pkgver = 2.3.1
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = http://projects.vdr-developer.org/projects/plg-live
 	install = vdr-live.install
@@ -14,6 +14,7 @@ pkgbase = vdr-live
 	arch = armv7h
 	license = GPL2
 	makedepends = git
+	makedepends = patchutils
 	depends = pcre
 	depends = tntnet
 	depends = vdr-api=2.4.0
@@ -21,8 +22,12 @@ pkgbase = vdr-live
 	optdepends = vdr-streamdev: Stream live TV
 	backup = etc/vdr/conf.avail/50-live.conf
 	source = git://projects.vdr-developer.org/vdr-plugin-live.git#commit=e582514ede475574842b44ca6792335ff141172d
+	source = https://projects.vdr-developer.org/attachments/download/2186/v2-0004-Add-ability-to-play-stream-by-external-media-player.patch
+	source = https://projects.vdr-developer.org/attachments/download/2187/0005-Remove-support-for-VLC-NPAPI-plugin-and-replace-it-w.patch
 	source = 50-live.conf
 	md5sums = SKIP
+	md5sums = 14152d6ddc14d5ec39473f92ca1c1f78
+	md5sums = ea8187d1e51fbc1a48767ac6eb0f33d2
 	md5sums = 563961eb90d9f2b3d2a0a34472ef51ee
 
 pkgname = vdr-live
diff --git a/PKGBUILD b/PKGBUILD
index 4bf52f5d6b37..2245d5558df9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.3.1
 epoch=1
 _gitver=e582514ede475574842b44ca6792335ff141172d
 _vdrapi=2.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Adds the possibility to control VDR and some of it's plugins by a web interface."
 url="http://projects.vdr-developer.org/projects/plg-live"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
@@ -14,15 +14,25 @@ license=('GPL2')
 depends=('pcre' 'tntnet' "vdr-api=${_vdrapi}")
 optdepends=('vdr-epgsearch: Manage searchtimers'
             'vdr-streamdev: Stream live TV')
-makedepends=('git')
+makedepends=('git' 'patchutils')
 install="$pkgname.install"
 _plugname=${pkgname//vdr-/}
 source=("git://projects.vdr-developer.org/vdr-plugin-live.git#commit=$_gitver"
+        'https://projects.vdr-developer.org/attachments/download/2186/v2-0004-Add-ability-to-play-stream-by-external-media-player.patch'
+        'https://projects.vdr-developer.org/attachments/download/2187/0005-Remove-support-for-VLC-NPAPI-plugin-and-replace-it-w.patch'
         "50-$_plugname.conf")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
 md5sums=('SKIP'
+         '14152d6ddc14d5ec39473f92ca1c1f78'
+         'ea8187d1e51fbc1a48767ac6eb0f33d2'
          '563961eb90d9f2b3d2a0a34472ef51ee')
 
+prepare() {
+  cd "${srcdir}/vdr-plugin-${_plugname}"
+  filterdiff -x '*.po' ${srcdir}/v2-0004-Add-ability-to-play-stream-by-external-media-player.patch | git apply -
+  filterdiff -x '*.po' ${srcdir}/0005-Remove-support-for-VLC-NPAPI-plugin-and-replace-it-w.patch | git apply -
+}
+
 pkgver() {
   cd "${srcdir}/vdr-plugin-${_plugname}"
   git describe --tags | sed -e 's/release_//g' -e 's/-/\./' -e 's/-/\./' -e 's/-/_/g'