xserver-xorg-video-ivtvdev: Changes to 'debian-unstable'
debian/changelog | 9 ++++++++
debian/patches/remove-PAGE_MASK | 38 +++++++++++++++++++++++++++++++++++++
debian/patches/remove-xf86_ansic.h | 17 +++++++++-------
debian/patches/series | 1
4 files changed, 58 insertions(+), 7 deletions(-)
New commits:
commit 71455798b16225aff65eb920bcb547b51ae42d27
Author: Ian Campbell <ijc@hellion.org.uk>
Date: Thu Sep 20 19:12:24 2007 +0100
Update patches to silence build warnings and hopefully fix FTBFS on hppa, mips
& powerpc.
diff --git a/debian/changelog b/debian/changelog
index 48da4f7..53c4151 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-ivtvdev (1.0.0~svn4049-3) unstable; urgency=low
+
+ * Use sysconf(_SC_PAGESIZE) instead of PAGE_MASK, fixes FTBFS on powerpc,
+ mips, hppa (new patch remove-PAGE_MASK).
+ * Update patch remove-xf86_ansic.h to include headers for ioctl, mmap,
+ munmap & close, fixes build warnings.
+
+ -- Ian Campbell <ijc@hellion.org.uk> Thu, 20 Sep 2007 19:00:59 +0100
+
xserver-xorg-video-ivtvdev (1.0.0~svn4049-2) unstable; urgency=low
* Build against xserver 1.4.
diff --git a/debian/patches/remove-PAGE_MASK b/debian/patches/remove-PAGE_MASK
new file mode 100644
index 0000000..db88ffb
--- /dev/null
+++ b/debian/patches/remove-PAGE_MASK
@@ -0,0 +1,38 @@
+Index: xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c
+===================================================================
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtv_hw.c 2007-09-20 18:55:16.000000000 +0100
++++ xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c 2007-09-20 19:00:32.000000000 +0100
+@@ -557,12 +557,13 @@
+ ivtvHWMapVidmem(ScrnInfoPtr pScrn)
+ {
+ ivtvHWPtr hwPtr = IVTVDEVHWPTR(pScrn);
++ long page_mask = ~(sysconf(_SC_PAGESIZE) - 1);
+
+ TRACE_ENTER("MapVidmem");
+ if (NULL == hwPtr->fbmem) {
+- hwPtr->fboff = (unsigned long)hwPtr->fix.smem_start & ~PAGE_MASK;
++ hwPtr->fboff = (unsigned long)hwPtr->fix.smem_start & ~page_mask;
+ hwPtr->fbmem_len =
+- (hwPtr->fboff + hwPtr->fix.smem_len + ~PAGE_MASK) & PAGE_MASK;
++ (hwPtr->fboff + hwPtr->fix.smem_len + ~page_mask) & page_mask;
+ hwPtr->fbmem =
+ mmap(NULL, hwPtr->fbmem_len, PROT_READ | PROT_WRITE, MAP_SHARED,
+ hwPtr->fd, 0);
+@@ -573,14 +574,14 @@
+ } else {
+ /* Perhaps we'd better add fboff to fbmem and return 0 in
+ * ivtvHWLinearOffset()? Of course we then need to mask
+- * fPtr->fbmem with PAGE_MASK in ivtvHWUnmapVidmem() as
++ * fPtr->fbmem with page_mask in ivtvHWUnmapVidmem() as
+ * well. [geert] */
+ }
+ }
+ pScrn->memPhysBase =
+- (unsigned long)hwPtr->fix.smem_start & (unsigned long)(PAGE_MASK);
++ (unsigned long)hwPtr->fix.smem_start & (unsigned long)(page_mask);
+ pScrn->fbOffset =
+- (unsigned long)hwPtr->fix.smem_start & (unsigned long)(~PAGE_MASK);
++ (unsigned long)hwPtr->fix.smem_start & (unsigned long)(~page_mask);
+ return hwPtr->fbmem;
+ }
+
diff --git a/debian/patches/remove-xf86_ansic.h b/debian/patches/remove-xf86_ansic.h
index 4b386a7..2ef1fc2 100644
--- a/debian/patches/remove-xf86_ansic.h
+++ b/debian/patches/remove-xf86_ansic.h
@@ -4,9 +4,9 @@ Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
Index: xserver-xorg-video-ivtvdev.git/src/ivtv.c
===================================================================
---- xserver-xorg-video-ivtvdev.git.orig/src/ivtv.c 2007-08-26 10:06:06.000000000 +0100
-+++ xserver-xorg-video-ivtvdev.git/src/ivtv.c 2007-08-26 10:18:42.000000000 +0100
-@@ -12,7 +12,6 @@
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtv.c 2007-09-18 08:24:59.000000000 +0100
++++ xserver-xorg-video-ivtvdev.git/src/ivtv.c 2007-09-20 18:53:26.000000000 +0100
+@@ -40,7 +40,6 @@
/* all drivers need this */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -16,22 +16,25 @@ Index: xserver-xorg-video-ivtvdev.git/src/ivtv.c
#include "mibstore.h"
Index: xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c
===================================================================
---- xserver-xorg-video-ivtvdev.git.orig/src/ivtv_hw.c 2007-08-26 10:06:06.000000000 +0100
-+++ xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c 2007-08-26 10:19:10.000000000 +0100
-@@ -2,6 +2,12 @@
+--- xserver-xorg-video-ivtvdev.git.orig/src/ivtv_hw.c 2007-09-18 08:24:59.000000000 +0100
++++ xserver-xorg-video-ivtvdev.git/src/ivtv_hw.c 2007-09-20 19:02:15.000000000 +0100
+@@ -32,6 +32,15 @@
# include "config.h"
#endif
++#include <sys/ioctl.h>
++#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <errno.h>
+#include <fcntl.h>
++#include <unistd.h>
+
#include "ivtv_compat.h"
#include "ivtv_hw.h"
#include "ivtv.h"
-@@ -9,7 +15,6 @@
+@@ -39,7 +48,6 @@
/* all drivers need this */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/debian/patches/series b/debian/patches/series
index 2256471..1596c0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
remove-xf86_ansic.h
+remove-PAGE_MASK
Reply to: