From: Matthias Schwarzott Date: Sun, 17 Feb 2008 21:52:16 +0000 (+0000) Subject: Restrict xine-lib version to 3 components, soliving Bug #210417. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f49fe1f057e1b33699af98aef65dde577bb54f01;p=gentoo.git Restrict xine-lib version to 3 components, soliving Bug #210417. Package-Manager: portage-2.1.4.4 --- diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog index 97ba9192929a..6d70f7315f34 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.33 2008/02/17 21:37:51 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.34 2008/02/17 21:52:16 zzam Exp $ + +*vdr-xineliboutput-1.0.0_rc2_p20080120-r1 (17 Feb 2008) + + 17 Feb 2008; Matthias Schwarzott + +vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild: + Restrict xine-lib version to 3 components, soliving Bug #210417. 17 Feb 2008; Matthias Schwarzott vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild: diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest index 4db51c3da66f..0778aeb62ae8 100644 --- a/media-plugins/vdr-xineliboutput/Manifest +++ b/media-plugins/vdr-xineliboutput/Manifest @@ -9,13 +9,14 @@ DIST vdr-xineliboutput-1.0.0rc2.tgz 266010 RMD160 406e48f343258c07e337460754181c DIST vdr-xineliboutput-cvs-20080120.tar.bz2 244376 RMD160 2256079c9a2cbab5fd4f47232aaee282ca4b7d57 SHA1 d8ba0f859b3be5ffe5f8fb37518996bb6b6082ef SHA256 54aa155c79a23669e9bb6f376846012a008ec13cd3f05e48bdae7acc9f6e155e EBUILD vdr-xineliboutput-1.0.0_rc1.ebuild 2009 RMD160 ce783135d9b4db3497c5bff020b85d199e0f9d7b SHA1 40e363ccc09450f0dc94f586d47cfdeb0e7f4cc1 SHA256 882e66a2629ecb2de41f6b71085b8006a2ad9e98dbbea924e5a26b96685be7f9 EBUILD vdr-xineliboutput-1.0.0_rc2.ebuild 2103 RMD160 8bd467b1964acb5d36dc6ae3b2d9dba92077c250 SHA1 8d5889e03676d9c6ad8dc851c090b89f7e34b4a6 SHA256 127a5b57f47755c2320d0f4810c9d92a866e58ac8468953f4509ac05b453ddd2 +EBUILD vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild 2505 RMD160 58fcef71f481ec46cb57062e50c3a49ab62986ab SHA1 91df216a9028e742288ad8e7f6816c14e5e85ed9 SHA256 a608681dce2666fe3102b5154fb14ee46c77d69f7afaf9eef304ea25dccbec63 EBUILD vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild 2351 RMD160 7921cb69f782a253caf9c400a18636cd53b7b47d SHA1 042b9a1803a8facb8084672d392eabb3616bbbcd SHA256 990900dff90a624022300ed13314c6e9bb16703d7000c79ce8ac70d4b5bbed43 -MISC ChangeLog 7273 RMD160 00f770d44149716d03910d5c749bc51467d08ac0 SHA1 1ac3654040ba224514163543eb934dd8f998f8af SHA256 afd92df5a618bd2aeb9efa6e96435a949f38008a3af9abe8dd9f15ef74bb292c +MISC ChangeLog 7503 RMD160 b0a8aae054eb593d199982e8adda2234ebc3459a SHA1 85d057a26e532cd57459dab5341d8dfae9bca634 SHA256 6eb9534051d3d16419f3ac590491a207320b75b70c850e5cf3529e23a3bcaea8 MISC metadata.xml 353 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e SHA1 a8466ebe913ea08351d9415bca28ee107e54a7cb SHA256 48731babb71989233956af5f82f8bd1b24625eab7b26493e43d753621c9ec359 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHuKk+t2vP6XvVdOcRArtdAJ0c9/YMaG46H5Qj6ouR5+rrGHxOLACgqK+M -myJHlPkvXvEyOUxMtFGNQXs= -=L+X9 +iD8DBQFHuKyWt2vP6XvVdOcRAtyVAJ0fHB1ppSzFtr1MA5bKqpqanAJ5jACeKuRb +CNIN4h4ziN3+pLhzf3fDME8= +=Z3sR -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild new file mode 100644 index 000000000000..1907cc9ffdb7 --- /dev/null +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2008 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.0_rc2_p20080120-r1.ebuild,v 1.1 2008/02/17 21:52:16 zzam Exp $ + +inherit vdr-plugin eutils multilib versionator + +#MY_PV=${PV/_/} +#MY_P=${PN}-${MY_PV} +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="mirror://sourceforge/${PN#vdr-}/${MY_P}.tar.bz2" +SRC_URI="mirror://gentoo/${MY_P}.tar.bz2 + http://dev.gentoo.org/~zzam/distfiles/${MY_P}.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="fbcon X" + +RDEPEND=">=media-video/vdr-1.3.42 + >=media-libs/xine-lib-1.1.1 + media-libs/jpeg + X? ( + x11-proto/xextproto + x11-proto/xf86vidmodeproto + x11-proto/xproto + )" + +DEPEND="${RDEPEND} + sys-kernel/linux-headers + X? ( + x11-libs/libX11 + x11-libs/libXv + x11-libs/libXext + )" + +S=${WORKDIR}/${MY_P#vdr-} + +VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6 +#PATCHES="${FILESDIR}/${P}-vdr-1.5.3.diff +# ${FILESDIR}/${P}-vdr-1.5.9.diff" + +NO_GETTEXT_HACK=1 + +set_var_in_makefile() { + local opt="XINELIBOUTPUT_$1" + local value="$2" + sed -i "s-^#${opt}.*= 1-${opt} = ${value}-" Makefile +} + +apply_useflag() { + local opt="$1" + local flag="$2" + local value=0 + use $flag && value=1 + set_var_in_makefile "$opt" "$value" +} + +src_unpack() { + vdr-plugin_src_unpack + + cd "${S}" + + XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h) + XINE_LIB_VERSION=$(get_version_component_range 1-3 "${XINE_LIB_VERSION}") + einfo "Compiling against xine-lib version ${XINE_LIB_VERSION}" + + set_var_in_makefile VDRPLUGIN 1 + set_var_in_makefile XINEPLUGIN 1 + apply_useflag FB fbcon + apply_useflag X11 X + + # 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() { + vdr-plugin_src_install + + use fbcon && dobin vdr-fbfe + use X && dobin vdr-sxfe + + insinto ${VDR_PLUGIN_DIR} + doins *.so.${SO_VERSION} || die "could not install sub-plugins" + + insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION} + doins xineplug_inp_*.so + + insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}/post + doins xineplug_post_*.so +}