summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Reimer2017-09-08 22:41:59 +0200
committerChristopher Reimer2017-09-08 22:41:59 +0200
commiteb1ffeb31598560a4db8bf8feac4cc620efa900e (patch)
tree98b0e2563e15c0c3eb8327bbf21d028ac945a5f4
parent781b489900776339ab75ffa6672104689bb24686 (diff)
downloadaur-eb1ffeb31598560a4db8bf8feac4cc620efa900e.tar.gz
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/2e4eecb817772e0131365224ac9fa029759f4dd0)
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD13
-rw-r--r--vdr-markad-newmakefile.diff (renamed from vdr-markad-fixes.diff)45
3 files changed, 16 insertions, 56 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d64ffbac38a..62d38ff8601 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by makepkg 5.0.1
-# Wed Aug 17 16:26:31 UTC 2016
+# Generated by makepkg 5.0.2
+# Fri Sep 8 20:41:59 UTC 2017
pkgbase = vdr-markad
pkgdesc = automatic advertisement detection
- pkgver = 0.1.4_40_g74e2a8c
+ pkgver = 0.1.4_44_g3681d3a
pkgrel = 1
epoch = 1
url = http://projects.vdr-developer.org/projects/plg-markad
@@ -16,11 +16,13 @@ pkgbase = vdr-markad
depends = ffmpeg
depends = vdr-api=2.2.0
backup = etc/vdr/conf.avail/50-markad.conf
- source = git://projects.vdr-developer.org/vdr-plugin-markad.git#commit=74e2a8c5382fa8bfacd12274899112724a1e0d51
- source = vdr-markad-fixes.diff
+ 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 = vdr-markad-newmakefile.diff
source = 50-markad.conf
md5sums = SKIP
- md5sums = b34797cc15aac8cd75828d265283f728
+ md5sums = 966a3b0ac4f9dbe9c3f0434072ed79cc
+ md5sums = 77001bbf5f138d1d1cd7a6f334fa8202
md5sums = c0d6383c9c9b8ee6c34af19179676bf3
pkgname = vdr-markad
diff --git a/PKGBUILD b/PKGBUILD
index ff25ba0d85b..b9de2b9c340 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
# Maintainer: Alexander Grothe <seahawk1986[at]hotmail[dot]com>
pkgname=vdr-markad
-pkgver=0.1.4_40_g74e2a8c
+pkgver=0.1.4_44_g3681d3a
epoch=1
-_gitver=74e2a8c5382fa8bfacd12274899112724a1e0d51
+_gitver=3681d3a18383c238870de7d1ec1f1f9c8079cf89
_vdrapi=2.2.0
pkgrel=1
pkgdesc="automatic advertisement detection"
@@ -15,11 +15,13 @@ depends=('ffmpeg' "vdr-api=${_vdrapi}")
makedepends=('git')
_plugname=${pkgname//vdr-/}
source=("git://projects.vdr-developer.org/vdr-plugin-markad.git#commit=$_gitver"
- "vdr-markad-fixes.diff"
+ "vdr-2.3.2-markad-0.1.4.git20160925_v2.diff::https://www.vdr-portal.de/index.php?attachment/40533"
+ "vdr-markad-newmakefile.diff"
"50-$_plugname.conf")
backup=("etc/vdr/conf.avail/50-$_plugname.conf")
md5sums=('SKIP'
- 'b34797cc15aac8cd75828d265283f728'
+ '966a3b0ac4f9dbe9c3f0434072ed79cc'
+ '77001bbf5f138d1d1cd7a6f334fa8202'
'c0d6383c9c9b8ee6c34af19179676bf3')
pkgver() {
@@ -29,7 +31,8 @@ pkgver() {
prepare() {
cd "${srcdir}/vdr-plugin-${_plugname}"
- patch -p1 -i "$srcdir/vdr-markad-fixes.diff"
+ patch -p1 -i "$srcdir/vdr-markad-newmakefile.diff"
+ patch -p1 -i "$srcdir/vdr-2.3.2-markad-0.1.4.git20160925_v2.diff"
}
build() {
diff --git a/vdr-markad-fixes.diff b/vdr-markad-newmakefile.diff
index 6879c1fe84b..eef11dc8aa4 100644
--- a/vdr-markad-fixes.diff
+++ b/vdr-markad-newmakefile.diff
@@ -1,48 +1,3 @@
-diff --git a/command/decoder.cpp b/command/decoder.cpp
-index cbd8055..7a941e0 100644
---- a/command/decoder.cpp
-+++ b/command/decoder.cpp
-@@ -232,7 +219,6 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH264, int Threads)
- video_context->codec_type=AVMEDIA_TYPE_UNKNOWN;
- video_context->codec_id=AV_CODEC_ID_NONE;
- video_context->codec_tag=0;
-- memset(video_context->codec_name,0,sizeof(video_context->codec_name));
- #if LIBAVCODEC_VERSION_INT >= ((53<<16)+(5<<8)+0)
- video_context->thread_count=threadcount;
- ret=avcodec_open2(video_context, video_codec, NULL);
-@@ -280,7 +266,7 @@ cMarkAdDecoder::cMarkAdDecoder(bool useH264, int Threads)
- }
- #endif
-
-- video_frame = avcodec_alloc_frame();
-+ video_frame = av_frame_alloc();
- if (!video_frame)
- {
- esyslog("could not allocate frame");
-diff --git a/command/demux.h b/command/demux.h
-index 8385b3e..11e101a 100644
---- a/command/demux.h
-+++ b/command/demux.h
-@@ -284,7 +284,6 @@ private:
- int ptype;
- int stream;
- int lasterror;
-- bool h264;
- public:
- cPES2ES(int PacketType, const char *QueueName="PES2ES", int QueueSize=32768);
- ~cPES2ES();
-diff --git a/command/markad-standalone.cpp b/command/markad-standalone.cpp
-index 4ca71cd..9b41193 100644
---- a/command/markad-standalone.cpp
-+++ b/command/markad-standalone.cpp
-@@ -1594,7 +1594,6 @@ time_t cMarkAdStandalone::GetBroadcastStart(time_t start, int fd)
- bool cMarkAdStandalone::CheckLogo()
- {
- if (!macontext.Config) return false;
-- if (!macontext.Config->logoDirectory) return false;
- if (!macontext.Info.ChannelName) return false;
- int len=strlen(macontext.Info.ChannelName);
- if (!len) return false;
diff --git a/plugin/Makefile b/plugin/Makefile
index 2f51502..550c1f2 100644
--- a/plugin/Makefile