Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/1f93be5bd35cecd2ff61d5d9d1afa47cad9e0556)

3 files changed, 16 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a6e609a2d33..196cc324bd01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vdr-markad
 	pkgdesc = Plugin to mark advertisemets in recordings and optionally auto-cut
-	pkgver = 3.4.3
-	pkgrel = 2
+	pkgver = 3.4.5
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/kfb77/vdr-plugin-markad
 	arch = x86_64
@@ -9,7 +9,7 @@ pkgbase = vdr-markad
 	arch = arm
 	arch = armv6h
 	arch = armv7h
-	license = GPL2
+	license = GPL-2.0-or-later
 	depends = vdr-api=2.6.5
 	depends = libavcodec.so
 	depends = libavfilter.so
@@ -17,11 +17,11 @@ pkgbase = vdr-markad
 	depends = libavutil.so
 	depends = libswresample.so
 	backup = etc/vdr/conf.avail/50-markad.conf
-	source = vdr-markad-3.4.3.tar.gz::https://github.com/kfb77/vdr-plugin-markad/archive/V3.4.3.tar.gz
+	source = vdr-markad-3.4.5.tar.gz::https://github.com/kfb77/vdr-plugin-markad/archive/V3.4.5.tar.gz
 	source = vdr-markad-logos-1.tar.gz::https://github.com/vdr-projects/vdr-plugin-markad/archive/ea2e182ec798375f3830f8b794e7408576f139ad.tar.gz
 	source = 50-markad.conf
-	sha256sums = dd18e82e9d1c99cbda07f0e23fa9d390eb6f7c8a4cc4b311e4adc39c9c01d956
+	sha256sums = 463a95d1ccafe463bd0dc509844942e40833b50212095220b15098219c5d7824
 	sha256sums = b2e58edae4899272a58c89d193089adf900e5098d57bf1fb449d4f308b61e9a8
-	sha256sums = 5b4f76d1ff31fc2aee847a070954bad1dbf00446c2e99269d9bf8331beb95e24
+	sha256sums = f756e221232e87275cb0094f27797b2e8345a9d0b0bf15de21a5d30161cae70c
 
 pkgname = vdr-markad
diff --git a/50-markad.conf b/50-markad.conf
index 748ec209ec40..33ded9216df7 100644
--- a/50-markad.conf
+++ b/50-markad.conf
@@ -5,14 +5,11 @@
 #--logocachedir=DIR
 #    use DIR as location for markad logos (default: /var/lib/markad)
 
---astopoffs=0
+#--astopoffs=0
 #    assume stop of the recording SECONDS after the end of the EPG time.
-#    default is 100 s
+#    default is 0 s
 #    If end marks are to early, try to add some seconds
 
---cDecoder
-#    use the alternative decoder
-
 #--cut
 #    cut video based on marks and write it in the recording directory
 #    requires --cDecoder
@@ -21,14 +18,10 @@
 
 #--ac3reencode
 #    re-encode AC3 stream to fix low audio level of cutted video on same devices
-#    requires --cDecoder and --cut
 
 #--autologo=<option>
-#    0 = disable, only use logos from logo cache directory (default)
-#    1 = enable, if there is no suitable logo in the logo cache directroy
-#        find logo from recording and store it in the recording directory
-#        memory usage optimized operation mode, but runs slow
+#    0 = disable, only use logos from logo cache directory
+# 
 #    2 = enable, if there is no suitable logo in the logo cache directroy
 #        find logo from recording and store it in the recording directory
-#        speed optimized operation mode, but needs a lot of memonry, use it
-#        only > 1 GB memory
+#        (default)
diff --git a/PKGBUILD b/PKGBUILD
index 5a24558a1449..e0ffac0ad5e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,24 @@
 
 # Maintainer: Manuel Reimer <manuel.reimer@gmx.de>
 pkgname=vdr-markad
-pkgver=3.4.3
-pkgrel=2
+pkgver=3.4.5
+pkgrel=1
 _logover=ea2e182ec798375f3830f8b794e7408576f139ad
 epoch=1
 _vdrapi=2.6.5
 pkgdesc="Plugin to mark advertisemets in recordings and optionally auto-cut"
 url="https://github.com/kfb77/vdr-plugin-markad"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
-license=('GPL2')
+license=('GPL-2.0-or-later')
 depends=("vdr-api=${_vdrapi}" 'libavcodec.so' 'libavfilter.so' 'libavformat.so' 'libavutil.so' 'libswresample.so')
 _plugname=${pkgname//vdr-/}
 source=("$pkgname-$pkgver.tar.gz::https://github.com/kfb77/vdr-plugin-markad/archive/V$pkgver.tar.gz"
         "$pkgname-logos-1.tar.gz::https://github.com/vdr-projects/vdr-plugin-markad/archive/$_logover.tar.gz"
         "50-$_plugname.conf")
 backup=("etc/vdr/conf.avail/50-$_plugname.conf")
-sha256sums=('dd18e82e9d1c99cbda07f0e23fa9d390eb6f7c8a4cc4b311e4adc39c9c01d956'
+sha256sums=('463a95d1ccafe463bd0dc509844942e40833b50212095220b15098219c5d7824'
             'b2e58edae4899272a58c89d193089adf900e5098d57bf1fb449d4f308b61e9a8'
-            '5b4f76d1ff31fc2aee847a070954bad1dbf00446c2e99269d9bf8331beb95e24')
+            'f756e221232e87275cb0094f27797b2e8345a9d0b0bf15de21a5d30161cae70c')
 
 prepare() {
   cd "${srcdir}/vdr-plugin-${_plugname}-$pkgver"