compile fix libav10/11, wrt bug 540850, thx to T.Foerster for testing,reporting

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

3 files changed, 53 insertions, 7 deletions

diff --git a/media-plugins/vdr-osdpip/ChangeLog b/media-plugins/vdr-osdpip/ChangeLog
index 4da4918b7193..7dacf59dba44 100644
--- a/media-plugins/vdr-osdpip/ChangeLog
+++ b/media-plugins/vdr-osdpip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-osdpip
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.24 2014/08/31 11:22:53 hd_brummy Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.25 2015/02/28 19:50:38 hd_brummy Exp $
+
+*vdr-osdpip-0.1.2-r1 (28 Feb 2015)
+
+  28 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-osdpip-0.1.2-r1.ebuild:
+  compile fix libav10/11, wrt bug 540850, thx to T.Foerster for
+  testing,reporting
 
   31 Aug 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
   -vdr-osdpip-0.1.1-r1.ebuild:
diff --git a/media-plugins/vdr-osdpip/Manifest b/media-plugins/vdr-osdpip/Manifest
index 8cb8543b3821..ad6229a079f6 100644
--- a/media-plugins/vdr-osdpip/Manifest
+++ b/media-plugins/vdr-osdpip/Manifest
@@ -4,14 +4,15 @@ Hash: SHA256
 AUX vdr-osdpip-0.1.1-ffmpeg-1.patch 856 SHA256 29901cf4773987d61296b2d0dbbdbb453c93c8f388ca0c99726734db24bc8d7a SHA512 e3fe8a83413e52abe36e6232f5326ccf27cbecfc2f7f4622411f9fb21807701a0fae72e72c1f431b0b32b2476db67266370ed4e9eb83a730d4d2300b260b6da1 WHIRLPOOL 3dd2ac100c1230b7a91dc97381a21678c2a386fb300e931ac7376ea003d84e419554f187ee82d627d89b02181bfe470163256a96f222ff474557617a7dec55b3
 AUX vdr-osdpip-libav-9.patch 1958 SHA256 1a79b2293ca3966de90a271cbe18394d2b450b4b2302fff8db6aedd1188d04f8 SHA512 a07ab81702153c2d2b5cba4f9227eef645103b9feea33da5d9af8c1dc157ab9c2e561da0c793bef09373e8bc7c771326c1cec09b71181799988040bc7e2f1613 WHIRLPOOL 164d1adce460385c3cc9c4c5ebb034a1b39feb2e2abbde4251f4a1ff782c5b70225ea14ce9cebc8a6756f37b512e612fe8e91662927c35b781249586e8dd1e13
 DIST vdr-osdpip-0.1.2.tgz 50756 SHA256 08761f6474dd2e5bd4d3dc83b4d2d3b9169a04931cb8aca2e54fdb5ad979a0c6 SHA512 bc3345497e260d3249e1864a05181939b52a3fea115264af21d0efae10aa4406e9d4e5d348fce967a4fdb1adf2a3c7877b5b2d6840854f55f665800ac080a0eb WHIRLPOOL 0503bb4ed6b5838ee1ff7eca61507f79b14a9bf0824c69989cb73d4fa89b48dfb41197e8152d4798f775a288968679008bfbe9e851627447064fe8c1a6780aa2
+EBUILD vdr-osdpip-0.1.2-r1.ebuild 1045 SHA256 32ea74c8052e805f56f91b39ad1ae62425d85eac1cbc33e691b6285dbdfceec4 SHA512 a396130f521e59d57ff08d1064a3c477aef061ae0f5c9ce5a5d9640b6961daf240e1b26871b389474498babf1370177449fedafcf537836cde728417e9985131 WHIRLPOOL a51fbfea21323d81a3263c9a4d4fe9fe027d5f5580ecc09b2adab3e9a3005af95d6f6eec00b208d3a114b9c2efab8a063629eee9bc9ed328852a0c11798477fd
 EBUILD vdr-osdpip-0.1.2.ebuild 881 SHA256 ef6fc17980ae03ff36f7457c5c711eaf3317677f1db517de0473551600588e31 SHA512 f587f45f92abcdb9295857fda44bdc21862f94f6bd59313bcff250dc30b0ec0d8892dcbcd8ee2dbf0c1489d8909823d559e1e6514b2326ff11aaa924010959ed WHIRLPOOL d974a2573a1fdd56bcd1b905c1be9cbafcf4df1f0850e1d261e8846f75379873f4411845066fb6ba83e743490d9c6685971fc24c6d3e5d73ae0045b745e2f49b
-MISC ChangeLog 4002 SHA256 dd0429a208dc919b016a941511c148d9f8f77175337b1c545babab321003790e SHA512 8defdb84ee97a2e5d4872b8ec9b1bcf6b9e5aa5c7aec12052f7686394cb911dad37d3755ec99d2b26a1e60b6d33a8084d23943aac01fc7884ff346cfcaa06bd6 WHIRLPOOL fe3536a3e6d0a7a8f3cbb7a4b0650c1bbad358c6a4af8dd08518477a724707f66eface22b1a2d8213f13d7f1d29db2c7342c243334157fb8dd60d938028a9f1c
+MISC ChangeLog 4209 SHA256 eb9120134f40b35b42e5f23787f963aee9f518b6ae6fef7645cf9c14136bd08f SHA512 23a86675875f590108261f695ca71ba608bd1726aef5757946f4c8acc66c764365cb95b760381b928fb9743e8cce099fcb8eff2795d6b7d97391ea3e4a229520 WHIRLPOOL 458f71bf0a7bb6e8000e15d6039a6310208ada8424fc5a7decdadd5419366c6b96935ec40389da764c782ec5d02e9342b1f8a4d5d01a25db23dfaa3cacc70f4b
 MISC metadata.xml 298 SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 SHA512 73724667e75fe7d8ca3b0d440e79d70f1a9fa900cf9ea9c3c03036cef44d5fe3e24ce745630e04e9a0a3776f4a73bc47d29f92a4bbe93af0ad544936f5e33b3c WHIRLPOOL e77dccdbffec743aaa54f4dd9529b70e22df631d1d93375274ef70022b8fd0e7d9c3f2f60d4fdbf6f6d72fac24c709357d6ca949068a3eca3558f8a377360913
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFUAwWOdn07HTTCgIoRCBIHAJ9eea7JY8vNftTUPTSGyYWF3NL2+QCcDcvE
-aB+INNPpu+X0RzzazvduuV0=
-=pFav
+iD8DBQFU8hwUdn07HTTCgIoRCO0OAJ9Nq8KlDvr4L4m2WJohJ/BnH8dmqgCgry26
+wyo8uj+r8qW+LepLBpjs6lc=
+=+ZUs
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2-r1.ebuild b/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..c17ec25f9254
--- /dev/null
+++ b/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.1.2-r1.ebuild,v 1.1 2015/02/28 19:50:38 hd_brummy Exp $
+
+EAPI=5
+
+VERSION="961" # every bump, new version
+
+inherit vdr-plugin-2 flag-o-matic
+
+DESCRIPTION="VDR plugin: Show another channel in the OSD"
+HOMEPAGE="http://projects.vdr-developer.org/projects/plg-osdpip"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.7.27
+	>=media-libs/libmpeg2-0.5.1
+	>=virtual/ffmpeg-0.6.90"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# UINT64_C is needed by ffmpeg headers
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+
+	epatch "${FILESDIR}/${PN}-0.1.1-ffmpeg-1.patch"
+	epatch "${FILESDIR}/${PN}-libav-9.patch"
+
+	# tested with libav10/11, ffmpeg-2.5.4
+	sed -e "s:CODEC_ID_MPEG2VIDEO:AV_CODEC_ID_MPEG2VIDEO:"\
+		-e "s:avcodec_alloc_frame:av_frame_alloc:"\
+		-i decoder.c
+}