[pkgsrc/trunk]: pkgsrc/devel/SDL GCC 2 does not understand the MMX asm core. ...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f72345c6ca7e
branches:  trunk
changeset: 487348:f72345c6ca7e
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Wed Jan 12 22:58:19 2005 +0000

description:
GCC 2 does not understand the MMX asm core.  Fall back to the C source
for GCC 2.

diffstat:

 devel/SDL/distinfo         |   4 +++-
 devel/SDL/patches/patch-ac |  13 +++++++++++++
 devel/SDL/patches/patch-ad |  22 ++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletions(-)

diffs (59 lines):

diff -r f5b0f6c239b8 -r f72345c6ca7e devel/SDL/distinfo
--- a/devel/SDL/distinfo        Wed Jan 12 22:56:41 2005 +0000
+++ b/devel/SDL/distinfo        Wed Jan 12 22:58:19 2005 +0000
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.36 2005/01/06 16:32:01 drochner Exp $
+$NetBSD: distinfo,v 1.37 2005/01/12 22:58:19 kristerw Exp $
 
 SHA1 (SDL-1.2.8.tar.gz) = 26f2104a60a28914b809d3cb77d5790bfdfd024c
 Size (SDL-1.2.8.tar.gz) = 2602449 bytes
 SHA1 (patch-aa) = d96902d3de2eb1f0c4edaa8b174f09ae1a654625
 SHA1 (patch-ab) = 6693545cafa5f5e73fb3f6f34d1a0b59a17872d2
+SHA1 (patch-ac) = 8471da99fcd2771e319556c95f6d1295dce002bb
+SHA1 (patch-ad) = 230544c0aa2f8d827a9d49c4962afe2e4936074e
 SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
 SHA1 (patch-aj) = bf5173f8a510cfb86a5d48b7afbbaee6c501f3a0
 SHA1 (patch-al) = d8b4ee9d33c4b34db87b098f4945018ae995ae99
diff -r f5b0f6c239b8 -r f72345c6ca7e devel/SDL/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/SDL/patches/patch-ac        Wed Jan 12 22:58:19 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.12 2005/01/12 22:58:19 kristerw Exp $
+
+--- src/video/SDL_yuv_mmx.c.orig       Wed Jan 12 23:20:48 2005
++++ src/video/SDL_yuv_mmx.c    Wed Jan 12 23:22:43 2005
+@@ -26,7 +26,7 @@
+ #endif
+ 
+ 
+-#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
++#if defined(i386) && defined(__GNUC__) && __GNUC__ > 2 && defined(USE_ASMBLIT)
+ 
+ #include "SDL_types.h"
+ 
diff -r f5b0f6c239b8 -r f72345c6ca7e devel/SDL/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/SDL/patches/patch-ad        Wed Jan 12 22:58:19 2005 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.7 2005/01/12 22:58:19 kristerw Exp $
+
+--- src/video/SDL_yuv_sw.c.orig        Wed Feb 18 18:22:04 2004
++++ src/video/SDL_yuv_sw.c     Wed Jan 12 23:43:27 2005
+@@ -1067,7 +1067,7 @@
+           case SDL_YV12_OVERLAY:
+           case SDL_IYUV_OVERLAY:
+               if ( display->format->BytesPerPixel == 2 ) {
+-#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
++#if defined(i386) && defined(__GNUC__) && __GNUC__ > 2 && defined(USE_ASMBLIT)
+                       /* inline assembly functions */
+                       if ( SDL_HasMMX() && (Rmask == 0xF800) &&
+                                            (Gmask == 0x07E0) &&
+@@ -1089,7 +1089,7 @@
+                       swdata->Display2X = Color24DitherYV12Mod2X;
+               }
+               if ( display->format->BytesPerPixel == 4 ) {
+-#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT)
++#if defined(i386) && defined(__GNUC__) && __GNUC__ > 2 && defined(USE_ASMBLIT)
+                       /* inline assembly functions */
+                       if ( SDL_HasMMX() && (Rmask == 0x00FF0000) &&
+                                            (Gmask == 0x0000FF00) &&