Added a patch to allow building splashutils against 2.6.14 on ppc (bug #112744).

(Portage version: 2.0.53_rc7)

5 files changed, 36 insertions, 25 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 751754e4ec26..a619e5814864 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.47 2005/09/29 08:47:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.48 2005/11/20 21:05:01 spock Exp $
+
+  20 Nov 2005; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.1.9.10-ppc-2.6.14.patch, splashutils-1.1.9.10.ebuild:
+  Added a patch to allow building splashutils against 2.6.14 on ppc (bug
+  #112744).
 
 *splashutils-1.1.9.10 (29 Sep 2005)
 
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 7a549c8d43c3..bf10feacc579 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 98fd11c248eba6f1f945bc2d7e530664 splashutils-1.1.9.9.ebuild 6323
-MD5 4180e756570d9f26db82b36b42c8cbc3 splashutils-1.1.9.8.ebuild 6287
-MD5 75ff271de4f54f2216844b1985739b93 splashutils-1.1.9.10.ebuild 6245
 MD5 ca9fde5b643138d691df691a5225d772 ChangeLog 10416
-MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
-MD5 1b03f7bbbe2db156b7b1a54d51d76ea0 splashutils-1.1.9.9-r1.ebuild 6234
-MD5 887e148191dfd124be52f9682e391c78 files/digest-splashutils-1.1.9.9-r1 483
+MD5 c518e5f1875064cb0c5784f53f9db7f5 files/digest-splashutils-1.1.9.10 484
 MD5 c55d25b2df1c791c0fa802c0de31af73 files/digest-splashutils-1.1.9.8 547
 MD5 227086af2d5e8360c3e2f23cdbfb97eb files/digest-splashutils-1.1.9.9 548
-MD5 e7021220db09b50d71298675110c4c40 files/digest-splashutils-1.1.9.10 484
+MD5 887e148191dfd124be52f9682e391c78 files/digest-splashutils-1.1.9.9-r1 483
+MD5 033bcf7cc012be52eb277d29f532ac89 files/splashutils-1.1.9.10-ppc-2.6.14.patch 770
 MD5 c9591cbde5eca614a8e1694ee01c315f files/splashutils-1.1.9.9-external-klibc.patch 10294
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDO6pgchej4aZK9/cRAjDJAJ9XEslfNJmhMqc3uypsv91bhVB2iwCeLTMy
-7PMoYtbBHGAHnHvGh+iMiWk=
-=o9O6
------END PGP SIGNATURE-----
+MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
+MD5 90b83eefa8465d2173933fde56ce0ea2 splashutils-1.1.9.10.ebuild 6328
+MD5 4180e756570d9f26db82b36b42c8cbc3 splashutils-1.1.9.8.ebuild 6287
+MD5 1b03f7bbbe2db156b7b1a54d51d76ea0 splashutils-1.1.9.9-r1.ebuild 6234
+MD5 98fd11c248eba6f1f945bc2d7e530664 splashutils-1.1.9.9.ebuild 6323
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10
index 623c3f264ac8..d3024bebfec2 100644
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.10
+++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.10
@@ -1,7 +1,7 @@
-MD5 3603b1d5124bf7a143f201dd828c95d7 splashutils-lite-1.1.9.10.tar.bz2 55094
-MD5 89c00eb118a549348bd3a97ee7087ecc splashutils-gentoo-0.1.14.tar.bz2 7750
-MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
-MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
-MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
 MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
+MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
+MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
+MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
+MD5 89c00eb118a549348bd3a97ee7087ecc splashutils-gentoo-0.1.14.tar.bz2 7750
+MD5 3603b1d5124bf7a143f201dd828c95d7 splashutils-lite-1.1.9.10.tar.bz2 55094
 MD5 dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 425209
diff --git a/media-gfx/splashutils/files/splashutils-1.1.9.10-ppc-2.6.14.patch b/media-gfx/splashutils/files/splashutils-1.1.9.10-ppc-2.6.14.patch
new file mode 100644
index 000000000000..d1647e11a430
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.1.9.10-ppc-2.6.14.patch
@@ -0,0 +1,13 @@
+Index: splashutils-1.1.9.10/Makefile
+===================================================================
+--- splashutils-1.1.9.10.orig/Makefile
++++ splashutils-1.1.9.10/Makefile
+@@ -48,7 +48,7 @@ ROOT	= $(shell pwd)
+ 
+ # flags for the kernel utils
+ K_CFLAGS = -w -ffunction-sections -fdata-sections $(MISCINCS) \
+-	   -I$(ROOT)/$(ZLIBSRC) -I$(ROOT)/$(FT2SRC)/include -I$(ROOT)/linux/include -I$(ROOT)/linux/include2 \
++	   -I$(ROOT)/$(ZLIBSRC) -I$(ROOT)/$(FT2SRC)/include -I$(ROOT)/linux/include -I$(ROOT)/linux/include2 -I$(ROOT)/linux/arch/$(ARCH)/include \
+ 	   -DWITH_ERRLIST -DTARGET_KERNEL -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
+ 
+ PNGDEFS = -DPNG_NO_WRITE_TIME -DPNG_NO_FLOATING_POINT_SUPPORTED -DPNG_NO_WRITE_SUPPORTED -DPNG_NO_READ_iTXt \
diff --git a/media-gfx/splashutils/splashutils-1.1.9.10.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10.ebuild
index b1bf8e25f288..6439a30eef07 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.10.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10.ebuild,v 1.1 2005/09/29 08:47:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10.ebuild,v 1.2 2005/11/20 21:05:01 spock Exp $
 
 inherit eutils multilib linux-mod
 
@@ -87,6 +87,8 @@ src_unpack() {
 	rm ${S}/libs/zlib-${V_ZLIB}/Makefile
 	cd ${S}
 
+	epatch ${FILESDIR}/splashutils-1.1.9.10-ppc-2.6.14.patch
+
 	# Check whether the kernel tree has been patched with fbsplash.
 	if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then
 		ewarn "Your kernel in ${KV_DIR} has not been patched with a compatible version"
@@ -128,7 +130,7 @@ src_compile() {
 	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
 	cd ${S}
 	export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
-	emake -j1 LIB=$(get_libdir) || die "failed to build splashutils"
+	emake -j1 LIB=$(get_libdir) ARCH=$(tc-arch-kernel) || die "failed to build splashutils"
 }
 
 src_install() {