Fix bug #120551 - recording on 64 bit systems.

(Portage version: 2.1_pre4-r1)

6 files changed, 44 insertions, 5 deletions

diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog
index 185b3459e0c5..1964daab6b11 100644
--- a/x11-misc/xvidcap/ChangeLog
+++ b/x11-misc/xvidcap/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2006/01/21 19:15:01 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.18 2006/02/11 00:20:27 nelchael Exp $
+
+*xvidcap-1.1.3-r3 (11 Feb 2006)
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xvidcap-1.1.3-alpha_mask.patch, -xvidcap-1.1.3-r2.ebuild,
+  +xvidcap-1.1.3-r3.ebuild:
+  Fix bug #120551 - recording on 64 bit systems.
 
   21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   -xvidcap-1.1.3-r1.ebuild:
diff --git a/x11-misc/xvidcap/Manifest b/x11-misc/xvidcap/Manifest
index 15a8d09bfd28..098c9ce39d8d 100644
--- a/x11-misc/xvidcap/Manifest
+++ b/x11-misc/xvidcap/Manifest
@@ -1,6 +1,21 @@
 MD5 829492a131585f4ebc80dff84570139e ChangeLog 2143
-MD5 33358554888df8808749a9c3cf28348b files/digest-xvidcap-1.1.3-r2 66
+RMD160 7d9aae846078f82a4603eaf4cb844ddc565a4ece ChangeLog 2143
+SHA256 e04fc96f19326ade7b76b7d061225d063c1e90acbcc0c7763b0d5354e3315765 ChangeLog 2143
+MD5 047783d7053abeeba8c83d8590183f23 files/digest-xvidcap-1.1.3-r3 244
+RMD160 1f84bd94f681f4899e4cf56421a45ad4c4f0526a files/digest-xvidcap-1.1.3-r3 244
+SHA256 1dfe82776b2d19a1c55db1e413f5ae9ea5bf74e2f36c1049df7a0f7145aed759 files/digest-xvidcap-1.1.3-r3 244
+MD5 2d4c4432c7e3f9aa7bbd67a806429c07 files/xvidcap-1.1.3-alpha_mask.patch 429
+RMD160 12e6fcdc2548b44abf5df895eee58d48ffda6951 files/xvidcap-1.1.3-alpha_mask.patch 429
+SHA256 0df34b4351c2ef70d93243ff15feb7608831a6a9841195559d9c096d809eafd0 files/xvidcap-1.1.3-alpha_mask.patch 429
 MD5 093c63bdced794db036ee6ea29df14bd files/xvidcap-1.1.3-new-ffmpeg.patch 2200
+RMD160 f69090e799a8807cc5cf8d6681ea512382275484 files/xvidcap-1.1.3-new-ffmpeg.patch 2200
+SHA256 2d9b1f76414824ae1f78ae76dcf56d785df887d29ae90664172380ecdae76734 files/xvidcap-1.1.3-new-ffmpeg.patch 2200
 MD5 588ec359065346a6c3413d4ce9427ec5 files/xvidcap-1.1.3-use-ffmpeg-0.4.9.patch 573
+RMD160 ce728ff9ac1adc28bcb43e62a6b90755763585e6 files/xvidcap-1.1.3-use-ffmpeg-0.4.9.patch 573
+SHA256 effd63602ef1f1b77ae077261bcc5671166ea268f3ff42277a4d364e8ca60e83 files/xvidcap-1.1.3-use-ffmpeg-0.4.9.patch 573
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 d74359fe57b0a2a8935cf40dc4f8f3b6 xvidcap-1.1.3-r2.ebuild 1380
+RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
+SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 metadata.xml 166
+MD5 abb5c15ed17bd4bc4c85b6003e952e2f xvidcap-1.1.3-r3.ebuild 1444
+RMD160 5b19d608d0dd7911f7c8c1ff09117ea7b3d59335 xvidcap-1.1.3-r3.ebuild 1444
+SHA256 839ccac9afb5785d1217077d40fe15ceb7927d89e25494b646d024de76cf607d xvidcap-1.1.3-r3.ebuild 1444
diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r2 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r2
deleted file mode 100644
index 545730f3eabf..000000000000
--- a/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea896ffd35d6fe6d2abf51b38605f5fd xvidcap-1.1.3.tar.gz 1627036
diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r3 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r3
new file mode 100644
index 000000000000..e37fe8e3fca0
--- /dev/null
+++ b/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r3
@@ -0,0 +1,3 @@
+MD5 ea896ffd35d6fe6d2abf51b38605f5fd xvidcap-1.1.3.tar.gz 1627036
+RMD160 cc7be360153f192b502ffedc6548cce163a9154c xvidcap-1.1.3.tar.gz 1627036
+SHA256 21909257a46f67f37a6b3eedda5023490bf1e02946ae7c56d4b6f782087013d7 xvidcap-1.1.3.tar.gz 1627036
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.3-alpha_mask.patch b/x11-misc/xvidcap/files/xvidcap-1.1.3-alpha_mask.patch
new file mode 100644
index 000000000000..13ccb7b77748
--- /dev/null
+++ b/x11-misc/xvidcap/files/xvidcap-1.1.3-alpha_mask.patch
@@ -0,0 +1,12 @@
+diff -Nru xvidcap-1.1.3.vanilla/src/colors.h xvidcap-1.1.3/src/colors.h
+--- xvidcap-1.1.3.vanilla/src/colors.h	2006-02-07 13:42:19.000000000 +0100
++++ xvidcap-1.1.3/src/colors.h	2006-02-07 14:00:35.000000000 +0100
+@@ -37,7 +37,7 @@
+ 	unsigned long blue_bit_depth;
+ 	unsigned long alpha_bit_depth;
+ 
+-	unsigned long alpha_mask;
++	u_int32_t alpha_mask;
+ } ColorInfo;
+ 
+ void GetColorInfo (XImage *image, ColorInfo *return_struct);
diff --git a/x11-misc/xvidcap/xvidcap-1.1.3-r2.ebuild b/x11-misc/xvidcap/xvidcap-1.1.3-r3.ebuild
index cc54bfc43c2f..684d56b29db2 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.3-r2.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.3-r2.ebuild,v 1.2 2006/01/21 17:36:16 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.3-r3.ebuild,v 1.1 2006/02/11 00:20:27 nelchael Exp $
 
 inherit eutils
 
@@ -48,6 +48,9 @@ src_unpack() {
 
 	# Fix bug #115675
 	epatch "${FILESDIR}/${P}-new-ffmpeg.patch"
+
+	# Fix bug #120551
+	epatch "${FILESDIR}/${P}-alpha_mask.patch"
 }
 
 src_compile() {