Added new snapshot. Thanks to ssuominen, Bug #282171.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 172 insertions, 5 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index eed36a39dd8b..8068218df3a2 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.46 2009/08/15 20:34:43 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.47 2009/08/26 08:20:13 zzam Exp $
+
+*vdr-xineliboutput-1.0.4_p20090820 (26 Aug 2009)
+
+  26 Aug 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-xineliboutput-1.0.4_p20090820.ebuild:
+  Added new snapshot. Thanks to ssuominen, Bug #282171.
 
   15 Aug 2009; Matthias Schwarzott <zzam@gentoo.org>
   vdr-xineliboutput-1.0.4_p20090810.ebuild:
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index ed3e6d549ee1..edb248c01371 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -14,6 +14,7 @@ DIST vdr-xineliboutput-1.0.3.tgz 329144 RMD160 b78c8f53d6406c9f499a090d97f082a6d
 DIST vdr-xineliboutput-1.0.4.tgz 327859 RMD160 2faef32accf4f985bf1a7e748a7d18ccfa519337 SHA1 389d51ea3b56fd312b5273cd3f9ba19fe9e46732 SHA256 c1cb82e02b193356864c0f6e12fb9ef59406fc2ce94244925d7523b3ec58e8ef
 DIST vdr-xineliboutput-cvs-20080120.tar.bz2 244376 RMD160 2256079c9a2cbab5fd4f47232aaee282ca4b7d57 SHA1 d8ba0f859b3be5ffe5f8fb37518996bb6b6082ef SHA256 54aa155c79a23669e9bb6f376846012a008ec13cd3f05e48bdae7acc9f6e155e
 DIST vdr-xineliboutput-cvs-20090810.tar.bz2 295621 RMD160 11bd4068b8c862c627ecb7935d0ae5971a267d0b SHA1 5d8a61b21418688dceffaccc2aeb22a7b6b21de4 SHA256 3630eadd9eb97fd997e3d238d2166a0be4e0018bb885d6719b3639461ac22db5
+DIST vdr-xineliboutput-cvs-20090820.tar.bz2 306261 RMD160 e69516f86400500eef222ad1b3d97c48f89658f0 SHA1 c195a14142c0617b6f6d9302f1837ff90b93a015 SHA256 aead394ac521866acc31dd15621035fe8a061b72ffc5c76060195ff26f564824
 EBUILD vdr-xineliboutput-1.0.0.ebuild 2509 RMD160 f090ce16a09d265acdb803127b42ac84041cf758 SHA1 67ebbe758173d218477df6817a2794ac7953bdbb SHA256 286f368adc9a1d9d91fee9a9ff5152eb6df9424d65a54adc2c6d27baebe7a0c5
 EBUILD vdr-xineliboutput-1.0.0_rc1.ebuild 2009 RMD160 ce783135d9b4db3497c5bff020b85d199e0f9d7b SHA1 40e363ccc09450f0dc94f586d47cfdeb0e7f4cc1 SHA256 882e66a2629ecb2de41f6b71085b8006a2ad9e98dbbea924e5a26b96685be7f9
 EBUILD vdr-xineliboutput-1.0.0_rc2.ebuild 2107 RMD160 cdc0b11c5c24f017e5d7936faeac5e255c41ec35 SHA1 0a92a7baa79c18228af82f68cdcc96ace486c95f SHA256 64ce7424cfa3d576a32ac08fa667bf3cc77772f08cfbc7315fd8b43b55e4c3a9
@@ -24,12 +25,13 @@ EBUILD vdr-xineliboutput-1.0.2.ebuild 2488 RMD160 241301c5e94e5beae82d5c5d2792bc
 EBUILD vdr-xineliboutput-1.0.3.ebuild 2488 RMD160 68258e9261babef9f2c6c570160afcffa1b16b3a SHA1 55cb09c5edd657ef517a5f8969e5db74968646db SHA256 e7802a2135df2eaebb2411abc6878c9e6a4d19225ac3ca73609dcb725fd4f4ba
 EBUILD vdr-xineliboutput-1.0.4.ebuild 3249 RMD160 411e63c3442547b0db4c74aa83791f2bb1d87ef5 SHA1 da370d6fdae3a8b83bb22c4b3bc6b95df356e37d SHA256 c9eb1d61017bd1d7993f0aefa03a0f8ba5c0ef67d084368c487d9fadb883f439
 EBUILD vdr-xineliboutput-1.0.4_p20090810.ebuild 3454 RMD160 4c2dc09359fe5aead90733042f74a429c6eca8e7 SHA1 39f54fe4ad756d1e8e381479f6968552c13f63d8 SHA256 14d5165b4c436252b1a1d9150c98bec7015976f338119a8292d57fee0e730f11
-MISC ChangeLog 9593 RMD160 611810ad83d6fa418e52a0bb61c7eb138f1654ca SHA1 45ecdb05f71235d0f4e6b38f8dddcb99515f83ad SHA256 27e2aab4aa0ed6e25a4ef6b02229ca9bdfa48bb1dd5dd9b5cc742e16f19801d7
+EBUILD vdr-xineliboutput-1.0.4_p20090820.ebuild 3513 RMD160 029b9cdda627e6e6d61e5edce2f3cc84b0c7ede3 SHA1 bd1c82523b1765d81530ebc82cd4429fab8d708c SHA256 9c184432e752cb94610256aa079dff13dd0cc96019c7542d680358b2ffd9a0ee
+MISC ChangeLog 9798 RMD160 ec1214312584ec625824363eaeaef0341b0c5eca SHA1 2d3096dae018b500b7d587460d53253653cfcf27 SHA256 444c190ff4a7a1955dc0202018551fc5b2836cdf841829276baaffe5f966ea85
 MISC metadata.xml 669 RMD160 b44f9873f5344ac61790204fb0d984749c382bae SHA1 d33350e1172589fb78170cfafdbc7e02e410a714 SHA256 e1aa0b3247ebf31c8de11efd7bb835ea989c92c5b505ac15347c1bb277f8b8a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqHG+kACgkQt2vP6XvVdOf+fgCfb4TG7mVkTYC8HuZ93ttFCx9n
-+0gAoMP7+Kz5UEoSZYW2PQ/fa5hM67Ml
-=fTWP
+iEYEARECAAYFAkqU8EQACgkQt2vP6XvVdOfOMACfUZ4YKIeXqNnJHaCPwdBXRSmr
+LAoAoKg+fGMpk+qq1Qxeg+Q8u94l07WY
+=7kTT
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild
new file mode 100644
index 000000000000..98e243133e66
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild,v 1.1 2009/08/26 08:20:13 zzam Exp $
+
+GENTOO_VDR_CONDITIONAL=yes
+
+EAPI="2"
+
+inherit vdr-plugin eutils multilib versionator
+
+MY_PV=${PV#*_p}
+MY_P=${PN}-cvs-${MY_PV}
+
+SO_VERSION="${PV%_p*}"
+SO_VERSION="${SO_VERSION/_/}"
+
+DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
+HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+vdr +xine fbcon X libextractor xinerama"
+
+# both vdr plugin or vdr-sxfe can use X11
+# still depends need some cleanup
+COMMON_DEPEND="
+	vdr? ( >=media-video/vdr-1.4.0 )
+
+	xine? ( >=media-libs/xine-lib-1.1.1 )
+
+	media-libs/jpeg
+	libextractor? ( >=media-libs/libextractor-0.5.20 )
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXv
+		x11-libs/libXext
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? (
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		x11-proto/renderproto
+		xinerama? ( x11-proto/xineramaproto )
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/${MY_P#vdr-}
+
+VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
+
+pkg_setup() {
+	vdr-plugin_pkg_setup
+
+	if ! use vdr && ! use xine; then
+		eerror "Compiling ${PN} with USE='-vdr -xine' is not possible."
+		eerror "You either need at least one of these flags."
+		#die "${PN} cannot be used with vdr support and xine support disabled!"
+	fi
+}
+
+use_onoff() {
+	if use "$1"; then
+		echo 1
+	else
+		echo 0
+	fi
+}
+
+use_onoff_xine() {
+	if use xine && use "$1"; then
+		echo 1
+	else
+		echo 0
+	fi
+}
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+#	epatch "${FILESDIR}/${PN}-1.0.4_p20090810-compile-fix.diff"
+
+	if use xine; then
+		XINE_PLUGIN_DIR=$(xine-config --plugindir)
+		if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
+			eerror "Could not find xine plugin dir"
+			die "Could not find xine plugin dir"
+		fi
+	fi
+
+	# stop some automagic overwriting of the stuff we set
+	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
+		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
+		-i Makefile
+
+	cat >>Make.config <<-EOF
+		XINELIBOUTPUT_XINEPLUGIN = $(use_onoff xine)
+		XINELIBOUTPUT_VDRPLUGIN = $(use_onoff vdr)
+
+		XINELIBOUTPUT_FB = $(use_onoff_xine fbcon)
+		XINELIBOUTPUT_X11 = $(use_onoff_xine X)
+
+		HAVE_XRENDER = 1
+		HAVE_XDPMS = 1
+		HAVE_EXTRACTOR_H = $(use_onoff libextractor)
+		HAVE_XINERAMA = $(use_onoff xinerama)
+	EOF
+
+	# patching makefile to work with this
+	# $ rm ${outdir}/file; cp file ${outdir}/file
+	# work in the sandbox
+	sed -i Makefile \
+		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
+		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
+	mkdir -p "${WORKDIR}/lib"
+}
+
+src_configure() { :; }
+
+src_install() {
+	if use vdr; then
+		# install vdr plugin
+		vdr-plugin_src_install
+
+		# There may be no sub-plugin, depending on use-flags
+		insinto ${VDR_PLUGIN_DIR}
+		local f
+		for f in libxineliboutput*.so.${SO_VERSION}; do
+			[[ -f "$f" ]] || continue
+			doins "${f}" || die "could not install sub-plugin ${f}"
+		done
+	fi
+
+	if use xine; then
+		# install xine-plugins
+		insinto "${XINE_PLUGIN_DIR}"
+		doins xineplug_inp_*.so
+
+		insinto "${XINE_PLUGIN_DIR}"/post
+		doins xineplug_post_*.so
+
+		# install xine-based frontends
+		use fbcon && dobin vdr-fbfe
+		use X && dobin vdr-sxfe
+
+	fi
+}
+
+pkg_config() {
+	einfo "emerge --config is not supported"
+}