rpms/svgalib/devel svgalib-1.9.21-ppc.patch, NONE, 1.1 svgalib.spec, 1.1, 1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/svgalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27514

Modified Files:
	svgalib.spec 
Added Files:
	svgalib-1.9.21-ppc.patch 
Log Message:
Fix PPC compilation

svgalib-1.9.21-ppc.patch:

--- NEW FILE svgalib-1.9.21-ppc.patch ---
diff -ur svgalib-1.9.21.orig/src/drivers/mach32.c svgalib-1.9.21/src/drivers/mach32.c
--- svgalib-1.9.21.orig/src/drivers/mach32.c	2005-08-05 18:17:09.000000000 +0200
+++ svgalib-1.9.21/src/drivers/mach32.c	2005-08-05 18:16:26.000000000 +0200
@@ -150,7 +150,11 @@
 #include <time.h>
 #include <sys/types.h>
 #include <sys/mman.h>
+#ifdef PPC
+#include <asm/io.h>
+#else 
 #include <sys/io.h>
+#endif
 
 #include "mach32.h"
 #include "8514a.h"
Only in svgalib-1.9.21/src/drivers: mach32.c~
diff -ur svgalib-1.9.21.orig/src/vga.c svgalib-1.9.21/src/vga.c
--- svgalib-1.9.21.orig/src/vga.c	2005-08-05 18:17:09.000000000 +0200
+++ svgalib-1.9.21/src/vga.c	2005-08-05 18:15:38.000000000 +0200
@@ -28,7 +28,11 @@
 #include <sys/vt.h>
 #include <sys/wait.h>
 #include <sys/syslog.h>
+#ifdef PPC
+#include <asm/io.h>
+#else
 #include <sys/io.h>
+#endif
 
 #ifdef INCLUDE_VESA_DRIVER
 #include <sys/vm86.h>
Only in svgalib-1.9.21/src: vga.c~
diff -ur svgalib-1.9.21.orig/src/vga_helper.c svgalib-1.9.21/src/vga_helper.c
--- svgalib-1.9.21.orig/src/vga_helper.c	2005-08-05 18:17:09.000000000 +0200
+++ svgalib-1.9.21/src/vga_helper.c	2005-08-05 18:16:10.000000000 +0200
@@ -1,4 +1,8 @@
+#ifdef PPC
+#include <asm/io.h>
+#else 
 #include <sys/io.h>
+#endif
 #include <sys/ioctl.h>
 #include "svgalib_helper.h"
 #include "libvga.h"
Only in svgalib-1.9.21/src: vga_helper.c~
diff -ur svgalib-1.9.21.orig/utils/fix132x43.c svgalib-1.9.21/utils/fix132x43.c
--- svgalib-1.9.21.orig/utils/fix132x43.c	2005-08-05 18:17:09.000000000 +0200
+++ svgalib-1.9.21/utils/fix132x43.c	2005-08-05 18:16:39.000000000 +0200
@@ -47,7 +47,11 @@
 #include <string.h>
 #include <unistd.h>
 #include <vga.h>
+#ifdef PPC
+#include <asm/io.h>
+#else 
 #include "sys/io.h"	/* For port I/O macros. */
+#endif
 #define OUTB(a,d) outb(d,a)
 
 static void fixfont (int);
Only in svgalib-1.9.21/utils: fix132x43.c~
diff -ur svgalib-1.9.21.orig/utils/setmclk.c svgalib-1.9.21/utils/setmclk.c
--- svgalib-1.9.21.orig/utils/setmclk.c	2005-08-05 18:17:09.000000000 +0200
+++ svgalib-1.9.21/utils/setmclk.c	2005-08-05 18:16:34.000000000 +0200
@@ -39,7 +39,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <vga.h>
+#ifdef PPC
+#include <asm/io.h>
+#else 
 #include <sys/io.h>	/* For port I/O macros. */
+#endif
 #define OUTB(a,d) outb(d,a)
 
 int
Only in svgalib-1.9.21/utils: setmclk.c~


Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svgalib.spec	5 Aug 2005 09:37:40 -0000	1.1
+++ svgalib.spec	5 Aug 2005 16:20:21 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		svgalib
 Version:	1.9.21
-Release:	2
+Release:	3
 Summary:	Low-level fullscreen SVGA graphics library
 
 Group:		System Environment/Libraries
@@ -16,6 +16,7 @@
 Patch5:		svgalib-1.9.21-wip2.patch
 Patch6:		svgalib-1.9.21-cfg.patch
 Patch7:		svgalib-1.9.21-x86_64.patch
+Patch8:		svgalib-1.9.21-ppc.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	libvga = %{version}-%{release}
 
@@ -49,6 +50,7 @@
 %ifnarch %{ix86}
 %patch7 -p1 -b .x86_64
 %endif
+%patch8 -p1 -b .ppc
 #the testlinear demo needs svgalib's internal libvga header, so copy it to the
 #demo dir
 cp src/libvga.h demos
@@ -129,6 +131,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Aug 5 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.21-3
+- Add patch 7 to fix compilation on ppc
+
 * Wed Aug 3 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.21-2
 - I've been working with upstream to get most patches intergrated, so
   most patches are gone now.