fix for amd64

4 files changed, 29 insertions, 5 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index fd87c317e81d..650bd98f5860 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.41 2004/04/27 08:05:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.42 2004/05/14 01:32:35 lv Exp $
+
+  13 May 2004; Travis Tilley <lv@gentoo.org> +files/cdrdao-1.1.8-cast.patch,
+  cdrdao-1.1.8-r1.ebuild:
+  added fix for amd64
 
 *cdrdao-1.1.8-r1 (17 Mar 2004)
 
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 7c3151674e83..eb4deeeadea6 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,15 +1,16 @@
 MD5 40d8c8936e6bd657d558993a17cd99a4 cdrdao-1.1.7-r2.ebuild 2742
 MD5 2c25e3db297f0e8289c305717b57d8f0 cdrdao-1.1.7.ebuild 1943
-MD5 6f286edaefc95134807580255cc3cbf5 cdrdao-1.1.8-r1.ebuild 1768
+MD5 af4b85325dd1d68f7d34dca51ad6a68d cdrdao-1.1.8-r1.ebuild 1919
 MD5 24170e206e6c1a3d5e6f95fecf75d4dc cdrdao-1.1.7-r3.ebuild 3046
 MD5 508dab1455947e00f8428a418e811243 cdrdao-1.1.8.ebuild 1456
-MD5 372436b67fd5db4eec8dc84f83550ec1 ChangeLog 5543
+MD5 b8eee91ebb44feddf343b0753524325c ChangeLog 5665
 MD5 bab69ebf527bd1791f4969f30c35cb38 metadata.xml 417
 MD5 24ed1424e23dee0c07caee0faab92ff1 cdrdao-1.1.5-r1.ebuild 2603
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7 69
 MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8 65
 MD5 6f398aabdbd1ed1aa966f460fdbac3d2 files/1.1.8-gcc34.patch 10476
 MD5 3ea011fa1308fc478529300a80443aab files/cdrdao-1.1.5-c++.patch 1622
+MD5 af6e60d9309156e8c64fafebfdd79e97 files/cdrdao-1.1.8-cast.patch 351
 MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779
 MD5 bfcab12a6211829eb71aa6ee3d0245be files/gcdmaster.desktop 127
 MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753
diff --git a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
index be2f0bf4faec..ec2b723cf950 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.3 2004/04/27 08:05:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.4 2004/05/14 01:32:35 lv Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/cdrdao/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
 IUSE="gnome debug"
 RESTRICT="nostrip"
 
@@ -36,6 +36,14 @@ src_unpack() {
 	cd scsilib/include
 	sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' xmconfig.h
 	sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' mconfig.h
+
+	if [ "${ARCH}" = "amd64" ]
+	then
+		cd ${S}
+		epatch ${FILESDIR}/${P}-cast.patch
+		cd scsilib/RULES
+		cp i686-linux-cc.rul x86_64-linux-cc.rul
+	fi
 }
 
 src_compile() {
diff --git a/app-cdr/cdrdao/files/cdrdao-1.1.8-cast.patch b/app-cdr/cdrdao/files/cdrdao-1.1.8-cast.patch
new file mode 100644
index 000000000000..60d0deb63c44
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.1.8-cast.patch
@@ -0,0 +1,11 @@
+--- cdrdao-1.1.8/trackdb/lec.cc.cast	2004-02-20 10:56:53.505801360 +0100
++++ cdrdao-1.1.8/trackdb/lec.cc	2004-02-20 11:00:26.328447400 +0100
+@@ -278,7 +278,7 @@
+   u_int32_t crc = 0;
+ 
+   while (len--) {
+-    crc = CRCTABLE[(crc ^ *data++) & 0xffL] ^ (crc >> 8);
++    crc = CRCTABLE[(int)((crc ^ *data++) & 0xffL)] ^ (crc >> 8);
+   }
+ 
+   return crc;