From a11e9a4c61eb8691e5883564a3a5d41943487f74 Mon Sep 17 00:00:00 2001 From: Matthias Schwarzott Date: Sun, 17 Feb 2008 21:37:51 +0000 Subject: [PATCH] Do not use autodetect-logic of makefile, solving Bug #209662. Package-Manager: portage-2.1.4.4 --- media-plugins/vdr-xineliboutput/ChangeLog | 6 +++- media-plugins/vdr-xineliboutput/Manifest | 14 +++++++-- ...r-xineliboutput-1.0.0_rc2_p20080120.ebuild | 29 ++++++++++++------- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog index b5d6dfd1111e..97ba9192929a 100644 --- a/media-plugins/vdr-xineliboutput/ChangeLog +++ b/media-plugins/vdr-xineliboutput/ChangeLog @@ -1,6 +1,10 @@ # 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.32 2008/01/20 23:00:15 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.33 2008/02/17 21:37:51 zzam Exp $ + + 17 Feb 2008; Matthias Schwarzott + vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild: + Do not use autodetect-logic of makefile, solving Bug #209662. 20 Jan 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 320b4db48a67..4db51c3da66f 100644 --- a/media-plugins/vdr-xineliboutput/Manifest +++ b/media-plugins/vdr-xineliboutput/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d4591f1a2525cdebbda53636c1138cf3563e592 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b AUX vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712 RMD160 520c285cb48887ae496d12a598cf356bf9b02843 SHA1 b77920e533d878e445847b9520d4653280c4b3b5 SHA256 a453eb5692f6e85bec1cc7297dd61e25405fac09a01504508262aa7f5246d668 AUX vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff 2852 RMD160 58f70d95046ae634fa2415643a05df2a395d7cf0 SHA1 4376acebfeed2c9ea35e076778a89c217da15ddb SHA256 6ac4301424dbeaf1227004824e744af3067e4fd69d8f8c6ce1ea187c5f303e09 @@ -6,6 +9,13 @@ 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.ebuild 2216 RMD160 93cc2c3b1857c8daf5f6dc711ddec27acdd5f193 SHA1 900567522e3c15ab655a6eda642d9aa6182149ad SHA256 7c6cb22c047ef4cc6753f76a29e59e307fa54a0b167ea432bd0b937815dc7f70 -MISC ChangeLog 7107 RMD160 73a9c0af184ec11d57d8daf8fd7aaea9ee5ca667 SHA1 47108a10f833c4451d7f5fa39a5de2373d5c86af SHA256 492d4e9fc6ad28cb5e9be3ac21ca65766d9e740504f4aa2d247e6f9d604e289e +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 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 +-----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild index 142557e62f9e..ea9f425ed186 100644 --- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild +++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.2 2008/01/20 23:00:15 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild,v 1.3 2008/02/17 21:37:51 zzam Exp $ inherit vdr-plugin eutils multilib @@ -48,11 +48,18 @@ VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6 NO_GETTEXT_HACK=1 -enable_in_makefile() { - local opt - for opt; do - sed -i "/^#${opt}.*= 1/s-^#--" Makefile - done +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() { @@ -62,9 +69,10 @@ src_unpack() { XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h) - enable_in_makefile XINELIBOUTPUT_VDRPLUGIN XINELIBOUTPUT_XINEPLUGIN - use fbcon && enable_in_makefile XINELIBOUTPUT_FB - use X && enable_in_makefile XINELIBOUTPUT_X11 + 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 @@ -78,7 +86,8 @@ src_unpack() { src_install() { vdr-plugin_src_install - dobin vdr-fbfe vdr-sxfe + use fbcon && dobin vdr-fbfe + use X && dobin vdr-sxfe insinto ${VDR_PLUGIN_DIR} doins *.so.${SO_VERSION} || die "could not install sub-plugins" -- 2.26.2