diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2008-06-11 13:35:40 +0000 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2008-06-11 13:35:40 +0000 |
| commit | 0d828453ed4690914489a30bcc124c16da3d7eba (patch) | |
| tree | 7c156e70bc3b271e33131ab32828560ad8975eaa /patches/xawtv-3.95 | |
| parent | b4983228f5a0f62dc1333c78adaf6738cb8ea6fc (diff) | |
| download | ptxdist-0d828453ed4690914489a30bcc124c16da3d7eba.tar.gz ptxdist-0d828453ed4690914489a30bcc124c16da3d7eba.tar.xz | |
* xawtv: add patch for ppc (copied from debian)
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8490 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches/xawtv-3.95')
| -rw-r--r-- | patches/xawtv-3.95/generic/page_size.diff | 50 | ||||
| -rw-r--r-- | patches/xawtv-3.95/generic/series | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/patches/xawtv-3.95/generic/page_size.diff b/patches/xawtv-3.95/generic/page_size.diff new file mode 100644 index 000000000..ccec0eb42 --- /dev/null +++ b/patches/xawtv-3.95/generic/page_size.diff @@ -0,0 +1,50 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix build against newer kernel-headers which do not define PAGE_MASK anymore. + +@DPATCH@ +diff -urN xawtv-3.95.orig/console/fbtools.c xawtv-3.95/console/fbtools.c +--- xawtv-3.95.orig/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 xawtv-3.95.orig/console/matrox.c xawtv-3.95/console/matrox.c +--- xawtv-3.95.orig/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; + + + diff --git a/patches/xawtv-3.95/generic/series b/patches/xawtv-3.95/generic/series index 0c9dd0865..a4286b6d3 100644 --- a/patches/xawtv-3.95/generic/series +++ b/patches/xawtv-3.95/generic/series @@ -1 +1,2 @@ xawtv-cross.patch +page_size.diff |