Version bumped. Added use-flags vdr and xine to only compile the selected plugins.

Package-Manager: portage-2.1.6.10/cvs/Linux i686

4 files changed, 170 insertions, 8 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 5d633be310ba..83a678392098 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.42 2008/11/03 08:17:45 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.43 2009/03/24 21:27:28 zzam Exp $
+
+*vdr-xineliboutput-1.0.4 (24 Mar 2009)
+
+  24 Mar 2009; Matthias Schwarzott <zzam@gentoo.org> metadata.xml,
+  +vdr-xineliboutput-1.0.4.ebuild:
+  Version bumped. Added use-flags vdr and xine to only compile the selected
+  plugins.
 
 *vdr-xineliboutput-1.0.3 (03 Nov 2008)
 
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 1269a08ecd7b..3f59489363a1 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -10,6 +10,7 @@ DIST vdr-xineliboutput-1.0.0rc2.tgz 266010 RMD160 406e48f343258c07e337460754181c
 DIST vdr-xineliboutput-1.0.1.tgz 321990 RMD160 09ea6f14221462965a49a4e186048cd85d1f41d2 SHA1 5ff470a6f2ee36a1ee32c1e54e85151a7ae047f6 SHA256 4b4c5c234030b7db30f525ab18e4ca38b2954692e904f4ee3574a1b672c5ce4a
 DIST vdr-xineliboutput-1.0.2.tgz 325042 RMD160 8564fd1c55c50e665168f4cd46a7bea33419257e SHA1 e7eadd3774429804b168928a840253d827fb5dcf SHA256 de8e4dbb60b73e91f7e13859b3bb246545c201edceb97431ae2bb08933b015b6
 DIST vdr-xineliboutput-1.0.3.tgz 329144 RMD160 b78c8f53d6406c9f499a090d97f082a6d08ec5a1 SHA1 0a97ccb92bbef13421371294dbde8884d7d1d496 SHA256 a194fbdfc79791f0980715dcb98b1f9393562052e125aedb8401f4691be1ae92
+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
 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
@@ -19,12 +20,13 @@ EBUILD vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild 2355 RMD160 77087b90ccb62f7e
 EBUILD vdr-xineliboutput-1.0.1.ebuild 2507 RMD160 8ca24292f7277f128098f27eb8f7a532de3e0555 SHA1 42d285d8bc6a160e31615d16cfe6a802d1961e0b SHA256 544ff9c127ba2035d8b3e30627ef6251ad11ad85c49c664a2a6d204d5f4341ff
 EBUILD vdr-xineliboutput-1.0.2.ebuild 2488 RMD160 241301c5e94e5beae82d5c5d2792bc6fe9c9e742 SHA1 9ecbb4cb2279f851d3808ae5edf0a9b8500c808b SHA256 2f3cc79800d3b8584f8005eaccc42cc03c1d33db59504ad7a00cfc80d12600c7
 EBUILD vdr-xineliboutput-1.0.3.ebuild 2488 RMD160 68258e9261babef9f2c6c570160afcffa1b16b3a SHA1 55cb09c5edd657ef517a5f8969e5db74968646db SHA256 e7802a2135df2eaebb2411abc6878c9e6a4d19225ac3ca73609dcb725fd4f4ba
-MISC ChangeLog 8787 RMD160 5ee5f5282e9915f081c734826bc6b696f79e070f SHA1 a918107a0a48ab434fa0f8c59b904064c9fd3ecb SHA256 871ceeff2ba1df3ebc594144b47d6ea1e87781905db52f43150aad134bc9e1ec
-MISC metadata.xml 485 RMD160 3c4a1fdd538e0737707e7d7f5e2f3918cd76b182 SHA1 792b7738c56cccb7689ec8a92cff5130e63ad394 SHA256 0bdd666fe4a4c3298db599104c786b63b8922f4dd25adeb218210cf4c3cb8bed
+EBUILD vdr-xineliboutput-1.0.4.ebuild 3246 RMD160 25394f22046554d75b8f9eb8dd0b6ef9a7237ccc SHA1 36f9606c833990dd12fdb2de4a9a10a25d52028f SHA256 7422f6c9fcb01b47bc7c22f9ce6731db351ef3fb855894b7b90066bbf3010936
+MISC ChangeLog 9017 RMD160 618529d9a675267ebb80e1319fb6dd2ed9d4ef4a SHA1 52fa8a7a915d39377fa9e56ea192bc95625eb937 SHA256 0889ea1009cace34f19361648339109004ec069e02b300c9474425cb3af9a054
+MISC metadata.xml 669 RMD160 b44f9873f5344ac61790204fb0d984749c382bae SHA1 d33350e1172589fb78170cfafdbc7e02e410a714 SHA256 e1aa0b3247ebf31c8de11efd7bb835ea989c92c5b505ac15347c1bb277f8b8a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkkOs7MACgkQt2vP6XvVdOfEHwCfaJbf9RUvEujNxaSOkGihKwx4
-UWcAn3W9Fe5VkrveUM3NHLcww3guoyvg
-=d36c
+iEYEARECAAYFAknJUEgACgkQt2vP6XvVdOdiKwCgxp83QiAnwKlzvBUK/3TObw6d
+ePUAoN3VfpoXMkiBlaUJAH6La022OfCl
+=WEGT
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xineliboutput/metadata.xml b/media-plugins/vdr-xineliboutput/metadata.xml
index 89e69080a6f5..94ce61857b87 100644
--- a/media-plugins/vdr-xineliboutput/metadata.xml
+++ b/media-plugins/vdr-xineliboutput/metadata.xml
@@ -12,5 +12,7 @@
 	<use>
 		<flag name='libextractor'>Use <pkg>media-libs/libextract</pkg> to gather
 			files' metadata in media-player</flag>
+		<flag name='vdr'>Compile the vdr output plugin to use local or remote xine as output</flag>
+		<flag name='xine'>Compile the xine input plugin for displaying vdr video and OSD</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4.ebuild
new file mode 100644
index 000000000000..f1bc1e5b7fa7
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4.ebuild
@@ -0,0 +1,151 @@
+# 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.ebuild,v 1.1 2009/03/24 21:27:28 zzam Exp $
+
+GENTOO_VDR_CONDITIONAL=yes
+
+EAPI="2"
+
+inherit vdr-plugin eutils multilib versionator
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+SO_VERSION="${PV%_p*}"
+SO_VERSION="${SO_VERSION/_/}"
+
+DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
+HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${MY_P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+vdr +xine fbcon X libextractor"
+
+# both vdr plugin or vdr-sxfe can use X11
+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 )"
+
+DEPEND="${COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? (
+		x11-libs/libX11
+		x11-libs/libXv
+		x11-libs/libXext
+		x11-libs/libXrender
+	)"
+RDEPEND="${COMMON_DEPEND}
+	X? (
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		x11-proto/renderproto
+	)"
+
+
+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
+
+	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)
+	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_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"
+}
+