Add patch that fixes creating xwd files on 64 bit archs, see bug #158143.

(Portage version: 2.1.2-r5)

3 files changed, 79 insertions, 4 deletions

diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog
index 7b8755ffad53..6654bdd7f3a0 100644
--- a/x11-misc/xvidcap/ChangeLog
+++ b/x11-misc/xvidcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xvidcap
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.29 2006/11/19 12:32:17 nelchael Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.30 2007/02/03 14:14:57 nelchael Exp $
+
+  03 Feb 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xvidcap-1.1.4-xtoxwd.c.patch, xvidcap-1.1.4.ebuild:
+  Add patch that fixes creating xwd files on 64 bit archs, see bug #158143.
 
   19 Nov 2006; Krzysiek Pawlik <nelchael@gentoo.org> xvidcap-1.1.4.ebuild:
   Add missing app-text/scrollkeeper, see bug #155547.
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.4-xtoxwd.c.patch b/x11-misc/xvidcap/files/xvidcap-1.1.4-xtoxwd.c.patch
new file mode 100644
index 000000000000..9382d43165e8
--- /dev/null
+++ b/x11-misc/xvidcap/files/xvidcap-1.1.4-xtoxwd.c.patch
@@ -0,0 +1,63 @@
+diff -Nru xvidcap-1.1.4.vanilla/src/xtoxwd.c xvidcap-1.1.4/src/xtoxwd.c
+--- xvidcap-1.1.4.vanilla/src/xtoxwd.c	2007-01-10 11:57:05.000000000 +0100
++++ xvidcap-1.1.4/src/xtoxwd.c	2007-01-10 11:58:28.000000000 +0100
+@@ -51,9 +51,9 @@
+ }
+ 
+ /* 
+- * swap the byte order of a long integer (32 byte)
++ * swap the byte order of a integer (32 byte)
+  */
+-void swap_4byte(unsigned long *i)
++void swap_4byte(unsigned int *i)
+ {
+     unsigned char t;
+     unsigned char *p = (unsigned char *) i;
+@@ -69,10 +69,10 @@
+ /* 
+  * swap the byte order of a 32 bit word;
+  */
+-void swap_n_4byte(unsigned char *p, unsigned long n)
++void swap_n_4byte(unsigned char *p, unsigned int n)
+ {
+     register unsigned char t;
+-    register unsigned long i;
++    register unsigned int i;
+     for (i = 0; i < n; i++) {
+         t = p[0];
+         p[0] = p[3];
+@@ -87,7 +87,7 @@
+ /* 
+  * swap n bytes in a char array
+  */
+-void swap_n_bytes(unsigned char *p, unsigned long n)
++void swap_n_bytes(unsigned char *p, unsigned int n)
+ {
+     unsigned char t;
+     unsigned int i, h;
+@@ -104,7 +104,7 @@
+ /* 
+  * global, we need this to check if we must swap some bytes
+  */
+-static unsigned long little_endian = 1;
++static unsigned int little_endian = 1;
+ 
+ /* 
+  * prepare the color table for the xwd file
+@@ -175,13 +175,13 @@
+         head.ncolors = (CARD32) job->ncolors;
+         head.window_width = (CARD32) win_attr.width;
+         head.window_height = (CARD32) win_attr.height;
+-        head.window_x = (long) win_attr.x;
+-        head.window_y = (long) win_attr.y;
++        head.window_x = (CARD32) win_attr.x;
++        head.window_y = (CARD32) win_attr.y;
+         head.window_bdrwidth = (CARD32) win_attr.border_width;
+ 
+         if (*(char *) &little_endian)
+             swap_n_4byte((unsigned char *) &head,
+-                         sizeof(head) / sizeof(long));
++                         sizeof(head) / sizeof(int));
+     }
+     if (fwrite((char *) &head, sizeof(head), 1, fp) < 1)
+         perror(file);
diff --git a/x11-misc/xvidcap/xvidcap-1.1.4.ebuild b/x11-misc/xvidcap/xvidcap-1.1.4.ebuild
index a6d168f8115a..ccbc6a067e73 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.4.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.4.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/x11-misc/xvidcap/xvidcap-1.1.4.ebuild,v 1.2 2006/11/19 12:32:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.4.ebuild,v 1.3 2007/02/03 14:14:57 nelchael Exp $
 
 inherit eutils autotools
 
@@ -23,6 +23,14 @@ RDEPEND=">=media-video/ffmpeg-0.4.9_pre1
 
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-xtoxwd.c.patch"
+
+}
+
 src_compile() {
 
 	econf `use_with gtk gtk2` || die "Configuration failed"