rpms/jfbterm/devel jfbterm-0.4.7-ppc.patch, NONE, 1.1 jfbterm.spec, 1.1, 1.2

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	jfbterm.spec 
Added Files:
	jfbterm-0.4.7-ppc.patch 
Log Message:


jfbterm-0.4.7-ppc.patch:

--- NEW FILE jfbterm-0.4.7-ppc.patch ---
--- jfbterm-0.4.7/fbcommon.c.ppc	2006-08-21 11:10:36.000000000 +0900
+++ jfbterm-0.4.7/fbcommon.c	2006-08-21 11:52:04.000000000 +0900
@@ -480,6 +480,13 @@
 	}
 }
 
+/* The following may happen on ppc */
+/* Bollowed from /include/asm-powerpc/page.h */
+#ifndef PAGE_MASK
+#define PAGE_SHIFT        12
+#define PAGE_MASK         (~((1 << PAGE_SHIFT) - 1))
+#endif
+
 void tfbm_open(TFrameBufferMemory* p)
 {
 	struct stat st;


Index: jfbterm.spec
===================================================================
RCS file: /cvs/extras/rpms/jfbterm/devel/jfbterm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jfbterm.spec	21 Aug 2006 02:16:09 -0000	1.1
+++ jfbterm.spec	21 Aug 2006 02:55:11 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:   Japanese Console for Linux Frame Buffer Device
 Name:      jfbterm
 Version:   0.4.7
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   BSD
 Group:     Applications/System
 Source0:   http://downloads.sourceforge.jp/jfbterm/13501/jfbterm-%{version}.tar.gz
@@ -15,6 +15,7 @@
 Patch10:   jfbterm-0.4.7-remove-warning.patch
 Patch11:   jfbterm-0.4.7-mmap-newkernel.patch
 Patch12:   jfbterm-0.4.7-hang-onexit.patch
+Patch13:   jfbterm-0.4.7-ppc.patch
 
 BuildRoot:   %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 URL:         http://jfbterm.sourceforge.jp/
@@ -60,6 +61,7 @@
 %patch10 -p1 -b .remove_warn
 %patch11 -p1 -b .nmap_newkernel
 %patch12 -p1 -b .hang_onexit
+%patch13 -p1 -b .ppc_page_mask
 
 %build
 # Copy fonts for a moment.
@@ -200,6 +202,9 @@
 %{_datadir}/terminfo/j/jfbterm
 
 %ChangeLog
+* Sun Aug 20 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-7
+- Fix compilation problem on ppc.
+
 * Sun Aug 20 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.4.7-6
 - Really require fonts as they are symlinks.