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

[Dmitry Butskoy (buc)]

Author: buc

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

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


xawtv-3.95-pagesize.patch:

Index: xawtv-3.95-pagesize.patch
===================================================================
RCS file: /cvs/extras/rpms/xawtv/devel/xawtv-3.95-pagesize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xawtv-3.95-pagesize.patch	25 Jun 2007 13:07:02 -0000	1.1
+++ xawtv-3.95-pagesize.patch	25 Jun 2007 13:21:45 -0000	1.2
@@ -1,6 +1,6 @@
 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
++++ xawtv-3.95-OK/console/fbtools.c	2007-06-25 17:17:58.000000000 +0400
 @@ -21,8 +21,6 @@
  #include <linux/vt.h>
  #include <linux/fb.h>
@@ -19,3 +19,23 @@
      fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,
  		  PROT_READ|PROT_WRITE,MAP_SHARED,fb,0);
      if (-1L == (long)fb_mem) {
+diff -Nrbu xawtv-3.95/console/matrox.c xawtv-3.95-OK/console/matrox.c
+--- xawtv-3.95/console/matrox.c	2005-02-03 13:40:41.000000000 +0300
++++ xawtv-3.95-OK/console/matrox.c	2007-06-25 17:19:02.000000000 +0400
+@@ -9,7 +9,6 @@
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
+ 
+-#include <asm/page.h> /* PAGE_SIZE */
+ #include <linux/fb.h>
+ 
+ #include "byteswap.h"
+@@ -226,7 +225,7 @@
+ 	return -1;
+     }
+     off = (unsigned long)fb_fix.mmio_start -
+-	((unsigned long)fb_fix.mmio_start & ~(PAGE_SIZE-1));
++	((unsigned long)fb_fix.mmio_start & ~(getpagesize()-1));
+     bmmio += off;
+     mmio = (uint32_t*)bmmio;
+     return 0;


Index: xawtv.spec
===================================================================
RCS file: /cvs/extras/rpms/xawtv/devel/xawtv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xawtv.spec	25 Jun 2007 13:07:02 -0000	1.2
+++ xawtv.spec	25 Jun 2007 13:21:45 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: TV applications for video4linux compliant devices
 Name: xawtv
 Version: 3.95
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://bytesex.org/xawtv/
@@ -136,7 +136,7 @@
 
 
 %changelog
-* Mon Jun 25 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 3.95-2
+* Mon Jun 25 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 3.95-3
 - add patch for use getpagesize() instead of a kernel headers macro
 
 * Thu Jun 21 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 3.95-1