compile fix libav11, wrt bug 540884, thx to T.Foerster for reporting this

(Portage version: 2.2.17/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 34C2808A)

2 files changed, 74 insertions, 1 deletions

diff --git a/media-plugins/vdr-markad/ChangeLog b/media-plugins/vdr-markad/ChangeLog
index bf2a4ffa92ec..2a688e7b7e07 100644
--- a/media-plugins/vdr-markad/ChangeLog
+++ b/media-plugins/vdr-markad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-markad
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.15 2015/02/06 21:09:43 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/ChangeLog,v 1.16 2015/03/01 03:23:54 hd_brummy Exp $
+
+*vdr-markad-0.1.4-r1 (01 Mar 2015)
+
+  01 Mar 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-markad-0.1.4-r1.ebuild:
+  compile fix libav11, wrt bug 540884, thx to T.Foerster for reporting this
 
   06 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-markad-0.1.4.ebuild:
   stable amd64 x86
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild b/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..1be38fdc9bae
--- /dev/null
+++ b/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild,v 1.1 2015/03/01 03:23:54 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+VERSION="1041" # every bump, new version
+
+DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
+HOMEPAGE="http://projects.vdr-developer.org/projects/plg-markad/"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.6
+		virtual/ffmpeg[mp3,x264]
+		!media-video/noad"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${VDRPLUGIN}-${PV}/plugin"
+S2="${WORKDIR}/${VDRPLUGIN}-${PV}/command"
+
+# vdr-plugin-2.eclass changes
+PO_SUBDIR="../command"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	cd "${S2}"
+	epatch "${FILESDIR}/${PN}-0.1.4-libav9.patch"
+	sed -i Makefile \
+		-e "s:\$(CXXFLAGS) \$(OBJS):\$(CXXFLAGS) \$(LDFLAGS) \$(OBJS):" \
+		-e "s:\@\$(STRIP) \$(DESTDIR)/usr/bin/markad::"
+
+	if has_version ">=media-video/vdr-1.7.15"; then
+		sed -e "s:2001:6419:" -i markad-standalone.cpp
+	fi
+
+	epatch "${FILESDIR}/${P}_ffmpeg-2.patch"
+
+	# compile fix, tested libav11, ffmpeg-2.5.2
+	sed -e "s:CODEC_ID_:AV_CODEC_ID_:"\
+		-e "s:avcodec_alloc_frame:av_frame_alloc:"\
+		-i "${S2}"/decoder.cpp
+}
+
+src_compile() {
+	vdr-plugin-2_src_compile
+
+	cd "${S2}"
+	emake markad || die "Compiling command-line markad binary failed"
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	cd "${S2}"
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	cd "${WORKDIR}/${VDRPLUGIN}-${PV}"
+	dodoc README HISTORY
+}