diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-06-30 11:14:14 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-06-30 11:14:14 +0000 |
| commit | 80652942e902bbb2c50d1b2a69d18a1759adc179 (patch) | |
| tree | c4b7df76bfef65500503a5a6caa9ef6f84f4688c /media-libs/svgalib | |
| parent | Apitest is no longer provided, bug #423331 by Mike Callahan and others. (diff) | |
| download | gentoo-2-80652942e902bbb2c50d1b2a69d18a1759adc179.tar.gz gentoo-2-80652942e902bbb2c50d1b2a69d18a1759adc179.tar.bz2 gentoo-2-80652942e902bbb2c50d1b2a69d18a1759adc179.zip | |
Fix compilation with kernel 3.4, bug #421753 by Len Meakin.
(Portage version: 2.1.11.3/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/svgalib')
| -rw-r--r-- | media-libs/svgalib/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch | 29 | ||||
| -rw-r--r-- | media-libs/svgalib/svgalib-1.9.25-r4.ebuild | 3 |
3 files changed, 36 insertions, 2 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/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 } |