diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-05-20 21:47:45 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-20 21:47:45 +0000 |
| commit | 20a095c453c2137392e57009d2a8055d48edca07 (patch) | |
| tree | 65dbbcf982a13c983c0b449f98b75aa6ec976633 /media-libs/imlib2 | |
| parent | Marking stable x86, keywording ~sparc (diff) | |
| download | historical-20a095c453c2137392e57009d2a8055d48edca07.tar.gz historical-20a095c453c2137392e57009d2a8055d48edca07.tar.bz2 historical-20a095c453c2137392e57009d2a8055d48edca07.zip | |
fix searching for X libs #93300 and amd64 asm #93314
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'media-libs/imlib2')
| -rw-r--r-- | media-libs/imlib2/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/imlib2/files/imlib2-1.2.0.007-x-typo.patch | 12 | ||||
| -rw-r--r-- | media-libs/imlib2/imlib2-1.2.0.007.ebuild | 14 |
3 files changed, 24 insertions, 5 deletions
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest index d85819b4111d..ce6b046728b8 100644 --- a/media-libs/imlib2/Manifest +++ b/media-libs/imlib2/Manifest @@ -2,10 +2,11 @@ MD5 7b0fe0945db61f48995a0f0b84b643bd ChangeLog 4104 MD5 0b095f88ab0ecae4abaacc19e515c5eb imlib2-1.1.2.ebuild 1003 MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284 MD5 ace21bde669d07679480220f8c887d64 imlib2-9999.ebuild 931 -MD5 96ee3a91a73fb8c343845568056c441f imlib2-1.2.0.007.ebuild 952 +MD5 d2d6b436edd7cfeb21fdc89cbed815fa imlib2-1.2.0.007.ebuild 1104 MD5 f65905e9f93f158e099b1f6524284f43 imlib2-1.2.0-r2.ebuild 1088 MD5 78f8f17705b3e58fd3f15a898dfa2e25 files/digest-imlib2-1.1.2 64 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-imlib2-9999 0 MD5 00966d224a91444676648c49ecc1eaf4 files/digest-imlib2-1.2.0-r2 64 MD5 1d4f605193247283ce4fac45d2a10c58 files/digest-imlib2-1.2.0.007 68 MD5 e493696ea98688132769496642a1044c files/imlib2-1.2.0-loaders.patch 2613 +MD5 3a2a6d558d381a6e8355a223b8b0f842 files/imlib2-1.2.0.007-x-typo.patch 298 diff --git a/media-libs/imlib2/files/imlib2-1.2.0.007-x-typo.patch b/media-libs/imlib2/files/imlib2-1.2.0.007-x-typo.patch new file mode 100644 index 000000000000..925398232022 --- /dev/null +++ b/media-libs/imlib2/files/imlib2-1.2.0.007-x-typo.patch @@ -0,0 +1,12 @@ +http://bugs.gentoo.org/93300 +--- configure ++++ configure +@@ -20251,7 +20251,7 @@ + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS +- LIBS="-lX $LIBS" ++ LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF diff --git a/media-libs/imlib2/imlib2-1.2.0.007.ebuild b/media-libs/imlib2/imlib2-1.2.0.007.ebuild index 8a04ee73ee71..e8764c335c34 100644 --- a/media-libs/imlib2/imlib2-1.2.0.007.ebuild +++ b/media-libs/imlib2/imlib2-1.2.0.007.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.007.ebuild,v 1.2 2005/05/20 05:01:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.2.0.007.ebuild,v 1.3 2005/05/20 21:47:45 vapier Exp $ EKEY_STATE=snap -EHACKAUTOGEN=yes inherit enlightenment MY_P=${P/_/-} @@ -19,10 +18,17 @@ DEPEND="=media-libs/freetype-2* tiff? ( >=media-libs/tiff-3.5.5 ) X? ( virtual/x11 )" +src_unpack() { + enlightenment_src_unpack + cd "${S}" + epatch "${FILESDIR}"/${P}-x-typo.patch +} + src_compile() { local mymmx="" - if [ "${ARCH}" == "amd64" ] ; then - mymmx="--disable-mmx" + if [[ ${ARCH} == "amd64" ]] ; then + mymmx="--disable-mmx --disable-amd64" + [[ ${PV} != "1.2.0.007" ]] && die "revisit amd64 check" else mymmx="$(use_enable mmx)" fi |