libav10 compile fix, wrt bug 519448

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)

2 files changed, 114 insertions, 1 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index 12862c45158b..1cdfe05feab2 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-graphtft
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.37 2014/01/08 12:46:48 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.38 2014/09/28 17:21:03 hd_brummy Exp $
+
+*vdr-graphtft-0.3.7-r1 (28 Sep 2014)
+
+  28 Sep 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-graphtft-0.3.7-r1.ebuild:
+  libav10 compile fix, wrt bug 519448
 
   08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
   -vdr-graphtft-0.3.2.24.ebuild, -files/vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff,
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild
new file mode 100644
index 000000000000..a73fbf73333e
--- /dev/null
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild,v 1.1 2014/09/28 17:21:03 hd_brummy Exp $
+
+EAPI="5"
+
+inherit vdr-plugin-2 flag-o-matic
+
+RESTRICT="test"
+
+DESCRIPTION="VDR plugin: GraphTFT"
+HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
+SRC_URI="http://www.jwendel.de/vdr/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter"
+IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen"
+
+DEPEND=">=media-video/vdr-1.7.27[graphtft]
+		media-libs/imlib2[png,jpeg]
+		gnome-base/libgtop
+		>=virtual/ffmpeg-0.4.8_p20090201
+		imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] )
+		directfb? ( dev-libs/DirectFB )
+		graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )"
+
+RDEPEND="${DEPEND}"
+
+PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 )
+		theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 )
+		theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 )
+		theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )"
+
+PATCHES=("${FILESDIR}/${P}_gentoo.diff"
+		"${FILESDIR}/${P}_makefile.diff"
+		"${FILESDIR}/${P}_gcc-4.4.x.diff")
+
+src_prepare() {
+
+	# remove untranslated Language
+	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,es_ES,et_EE,fr_FR,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+
+	sed -i Makefile -e "s:  WITH_X_COMM = 1:#WITH_X_COMM = 1:"
+
+	! use touchscreen && sed -i Makefile  \
+		-e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:"
+
+	use graphtft-fe && sed -i Makefile \
+		-e "s:#WITH_X_COMM:WITH_X_COMM:"
+
+	# libav9 support
+	sed -i \
+		-e 's:avcodec.h>:avcodec.h>\n#include <libavutil/mem.h>:' \
+		imlibrenderer/dvbrenderer/mpeg2encoder.c || die
+
+	# libav10 support, wrt bug 519448
+	sed -i \
+		-e "s:CODEC_ID_MPEG1VIDEO:AV_CODEC_ID_MPEG1VIDEO:" \
+		imlibrenderer/dvbrenderer/mpeg2encoder.c || die
+
+	vdr-plugin-2_src_prepare
+
+	remove_i18n_include graphtft.h setup.h
+
+	# UINT64_C is needed by ffmpeg headers
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+
+	if has_version ">=media-video/vdr-1.7.33"; then
+		sed -i dspitems.c \
+			-e "s:int timerMatch = 0:eTimerMatch timerMatch = tmNone:"
+	fi
+}
+
+src_compile() {
+	vdr-plugin-2_src_compile
+
+	if use graphtft-fe; then
+		cd "${S}"/graphtft-fe
+		emake
+	fi
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL}
+
+	if use graphtft-fe; then
+		cd "${S}"/graphtft-fe && dobin graphtft-fe
+		doinit graphtft-fe
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	if use graphtft-fe; then
+		echo
+		elog "Graphtft-fe user:"
+		elog "Edit /etc/conf.d/vdr.graphtft"
+		elog "/etc/init.d/graphtft-fe start"
+		echo
+	fi
+}