From 488cfd834b2c3c24d4d2c55db01799658531cac2 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 10 Mar 2010 21:02:26 +0000 Subject: [PATCH] Fix building with jpeg-8 wrt #308895 by Locke Shinseiko. Package-Manager: portage-2.2_rc66/cvs/Linux x86_64 --- games-fps/qudos/ChangeLog | 5 ++++- games-fps/qudos/Manifest | 4 ++-- games-fps/qudos/qudos-0.40.1.ebuild | 8 ++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/games-fps/qudos/ChangeLog b/games-fps/qudos/ChangeLog index 7b253c502a42..6422ed659be4 100644 --- a/games-fps/qudos/ChangeLog +++ b/games-fps/qudos/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-fps/qudos # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/ChangeLog,v 1.9 2010/01/25 22:50:52 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/ChangeLog,v 1.10 2010/03/10 21:02:26 ssuominen Exp $ + + 10 Mar 2010; Samuli Suominen qudos-0.40.1.ebuild: + Fix building with jpeg-8 wrt #308895 by Locke Shinseiko. 25 Jan 2010; Michael Sterrett qudos-0.40.1.ebuild: EAPI=2; tidy diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest index 91229d9eb9a5..e985e410f362 100644 --- a/games-fps/qudos/Manifest +++ b/games-fps/qudos/Manifest @@ -1,5 +1,5 @@ DIST QuDos-0.40.1-src.tar.bz2 2031636 RMD160 998c9ff2f6ee702ed391946afd2924081cdb6976 SHA1 008ee5df6c0d3a1ed475ab2b373013970a570300 SHA256 90d8dbbbe4e006b4233b9c8c20bc3da5c240dde8fdf17ccf43ca533d296aa21a DIST QuDos-0.40.1.pk3 5253128 RMD160 21a2643300126753ae2a5f07597807e6f5a2a549 SHA1 982f91d17f369754906465bfe96bb2395cfc7f3f SHA256 c02e0df50785d5b360ec5435e2fd3d31b337f28f676b7af141a8e2664f518f1c -EBUILD qudos-0.40.1.ebuild 4744 RMD160 19d97bdd4db5cbaece65e09345cf3dcfbc858184 SHA1 0df8e572395ce67b56df2299f639faa17308cbf0 SHA256 2c33a11a46230533a7e0418aa596c03e1633529255a471f75a0041e27a0caac5 -MISC ChangeLog 1448 RMD160 1a11d079c5a8ec00e548522e28c0e11617e6c9c9 SHA1 8c0486cc9e28bcf92635e01e0636039d9e7ce88b SHA256 1e23b073aa63ac14f0fbabf53e359ad7d018e4178fb5a9a63ee8f0ff1a7c2a40 +EBUILD qudos-0.40.1.ebuild 4833 RMD160 7aef4f9b77cdd81168245c48345b8f14a03f5dfc SHA1 cbc7103deed7b6ee1992584ffa649db9a00e5267 SHA256 481ed9e3fe55c9268270d835c51a6fcb6252f746c771e003dbb813c6e5725914 +MISC ChangeLog 1584 RMD160 8e03458169528379b0768e1edf02d0558a30d417 SHA1 cb19d6c3b09230c81236896965a82b29341261ec SHA256 4892a8826f97a7b0986e6411960b17d60d0ebf9d055cdd1680875b6723f6afee MISC metadata.xml 488 RMD160 1a6bb96dde922755d33b65b721e79d4d8dab309b SHA1 b0435bdea92b49c65f71ff16b02795716ae85711 SHA256 8f2ca78e00c4b7f92c729835efb4100e2756fe88a362f7c4410388b28ff2d60a diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild index 50baebb976d0..ae786e5b2a6b 100644 --- a/games-fps/qudos/qudos-0.40.1.ebuild +++ b/games-fps/qudos/qudos-0.40.1.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-fps/qudos/qudos-0.40.1.ebuild,v 1.10 2010/01/25 22:50:52 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/qudos/qudos-0.40.1.ebuild,v 1.11 2010/03/10 21:02:26 ssuominen Exp $ EAPI=2 inherit eutils toolchain-funcs games @@ -24,7 +24,7 @@ UIDEPEND="alsa? ( media-libs/alsa-lib ) virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl ) - media-libs/jpeg + media-libs/jpeg:0 media-libs/libogg media-libs/libpng media-libs/libvorbis @@ -108,6 +108,10 @@ src_prepare() { -e "s:\"oss\":\"${snd_drv}\":" \ -e "s:\"\./snd:\"$(games_get_libdir)/${PN}/snd:" \ || die "sed snd_dma.c failed" + + sed -i \ + -e 's:jpeg_mem_src:qudos_jpeg_mem_src:g' \ + src/ref_gl/gl_image.c || die } src_compile() { -- 2.26.2