Added wormo's fix from bug #91469.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 83 insertions, 6 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/Manifest b/x11-wm/metisse/Manifest
index c379fe2144e5..ba77c71c55ae 100644
--- a/x11-wm/metisse/Manifest
+++ b/x11-wm/metisse/Manifest
@@ -1,6 +1,7 @@
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 7ed8fb655e28ebf44304c40a2496d82f ChangeLog 1887
+MD5 349cec38fdb4f27b3b0a231d5cb2d828 ChangeLog 2044
 MD5 bd188a43cc088ca73161889614be3035 metisse-0.3.4.ebuild 1112
-MD5 8cbd77484deafae549df5956110a0ba3 metisse-0.3.5.ebuild 1120
+MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
+MD5 072de6949a16bf1ce0d0a93bc644dbac metisse-0.3.5.ebuild 1316
 MD5 9b064fb7563ea3a27b17c5c02871eba9 files/digest-metisse-0.3.5 67
 MD5 417e224f0ecd4c48bc9f5cffdeaa7787 files/digest-metisse-0.3.4 67
+MD5 ba83f501db0ce112a985289ca34a7bb4 files/metisse-0.3.5-mmx-config.patch 2038
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) \