rpms/xawtv/devel xawtv-3.95-pagesize.patch, NONE, 1.1 xawtv.spec, 1.1, 1.2

[Dmitry Butskoy (buc)]

Author: buc

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

Modified Files:
	xawtv.spec 
Added Files:
	xawtv-3.95-pagesize.patch 
Log Message:


xawtv-3.95-pagesize.patch:

--- NEW FILE xawtv-3.95-pagesize.patch ---
diff -Nrbu xawtv-3.95/console/fbtools.c xawtv-3.95-OK/console/fbtools.c
--- xawtv-3.95/console/fbtools.c	2003-02-14 17:14:04.000000000 +0300
+++ xawtv-3.95-OK/console/fbtools.c	2007-06-25 16:51:24.000000000 +0400
@@ -21,8 +21,6 @@
 #include <linux/vt.h>
 #include <linux/fb.h>
 
-#include <asm/page.h>
-
 #include "fbtools.h"
 
 /* -------------------------------------------------------------------- */
@@ -424,7 +422,7 @@
 	goto err;
     }
 #endif
-    fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK);
+    fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (getpagesize()-1);
     fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,
 		  PROT_READ|PROT_WRITE,MAP_SHARED,fb,0);
     if (-1L == (long)fb_mem) {


Index: xawtv.spec
===================================================================
RCS file: /cvs/extras/rpms/xawtv/devel/xawtv.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xawtv.spec	25 Jun 2007 11:25:58 -0000	1.1
+++ xawtv.spec	25 Jun 2007 13:07:02 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
 Version: 3.95
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://bytesex.org/xawtv/
@@ -14,6 +14,7 @@
 Patch2: xawtv-3.95-gcc4.patch
 Patch3: xawtv-3.95-font.patch
 Patch4: xawtv-3.95-region.patch
+Patch5: xawtv-3.95-pagesize.patch
 
 BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel
 BuildRequires: libFS-devel, libXft-devel, libXinerama-devel
@@ -44,6 +45,7 @@
 %patch2 -p1 -b .gcc4
 %patch3 -p1 -b .font
 %patch4 -p1 -b .region
+%patch5 -p1 -b .pagesize
 
 sed -i -e 's,/usr/X11R6/lib/X11,%{_datadir}/X11,g' configure.ac
 sed -i -e 's,/usr/X11R6/include/X11,%{_includedir}/X11,g' Makefile.in
@@ -134,6 +136,9 @@
 
 
 %changelog
+* Mon Jun 25 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 3.95-2
+- add patch for use getpagesize() instead of a kernel headers macro
+
 * Thu Jun 21 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 3.95-1
 - spec file cleanup
 - accepted for Fedora (review by Jason Tibbitts <tibbs at math.uh.edu>)