diff options
| author |   Joseph Jezak <josejx@gentoo.org> | 2005-07-12 04:53:26 +0000 |
|---|---|---|
| committer | Joseph Jezak <josejx@gentoo.org> | 2005-07-12 04:53:26 +0000 |
| commit | 997a637e80d06d294708b9c6d0912bff94fcc366 (patch) | |
| tree | bd92f045b079b27dd5ae40d3cf86c6c9fbf65a2f /x11-wm | |
| parent | stable on mips (diff) | |
| download | gentoo-2-997a637e80d06d294708b9c6d0912bff94fcc366.tar.gz gentoo-2-997a637e80d06d294708b9c6d0912bff94fcc366.tar.bz2 gentoo-2-997a637e80d06d294708b9c6d0912bff94fcc366.zip | |
Added wormo's fix from bug #91469.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/metisse/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-wm/metisse/files/metisse-0.3.5-mmx-config.patch | 59 | ||||
| -rw-r--r-- | x11-wm/metisse/metisse-0.3.5.ebuild | 17 |
3 files changed, 79 insertions, 3 deletions
diff --git a/x11-wm/metisse/ChangeLog b/x11-wm/metisse/ChangeLog index 57fa15434b39..02dad546c3b6 100644 --- a/x11-wm/metisse/ChangeLog +++ b/x11-wm/metisse/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/metisse # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metisse/ChangeLog,v 1.10 2005/04/23 00:36:46 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metisse/ChangeLog,v 1.11 2005/07/12 04:53:26 josejx Exp $ + + 12 Jul 2005; Joseph Jezak <josejx@gentoo.org> + +files/metisse-0.3.5-mmx-config.patch, metisse-0.3.5.ebuild: + Added wormo's fix for mmx, see bug #98050. 23 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> metisse-0.3.5.ebuild: Stable on ppc. diff --git a/x11-wm/metisse/files/metisse-0.3.5-mmx-config.patch b/x11-wm/metisse/files/metisse-0.3.5-mmx-config.patch new file mode 100644 index 000000000000..ae0479f81cbf --- /dev/null +++ b/x11-wm/metisse/files/metisse-0.3.5-mmx-config.patch @@ -0,0 +1,59 @@ +diff -ur metisse-0.3.5-orig/configure.ac metisse-0.3.5/configure.ac +--- metisse-0.3.5-orig/configure.ac 2005-05-16 21:54:38.566053256 -0700 ++++ metisse-0.3.5/configure.ac 2005-05-15 23:44:29.137041600 -0700 +@@ -46,30 +46,34 @@ + + AC_C_BIGENDIAN + ++AC_ARG_ENABLE(mmx, [ --enable-mmx compile with mmx optimizations],,enable_mmx=no) ++ + gcc_ok_for_mmx=no + USE_GCC34_MMX=0 + +-AC_MSG_CHECKING(if we can use gcc mmx code) +-if test "x$GCC" = "xyes"; then +- CFLAGS="$CFLAGS -Wall" ; +- +- gcc_major=`$CC -dumpversion | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- gcc_minor=`$CC -dumpversion | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- echo -n " gcc version $gcc_major.$gcc_minor ... " +- gcc_min_major_for_mmx=3 +- gcc_min_minor_for_mmx=4 +- gcc_ok_for_mmx=no +- if test $gcc_major -gt $gcc_min_major_for_mmx ; then +- gcc_ok_for_mmx=yes +- else +- if test $gcc_major -eq $gcc_min_major_for_mmx ; then +- if test $gcc_minor -gt $gcc_min_minor_for_mmx ; then +- gcc_ok_for_mmx=yes +- else +- if test $gcc_minor -eq $gcc_min_minor_for_mmx ; then +- gcc_ok_for_mmx=yes ++if test "$enable_mmx" = yes ; then ++ AC_MSG_CHECKING(if we can use gcc mmx code) ++ if test "x$GCC" = "xyes"; then ++ CFLAGS="$CFLAGS -Wall" ; ++ ++ gcc_major=`$CC -dumpversion | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ gcc_minor=`$CC -dumpversion | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ echo -n " gcc version $gcc_major.$gcc_minor ... " ++ gcc_min_major_for_mmx=3 ++ gcc_min_minor_for_mmx=4 ++ gcc_ok_for_mmx=no ++ if test $gcc_major -gt $gcc_min_major_for_mmx ; then ++ gcc_ok_for_mmx=yes ++ else ++ if test $gcc_major -eq $gcc_min_major_for_mmx ; then ++ if test $gcc_minor -gt $gcc_min_minor_for_mmx ; then ++ gcc_ok_for_mmx=yes ++ else ++ if test $gcc_minor -eq $gcc_min_minor_for_mmx ; then ++ gcc_ok_for_mmx=yes ++ fi + fi + fi + fi diff --git a/x11-wm/metisse/metisse-0.3.5.ebuild b/x11-wm/metisse/metisse-0.3.5.ebuild index 5cdf23da6597..79b705a025ac 100644 --- a/x11-wm/metisse/metisse-0.3.5.ebuild +++ b/x11-wm/metisse/metisse-0.3.5.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metisse/metisse-0.3.5.ebuild,v 1.4 2005/04/23 00:36:46 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metisse/metisse-0.3.5.ebuild,v 1.5 2005/07/12 04:53:26 josejx Exp $ + +inherit eutils # fc is broken -IUSE="truetype xv opengl" +IUSE="truetype xv opengl mmx" DESCRIPTION="Experimental X desktop with some OpenGL capacity." SRC_URI="http://insitu.lri.fr/~chapuis/software/metisse/${P}.tar.bz2" @@ -19,6 +21,13 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="x86 ppc -amd64" +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/metisse-0.3.5-mmx-config.patch + libtoolize --copy --force +} + src_compile() { local myconf if use opengl && use x86 ; then @@ -29,6 +38,10 @@ src_compile() { myconf="${myconf} --disable-glx --disable-glx-x86" fi + if use mmx ; then + myconf="${myconf} --enable-mmx" + fi + econf \ $(use_enable xv) \ $(use_enable truetype freetype) \ |