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

Package-Manager: portage-2.1.2-r5

4 files changed, 95 insertions, 16 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/Manifest b/x11-misc/xvidcap/Manifest
index d5be3aa39a6d..7e1272703d27 100644
--- a/x11-misc/xvidcap/Manifest
+++ b/x11-misc/xvidcap/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xvidcap-1.1.4-xtoxwd.c.patch 1986 RMD160 d80ffb5ddc262921ad94e0a7a16f839a477401ff SHA1 335a56a9898493f3f349894ed67350b6ca0f0f19 SHA256 9a5e897407a1f8cb00a1de88a9693112317d0835c72fb11368adead7a47760fb
+MD5 e143d45f30736ba30b0b8853ebf655a6 files/xvidcap-1.1.4-xtoxwd.c.patch 1986
+RMD160 d80ffb5ddc262921ad94e0a7a16f839a477401ff files/xvidcap-1.1.4-xtoxwd.c.patch 1986
+SHA256 9a5e897407a1f8cb00a1de88a9693112317d0835c72fb11368adead7a47760fb files/xvidcap-1.1.4-xtoxwd.c.patch 1986
 DIST xvidcap-1.1.4.tar.gz 4004780 RMD160 506c85c2670e481833283b4f19de4d89ebcfabb3 SHA1 51b3a8e3fcc09ab0d2b224e9e6080def1c85ec09 SHA256 9e0833795b88a2dd246e1f9cb9b4c347e2355f70826cddf34a35043f4e8afa35
 DIST xvidcap-1.1.4rc1.tar.gz 2642762 RMD160 9e0d13da57feb6991a6ebe0d42db399d97da3c18 SHA1 473c9d4dd7dcae645077b711de4d5fcb56bab9fd SHA256 912df39e610397e78d40197dc603178d62d1e9de1c522de53a82db92810d8648
-EBUILD xvidcap-1.1.4.ebuild 984 RMD160 510f9e1f60886e5fc587c4c0e92ed6e56f385a92 SHA1 c33e336e7e1801c0bad25c604dd813fd11c2ec4d SHA256 99513a256968dce28b8f4b75f2ba037f2249047e45362fc54a6e847c42411896
-MD5 fd3a42bb4f867b1587eff2134c57b93d xvidcap-1.1.4.ebuild 984
-RMD160 510f9e1f60886e5fc587c4c0e92ed6e56f385a92 xvidcap-1.1.4.ebuild 984
-SHA256 99513a256968dce28b8f4b75f2ba037f2249047e45362fc54a6e847c42411896 xvidcap-1.1.4.ebuild 984
+EBUILD xvidcap-1.1.4.ebuild 1070 RMD160 627d4606041c407fd38866e52380f6966d19586d SHA1 2a168f86abe667002721f3ba022849fe5cd63d6f SHA256 c649227542a7cad5a4aa125a38b9353458e423bd3e64b4e45becf2c3a7390086
+MD5 a65cf0ce802f39f337d929851dfa5bfc xvidcap-1.1.4.ebuild 1070
+RMD160 627d4606041c407fd38866e52380f6966d19586d xvidcap-1.1.4.ebuild 1070
+SHA256 c649227542a7cad5a4aa125a38b9353458e423bd3e64b4e45becf2c3a7390086 xvidcap-1.1.4.ebuild 1070
 EBUILD xvidcap-1.1.4_rc1.ebuild 1019 RMD160 408c7ae362f95045c8f4593079b2d01d88bed3f0 SHA1 f2a1be1dceb3192ac21bb3941514f4801e052ba6 SHA256 84df47ac5ebeb3c8c90da534034aa72831d57af1d87b6989d342048744465b2c
 MD5 2f7bd715e9f6266adee17d8624ccaa40 xvidcap-1.1.4_rc1.ebuild 1019
 RMD160 408c7ae362f95045c8f4593079b2d01d88bed3f0 xvidcap-1.1.4_rc1.ebuild 1019
 SHA256 84df47ac5ebeb3c8c90da534034aa72831d57af1d87b6989d342048744465b2c xvidcap-1.1.4_rc1.ebuild 1019
-MISC ChangeLog 4142 RMD160 8fc251e967eedb1d08fa083f5679ad88d5a15571 SHA1 23a733a3ee0a004675406da2fec0659d74a22004 SHA256 356acc02a4767f913f3198d3412ec42d30afb9ee0dea23b97958db315e6560db
-MD5 a76917736d5ad7cb4f8ef9700bc1e09c ChangeLog 4142
-RMD160 8fc251e967eedb1d08fa083f5679ad88d5a15571 ChangeLog 4142
-SHA256 356acc02a4767f913f3198d3412ec42d30afb9ee0dea23b97958db315e6560db ChangeLog 4142
+MISC ChangeLog 4333 RMD160 b78d0bd5a0f96ea952b373ac1bfc4df1dc068586 SHA1 f1b65bd1ee9e5ff93d4bba84b9e41b8f8a64295d SHA256 19d3feeda47492d33e7c7542c8b1c8605d446423559112e447039d65c403e0cb
+MD5 0d36e705d819d278baba0dd8dc069002 ChangeLog 4333
+RMD160 b78d0bd5a0f96ea952b373ac1bfc4df1dc068586 ChangeLog 4333
+SHA256 19d3feeda47492d33e7c7542c8b1c8605d446423559112e447039d65c403e0cb ChangeLog 4333
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -26,9 +30,9 @@ MD5 164c233bad539af54d3bfbf11604a03e files/digest-xvidcap-1.1.4_rc1 253
 RMD160 887e29c30f6635107a1f26440ae4daa0fcd27f9c files/digest-xvidcap-1.1.4_rc1 253
 SHA256 80537b20385946efc650f02264f73e0c193a8138c55bab27bfb583e5241ccbfa files/digest-xvidcap-1.1.4_rc1 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFYE7ego/w9rxVVVERAnI7AKCkSUMD4Am+JBL4V+8DeUAkwEqRPACfdy1D
-vJhDKGM+iGt3WTgmZ0sNE5A=
-=kdSp
+iD8DBQFFxJlOgo/w9rxVVVERAuIGAJ9Zi0ENLa42ZtDxjDSY9h5F28sVTQCgjtU4
+QrlaNYcqwkd1NIvCc1QsXIc=
+=fpz/
 -----END PGP SIGNATURE-----
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"