Fix compilation with linux-headers-2.6.20, patch from Andreas Jochens, thanks to...

Package-Manager: portage-2.1.2-r13

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 29299551a642680e162680059674a45dd980160c..c694b2359acf4fc47de7fe20f621e42b6af8887e 100644 (file)
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/xawtv
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.55 2006/12/31 18:07:46 beandog Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.56 2007/03/02 17:26:49 aballier Exp $
+
+  02 Mar 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/xawtv-3.95-pagemask-fix.patch, xawtv-3.95-r1.ebuild:
+  Fix compilation with linux-headers-2.6.20, patch from Andreas Jochens,
+  thanks to Nicolas Boichat <nicolas@boichat.ch> for reporting that in bug
+  #168527
 
   31 Dec 2006; Steve Dibb <beandog@gentoo.org> xawtv-3.95-r1.ebuild:
   Fix libpng dep, bug 150826

diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index 820259968c669fc7bba9d51e2e49ad174d2bc5dc..b7218ac92c30b9f512d5872eba9ae1b770ef58de 100644 (file)
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX webcamrc 597 RMD160 54897fefd31711f402da3e39cb97d4ef63bb200b SHA1 0a9d7d1fe4e455c9bee387fdc6334df73f33b233 SHA256 9cf61695be6b8005c663a6c73f90bd4b048f9e16f95ba659b6bc1087bc6e248e
 MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
 RMD160 54897fefd31711f402da3e39cb97d4ef63bb200b files/webcamrc 597
@@ -6,17 +9,21 @@ AUX xawtv-3.95-libquicktime-compat.patch 1040 RMD160 07a6a212136dd6b1108a1fc1605
 MD5 4797c31e903a3f5b4c092e4da8ba68f6 files/xawtv-3.95-libquicktime-compat.patch 1040
 RMD160 07a6a212136dd6b1108a1fc1605506e9f94a8ceb files/xawtv-3.95-libquicktime-compat.patch 1040
 SHA256 e7c49e00e845d237478ba13b7afdfa4f8e59d49749a1f953464ae848b90454b3 files/xawtv-3.95-libquicktime-compat.patch 1040
+AUX xawtv-3.95-pagemask-fix.patch 1466 RMD160 4407a85bf518bf7d02bec44d7f436b085c1a69d5 SHA1 7983bc9977a1b3cdb7a6b68f390175ef82d26c00 SHA256 9e47b5e49fd64bd5cf67452d5c010434bf43d4006b1ff946f9f198913e75eee5
+MD5 97493dfaac8c80084d8b66891becd76c files/xawtv-3.95-pagemask-fix.patch 1466
+RMD160 4407a85bf518bf7d02bec44d7f436b085c1a69d5 files/xawtv-3.95-pagemask-fix.patch 1466
+SHA256 9e47b5e49fd64bd5cf67452d5c010434bf43d4006b1ff946f9f198913e75eee5 files/xawtv-3.95-pagemask-fix.patch 1466
 DIST tv-fonts-1.1.tar.bz2 80177 RMD160 0bf4aa9ebc8b08edfc3b6c306e0d9efad3656652 SHA1 e35d1ddf5cc0b68a5935e5cabd2fbb1c39c6f760 SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efcd08516732720a1a4704d9f6
 DIST xawtv-3.95.tar.gz 555731 RMD160 1dc7b564bec0515cc409c723904ec9c6f8dae998 SHA1 0b0743fc06aae4f1a03c8572bcf2baa9b869ff52 SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f
 DIST xawtv-patches-4.tar.bz2 3258 RMD160 83199822cca5c06fb155b0764fccf77a61c8040e SHA1 18e2feb33fccb231261438125ac6aad26b029bc9 SHA256 0d1a6c386c9e3ea58e92ab26268f620a3e36d888dd8cbaa46441e38215a69e9e
-EBUILD xawtv-3.95-r1.ebuild 3753 RMD160 a417f3fa00a42e440f8e9d99c776c4b94ce32583 SHA1 0d419dbf8f6bc9015e37292d93e6eb4a1846038e SHA256 c64e36d41a6ef8311c2c736ebb7f468556282c80d0f1ce51943359d1493e3398
-MD5 98a59075f1a3fca8f3f8641498b0be17 xawtv-3.95-r1.ebuild 3753
-RMD160 a417f3fa00a42e440f8e9d99c776c4b94ce32583 xawtv-3.95-r1.ebuild 3753
-SHA256 c64e36d41a6ef8311c2c736ebb7f468556282c80d0f1ce51943359d1493e3398 xawtv-3.95-r1.ebuild 3753
-MISC ChangeLog 13901 RMD160 1629c42bbfb1baf81d5826ccba718d3837b23bcc SHA1 966109ae409736fcdf55e5dc730989968dcf4afc SHA256 5b3dc7ea5861fab709a25f28e5b39593f780eafa133385717c386fa558559461
-MD5 ad054a02059f4f158c2590bb49adff37 ChangeLog 13901
-RMD160 1629c42bbfb1baf81d5826ccba718d3837b23bcc ChangeLog 13901
-SHA256 5b3dc7ea5861fab709a25f28e5b39593f780eafa133385717c386fa558559461 ChangeLog 13901
+EBUILD xawtv-3.95-r1.ebuild 3800 RMD160 6d37d9cff262661ce4e9b36025938035774e2478 SHA1 2fc8f2a1af749ed2ea4736ab285298f435defd94 SHA256 c671002a264aa198a7695ba5e52a36eb34259b792fc64c01fb6829740179812f
+MD5 e386fe4af7edcbe931ef1d250bff42f4 xawtv-3.95-r1.ebuild 3800
+RMD160 6d37d9cff262661ce4e9b36025938035774e2478 xawtv-3.95-r1.ebuild 3800
+SHA256 c671002a264aa198a7695ba5e52a36eb34259b792fc64c01fb6829740179812f xawtv-3.95-r1.ebuild 3800
+MISC ChangeLog 14175 RMD160 06b04ca06ee2d40837982f11cdd6ea593d42db6a SHA1 47cbc147a540aa61cb2309ab28e32d0ef3a43b7f SHA256 a9fc7ed0f36d23cb319c70f4dc1590b4aa6ead490e0865db5e65ea7ea2c135e8
+MD5 b7b06f76f60dba8c651c113d6276826a ChangeLog 14175
+RMD160 06b04ca06ee2d40837982f11cdd6ea593d42db6a ChangeLog 14175
+SHA256 a9fc7ed0f36d23cb319c70f4dc1590b4aa6ead490e0865db5e65ea7ea2c135e8 ChangeLog 14175
 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 metadata.xml 161
@@ -24,3 +31,10 @@ SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd metadata
 MD5 40bc1b04486363a955d554c7dc4b09dc files/digest-xawtv-3.95-r1 714
 RMD160 5c98df6758630be0b66e92dbde4f21ae57f5a23e files/digest-xawtv-3.95-r1 714
 SHA256 ab680678250961966b41a66a91c20b4c3508b5728848c42cd3d4bc3331f4c062 files/digest-xawtv-3.95-r1 714
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF6F5fvFcC4BYPU0oRAoALAKCs+lXbFOWRnDyrRFf3P925YFG+9wCgpApG
+HsCdV9RZztkb771FzZsJK6I=
+=GIdG
+-----END PGP SIGNATURE-----

diff --git a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch b/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
new file mode 100644 (file)
index 0000000..ab635f7
--- /dev/null
+++ b/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
@@ -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;

diff --git a/media-tv/xawtv/xawtv-3.95-r1.ebuild b/media-tv/xawtv/xawtv-3.95-r1.ebuild
index 796b035999f39f6235905f8b753f5bb5324d3485..73a84f7d0b4fe4f6b3a00c10a531adf11a815745 100644 (file)
--- a/media-tv/xawtv/xawtv-3.95-r1.ebuild
+++ b/media-tv/xawtv/xawtv-3.95-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.21 2006/12/31 18:07:46 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.95-r1.ebuild,v 1.22 2007/03/02 17:26:49 aballier Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -78,6 +78,7 @@ src_unpack() {
 
        EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
        epatch "${FILESDIR}/${P}-libquicktime-compat.patch"
+       epatch "${FILESDIR}/${P}-pagemask-fix.patch"
        eautoreconf
 }