Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/70b9b869b359a654a451bc7b631ec3108cffe860)

2 files changed, 18 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index feba5f4adea8..f08d1e6cce13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,11 @@
 # Generated by makepkg 5.2.2
-# Wed Dec 23 12:15:39 UTC 2020
+# Sun Jan 17 15:24:08 UTC 2021
 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 = 6
+	pkgver = 3.0.0
+	pkgrel = 1
 	epoch = 1
-	url = http://projects.vdr-developer.org/projects/plg-live
+	url = https://github.com/MarkusEh/vdr-plugin-live
 	install = vdr-live.install
 	arch = x86_64
 	arch = i686
@@ -13,22 +13,17 @@ pkgbase = vdr-live
 	arch = armv6h
 	arch = armv7h
 	license = GPL2
-	makedepends = git
-	makedepends = patchutils
 	depends = pcre
 	depends = tntnet
 	depends = vdr-api=2.4.6
 	optdepends = vdr-epgsearch: Manage searchtimers
 	optdepends = vdr-streamdev: Stream live TV
+	optdepends = ffmpeg: Transcoding video streams
 	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 = vdr-live-3.0.0.tar.gz::https://github.com/MarkusEh/vdr-plugin-live/archive/v3.0.0.tar.gz
 	source = 50-live.conf
-	md5sums = SKIP
-	md5sums = 14152d6ddc14d5ec39473f92ca1c1f78
-	md5sums = ea8187d1e51fbc1a48767ac6eb0f33d2
-	md5sums = 563961eb90d9f2b3d2a0a34472ef51ee
+	sha256sums = 12fc0dc77d894124d61b62101106a9c2e4c75277163b90ea796a82e0eb5a8441
+	sha256sums = a14466937a4c618341ca3120bf353ca5b207dda0aca3b605532d3500415d7fea
 
 pkgname = vdr-live
 
diff --git a/PKGBUILD b/PKGBUILD
index 501f1da04b35..75b00123f816 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,49 +2,33 @@
 
 # Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
 pkgname=vdr-live
-pkgver=2.3.1
+pkgver=3.0.0
 epoch=1
-_gitver=e582514ede475574842b44ca6792335ff141172d
 _vdrapi=2.4.6
-pkgrel=6
+pkgrel=1
 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"
+url="https://github.com/MarkusEh/vdr-plugin-live"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
 depends=('pcre' 'tntnet' "vdr-api=${_vdrapi}")
 optdepends=('vdr-epgsearch: Manage searchtimers'
-            'vdr-streamdev: Stream live TV')
-makedepends=('git' 'patchutils')
+            'vdr-streamdev: Stream live TV'
+            'ffmpeg: Transcoding video streams')
 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'
+source=("$pkgname-$pkgver.tar.gz::https://github.com/MarkusEh/vdr-plugin-live/archive/v3.0.0.tar.gz"
         "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'
-}
+sha256sums=('12fc0dc77d894124d61b62101106a9c2e4c75277163b90ea796a82e0eb5a8441'
+            'a14466937a4c618341ca3120bf353ca5b207dda0aca3b605532d3500415d7fea')
 
 build() {
-  cd "${srcdir}/vdr-plugin-${_plugname}"
+  cd "${srcdir}/vdr-plugin-${_plugname}-$pkgver"
   make
 }
 
 package() {
-  cd "${srcdir}/vdr-plugin-${_plugname}"
+  cd "${srcdir}/vdr-plugin-${_plugname}-$pkgver"
   make DESTDIR="$pkgdir" install
 
   # Copy resource files