Fix compilation with kernel 3.4, bug #421753 by Len Meakin.

Package-Manager: portage-2.1.11.3/cvs/Linux x86_64

4 files changed, 42 insertions, 7 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 9ee81969e1ab..af71fd17d862 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.95 2012/06/16 09:59:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.96 2012/06/30 11:14:14 pacho Exp $
+
+  30 Jun 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/svgalib-1.9.25-kernel3.4.patch, svgalib-1.9.25-r4.ebuild:
+  Fix compilation with kernel 3.4, bug #421753 by Len Meakin.
 
 *svgalib-1.9.25-r4 (16 Jun 2012)
 
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 6547cb67db12..a81951a5108c 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -6,6 +6,7 @@ AUX svgalib-1.9.25-build.patch 2163 RMD160 70255c504d944e173a98604ffb96a8f183930
 AUX svgalib-1.9.25-build2.patch 747 RMD160 bd4904d58b87e68e179c48c5cbf55416871eef50 SHA1 33664fbbe2fc66c033d4915953ef62ee34668dfa SHA256 dd89edb6a63e07f42c31db5844166261808d01d4d4271922e06854a6973c248d
 AUX svgalib-1.9.25-fPIC.patch 499 RMD160 97799d7be30e91ed1be96781b9b4fb6b2fb178ca SHA1 75c350fc632d7035e49ef3614893f5b163c9e2ed SHA256 6a6d0100aa7d9f4b6f5557338a5c5ca6adb5264b01c51f5f55be142f285823b4
 AUX svgalib-1.9.25-glibc210.patch 3842 RMD160 23210ad56b8f6491e43aa1e6ffe454272980c4ed SHA1 fd77a6ce10ed5bba54680cc73d81ab1f16ae0f40 SHA256 d8ac6b82406e9d85fbd7ce3f35ee94a3bb77b729352d62f51d51931c46a2a434
+AUX svgalib-1.9.25-kernel3.4.patch 1125 RMD160 00658734bc0d6995bde20d3b4323eea4715f16a9 SHA1 a1aef8e3d9de62d569d87228b4f4ca12663237f6 SHA256 8ce6db9fe60ac28a29765d2108ef6cb3d6cedea13bfecf0e3da424b3913fc8b0
 AUX svgalib-1.9.25-linux2.6.28.patch 1672 RMD160 6fb7b32d15c24f927d3d5566cdfacd70ecad212d SHA1 d578c12c05c6d2377972bb7a8f2164f2a9af2d79 SHA256 79e3b78faadc7fc4a0f965e8ce7564c0a391293105a5bcd88ce44a77543af512
 AUX svgalib-1.9.25-linux2.6.36-r1.patch 1244 RMD160 ad478c2a84fe8d3da8137a35d371c73c5ca07dab SHA1 1f49f3ae7959a83c859eb67a00658f45fc5e3fbb SHA256 1445663954f46a4a60777a9e8f8966f3c7e711327a921c6b65b0bef16961a1d2
 AUX svgalib-1.9.25-linux2.6.36.patch 1115 RMD160 d0b042e6a6c0d40818b95fc2306cbb84f710f514 SHA1 220a232db7a479487760dcc8b78d71c71dae058e SHA256 9d4094612b4ed221cabb20534c3caf9fe9efad2467962d788d6fb16b8c368a9f
@@ -15,13 +16,13 @@ AUX svgalib-1.9.25-segfault.patch 302 RMD160 cb8d6ca4838134c53a88828c7840debe378
 AUX svgalib.udev.rules.d.2 44 RMD160 55aa262f106cb98eabe3e6755222b5561da799cd SHA1 37892842ba2c7cb4d71f7e558a20a6dfa26c4204 SHA256 08973143b979ff88ff49701d7173cb6fb9661ea9c8f3911efc031435b648cc96
 DIST svgalib-1.9.25.tar.gz 987084 RMD160 e987f65ddb5610c575183e4a2058423eab3ce1e4 SHA1 187b2156dde0e8f397b130d14cc35237386273d6 SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602
 EBUILD svgalib-1.9.25-r1.ebuild 3824 RMD160 b50ebd6c1b45e9de620e9198c743035224a3c33a SHA1 c73dc93fecb575d266af9f6a2bb9f6014a106139 SHA256 cb8fea8df71e69c8aaf068ed5e41187ca786405a493817a3cfc73e153dcd9a11
-EBUILD svgalib-1.9.25-r4.ebuild 4030 RMD160 4da66ab211ca9422b2c4b2e7b7dc497e4dfd254c SHA1 5a55c43b06d59e4f30ac53bf140132632a0c2578 SHA256 dc375c6e42890dff34a555d7ff8b402d7a8eb5f5c4b497408f98231c7536b110
-MISC ChangeLog 16769 RMD160 7342cae341afbb722d98b2030ad8b3c3562bfc23 SHA1 72c19792faa739aa8d788cc63e9b0576e2954722 SHA256 3a1e63bca0c324b5a7c25048d0bfc31db6d86e652567e9ac0f3ecff297368784
+EBUILD svgalib-1.9.25-r4.ebuild 4081 RMD160 fe11cb6b7aeeb5481ccd213c1deee3387d11c5c7 SHA1 6220c2cfeeff18c3b67bef1e7b4ecc9efc20058e SHA256 4325ebebae7f50de14aa252b7e50b85bbe148beb60a691b5c437eb746d367dbb
+MISC ChangeLog 16945 RMD160 783eaa3f98862f76cd0c0580e5f5fa69bd35d6a5 SHA1 56920d3d5343c0b6aa936d4e5571a6c86289e7b4 SHA256 8a5cca6f8ed0666fbdf768390dcb4d557a8b347e0764afd30e14c50daed9f45d
 MISC metadata.xml 563 RMD160 eaae7835d9f39030edc6b44feeb462027db92a7f SHA1 3ee0746b8b3c4ac493f595615a9cecd029c54129 SHA256 013981488ee5703eef32fafc772c5d79fbe987c157a004ed7d9e7cef9f8b5cd9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk/cWQ0ACgkQCaWpQKGI+9TG/ACfTtqzuXZENDQYXWPbrxXQnM3g
-brwAnRz8odOxV+Uvn0urVpIAlNdW9ZsD
-=YfBR
+iEYEARECAAYFAk/u34wACgkQCaWpQKGI+9TURQCfXEW2hnDaePYJGDgwCI/x8kJ4
+LnsAmwSyXf+iKlJvdC0MK5ptN4Gngyi1
+=W1NY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch b/media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch
new file mode 100644
index 000000000000..5e2d1e527cbb
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch
@@ -0,0 +1,29 @@
+diff -Naur svgalib-1.9.25/kernel/svgalib_helper/main.c svgalib-1.9.25_new/kernel/svgalib_helper/main.c

+--- svgalib-1.9.25/kernel/svgalib_helper/main.c    2006-01-12 18:17:53.000000000 +0000

++++ svgalib-1.9.25_new/kernel/svgalib_helper/main.c    2012-06-25 15:02:11.000000000 +0100

+@@ -33,7 +33,9 @@

+ 

+ #include <asm/processor.h>

+ #include <asm/uaccess.h>

+-#include <asm/system.h>   /* cli(), *_flags */

++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)

++  #include <asm/system.h>   /* cli(), *_flags */

++#endif

+ #include <asm/segment.h>  /* memcpy and such */

+ #include <asm/io.h>

+ #include <asm/pgtable.h>

+diff -Naur svgalib-1.9.25/kernel/svgalib_helper/Makefile svgalib-1.9.25_new/kernel/svgalib_helper/Makefile

+--- svgalib-1.9.25/kernel/svgalib_helper/Makefile    2006-05-20 13:31:04.000000000 +0100

++++ svgalib-1.9.25_new/kernel/svgalib_helper/Makefile    2012-06-25 13:39:38.000000000 +0100

+@@ -11,9 +11,11 @@

+    PWD    := $(shell pwd)

+    TARGET  := svgalib_helper

+ 

++   ifneq ($(TOPDIR),)

+       ifeq ($(PATCHLEVEL),4)

+          include $(TOPDIR)/Rules.make

+       endif

++   endif 

+ 

+ else

+ 
\ No newline at end of file
diff --git a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
index f626c09d2266..5f8e9b34a5be 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.25-r4.ebuild,v 1.1 2012/06/16 09:59:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.25-r4.ebuild,v 1.2 2012/06/30 11:14:14 pacho Exp $
 
 EAPI="4"
 
@@ -36,6 +36,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.9.25-segfault.patch
 	epatch "${FILESDIR}"/${PN}-1.9.25-build2.patch
 	epatch "${FILESDIR}"/${PN}-1.9.25-qa.patch
+	epatch "${FILESDIR}"/${PN}-1.9.25-kernel3.4.patch
 	sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
 }