[arch-commits] Commit in xawtv/trunk (PKGBUILD xawtv-3.95-pagemask-fix.patch)

[Eric Belanger]

    Date: Monday, June 30, 2008 @ 22:44:26
  Author: eric
Revision: 3791

upgpkg: xawtv 3.95-2
    rebuild against gpm 1.20.4, added arch tag, added license, added mesa makedepends, disabled SMP build, FSH man pages, Xorg 7 fixes

Added:
  xawtv/trunk/xawtv-3.95-pagemask-fix.patch
Modified:
  xawtv/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   20 +++++++++++-------
 xawtv-3.95-pagemask-fix.patch |   44 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-01 02:29:57 UTC (rev 3790)
+++ PKGBUILD	2008-07-01 02:44:26 UTC (rev 3791)
@@ -4,20 +4,26 @@
 
 pkgname=xawtv
 pkgver=3.95
-pkgrel=1
+pkgrel=2
 pkgdesc="Is a simple Xaw-based TV program which uses the bttv driver or video4linux."
+arch=('i686' 'x86_64')
+url="http://linux.bytesex.org/xawtv/"
+license=('GPL')
 depends=('libjpeg' 'alsa-lib' 'lesstif' 'libdv' 'zvbi' 'aalib' \
          'libxxf86dga' 'libfs' 'libxrandr' 'libxinerama' 'libxv' 'libxaw' \
-	 'libxxf86vm' 'libgl')
+	 'libxxf86vm' 'libgl' 'gpm>=1.20.4')
+makedepends=('mesa')
+options=('!makeflags')
 source=(http://dl.bytesex.org/releases/$pkgname/$pkgname-$pkgver.tar.gz \
-        xawtv-395.diff)
-url="http://linux.bytesex.org/xawtv/"
-md5sums=('ad25e03f7e128b318e392cb09f52207d')
+        xawtv-395.diff xawtv-3.95-pagemask-fix.patch)
+md5sums=('ad25e03f7e128b318e392cb09f52207d' '87a87b6c62b39348053704f052141843'\
+         '97493dfaac8c80084d8b66891becd76c')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   patch -Np1 < $startdir/src/xawtv-395.diff
-  ./configure --prefix=/usr
+  patch -Np1 < $startdir/src/xawtv-3.95-pagemask-fix.patch
+  ./configure --prefix=/usr --mandir=/usr/share/man
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$startdir/pkg resdir=$startdir/pkg/usr/lib/X11 install
 }

Added: xawtv-3.95-pagemask-fix.patch
===================================================================
--- xawtv-3.95-pagemask-fix.patch	                        (rev 0)
+++ xawtv-3.95-pagemask-fix.patch	2008-07-01 02:44:26 UTC (rev 3791)
@@ -0,0 +1,44 @@
+Patch from Andreas Jochens
+http://lists.debian.org/debian-qa-packages/2006/08/msg00519.html
+
+diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c
+--- ../tmp-orig/xawtv-3.95/console/fbtools.c	2003-02-14 14:14:04.000000000 +0000
++++ ./console/fbtools.c	2006-08-23 10:57:40.000000000 +0000
+@@ -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) & ~(sysconf(_SC_PAGE_SIZE)-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) {
+diff -urN ../tmp-orig/xawtv-3.95/console/matrox.c ./console/matrox.c
+--- ../tmp-orig/xawtv-3.95/console/matrox.c	2005-02-03 10:40:41.000000000 +0000
++++ ./console/matrox.c	2006-08-23 11:09:51.000000000 +0000
+@@ -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 & ~(sysconf(_SC_PAGE_SIZE)-1));
+     bmmio += off;
+     mmio = (uint32_t*)bmmio;
+     return 0;