Fix compilation problems with 2.6.19+ kernels (bug #164806).

Package-Manager: portage-2.1.2-r9

4 files changed, 41 insertions, 18 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 3c8c50e1afdb..8448d52f6fb9 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.71 2007/01/27 15:40:40 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.72 2007/02/10 14:23:37 spock Exp $
+
+  10 Feb 2007; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.1.9.10-types_h.patch, splashutils-1.1.9.10-r1.ebuild:
+  Fix compilation problems with 2.6.19+ kernels (bug #164806).
 
   27 Jan 2007; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.3-initrd-chvt.patch, splashutils-1.3-r2.ebuild,
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 85353fd99890..199c813c4020 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -13,6 +13,10 @@ AUX splashutils-1.1.9.10-ppc-2.6.14.patch 749 RMD160 0642a987ff97cc18294840c37a2
 MD5 6b70ab6899c37465a35de0f0a89c6365 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
 RMD160 0642a987ff97cc18294840c37a2f88aa4f252450 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
 SHA256 3995fd9d153a80f709882cbafc9c2330061eb0c8b6187b136ce79e956617f000 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
+AUX splashutils-1.1.9.10-types_h.patch 424 RMD160 87e86d7e1949565ebd8d0526a9ec3c24a2427e78 SHA1 439ddd2756d2d70fd5af99cdd030c1b0bcee9801 SHA256 60b5144f6fe2ba3bcde061eea5d87d8cc96a3565bbcc2ef1bb19d2d340f4e87b
+MD5 53f2b4e6ca85df9238a92ea7747a3394 files/splashutils-1.1.9.10-types_h.patch 424
+RMD160 87e86d7e1949565ebd8d0526a9ec3c24a2427e78 files/splashutils-1.1.9.10-types_h.patch 424
+SHA256 60b5144f6fe2ba3bcde061eea5d87d8cc96a3565bbcc2ef1bb19d2d340f4e87b files/splashutils-1.1.9.10-types_h.patch 424
 AUX splashutils-1.3-initrd-chvt.patch 1780 RMD160 e71e8f5102ed7f5e00e3ca2b6e92a7fcbb840920 SHA1 9a813e192c03d6d041551efbf9fe0b68b094849b SHA256 bf86846bc90c2184b7d4fc02a85b9d909313036d9480859478b181f878f32c35
 MD5 18a70173c33159b9cac048486be50c8e files/splashutils-1.3-initrd-chvt.patch 1780
 RMD160 e71e8f5102ed7f5e00e3ca2b6e92a7fcbb840920 files/splashutils-1.3-initrd-chvt.patch 1780
@@ -44,10 +48,10 @@ DIST splashutils-lite-1.1.9.8.tar.bz2 55013 RMD160 377396b94562f4cde5e298170f762
 DIST splashutils-lite-1.3.tar.bz2 61079 RMD160 4d5296ed0b2a7a7783cfe5f9f25b53fa56307bc7 SHA1 22349164fc0512a698ae2f387bfd7845d3f8063e SHA256 4f94e91ee81acea4d6ef8d481b32cf15cd7987030e048e0e249eec995ef8a5d0
 DIST zlib-1.2.1.tar.bz2 284152 RMD160 aca88eb02d90b91c732f351e1b7efd4ce409ee25 SHA1 13bd164df955911c25342adfad805c1cad5e398e SHA256 9ea4bd04487e05254d05cebde539b3855af2899658e2da84487e86f7f400e0e1
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
-EBUILD splashutils-1.1.9.10-r1.ebuild 6873 RMD160 2669d3a1890b1086abaf32454c96d6bb7f58b2ef SHA1 406243677d40df826b5053621f4a0dfa53dbdb96 SHA256 a9c5b33e2583705ecbaf0066de51d77a7da0d4baea2b48186087cbfb81f32ff5
-MD5 a007b304b60ea0d122a7e5d153efb3ba splashutils-1.1.9.10-r1.ebuild 6873
-RMD160 2669d3a1890b1086abaf32454c96d6bb7f58b2ef splashutils-1.1.9.10-r1.ebuild 6873
-SHA256 a9c5b33e2583705ecbaf0066de51d77a7da0d4baea2b48186087cbfb81f32ff5 splashutils-1.1.9.10-r1.ebuild 6873
+EBUILD splashutils-1.1.9.10-r1.ebuild 6864 RMD160 123a3c1b3789a5d90d461811e3589a356c5c81b9 SHA1 10d82a4d88d2bbd7683a700009769a30a6a8cbf3 SHA256 4be9e32911aa265931a061ebb0767e26fcb0ee752464140f2e7797f712820784
+MD5 8666dcdb6e527b71f6cbdb2624160193 splashutils-1.1.9.10-r1.ebuild 6864
+RMD160 123a3c1b3789a5d90d461811e3589a356c5c81b9 splashutils-1.1.9.10-r1.ebuild 6864
+SHA256 4be9e32911aa265931a061ebb0767e26fcb0ee752464140f2e7797f712820784 splashutils-1.1.9.10-r1.ebuild 6864
 EBUILD splashutils-1.1.9.8-r1.ebuild 6450 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 SHA1 8cd9ff8737d7f40c2ffd7cde62c6b37df887539c SHA256 05085409393be9b3561dfa05fcbac6fea86bb2aaf1c82b0b11b31ba9ab8a590b
 MD5 e79713db9ac0cc2a97fcabab4fe83275 splashutils-1.1.9.8-r1.ebuild 6450
 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 splashutils-1.1.9.8-r1.ebuild 6450
@@ -60,10 +64,10 @@ EBUILD splashutils-1.3-r3.ebuild 7167 RMD160 db1eeda993d9f5b1e5b4f0436c6d18a80c5
 MD5 0ea144780a3b1d31dc2f39f78ecdb773 splashutils-1.3-r3.ebuild 7167
 RMD160 db1eeda993d9f5b1e5b4f0436c6d18a80c538691 splashutils-1.3-r3.ebuild 7167
 SHA256 e4d701a6eb8eba4582ff3a3fd1eb09767c5d57f0527eebe15b917fd3ba5e9947 splashutils-1.3-r3.ebuild 7167
-MISC ChangeLog 14882 RMD160 c2187a6e8d950c692e1316113d53633681e6b5f4 SHA1 c8baff4e4b4c7ed30698a496c887163e210097b1 SHA256 83e832f9939c6a4a9dae0019138878eeb8d83733f40aa60b3a87bfc082fabac5
-MD5 36043ad0f429169303fee163b4f650e3 ChangeLog 14882
-RMD160 c2187a6e8d950c692e1316113d53633681e6b5f4 ChangeLog 14882
-SHA256 83e832f9939c6a4a9dae0019138878eeb8d83733f40aa60b3a87bfc082fabac5 ChangeLog 14882
+MISC ChangeLog 15077 RMD160 29f7337cf19541667f6e4c1ccfdd8e6f6612bf0a SHA1 38321e66bb279277a2ff4b17fff893ee7bb6822b SHA256 f8411781a8b92c94031787144c51ac459789670c49d78ada1f69a7bcc93305ba
+MD5 53cda1be9321c32eafce73150d5fffa0 ChangeLog 15077
+RMD160 29f7337cf19541667f6e4c1ccfdd8e6f6612bf0a ChangeLog 15077
+SHA256 f8411781a8b92c94031787144c51ac459789670c49d78ada1f69a7bcc93305ba ChangeLog 15077
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -81,9 +85,9 @@ MD5 4d847b245ed019bdbc5e49db00f16411 files/digest-splashutils-1.3-r3 1756
 RMD160 6cf154f3a835edc1b7c14afbc1880a1debeebd98 files/digest-splashutils-1.3-r3 1756
 SHA256 033b154e5cba7f58d9cce3d213a3b1f229e3750c78526e26cd04d9a5fac383a4 files/digest-splashutils-1.3-r3 1756
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFu3Kdchej4aZK9/cRArxIAJ9pwDALX2L6GQ+nSRTGiveG9V4uiwCfUHXo
-KBfatIErMPTpYG48vl4XbUQ=
-=stbI
+iD8DBQFFzdVychej4aZK9/cRAnINAJ98g/xB8Vi2sCblefxpHFgMRCf8egCfWGPq
+Jm1nCnZ6RkGzOK/PT0jhGbY=
+=XJdR
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.1.9.10-types_h.patch b/media-gfx/splashutils/files/splashutils-1.1.9.10-types_h.patch
new file mode 100644
index 000000000000..84ab9c8e9aeb
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.1.9.10-types_h.patch
@@ -0,0 +1,14 @@
+diff -Naurp splashutils-1.1.9.10-orig/render.c splashutils-1.1.9.10/render.c
+--- splashutils-1.1.9.10-orig/render.c	2007-02-10 15:05:53.000000000 +0100
++++ splashutils-1.1.9.10/render.c	2007-02-10 15:06:36.000000000 +0100
+@@ -17,9 +17,9 @@
+ #undef __KERNEL__
+ #endif
+ 
+-#include <linux/fb.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <linux/fb.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
diff --git a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
index 0b7afc9e564d..4d4af9214662 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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-r1.ebuild,v 1.7 2006/09/27 15:06:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild,v 1.8 2007/02/10 14:23:37 spock Exp $
 
 inherit eutils multilib linux-mod
 
@@ -92,9 +92,10 @@ src_unpack() {
 	rm ${S}/libs/zlib-${V_ZLIB}/Makefile
 	cd ${S}
 
-	epatch ${FILESDIR}/splashutils-1.1.9.10-ppc-2.6.14.patch
-	epatch ${FILESDIR}/splashutils-1.1.9.10-makefile.patch
-	epatch ${FILESDIR}/splashutils-1.1.9.10-2.6.18-vt-fix.patch
+	epatch ${FILESDIR}/${P}-ppc-2.6.14.patch
+	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch ${FILESDIR}/${P}-2.6.18-vt-fix.patch
+	epatch ${FILESDIR}/${P}-types_h.patch
 
 	# Check whether the kernel tree has been patched with fbsplash.
 	if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then