summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Reimer2016-08-17 18:26:31 +0200
committerChristopher Reimer2016-08-17 18:26:31 +0200
commit781b489900776339ab75ffa6672104689bb24686 (patch)
tree70d770bd183f8d3eb4facddde4b96587e7836028
parent860d2a242ddc69c6dd6ef8ca19f4dffa5e15fb4a (diff)
downloadaur-781b489900776339ab75ffa6672104689bb24686.tar.gz
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/949b5be573c7cb4ae6a04bdafd06bf366c60e6b9)
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD18
-rw-r--r--vdr-markad-fixes.diff195
3 files changed, 212 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bb9ce1aaef0..d64ffbac38a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by makepkg 5.0.1
+# Wed Aug 17 16:26:31 UTC 2016
pkgbase = vdr-markad
pkgdesc = automatic advertisement detection
- pkgver = 0.1.4_37_gc55f43f
- pkgrel = 10
+ pkgver = 0.1.4_40_g74e2a8c
+ pkgrel = 1
epoch = 1
url = http://projects.vdr-developer.org/projects/plg-markad
arch = x86_64
@@ -11,14 +13,14 @@ pkgbase = vdr-markad
arch = armv7h
license = GPL2
makedepends = git
- depends = ffmpeg2.8
+ 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=c55f43f413dff8740f99d684e8879835d4409920
- source = markad-newmakefile-vdr-1.7.36.tgz::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=32670
+ source = git://projects.vdr-developer.org/vdr-plugin-markad.git#commit=74e2a8c5382fa8bfacd12274899112724a1e0d51
+ source = vdr-markad-fixes.diff
source = 50-markad.conf
md5sums = SKIP
- md5sums = 5dd5c090a59066adca01ac487a9faeae
+ md5sums = b34797cc15aac8cd75828d265283f728
md5sums = c0d6383c9c9b8ee6c34af19179676bf3
pkgname = vdr-markad
diff --git a/PKGBUILD b/PKGBUILD
index edf8d9bb25b..ff25ba0d85b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,24 @@
# Maintainer: Alexander Grothe <seahawk1986[at]hotmail[dot]com>
pkgname=vdr-markad
-pkgver=0.1.4_37_gc55f43f
+pkgver=0.1.4_40_g74e2a8c
epoch=1
-_gitver=c55f43f413dff8740f99d684e8879835d4409920
+_gitver=74e2a8c5382fa8bfacd12274899112724a1e0d51
_vdrapi=2.2.0
-pkgrel=10
+pkgrel=1
pkgdesc="automatic advertisement detection"
url="http://projects.vdr-developer.org/projects/plg-markad"
arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
license=('GPL2')
-depends=('ffmpeg2.8' "vdr-api=${_vdrapi}")
+depends=('ffmpeg' "vdr-api=${_vdrapi}")
makedepends=('git')
_plugname=${pkgname//vdr-/}
source=("git://projects.vdr-developer.org/vdr-plugin-markad.git#commit=$_gitver"
- "markad-newmakefile-vdr-1.7.36.tgz::http://www.vdr-portal.de/index.php?page=Attachment&attachmentID=32670"
+ "vdr-markad-fixes.diff"
"50-$_plugname.conf")
backup=("etc/vdr/conf.avail/50-$_plugname.conf")
md5sums=('SKIP'
- '5dd5c090a59066adca01ac487a9faeae'
+ 'b34797cc15aac8cd75828d265283f728'
'c0d6383c9c9b8ee6c34af19179676bf3')
pkgver() {
@@ -29,17 +29,17 @@ pkgver() {
prepare() {
cd "${srcdir}/vdr-plugin-${_plugname}"
- cp "$srcdir/markad/plugin/Makefile" plugin/Makefile
+ patch -p1 -i "$srcdir/vdr-markad-fixes.diff"
}
build() {
cd "${srcdir}/vdr-plugin-${_plugname}"
- PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" make
+ make
}
package() {
cd "${srcdir}/vdr-plugin-${_plugname}"
- PKG_CONFIG_PATH="/usr/lib/ffmpeg2.8/pkgconfig" make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
#Move the logofiles to the right place and add a symlink to workaround patching.
mkdir -p "$pkgdir/usr/share"
diff --git a/vdr-markad-fixes.diff b/vdr-markad-fixes.diff
new file mode 100644
index 00000000000..6879c1fe84b
--- /dev/null
+++ b/vdr-markad-fixes.diff
@@ -0,0 +1,195 @@
+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
++++ b/plugin/Makefile
+@@ -1,54 +1,51 @@
+ #
+ # Makefile for a Video Disk Recorder plugin
++# Adapted to the new VDR makefile environment by Stefan Hofmann
+ #
++# $Id: $
+
+ # The official name of this plugin.
+ # This name will be used in the '-P...' option of VDR to load the plugin.
+ # By default the main source file also carries this name.
+-# IMPORTANT: the presence of this macro is important for the Make.config
+-# file. So it must be defined, even if it is not used here!
+-#
+-PLUGIN = markad
+-
+-### The version number of this plugin (taken from the main source file):
+
+-$(shell GITVERSION=`git rev-parse --short HEAD 2> /dev/null`; if [ "$$GITVERSION" ]; then sed "s/\";/ ($$GITVERSION)\";/" ../version.dist > ../version.h; else cp ../version.dist ../version.h; fi)
+-VERSION = $(shell grep 'static const char \*VERSION *=' ../version.h | awk '{ print $$6 }' | sed -e 's/[";]//g')
++PLUGIN = markad
+
+-### The C++ compiler and options:
++### The version number of this plugin (taken from the version header file):
+
+-CXX ?= g++
+-CXXFLAGS ?= -fPIC -g -O2 -Wall -Wextra -Woverloaded-virtual -Wno-parentheses
++VERSION = $(shell grep 'static const char \*VERSION *=' version.h | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+ ### The directory environment:
+
+-VDRDIR ?= ../../../..
+-LIBDIR ?= ../../../lib
++# Use package data if installed...otherwise assume we're under the VDR source directory:
++PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
++LIBDIR = $(call PKGCFG,libdir)
++LOCDIR = $(call PKGCFG,locdir)
++#
+ TMPDIR ?= /tmp
+
+-### Make sure that necessary options are included:
+-
+--include $(VDRDIR)/Make.global
++### The compiler options:
+
+-### Allow user defined options to overwrite defaults:
++export CFLAGS = $(call PKGCFG,cflags)
++export CXXFLAGS = $(call PKGCFG,cxxflags)
+
+--include $(VDRDIR)/Make.config
++### The version number of VDR's plugin API:
+
+-### The version number of VDR's plugin API (taken from VDR's "config.h"):
+-
+-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
++APIVERSION = $(call PKGCFG,apiversion)
+
+ ### The name of the distribution archive:
+
+ ARCHIVE = $(PLUGIN)-$(VERSION)
+ PACKAGE = vdr-$(ARCHIVE)
+
++### The name of the shared object file:
++
++SOFILE = libvdr-$(PLUGIN).so
++
+ ### Includes and Defines (add further entries here):
+
+-INCLUDES += -I$(VDRDIR)/include
++INCLUDES +=
+
+-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
++DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+ ### The object files (add further files here):
+
+@@ -56,12 +53,12 @@ OBJS = $(PLUGIN).o status.o menu.o setup.o
+
+ ### The main target:
+
+-all: libvdr-$(PLUGIN).so i18n
++all: $(SOFILE) i18n
+
+ ### Implicit rules:
+
+ %.o: %.cpp
+- $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
++ $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+
+ ### Dependencies:
+
+@@ -75,36 +72,39 @@ $(DEPFILE): Makefile
+ ### Internationalization (I18N):
+
+ PODIR = po
+-LOCALEDIR = $(VDRDIR)/locale
+ I18Npo = $(wildcard $(PODIR)/*.po)
+-I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
++I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
++I18Nmsgs = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot = $(PODIR)/$(PLUGIN).pot
+
+ %.mo: %.po
+ msgfmt -c -o $@ $<
+
+ $(I18Npot): $(wildcard *.cpp *.h)
+- xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o $@ $^
++ xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<vdr@dolze.de>' -o $@ `ls $^`
+
+ %.po: $(I18Npot)
+- msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
++ msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+ @touch $@
+
+-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+- @mkdir -p $(dir $@)
+- cp $< $@
++$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
++ install -D -m644 $< $@
+
+ .PHONY: i18n
+-i18n: $(I18Nmsgs) $(I18Npot)
++i18n: $(I18Nmo) $(I18Npot)
++
++install-i18n: $(I18Nmsgs)
+
+ ### Targets:
+
+-install: all
+- cp --remove-destination libvdr-$(PLUGIN).so $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION)
++$(SOFILE): $(OBJS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
++
++install-lib: $(SOFILE)
++ install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+
+-libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@
+- cp --remove-destination libvdr-$(PLUGIN).so $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION)
++install: install-lib install-i18n
+
+ clean:
+- @-rm -f $(OBJS) $(DEPFILE) *.so *.so.* *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
++ @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
++ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+