summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad House <brad_mssw@gentoo.org>2003-10-26 03:59:04 +0000
committerBrad House <brad_mssw@gentoo.org>2003-10-26 03:59:04 +0000
commit708c840aea91094f5f0b03acca68fde0ccfc49c0 (patch)
tree7b1bf6840aa9175ad2949b8cc88fde548995e820
parentnabi 0.9 new version (diff)
downloadgentoo-2-708c840aea91094f5f0b03acca68fde0ccfc49c0.tar.gz
gentoo-2-708c840aea91094f5f0b03acca68fde0ccfc49c0.tar.bz2
gentoo-2-708c840aea91094f5f0b03acca68fde0ccfc49c0.zip
amd64 compile fix
-rw-r--r--media-tv/xawtv/ChangeLog6
-rw-r--r--media-tv/xawtv/Manifest12
-rw-r--r--media-tv/xawtv/xawtv-3.90.ebuild13
3 files changed, 22 insertions, 9 deletions
diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 7d27d2414003..7a47f6486d29 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-tv/xawtv
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.5 2003/10/21 22:25:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.6 2003/10/26 03:59:01 brad_mssw Exp $
+
+ 26 Oct 2003; Brad House <brad_mssw@gentoo.org> xawtv-3.90.ebuild:
+ take out use_enable mmx for amd64 as it assumes 32bit assembly which is
+ obviously incorrect
*xawtv-3.90 (21 Oct 2003)
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index 666e2cb3088a..e60b982ede93 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,12 +1,12 @@
+MD5 a0dec81bebd5d6370c35391a8ffe94bc ChangeLog 6266
MD5 4f37cfbf9c5930cd2840b183942c9551 xawtv-3.86-r1.ebuild 2444
-MD5 78d31b717dbd8c504deb63503c602956 xawtv-3.88.1.ebuild 2438
-MD5 af4bcf4483d820a35169819871afa1f9 xawtv-3.90.ebuild 2109
MD5 0d4dc8d0b888cedba21c463bc5cba94c xawtv-3.88.ebuild 2437
-MD5 123d380c95a07d4092f1d8e46edd6366 ChangeLog 6099
MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 309f5000ed37fb2aef346e12a62fbb04 files/digest-xawtv-3.88.1 207
+MD5 78d31b717dbd8c504deb63503c602956 xawtv-3.88.1.ebuild 2438
+MD5 4c86e892ad054e121efcd1e5eecc2320 xawtv-3.90.ebuild 2266
+MD5 6a07c4c744b1c6004fb3d6504359ed50 files/digest-xawtv-3.86-r1 399
MD5 2d7c5b5b3bb0b4ebfe507c800e5b5e21 files/digest-xawtv-3.88 205
-MD5 75d1944d291d44ff7e8e55150dac925c files/digest-xawtv-3.90 205
MD5 e4dcb4819e11ae2fb4fa72f4f8420bca files/tv-fonts-1.0-gentoo.diff 426
-MD5 6a07c4c744b1c6004fb3d6504359ed50 files/digest-xawtv-3.86-r1 399
MD5 04a2ce4d8937cc7dfc255082396fa5fe files/webcamrc 597
+MD5 309f5000ed37fb2aef346e12a62fbb04 files/digest-xawtv-3.88.1 207
+MD5 75d1944d291d44ff7e8e55150dac925c files/digest-xawtv-3.90 205
diff --git a/media-tv/xawtv/xawtv-3.90.ebuild b/media-tv/xawtv/xawtv-3.90.ebuild
index 950574602287..16242c28d272 100644
--- a/media-tv/xawtv/xawtv-3.90.ebuild
+++ b/media-tv/xawtv/xawtv-3.90.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.90.ebuild,v 1.2 2003/10/21 22:27:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.90.ebuild,v 1.3 2003/10/26 03:59:01 brad_mssw Exp $
inherit virtualx
@@ -32,6 +32,15 @@ DEPEND=">=sys-libs/ncurses-5.1
quicktime? ( virtual/quicktime )"
src_compile() {
+
+# mmx enables 32bit assembly which is not valid when compiling 64bit on amd64
+ if [ "${ARCH}" = "x86" ]
+ then
+ myconf="`use_enable mmx`"
+ else
+ myconf=""
+ fi
+
econf \
--with-x \
--enable-xfree-ext \
@@ -41,9 +50,9 @@ src_compile() {
`use_enable motif` \
`use_enable quicktime` \
`use_enable alsa` \
- `use_enable mmx` \
`use_enable lirc` \
`use_enable opengl gl`\
+ ${myconf} \
`use_enable aalib aa` || die " xawtv configure failed"
make || die