version bump; thx to all tester on #336143

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

3 files changed, 180 insertions, 3 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 48149260e823..6cfaf6fe08fc 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.52 2009/12/08 20:05:51 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.53 2010/09/22 13:06:17 hd_brummy Exp $
+
+*vdr-xineliboutput-1.0.5 (22 Sep 2010)
+
+  22 Sep 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-xineliboutput-1.0.5.ebuild:
+  version bump; thx to all tester on #336143
 
   08 Dec 2009; Mark Loeser <halcy0n@gentoo.org>
   vdr-xineliboutput-9999.ebuild:
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 9768db5a2ef1..d1bf040842f5 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d4591f1a2525cdebbda53636c1138cf3563e592 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b
 AUX vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff 3657 RMD160 7f7c9b16b3c00cabe826971cbd3d7a559b1f5577 SHA1 b0cb9b85ee75800045076616da182d5b9eda38a5 SHA256 e4062ec7b43136b2113173641a6b5b7a2d50cd892a0aec8cf778c97874f84743
 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-1.0.5.tgz 366309 RMD160 cb9fbbb1a09876caa307bfda5db0e52544819917 SHA1 a92c6e76b69b98b4eba2c4a9a1e731d21e2714e0 SHA256 305f98f00f40d319bb5beb44f832a445e9d36a33a5c4966874f368f4bbffaf91
 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
 DIST vdr-xineliboutput-cvs-20091118.tar.bz2 330515 RMD160 685483db1f6cf2caaa585a3bfe4fef5967b54f9d SHA1 dda9e29aa79084276782827043a86b4e781c9fb2 SHA256 2c3ef82851e01c895f93138fb16495a2f2676ecc151da9d63cd28056c093b8dc
@@ -12,6 +16,15 @@ EBUILD vdr-xineliboutput-1.0.4.ebuild 3249 RMD160 411e63c3442547b0db4c74aa83791f
 EBUILD vdr-xineliboutput-1.0.4_p20090810.ebuild 3454 RMD160 4c2dc09359fe5aead90733042f74a429c6eca8e7 SHA1 39f54fe4ad756d1e8e381479f6968552c13f63d8 SHA256 14d5165b4c436252b1a1d9150c98bec7015976f338119a8292d57fee0e730f11
 EBUILD vdr-xineliboutput-1.0.4_p20090820.ebuild 3599 RMD160 72eff37458948d0b9fd287a1be5f30415bda9ca3 SHA1 492dee6e3f7cf2441240aefe96c45929a7ea5c22 SHA256 a22b7a8841c205645f58c53f659fd7cc4dcfdb96f5e8a0916956e56713af1a2f
 EBUILD vdr-xineliboutput-1.0.4_p20091118.ebuild 3599 RMD160 018f6f522d695eb41e40375308aed8b128452ba1 SHA1 c3772597201502f3a785ecc61e4e896eb549faac SHA256 948f05820dac82cfbb137729541790e3fb6228b36ec08dc0799749c60e096de0
+EBUILD vdr-xineliboutput-1.0.5.ebuild 3536 RMD160 4eeb1bdec5e3bb4fd8e200dd9d4441434ba40b10 SHA1 a89f6c96a8080458f8bcb36b1ee936227858d135 SHA256 06a9b61f7e7616ae73a79affe464285173f7465d7f6199fb56c56aaa5aa2a866
 EBUILD vdr-xineliboutput-9999.ebuild 3542 RMD160 5603a8f5d53ff0a6a69bda91589ae9240b86ccd2 SHA1 c5bcc85fe90c5ddb9ef582efdaeb2adf08322558 SHA256 b586231397a37467d1fe2a690930d0a3e3cb98cd545a25fdcaa7998d8c89287d
-MISC ChangeLog 10935 RMD160 bc46042595366b3bf12ac6e6e711a7284a2fc330 SHA1 36d6880347c5eb52876d56783f3f3706f82eb814 SHA256 73a1dfa529551bebd92068b9fe97c1987fbdb2b33fa4541c0973b6c2d413a1da
+MISC ChangeLog 11113 RMD160 9d8e1382afd5f2be3c240ffa2d39179904fe58a6 SHA1 60c7577297fe990bd3635cf945303a096153ba73 SHA256 159f398b68592e75a3eaa4c5deedb1e5116d974514566406aa4d27e9d0e9292d
 MISC metadata.xml 669 RMD160 b44f9873f5344ac61790204fb0d984749c382bae SHA1 d33350e1172589fb78170cfafdbc7e02e410a714 SHA256 e1aa0b3247ebf31c8de11efd7bb835ea989c92c5b505ac15347c1bb277f8b8a2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFMmf+Edn07HTTCgIoRAjbJAKCujj2T76noO/i1tVNxeYV6b56NrQCfR9B6
+s2XlHNn4l2LQjiY7/Ud5Crg=
+=LK9s
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5.ebuild
new file mode 100644
index 000000000000..679d324b5b97
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2010 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.5.ebuild,v 1.1 2010/09/22 13:06:17 hd_brummy Exp $
+
+GENTOO_VDR_CONDITIONAL=yes
+
+EAPI="2"
+
+inherit vdr-plugin eutils multilib versionator
+
+MY_PV=${PV#*_p}
+MY_P=${PN}-cvs-${MY_PV}
+
+DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
+HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
+
+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
+
+	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
+
+		# version number that the sources contain
+		local SO_VERSION="$(grep 'static const char \*VERSION *=' xineliboutput.c |\
+						cut	-d'"' -f2)"
+	echo SO_VERSION=$SO_VERSION
+		insinto ${VDR_PLUGIN_DIR}
+		if use fbcon; then
+			doins libxineliboutput-fbfe.so.${SO_VERSION} || die "doins failed"
+		fi
+		if use X; then
+			doins libxineliboutput-sxfe.so.${SO_VERSION} || die "doins failed"
+		fi
+	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"
+}