diff --git a/jfbterm-0.4.7-pagemask_userspace.patch b/jfbterm-0.4.7-pagemask_userspace.patch new file mode 100644 index 0000000..b298ebb --- /dev/null +++ b/jfbterm-0.4.7-pagemask_userspace.patch @@ -0,0 +1,17 @@ +--- jfbterm-0.4.7/fbcommon.h.pagemask 2003-09-03 00:24:06.000000000 +0900 ++++ jfbterm-0.4.7/fbcommon.h 2007-08-22 17:10:35.000000000 +0900 +@@ -30,6 +30,14 @@ + + #include + ++#ifndef PAGE_MASK ++#undef PAGE_SHIFT ++#include ++#include ++#define PAGE_SHIFT sysconf(_SC_PAGESIZE) ++#define PAGE_MASK (~(PAGE_SIZE-1)) ++#endif ++ + struct Raw_TFrameBufferMemory; + + typedef struct Raw_TFrameBufferCapability { diff --git a/jfbterm-0.4.7-ppc.patch b/jfbterm-0.4.7-ppc.patch deleted file mode 100644 index 1840d28..0000000 --- a/jfbterm-0.4.7-ppc.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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; diff --git a/jfbterm.spec b/jfbterm.spec index 6a042a6..86bc0b1 100644 --- a/jfbterm.spec +++ b/jfbterm.spec @@ -1,7 +1,7 @@ Summary: Japanese Console for Linux Frame Buffer Device Name: jfbterm Version: 0.4.7 -Release: 10%{?dist}.2 +Release: 11%{?dist} License: BSD Group: Applications/System Source0: http://downloads.sourceforge.jp/jfbterm/13501/jfbterm-%{version}.tar.gz @@ -15,7 +15,7 @@ Patch5: jfbterm-0.4.7-userspace.patch 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 +Patch13: jfbterm-0.4.7-pagemask_userspace.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) URL: http://jfbterm.sourceforge.jp/ @@ -61,7 +61,7 @@ Features: %patch10 -p1 -b .remove_warn %patch11 -p1 -b .nmap_newkernel %patch12 -p1 -b .hang_onexit -%patch13 -p1 -b .ppc_page_mask +%patch13 -p1 -b .pagemask %build # Copy fonts for a moment. @@ -177,6 +177,9 @@ iconv -f EUCJP -t UTF8 README.ja.orig > README.ja && \ %endif %changelog +* Wed Aug 22 2007 Mamoru Tasaka - 0.4.7-11 +- Use sysconf instead of kernel-private MAGE_SIZE macro + * Wed Aug 22 2007 Mamoru Tasaka - 0.4.7-10.dist.2 - Mass rebuild (buildID or binutils issue)