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

Package-Manager: portage-2.2.17/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x34C2808A

3 files changed, 80 insertions, 6 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/Manifest b/media-plugins/vdr-markad/Manifest
index 42e50f7d7497..d3e0d1f95e3b 100644
--- a/media-plugins/vdr-markad/Manifest
+++ b/media-plugins/vdr-markad/Manifest
@@ -4,14 +4,15 @@ Hash: SHA256
 AUX vdr-markad-0.1.4-libav9.patch 1300 SHA256 e160f0ccbd1c7c5f3325cabc30d52d17486b7eb2234879ec3f1c4c74949269b3 SHA512 3e0bc603840cd07f4499c3b7db2f44e7e069363ac43936647d52faff504a715449db4d3691b80cd818b5f1b7b83ef0de1229b515316d85adff191738ef6fb4f5 WHIRLPOOL ecc823940a3b7e5ce77a5a5cdd4d09fc6b9d6b46065db9b1add6eb64b39d32bc26e93cbbfc5f8cc3e859ca44c0833acc6cb0df655fb070af612a7057e45a0fb8
 AUX vdr-markad-0.1.4_ffmpeg-2.patch 400 SHA256 7debbaf580976b51c53a7f5d0d63b94961d92d075926e5359018cb1ec5a41960 SHA512 8d6619cc84c797371991fa7f3848724ab9f085c02892bf2b754f51e88d1f4eb2a68cb0a1da269bdb1d5cd130686e79d1b850a9fdb13622a33817decc5c2f28e9 WHIRLPOOL cad80741fca84eec32700b916a739cbc01dd754990a5bed6805c91d88854e82be545dc88ad1e445ca49f67246c983f1253c881dd4b982980f1b43087e73fab5e
 DIST vdr-markad-0.1.4.tgz 118728 SHA256 f940765c5dd4a5d66e1ff2650fa0a2b7bda7138953782431230a6c7539334a85 SHA512 10121e72803f489cdcabb46c989ecf4ae2ced1893bbdaccefbeef412ca34b124952ddf4639b3f78da3413e7b784ead4a60034a70cbab43a7c27e0e41f9653ae1 WHIRLPOOL 9e926e44798c5449346b078cfb906341a15715be49bff52bbad7594c299edff5f2454f1f2de9f5f3dc05a85968a860baa3d7796e220461da2663ca897db87414
+EBUILD vdr-markad-0.1.4-r1.ebuild 1635 SHA256 fae95f9f183758641fb8885ee464ec7b1055d7b9e14bdb15da700d0c1dd7e12b SHA512 d5d9d4132aefd25d2f2c512eb7128b0fc159419928d758503ebab9f0d7ff5986ee452a0eb06728a8c1f06bc8d1c16a946995d954d30c71873d7569345c2d7d66 WHIRLPOOL 7c0287d57b699bf176eb63a65d7f4ccc07b5360b051088701bc59b4a2b6ac98b84873a628bc02e9e5103e4ef64bd3f7975b6ba681782bc975603f9b21669fe9c
 EBUILD vdr-markad-0.1.4.ebuild 1476 SHA256 86fa41359dd383a6aef4eeb51c2bbc36b37ec5d23aa79060417eee7b867f498f SHA512 bc8ee37374670e4fa6f8e22b56932da9b742e604c31e6a27aad9f1f5203eb41d8fcccacb0cb056f9a75c11300db65902a277f486e074469c56b4580f2c04f331 WHIRLPOOL 12d6ba626f7a482778d3a684f6cf519a7159cec75dbb450b48361222a043a8db0c22a2171f17fafd886fec6fe418d78cf09a9e75ceed69bdd65f9ee10b2cb9cb
-MISC ChangeLog 2693 SHA256 7f02112ead8e42b017c4ea9ecdd29e58f3212f7140044382c95537e471a7c633 SHA512 ce59af411ff13c76fe6035317827599d11ada6521da1a10ab644aefbb783f8fb406103d5b783f645d179dba8fe080272debdfc8b2f72afd4af98ca48d1ce71e4 WHIRLPOOL dd4cbc140578afb93c9d500a6e8dc58aa328f048620c63c46b7ff8322f87b2ede167fa5d1d5f301692198e930675c934daf9d1ab8519eba1f7182b0ba8f03ede
+MISC ChangeLog 2892 SHA256 ead740d4ab8a7f74cbc8f7d6ed205f76a728310730b061a7e8323a517e7d6bf9 SHA512 2ae0cc4ec9a6fb02d6faccf2430062f5eb42d10e354a01f5ace1c275a5251cedd9de8deac5d05a29edfcfe3b63f4f1ee60ac9a3f568c27e40cd4cea0c9ac0d92 WHIRLPOOL f71629cf4a69d471ff3fa196dfdf2262a6f7f8dadec545240d1317214c9f236702b895251d8fab69321dbc019bd712fac31b1c80606354a3129774fe49e46a55
 MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFU1S2ddn07HTTCgIoRCMl1AJ4jBhaKZ/7bIeTBWPErVkl8DWGNXwCgl1A1
-FVOSSVY9cKiPj95GAKwHP1o=
-=2/F8
+iD8DBQFU8oZPdn07HTTCgIoRCLsYAJwN5tbwetnRwBfaLNWqmfgvIvSJcACgp7JR
+e8gk8b0jtU/PcqHZYVBC6kw=
+=s4Xp
 -----END PGP SIGNATURE-----
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
+}