summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad House <brad_mssw@gentoo.org>2003-11-29 19:38:37 +0000
committerBrad House <brad_mssw@gentoo.org>2003-11-29 19:38:37 +0000
commit9e734e6eef03e57b9d2e581d0e0cb65c89c9d7f6 (patch)
treed281b096182e79b42859c62def1a666b0bb69fba /media-libs
parentReplaced 'emake' with 'make' as 'emake' was creating strange code which gave ... (diff)
downloadhistorical-9e734e6eef03e57b9d2e581d0e0cb65c89c9d7f6.tar.gz
historical-9e734e6eef03e57b9d2e581d0e0cb65c89c9d7f6.tar.bz2
historical-9e734e6eef03e57b9d2e581d0e0cb65c89c9d7f6.zip
amd64 fixes
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/imlib2/ChangeLog5
-rw-r--r--media-libs/imlib2/Manifest13
-rw-r--r--media-libs/imlib2/imlib2-1.1.0.20031108.ebuild17
3 files changed, 24 insertions, 11 deletions
diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index 3a6c138547fb..aae4c8626092 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/imlib2
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.21 2003/11/08 19:29:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.22 2003/11/29 19:38:33 brad_mssw Exp $
+
+ 29 Nov 2003; Brad House <brad_mssw@gentoo.org> imlib2-1.1.0.20031108.ebuild:
+ amd64 fixes
*imlib2-1.1.0.20031108 (08 Nov 2003)
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 7b6d2ff6f880..30646038345c 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,9 +1,8 @@
-MD5 66cf67f9f2edc2915af6b4ef8327eb4e imlib2-1.1.0-r2.ebuild 1675
-MD5 23a68d4ee9f10a085341f381380c9dcf ChangeLog 2763
-MD5 2ad5108a4c189d946602a6d503359b5e imlib2-1.0.6-r1.ebuild 1127
-MD5 b68730bc69a5ca349cbb0eb0d79f90de imlib2-1.1.0.ebuild 1561
+MD5 07ff4a6009932c9e5f0666edc441ce2c ChangeLog 2597
+MD5 3b9f60708f559be33f75dc3b5a2180e1 imlib2-1.0.6-r1.ebuild 1185
+MD5 b373d8b0a6f40356d6666a8fdab914f7 imlib2-1.1.0.ebuild 1558
MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284
-MD5 4e0847f0613f236aa70a1f33f5368af7 files/imlib2-1.1.0-no-xfree.patch 6873
-MD5 f3d4c14b13a24c9b4c581b8058454a6d files/digest-imlib2-1.1.0 64
+MD5 b1cde0b6fe0ae524fd49ec1e8ad95c08 imlib2-1.1.0.20031108.ebuild 1730
MD5 cb6aca209de26812229b80a65801e2e9 files/digest-imlib2-1.0.6-r1 64
-MD5 f3d4c14b13a24c9b4c581b8058454a6d files/digest-imlib2-1.1.0-r2 64
+MD5 f3d4c14b13a24c9b4c581b8058454a6d files/digest-imlib2-1.1.0 64
+MD5 a7651a3c056e41dff4cd29984c972f79 files/digest-imlib2-1.1.0.20031108 74
diff --git a/media-libs/imlib2/imlib2-1.1.0.20031108.ebuild b/media-libs/imlib2/imlib2-1.1.0.20031108.ebuild
index 629b0b240366..65ebcb106e44 100644
--- a/media-libs/imlib2/imlib2-1.1.0.20031108.ebuild
+++ b/media-libs/imlib2/imlib2-1.1.0.20031108.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-libs/imlib2/imlib2-1.1.0.20031108.ebuild,v 1.1 2003/11/08 19:29:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.1.0.20031108.ebuild,v 1.2 2003/11/29 19:38:33 brad_mssw Exp $
inherit enlightenment flag-o-matic gcc
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.enlightenment.org/pages/imlib2.html"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~mips ~arm ~hppa ~sparc ~amd64"
+KEYWORDS="~x86 ~ppc ~alpha ~mips ~arm ~hppa ~sparc amd64"
IUSE="${IUSE} mmx gif png jpeg tiff static X"
DEPEND="${DEPEND}
@@ -30,10 +30,21 @@ src_compile() {
replace-flags k6-2 i586
replace-flags k6 i586
+ [ "${ARCH}" = "amd64" ] && append-flags -fPIC
+
if [ "${S}" == "${WORKDIR}/${PN}" ] ; then
# cvs only stuff
+
+ # uhh, assumes x86 asm for mmx, doesn't work on amd64
+ if [ "${ARCH}" = "amd64" ]
+ then
+ mmx="--disable-mmx"
+ else
+ mmx=`use_enable mmx`
+ fi
+
export MY_ECONF="
- `use_enable mmx` \
+ ${mmx} \
`use_with X x` \
--sysconfdir=/etc/X11/imlib
"