summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-03-21 05:03:55 +0000
committerMike Frysinger <vapier@gentoo.org>2010-03-21 05:03:55 +0000
commit3e40c713b9b424462c669d22213e1d1a5c1b4755 (patch)
tree7831adaa646b4677c9d9bfe53ef8524d1da73cc6 /media-libs/iulib
parentVersion bump, drop old versions (diff)
downloadgentoo-2-3e40c713b9b424462c669d22213e1d1a5c1b4755.tar.gz
gentoo-2-3e40c713b9b424462c669d22213e1d1a5c1b4755.tar.bz2
gentoo-2-3e40c713b9b424462c669d22213e1d1a5c1b4755.zip
Pull in sdl-gfx depend and remove useless sdl-image include #310443 by Samuli Suominen. Fix by Samuli Suominen for as-needed issues #310439.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/iulib')
-rw-r--r--media-libs/iulib/ChangeLog6
-rw-r--r--media-libs/iulib/iulib-0.4.ebuild11
2 files changed, 13 insertions, 4 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 <vapier@gentoo.org> 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 <vapier@gentoo.org> iulib-0.4.ebuild:
Fix tiff check #308955 by Samuli Suominen and automagic SDL depends
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() {