[gentoo-commits] gentoo-x86 commit in media-libs/svgalib/files: svgalib-1.9.25-kernel3.4.patch

[Pacho Ramos (pacho)]

pacho       12/06/30 11:14:14

  Added:                svgalib-1.9.25-kernel3.4.patch
  Log:
  Fix compilation with kernel 3.4, bug #421753 by Len Meakin.
  
  (Portage version: 2.1.11.3/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/svgalib/files/svgalib-1.9.25-kernel3.4.patch?rev=1.1&content-type=text/plain

Index: svgalib-1.9.25-kernel3.4.patch
===================================================================
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