summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-05-14 01:32:35 +0000
committerTravis Tilley <lv@gentoo.org>2004-05-14 01:32:35 +0000
commit03a26d0eeddb322e57d0af8aec7435fd378bbc0a (patch)
tree5104e7b4162b70056f2c12657e3c2185074f20ff /app-cdr/cdrdao
parentDep fix. Closes #50788 (Manifest recommit) (diff)
downloadgentoo-2-03a26d0eeddb322e57d0af8aec7435fd378bbc0a.tar.gz
gentoo-2-03a26d0eeddb322e57d0af8aec7435fd378bbc0a.tar.bz2
gentoo-2-03a26d0eeddb322e57d0af8aec7435fd378bbc0a.zip
fix for amd64
Diffstat (limited to 'app-cdr/cdrdao')
-rw-r--r--app-cdr/cdrdao/ChangeLog6
-rw-r--r--app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild12
-rw-r--r--app-cdr/cdrdao/files/cdrdao-1.1.8-cast.patch11
3 files changed, 26 insertions, 3 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/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;