summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Reimer2018-12-25 16:27:37 +0100
committerManuel Reimer2018-12-25 16:27:37 +0100
commitd5cec83a981cb4a78a8ae8073ba0e5a71903b6f4 (patch)
treea8f322914a4f09ae0c633a74feea04e999707005
parenteb1ffeb31598560a4db8bf8feac4cc620efa900e (diff)
downloadaur-d5cec83a981cb4a78a8ae8073ba0e5a71903b6f4.tar.gz
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/de361af365552cc33e85cfdc111d34da5f1758ae)
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD16
-rw-r--r--vdr-markad-ffmpeg4-fix.patch86
3 files changed, 102 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 62d38ff8601..30924a524f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 5.0.2
-# Fri Sep 8 20:41:59 UTC 2017
+# Generated by makepkg 5.1.1
+# Tue Dec 25 15:27:36 UTC 2018
pkgbase = vdr-markad
pkgdesc = automatic advertisement detection
- pkgver = 0.1.4_44_g3681d3a
- pkgrel = 1
+ pkgver = 0.1.4_45_gea2e182
+ pkgrel = 2
epoch = 1
url = http://projects.vdr-developer.org/projects/plg-markad
arch = x86_64
@@ -14,14 +14,14 @@ pkgbase = vdr-markad
license = GPL2
makedepends = git
depends = ffmpeg
- depends = vdr-api=2.2.0
+ depends = vdr-api=2.4.0
backup = etc/vdr/conf.avail/50-markad.conf
- source = git://projects.vdr-developer.org/vdr-plugin-markad.git#commit=3681d3a18383c238870de7d1ec1f1f9c8079cf89
- source = vdr-2.3.2-markad-0.1.4.git20160925_v2.diff::https://www.vdr-portal.de/index.php?attachment/40533
+ source = git+https://projects.vdr-developer.org/git/vdr-plugin-markad.git#commit=ea2e182ec798375f3830f8b794e7408576f139ad
+ source = vdr-markad-ffmpeg4-fix.patch
source = vdr-markad-newmakefile.diff
source = 50-markad.conf
md5sums = SKIP
- md5sums = 966a3b0ac4f9dbe9c3f0434072ed79cc
+ md5sums = 118d57db2dd99bf5fbb829e2e55887ed
md5sums = 77001bbf5f138d1d1cd7a6f334fa8202
md5sums = c0d6383c9c9b8ee6c34af19179676bf3
diff --git a/PKGBUILD b/PKGBUILD
index b9de2b9c340..5eda7c6bae7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
# Maintainer: Alexander Grothe <seahawk1986[at]hotmail[dot]com>
pkgname=vdr-markad
-pkgver=0.1.4_44_g3681d3a
+pkgver=0.1.4_45_gea2e182
epoch=1
-_gitver=3681d3a18383c238870de7d1ec1f1f9c8079cf89
-_vdrapi=2.2.0
-pkgrel=1
+_gitver=ea2e182ec798375f3830f8b794e7408576f139ad
+_vdrapi=2.4.0
+pkgrel=2
pkgdesc="automatic advertisement detection"
url="http://projects.vdr-developer.org/projects/plg-markad"
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
@@ -14,13 +14,13 @@ license=('GPL2')
depends=('ffmpeg' "vdr-api=${_vdrapi}")
makedepends=('git')
_plugname=${pkgname//vdr-/}
-source=("git://projects.vdr-developer.org/vdr-plugin-markad.git#commit=$_gitver"
- "vdr-2.3.2-markad-0.1.4.git20160925_v2.diff::https://www.vdr-portal.de/index.php?attachment/40533"
+source=("git+https://projects.vdr-developer.org/git/vdr-plugin-markad.git#commit=$_gitver"
+ "vdr-markad-ffmpeg4-fix.patch"
"vdr-markad-newmakefile.diff"
"50-$_plugname.conf")
backup=("etc/vdr/conf.avail/50-$_plugname.conf")
md5sums=('SKIP'
- '966a3b0ac4f9dbe9c3f0434072ed79cc'
+ '118d57db2dd99bf5fbb829e2e55887ed'
'77001bbf5f138d1d1cd7a6f334fa8202'
'c0d6383c9c9b8ee6c34af19179676bf3')
@@ -32,7 +32,7 @@ pkgver() {
prepare() {
cd "${srcdir}/vdr-plugin-${_plugname}"
patch -p1 -i "$srcdir/vdr-markad-newmakefile.diff"
- patch -p1 -i "$srcdir/vdr-2.3.2-markad-0.1.4.git20160925_v2.diff"
+ patch -p1 -i "$srcdir/vdr-markad-ffmpeg4-fix.patch"
}
build() {
diff --git a/vdr-markad-ffmpeg4-fix.patch b/vdr-markad-ffmpeg4-fix.patch
new file mode 100644
index 00000000000..bb943d2d038
--- /dev/null
+++ b/vdr-markad-ffmpeg4-fix.patch
@@ -0,0 +1,86 @@
+diff --git a/command/decoder.cpp b/command/decoder.cpp
+index 6400aa7..8cb14b9 100644
+--- a/command/decoder.cpp
++++ b/command/decoder.cpp
+@@ -180,16 +180,22 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH264, int Threads)
+ }
+ else
+ {
++#ifdef AV_CODEC_ID_MPEG2VIDEO_XVMC
+ video_codecid=AV_CODEC_ID_MPEG2VIDEO_XVMC;
++#else
++ video_codecid=AV_CODEC_ID_MPEG2VIDEO;
++#endif
+ }
+
+ video_codec = avcodec_find_decoder(video_codecid);
++#ifdef AV_CODEC_ID_MPEG2VIDEO_XVMC
+ if ((!video_codec) && (video_codecid==AV_CODEC_ID_MPEG2VIDEO_XVMC))
+ {
+ // fallback to MPEG2VIDEO
+ video_codecid=AV_CODEC_ID_MPEG2VIDEO;
+ video_codec=avcodec_find_decoder(video_codecid);
+ }
++#endif
+
+ if (video_codec)
+ {
+@@ -200,17 +206,17 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH264, int Threads)
+ #endif
+ if (video_context)
+ {
+- if (video_codec->capabilities & CODEC_CAP_TRUNCATED)
+- video_context->flags|=CODEC_FLAG_TRUNCATED; // we do not send complete frames
+- video_context->flags|=CODEC_FLAG_LOW_DELAY;
+- video_context->flags2|=CODEC_FLAG2_FAST; // really?
++ if (video_codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ video_context->flags|=AV_CODEC_FLAG_TRUNCATED; // we do not send complete frames
++ video_context->flags|=AV_CODEC_FLAG_LOW_DELAY;
++ video_context->flags2|=AV_CODEC_FLAG2_FAST; // really?
+ video_context->skip_idct=AVDISCARD_ALL;
+
+ if (video_codecid!=AV_CODEC_ID_H264)
+ {
+ video_context->skip_frame=AVDISCARD_NONKEY; // just I-frames
+ } else {
+- video_context->flags2|=CODEC_FLAG2_CHUNKS;
++ video_context->flags2|=AV_CODEC_FLAG2_CHUNKS;
+ #if LIBAVCODEC_VERSION_INT >= ((52<<16)+(47<<8)+0)
+ av_log_set_level(AV_LOG_FATAL); // silence decoder output
+ #else
+@@ -224,7 +230,11 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH264, int Threads)
+ #else
+ int ret=avcodec_open(video_context, video_codec);
+ #endif
++#ifdef AV_CODEC_ID_MPEG2VIDEO_XVMC
+ if ((ret < 0) && (video_codecid==AV_CODEC_ID_MPEG2VIDEO_XVMC))
++#else
++ if (ret < 0)
++#endif
+ {
+ // fallback to MPEG2VIDEO
+ video_codecid=AV_CODEC_ID_MPEG2VIDEO;
+@@ -256,9 +266,11 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH264, int Threads)
+ case AV_CODEC_ID_H264:
+ esyslog("could not open codec for H264");
+ break;
++#ifdef AV_CODEC_ID_MPEG2VIDEO_XVMC
+ case AV_CODEC_ID_MPEG2VIDEO_XVMC:
+ esyslog("could not open codec MPEG2 (XVMC)");
+ break;
++#endif
+ case AV_CODEC_ID_MPEG2VIDEO:
+ esyslog("could not open codec MPEG2");
+ break;
+@@ -322,9 +334,11 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH264, int Threads)
+ case AV_CODEC_ID_H264:
+ esyslog("codec for H264 not found");
+ break;
++#ifdef AV_CODEC_ID_MPEG2VIDEO_XVMC
+ case AV_CODEC_ID_MPEG2VIDEO_XVMC:
+ esyslog("codec for MPEG2 (XVMC) not found");
+ break;
++#endif
+ case AV_CODEC_ID_MPEG2VIDEO:
+ esyslog("codec for MPEG2 not found");
+ break;