From 4856a5827549ae16bc31e981ef677638b6243cee Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 10 Mar 2010 20:22:33 +0000 Subject: Fix building with libpng14 wrt #308875 by Locke Shinseiko. (Portage version: 2.2_rc66/cvs/Linux x86_64) --- games-sports/xmoto/ChangeLog | 5 ++++- games-sports/xmoto/xmoto-0.5.2.ebuild | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/games-sports/xmoto/ChangeLog b/games-sports/xmoto/ChangeLog index 9b33716969ac..21750d48841d 100644 --- a/games-sports/xmoto/ChangeLog +++ b/games-sports/xmoto/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-sports/xmoto # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.44 2010/01/07 00:48:52 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/ChangeLog,v 1.45 2010/03/10 20:22:33 ssuominen Exp $ + + 10 Mar 2010; Samuli Suominen xmoto-0.5.2.ebuild: + Fix building with libpng14 wrt #308875 by Locke Shinseiko. 07 Jan 2010; Joseph Jezak xmoto-0.5.2.ebuild: Marked ppc stable for bug #288801. diff --git a/games-sports/xmoto/xmoto-0.5.2.ebuild b/games-sports/xmoto/xmoto-0.5.2.ebuild index 1a651b3eada3..cb501aaea295 100644 --- a/games-sports/xmoto/xmoto-0.5.2.ebuild +++ b/games-sports/xmoto/xmoto-0.5.2.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/games-sports/xmoto/xmoto-0.5.2.ebuild,v 1.7 2010/01/07 00:48:52 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-sports/xmoto/xmoto-0.5.2.ebuild,v 1.8 2010/03/10 20:22:33 ssuominen Exp $ EAPI=2 inherit eutils flag-o-matic games @@ -21,7 +21,7 @@ RDEPEND=" dev-db/sqlite:3 dev-games/ode dev-lang/lua[deprecated] - media-libs/jpeg + media-libs/jpeg:0 media-libs/libpng media-libs/libsdl[joystick] media-libs/sdl-mixer[vorbis] @@ -43,8 +43,10 @@ src_prepare() { use editor && rm -vf "${WORKDIR}"/extensions/{bezmisc,inkex}.py sed -i \ -e '/^gettextsrcdir/s:=.*:= @localedir@/gettext/po:' \ - po/Makefile.in.in \ - || die "sed failed" + po/Makefile.in.in || die + sed -i \ + -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ + src/image/tim_png.cpp || die epatch "${FILESDIR}"/${P}-64bit.patch } -- cgit v1.2.3-65-gdbad