Author: raskin
Date: Wed Oct 13 15:48:37 2010
New Revision: 24267
URL: https://svn.nixos.org/websvn/nix/?rev=24267&sc=1
Log:
Fix XawTV build
Added:
nixpkgs/trunk/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch
Modified:
nixpkgs/trunk/pkgs/applications/video/xawtv/default.nix
Modified: nixpkgs/trunk/pkgs/applications/video/xawtv/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/xawtv/default.nix Wed Oct 13
13:12:43 2010 (r24266)
+++ nixpkgs/trunk/pkgs/applications/video/xawtv/default.nix Wed Oct 13
15:48:37 2010 (r24267)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, libXft, xproto, libFS,
fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto}:
+{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, libXft, xproto, libFS,
fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}:
stdenv.mkDerivation {
name = "xawtv-3.95";
@@ -6,7 +6,10 @@
url = http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz;
md5 = "ad25e03f7e128b318e392cb09f52207d";
};
+ preConfigure = ''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo
${linux}/lib/modules/*/build/include)"
+ '';
buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS fontsproto
libXaw libXpm libXext libSM libICE perl xextproto];
- patches = [./xawtv-3.95-libfs.patch ./xawtv-3.95-makefile.patch];
+ patches = [./xawtv-3.95-libfs.patch ./xawtv-3.95-makefile.patch
./xawtv-3.95-page-mask.patch ];
}
Added: nixpkgs/trunk/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/video/xawtv/xawtv-3.95-page-mask.patch
Wed Oct 13 15:48:37 2010 (r24267)
@@ -0,0 +1,44 @@
+Fix problems with fbtv and kernel headers
+
+diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c
+--- xawtv-3.95/console/fbtools.c 2003-02-14 14:14:04.000000000 +0000
++++ xawtv-3.95/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
+--- xawtv-3.95/console/matrox.c 2005-02-03 10:40:41.000000000 +0000
++++ xawtv-3.95/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;
+
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
