From 8b3a473a04ada7c058a5b04938cbcc83879e550d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 21 Mar 2010 05:03:55 +0000 Subject: [PATCH] Pull in sdl-gfx depend and remove useless sdl-image include #310443 by Samuli Suominen. Fix by Samuli Suominen for as-needed issues #310439. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-libs/iulib/ChangeLog | 6 +++++- media-libs/iulib/Manifest | 10 +++++----- media-libs/iulib/iulib-0.4.ebuild | 11 ++++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/media-libs/iulib/ChangeLog b/media-libs/iulib/ChangeLog index 8bbb817c3e59..24dae1d4f684 100644 --- a/media-libs/iulib/ChangeLog +++ b/media-libs/iulib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/iulib # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/iulib/ChangeLog,v 1.7 2010/03/20 21:20:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/iulib/ChangeLog,v 1.8 2010/03/21 05:03:55 vapier Exp $ + + 21 Mar 2010; Mike Frysinger iulib-0.4.ebuild: + Pull in sdl-gfx depend and remove useless sdl-image include #310443 by + Samuli Suominen. Fix by Samuli Suominen for as-needed issues #310439. 20 Mar 2010; Mike Frysinger iulib-0.4.ebuild: Fix tiff check #308955 by Samuli Suominen and automagic SDL depends diff --git a/media-libs/iulib/Manifest b/media-libs/iulib/Manifest index d91aede20412..b4a4d3a25daf 100644 --- a/media-libs/iulib/Manifest +++ b/media-libs/iulib/Manifest @@ -6,13 +6,13 @@ AUX iulib-0.4-scons-build-env.patch 1381 RMD160 9807dfe606df789fd023bc43573ecba0 DIST iulib-0.3.tar.gz 3065868 RMD160 0d37a19fb003762479b1f9a2222e6ad0062e8514 SHA1 04c1ee3130df94c8d1439cac0d3f3183193a3dce SHA256 229f6c6b3724a442efd7306def6d2b35cd7ad38ec725adc6446632c9e8cd20f2 DIST iulib-0.4.tgz 3288112 RMD160 a50f6cd539d3a87ab5ccca925c5f6b80edd87a32 SHA1 96a006f806a650886fdd59b1239f6e56d1a864c1 SHA256 c70dab420f5ce0ff0185c922881576f4a82eacec3feb0befa66bd7468151d99b EBUILD iulib-0.3.ebuild 808 RMD160 c35450fa0a483a95751b8295259489392613e1af SHA1 0aa60aa6696490dc354037f76d2e0d5d479d5f5b SHA256 7e21e0b96bc813e9c3f628cc703a22b4faab5f5d7c729b11675a17f8456bcfea -EBUILD iulib-0.4.ebuild 971 RMD160 13c4dbadb45cf7fa8b7af5167296ebc94e23d9c8 SHA1 d72479c355ec681440ce0845da9bbefb578b889e SHA256 6b636c3b360b5390287b73f6a0e09304e6c51deefc5c734b89a4d9d40ca78bdd -MISC ChangeLog 1073 RMD160 629891547ca632aa7284b483c9d0e4d82d39e6bf SHA1 509c7c1ad9b8925e81baa113c17b67dc9fa4a816 SHA256 e76c143f93b8e64da2baa4fb967181a4e17335418504d5e94f0c198d35baf27f +EBUILD iulib-0.4.ebuild 1122 RMD160 fcef6927b8159e912e379c6ba66a8a8fdbb833d1 SHA1 24c36a85408fe32ae64b401241fc99c79052d8bc SHA256 d16a39eeed7a80b68cdd5d4be4b0456e4f3ade9c0028eade531159354903bb9d +MISC ChangeLog 1287 RMD160 56834a6c9818075c6b66755884c482a2526f5982 SHA1 328820f64c0dce777eaef4e0c66e5faaf7c54cb6 SHA256 a6a62e4c0e4cf801345d35817e27fa2f4e97e1363857e172e6201fa15bb90205 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iF4EAREIAAYFAkulPCoACgkQTwhj9JtAlp7mQwD+ONb8FH89GpmXPchf+ahbRriu -CRAHdZfHz9f9u/mLvn4A/jFqrpmaoJqHb/ykJ6zOiub/Joznt+03d/XO6MnVipFq -=jkVh +iF4EAREIAAYFAkulqLoACgkQTwhj9JtAlp4NsgEAix/sLETtd+pnxbVyMjWr+wNU +PzafVUBIBUREtF34dOAA/iKes/i8gvtoSPWQSXdMTLKCHqutxBk0qDDektT+nvp8 +=zC3e -----END PGP SIGNATURE----- diff --git a/media-libs/iulib/iulib-0.4.ebuild b/media-libs/iulib/iulib-0.4.ebuild index 8cd12abe1ad0..b50042f85400 100644 --- a/media-libs/iulib/iulib-0.4.ebuild +++ b/media-libs/iulib/iulib-0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/iulib/iulib-0.4.ebuild,v 1.3 2010/03/20 21:20:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/iulib/iulib-0.4.ebuild,v 1.4 2010/03/21 05:03:55 vapier Exp $ inherit eutils toolchain-funcs @@ -18,7 +18,10 @@ DEPEND="sys-libs/zlib media-libs/libpng media-libs/jpeg media-libs/tiff - sdl? ( media-libs/libsdl )" + sdl? ( + media-libs/libsdl + media-libs/sdl-gfx + )" src_unpack() { unpack ${A} @@ -27,7 +30,9 @@ src_unpack() { sed -i \ -e "/^have_sdl = 1/s:1:`use sdl && echo 1 || echo 0`:" \ -e '/tiff/s:inflate:TIFFOpen:' \ - SConstruct || die #297326 #308955 + -e '/progs.Append(LIBS=libiulib)/s:Append:Prepend:' \ + SConstruct || die #297326 #308955 #310439 + sed -i '/SDL.SDL_image.h/d' utils/dgraphics.cc || die #310443 } src_compile() { -- 2.26.2