Benjamin Schieder
20 years ago
6 changed files with 2 additions and 491 deletions
Split View
Diff Options
-
+0 -38package/blindcoder/libsdl/alsa-fix.patch
-
+0 -38package/blindcoder/libsdl/configure-artsc-fix.patch
-
+0 -65package/blindcoder/libsdl/head-tail.patch
-
+0 -255package/blindcoder/libsdl/libsdl-gcc3.4.patch
-
+2 -2package/blindcoder/libsdl/libsdl.desc
-
+0 -93package/blindcoder/libsdl/noreg-opt-fix.patch
@ -1,38 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/blindcoder/libsdl/alsa-fix.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
|
|||
Fix outdated ALSA API useage ... |
|||
|
|||
- Rene Rebe <rene@exactcode.de> |
|||
|
|||
--- SDL-1.2.6/src/audio/alsa/SDL_alsa_audio.c.orig 2004-01-11 20:16:20.000000000 +0100
|
|||
+++ SDL-1.2.6/src/audio/alsa/SDL_alsa_audio.c 2004-01-11 20:39:32.000000000 +0100
|
|||
@@ -34,6 +34,11 @@
|
|||
#include <sys/types.h> |
|||
#include <sys/time.h> |
|||
|
|||
+/* until convertion to the new ALSA API ... */
|
|||
+
|
|||
+#define ALSA_PCM_OLD_HW_PARAMS_API
|
|||
+#define ALSA_PCM_OLD_SW_PARAMS_API
|
|||
+
|
|||
#include "SDL_audio.h" |
|||
#include "SDL_error.h" |
|||
#include "SDL_audiomem.h" |
|||
@ -1,38 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/blindcoder/libsdl/configure-artsc-fix.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
--- ./configure.orig 2004-02-22 23:32:33.000000000 +0200
|
|||
+++ ./configure 2004-03-11 19:23:23.000000000 +0200
|
|||
@@ -22159,6 +22159,7 @@
|
|||
else |
|||
ARTSC_CFLAGS=`$ARTSCCONFIG --cflags` |
|||
ARTSC_LIBS=`$ARTSCCONFIG --libs` |
|||
+ ARTSC_PREFIX=`$ARTSCCONFIG --arts-prefix`
|
|||
echo "$as_me:$LINENO: checking for aRts development environment" >&5 |
|||
echo $ECHO_N "checking for aRts development environment... $ECHO_C" >&6 |
|||
audio_arts=no |
|||
@@ -22225,7 +22226,7 @@
|
|||
else |
|||
enable_arts_shared=yes |
|||
fi; |
|||
- arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libartsc.so.*/'`
|
|||
+ arts_lib_spec="$ARTSC_PREFIX/lib/libartsc.so.*"
|
|||
arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'` |
|||
echo "-- $arts_lib_spec -> $arts_lib" |
|||
if test x$use_dlopen != xyes && \ |
|||
@ -1,65 +0,0 @@ |
|||
diff -dur SDL-1.2.7/configure SDL-1.2.7-p/configure
|
|||
--- SDL-1.2.7/configure 2004-11-08 21:45:34.792141160 +0100
|
|||
+++ SDL-1.2.7-p/configure 2004-11-08 21:44:53.429429248 +0100
|
|||
@@ -22083,7 +22083,7 @@
|
|||
enable_esd_shared=yes |
|||
fi; |
|||
esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libesd.so.*/'` |
|||
- esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
|
|||
+ esd_lib=`ls $esd_lib_spec | head -n1 | sed 's/.*\/\(.*\)/\1/'`
|
|||
echo "-- $esd_lib_spec -> $esd_lib" |
|||
if test x$use_dlopen != xyes && \ |
|||
test x$enable_esd_shared = xyes; then |
|||
@@ -22227,7 +22227,7 @@
|
|||
enable_arts_shared=yes |
|||
fi; |
|||
arts_lib_spec="$ARTSC_PREFIX/lib/libartsc.so.*" |
|||
- arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
|
|||
+ arts_lib=`ls $arts_lib_spec | head -n1 | sed 's/.*\/\(.*\)/\1/'`
|
|||
echo "-- $arts_lib_spec -> $arts_lib" |
|||
if test x$use_dlopen != xyes && \ |
|||
test x$enable_arts_shared = xyes; then |
|||
Nur in SDL-1.2.7-p/: configure~. |
|||
diff -dur SDL-1.2.7/configure.in SDL-1.2.7-p/configure.in
|
|||
--- SDL-1.2.7/configure.in 2004-02-22 22:31:47.000000000 +0100
|
|||
+++ SDL-1.2.7-p/configure.in 2004-11-08 21:42:50.051185592 +0100
|
|||
@@ -342,7 +342,7 @@
|
|||
[ --enable-esd-shared dynamically load ESD audio support [default=yes]], |
|||
, enable_esd_shared=yes) |
|||
esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'` |
|||
- esd_lib=`ls $esd_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
|
|||
+ esd_lib=`ls $esd_lib_spec | head -n1 | sed 's/.*\/\(.*\)/\1/'`
|
|||
echo "-- $esd_lib_spec -> $esd_lib" |
|||
if test x$use_dlopen != xyes && \ |
|||
test x$enable_esd_shared = xyes; then |
|||
@@ -392,7 +392,7 @@
|
|||
[ --enable-arts-shared dynamically load aRts audio support [default=yes]], |
|||
, enable_arts_shared=yes) |
|||
arts_lib_spec=`echo $ARTSC_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libartsc.so.*/'` |
|||
- arts_lib=`ls $arts_lib_spec | head -1 | sed 's/.*\/\(.*\)/\1/'`
|
|||
+ arts_lib=`ls $arts_lib_spec | head -n1 | sed 's/.*\/\(.*\)/\1/'`
|
|||
echo "-- $arts_lib_spec -> $arts_lib" |
|||
if test x$use_dlopen != xyes && \ |
|||
test x$enable_arts_shared = xyes; then |
|||
Nur in SDL-1.2.7-p/: configure.rej. |
|||
diff -dur SDL-1.2.7/test/config.guess SDL-1.2.7-p/test/config.guess
|
|||
--- SDL-1.2.7/test/config.guess 2001-06-10 20:20:23.000000000 +0200
|
|||
+++ SDL-1.2.7-p/test/config.guess 2004-11-08 21:42:50.053185288 +0100
|
|||
@@ -314,7 +314,7 @@
|
|||
echo m68k-sun-sunos${UNAME_RELEASE} |
|||
exit 0 ;; |
|||
sun*:*:4.2BSD:*) |
|||
- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
|
|||
+ UNAME_RELEASE=`(head -n1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
|
|||
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 |
|||
case "`/bin/arch`" in |
|||
sun3) |
|||
@@ -493,7 +493,7 @@
|
|||
fi |
|||
exit 0 ;; |
|||
*:AIX:*:[45]) |
|||
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
|
|||
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -n1 | awk '{ print $1 }'`
|
|||
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
|||
IBM_ARCH=rs6000 |
|||
else |
|||
@ -1,255 +0,0 @@ |
|||
--- ./src/audio/SDL_mixer_MMX.c 9 Nov 2002 06:13:28 -0000
|
|||
+++ ./src/audio/SDL_mixer_MMX.c 3 May 2004 19:51:58 -0000
|
|||
@@ -15,13 +15,11 @@
|
|||
{ |
|||
__asm__ __volatile__ ( |
|||
|
|||
-" movl %0,%%edi\n" // edi = dst
|
|||
-" movl %1,%%esi\n" // esi = src
|
|||
" movl %3,%%eax\n" // eax = volume |
|||
|
|||
-" movl %2,%%ebx\n" // ebx = size
|
|||
+" movl %2,%%edx\n" // edx = size
|
|||
|
|||
-" shrl $4,%%ebx\n" // process 16 bytes per iteration = 8 samples
|
|||
+" shrl $4,%%edx\n" // process 16 bytes per iteration = 8 samples
|
|||
|
|||
" jz .endS16\n" |
|||
|
|||
@@ -39,14 +37,14 @@
|
|||
".align 16\n" |
|||
" .mixloopS16:\n" |
|||
|
|||
-" movq (%%esi),%%mm1\n" // mm1 = a|b|c|d
|
|||
+" movq (%1),%%mm1\n" // mm1 = a|b|c|d
|
|||
|
|||
" movq %%mm1,%%mm2\n" // mm2 = a|b|c|d |
|||
|
|||
-" movq 8(%%esi),%%mm4\n" // mm4 = e|f|g|h
|
|||
+" movq 8(%1),%%mm4\n" // mm4 = e|f|g|h
|
|||
|
|||
// pré charger le buffer dst dans mm7 |
|||
-" movq (%%edi),%%mm7\n" // mm7 = dst[0]"
|
|||
+" movq (%0),%%mm7\n" // mm7 = dst[0]"
|
|||
|
|||
// multiplier par le volume |
|||
" pmullw %%mm0,%%mm1\n" // mm1 = l(a*v)|l(b*v)|l(c*v)|l(d*v) |
|||
@@ -69,11 +67,11 @@
|
|||
" punpcklwd %%mm5,%%mm6\n" // mm6 = g*v|h*v |
|||
|
|||
// pré charger le buffer dst dans mm5 |
|||
-" movq 8(%%edi),%%mm5\n" // mm5 = dst[1]
|
|||
+" movq 8(%0),%%mm5\n" // mm5 = dst[1]
|
|||
|
|||
// diviser par 128 |
|||
" psrad $7,%%mm1\n" // mm1 = a*v/128|b*v/128 , 128 = SDL_MIX_MAXVOLUME |
|||
-" addl $16,%%esi\n"
|
|||
+" add $16,%1\n"
|
|||
|
|||
" psrad $7,%%mm3\n" // mm3 = c*v/128|d*v/128 |
|||
|
|||
@@ -87,15 +85,15 @@
|
|||
|
|||
// mm4 = le sample avec le volume modifié |
|||
" packssdw %%mm4,%%mm6\n" // mm6 = s(e*v|f*v|g*v|h*v) |
|||
-" movq %%mm3,(%%edi)\n"
|
|||
+" movq %%mm3,(%0)\n"
|
|||
|
|||
" paddsw %%mm5,%%mm6\n" // mm6 = adjust_volume(src)+dst |
|||
|
|||
-" movq %%mm6,8(%%edi)\n"
|
|||
+" movq %%mm6,8(%0)\n"
|
|||
|
|||
-" addl $16,%%edi\n"
|
|||
+" add $16,%0\n"
|
|||
|
|||
-" dec %%ebx\n"
|
|||
+" dec %%edx\n"
|
|||
|
|||
" jnz .mixloopS16\n" |
|||
|
|||
@@ -103,9 +101,9 @@
|
|||
|
|||
".endS16:\n" |
|||
: |
|||
- : "m" (dst), "m"(src),"m"(size),
|
|||
+ : "r" (dst), "r"(src),"m"(size),
|
|||
"m"(volume) |
|||
- : "eax","ebx", "esi", "edi","memory"
|
|||
+ : "eax","edx","memory"
|
|||
); |
|||
} |
|||
|
|||
@@ -119,11 +117,9 @@
|
|||
{ |
|||
__asm__ __volatile__ ( |
|||
|
|||
-" movl %0,%%edi\n" // edi = dst
|
|||
-" movl %1,%%esi\n" // esi = src
|
|||
" movl %3,%%eax\n" // eax = volume |
|||
|
|||
-" movd %%ebx,%%mm0\n"
|
|||
+" movd %%edx,%%mm0\n"
|
|||
" movq %%mm0,%%mm1\n" |
|||
" psllq $16,%%mm0\n" |
|||
" por %%mm1,%%mm0\n" |
|||
@@ -132,17 +128,17 @@
|
|||
" psllq $16,%%mm0\n" |
|||
" por %%mm1,%%mm0\n" |
|||
|
|||
-" movl %2,%%ebx\n" // ebx = size
|
|||
-" shr $3,%%ebx\n" // process 8 bytes per iteration = 8 samples
|
|||
+" movl %2,%%edx\n" // edx = size
|
|||
+" shr $3,%%edx\n" // process 8 bytes per iteration = 8 samples
|
|||
|
|||
-" cmp $0,%%ebx\n"
|
|||
+" cmp $0,%%edx\n"
|
|||
" je .endS8\n" |
|||
|
|||
".align 16\n" |
|||
" .mixloopS8:\n" |
|||
|
|||
" pxor %%mm2,%%mm2\n" // mm2 = 0 |
|||
-" movq (%%esi),%%mm1\n" // mm1 = a|b|c|d|e|f|g|h
|
|||
+" movq (%1),%%mm1\n" // mm1 = a|b|c|d|e|f|g|h
|
|||
|
|||
" movq %%mm1,%%mm3\n" // mm3 = a|b|c|d|e|f|g|h |
|||
|
|||
@@ -152,10 +148,10 @@
|
|||
" punpckhbw %%mm2,%%mm1\n" // mm1 = 0|a|0|b|0|c|0|d |
|||
|
|||
" punpcklbw %%mm2,%%mm3\n" // mm3 = 0|e|0|f|0|g|0|h |
|||
-" movq (%%edi),%%mm2\n" // mm2 = destination
|
|||
+" movq (%0),%%mm2\n" // mm2 = destination
|
|||
|
|||
" pmullw %%mm0,%%mm1\n" // mm1 = v*a|v*b|v*c|v*d |
|||
-" addl $8,%%esi\n"
|
|||
+" add $8,%1\n"
|
|||
|
|||
" pmullw %%mm0,%%mm3\n" // mm3 = v*e|v*f|v*g|v*h |
|||
" psraw $7,%%mm1\n" // mm1 = v*a/128|v*b/128|v*c/128|v*d/128 |
|||
@@ -166,19 +162,19 @@
|
|||
|
|||
" paddsb %%mm2,%%mm3\n" // add to destination buffer |
|||
|
|||
-" movq %%mm3,(%%edi)\n" // store back to ram
|
|||
-" addl $8,%%edi\n"
|
|||
+" movq %%mm3,(%0)\n" // store back to ram
|
|||
+" add $8,%0\n"
|
|||
|
|||
-" dec %%ebx\n"
|
|||
+" dec %%edx\n"
|
|||
|
|||
" jnz .mixloopS8\n" |
|||
|
|||
".endS8:\n" |
|||
" emms\n" |
|||
: |
|||
- : "m" (dst), "m"(src),"m"(size),
|
|||
+ : "r" (dst), "r"(src),"m"(size),
|
|||
"m"(volume) |
|||
- : "eax","ebx", "esi", "edi","memory"
|
|||
+ : "eax","edx","memory"
|
|||
); |
|||
} |
|||
#endif |
|||
--- ./src/cpuinfo/SDL_cpuinfo.c 11 Apr 2004 19:49:34 -0000
|
|||
+++ ./src/cpuinfo/SDL_cpuinfo.c 3 May 2004 19:52:08 -0000
|
|||
@@ -118,7 +118,7 @@
|
|||
" movl %%edi,%%ebx\n" |
|||
: "=m" (features) |
|||
: |
|||
- : "%eax", "%ebx", "%ecx", "%edx", "%edi"
|
|||
+ : "%eax", "%ecx", "%edx", "%edi"
|
|||
); |
|||
#elif defined(_MSC_VER) |
|||
__asm { |
|||
@@ -153,7 +153,7 @@
|
|||
" movl %%edi,%%ebx\n" |
|||
: "=m" (features) |
|||
: |
|||
- : "%eax", "%ebx", "%ecx", "%edx", "%edi"
|
|||
+ : "%eax", "%ecx", "%edx", "%edi"
|
|||
); |
|||
#elif defined(_MSC_VER) |
|||
__asm { |
|||
--- ./src/video/SDL_yuv_mmx.c 4 Jan 2004 16:49:22 -0000
|
|||
+++ ./src/video/SDL_yuv_mmx.c 3 May 2004 19:52:24 -0000
|
|||
@@ -120,12 +120,12 @@
|
|||
"movd (%2), %%mm2\n" // 0 0 0 0 l3 l2 l1 l0 |
|||
"punpcklbw %%mm7,%%mm1\n" // 0 v3 0 v2 00 v1 00 v0 |
|||
"punpckldq %%mm1,%%mm1\n" // 00 v1 00 v0 00 v1 00 v0 |
|||
- "psubw _MMX_0080w,%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0
|
|||
+ "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0
|
|||
|
|||
// create Cr_g (result in mm0) |
|||
"movq %%mm1,%%mm0\n" // r1 r1 r0 r0 r1 r1 r0 r0 |
|||
- "pmullw _MMX_VgrnRGB,%%mm0\n"// red*-46dec=0.7136*64
|
|||
- "pmullw _MMX_VredRGB,%%mm1\n"// red*89dec=1.4013*64
|
|||
+ "pmullw %[_MMX_VgrnRGB],%%mm0\n"// red*-46dec=0.7136*64
|
|||
+ "pmullw %[_MMX_VredRGB],%%mm1\n"// red*89dec=1.4013*64
|
|||
"psraw $6, %%mm0\n" // red=red/64 |
|||
"psraw $6, %%mm1\n" // red=red/64 |
|||
|
|||
@@ -134,8 +134,8 @@
|
|||
"movq (%2,%4),%%mm3\n" // 0 0 0 0 L3 L2 L1 L0 |
|||
"punpckldq %%mm3,%%mm2\n" // L3 L2 L1 L0 l3 l2 l1 l0 |
|||
"movq %%mm2,%%mm4\n" // L3 L2 L1 L0 l3 l2 l1 l0 |
|||
- "pand _MMX_FF00w,%%mm2\n" // L3 0 L1 0 l3 0 l1 0
|
|||
- "pand _MMX_00FFw,%%mm4\n" // 0 L2 0 L0 0 l2 0 l0
|
|||
+ "pand %[_MMX_FF00w],%%mm2\n" // L3 0 L1 0 l3 0 l1 0
|
|||
+ "pand %[_MMX_00FFw],%%mm4\n" // 0 L2 0 L0 0 l2 0 l0
|
|||
"psrlw $8,%%mm2\n" // 0 L3 0 L1 0 l3 0 l1 |
|||
|
|||
// create R (result in mm6) |
|||
@@ -152,11 +152,11 @@
|
|||
"movd (%1), %%mm1\n" // 0 0 0 0 u3 u2 u1 u0 |
|||
"punpcklbw %%mm7,%%mm1\n" // 0 u3 0 u2 00 u1 00 u0 |
|||
"punpckldq %%mm1,%%mm1\n" // 00 u1 00 u0 00 u1 00 u0 |
|||
- "psubw _MMX_0080w,%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0
|
|||
+ "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0
|
|||
// create Cb_g (result in mm5) |
|||
"movq %%mm1,%%mm5\n" // u1 u1 u0 u0 u1 u1 u0 u0 |
|||
- "pmullw _MMX_UgrnRGB,%%mm5\n" // blue*-109dec=1.7129*64
|
|||
- "pmullw _MMX_UbluRGB,%%mm1\n" // blue*114dec=1.78125*64
|
|||
+ "pmullw %[_MMX_UgrnRGB],%%mm5\n" // blue*-109dec=1.7129*64
|
|||
+ "pmullw %[_MMX_UbluRGB],%%mm1\n" // blue*114dec=1.78125*64
|
|||
"psraw $6, %%mm5\n" // blue=red/64 |
|||
"psraw $6, %%mm1\n" // blue=blue/64 |
|||
|
|||
@@ -238,8 +238,14 @@
|
|||
"popl %%ebx\n" |
|||
: |
|||
: "m" (cr), "r"(cb),"r"(lum), |
|||
- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
|
|||
- : "%ebx"
|
|||
+ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod),
|
|||
+ [_MMX_0080w] "m" (*_MMX_0080w),
|
|||
+ [_MMX_00FFw] "m" (*_MMX_00FFw),
|
|||
+ [_MMX_FF00w] "m" (*_MMX_FF00w),
|
|||
+ [_MMX_VgrnRGB] "m" (*_MMX_VgrnRGB),
|
|||
+ [_MMX_VredRGB] "m" (*_MMX_VredRGB),
|
|||
+ [_MMX_UgrnRGB] "m" (*_MMX_UgrnRGB),
|
|||
+ [_MMX_UbluRGB] "m" (*_MMX_UbluRGB)
|
|||
); |
|||
} |
|||
|
|||
@@ -413,8 +419,16 @@
|
|||
"popl %%ebx\n" |
|||
: |
|||
:"m" (cr), "r"(cb),"r"(lum), |
|||
- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)
|
|||
- : "%ebx"
|
|||
+ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod),
|
|||
+ [_MMX_0080w] "m" (*_MMX_0080w),
|
|||
+ [_MMX_Ugrn565] "m" (*_MMX_Ugrn565),
|
|||
+ [_MMX_Ublu5x5] "m" (*_MMX_Ublu5x5),
|
|||
+ [_MMX_00FFw] "m" (*_MMX_00FFw),
|
|||
+ [_MMX_Vgrn565] "m" (*_MMX_Vgrn565),
|
|||
+ [_MMX_Vred5x5] "m" (*_MMX_Vred5x5),
|
|||
+ [_MMX_Ycoeff] "m" (*_MMX_Ycoeff),
|
|||
+ [_MMX_red565] "m" (*_MMX_red565),
|
|||
+ [_MMX_grn565] "m" (*_MMX_grn565)
|
|||
); |
|||
} |
|||
|
|||
@ -1,93 +0,0 @@ |
|||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|||
# |
|||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|||
# Please add additional copyright information _after_ the line containing |
|||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|||
# |
|||
# ROCK Linux: rock-src/package/blindcoder/libsdl/noreg-opt-fix.patch |
|||
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
|||
# |
|||
# This patch file is dual-licensed. It is available under the license the |
|||
# patched project is licensed under, as long as it is an OpenSource license |
|||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|||
# of the GNU General Public License as published by the Free Software |
|||
# Foundation; either version 2 of the License, or (at your option) any later |
|||
# version. |
|||
# |
|||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|||
|
|||
gcc 3.3 is a bit too smart here, It optimizes these variables away. However |
|||
movd to a mmx register only works from reg or mem. |
|||
-jsaw |
|||
|
|||
--- SDL-1.2.6/src/video/SDL_RLEaccel.c 2003-08-30 21:13:06.000000000 +0200
|
|||
+++ SDL-1.2.6-rock/src/video/SDL_RLEaccel.c 2004-02-23 18:11:50.000000000 +0100
|
|||
@@ -143,7 +143,7 @@
|
|||
do { \ |
|||
Uint32 *srcp = (Uint32 *)(from); \ |
|||
Uint32 *dstp = (Uint32 *)(to); \ |
|||
- int i = 0x00FF00FF; \
|
|||
+ volatile int i = 0x00FF00FF; \
|
|||
movd_m2r(*(&i), mm3); \ |
|||
punpckldq_r2r(mm3, mm3); \ |
|||
i = 0xFF000000; \ |
|||
@@ -213,10 +213,11 @@
|
|||
|
|||
#define ALPHA_BLIT16_565MMX(to, from, length, bpp, alpha) \ |
|||
do { \ |
|||
- int i, n = 0; \
|
|||
+ volatile int i; \
|
|||
+ int n = 0; \
|
|||
Uint16 *srcp = (Uint16 *)(from); \ |
|||
Uint16 *dstp = (Uint16 *)(to); \ |
|||
- Uint32 ALPHA = 0xF800; \
|
|||
+ volatile Uint32 ALPHA = 0xF800; \
|
|||
movd_m2r(*(&ALPHA), mm1); \ |
|||
punpcklwd_r2r(mm1, mm1); \ |
|||
punpcklwd_r2r(mm1, mm1); \ |
|||
@@ -229,7 +230,7 @@
|
|||
punpcklwd_r2r(mm7, mm7); \ |
|||
punpcklwd_r2r(mm7, mm7); \ |
|||
alpha &= ~(1+2+4); \ |
|||
- i = (Uint32)alpha | (Uint32)alpha << 16; \
|
|||
+ *(&i) = (Uint32)alpha | (Uint32)alpha << 16; \
|
|||
movd_m2r(*(&i), mm0); \ |
|||
punpckldq_r2r(mm0, mm0); \ |
|||
ALPHA = alpha >> 3; \ |
|||
@@ -303,10 +304,11 @@
|
|||
|
|||
#define ALPHA_BLIT16_555MMX(to, from, length, bpp, alpha) \ |
|||
do { \ |
|||
- int i, n = 0; \
|
|||
+ volatile int i; \
|
|||
+ int n = 0; \
|
|||
Uint16 *srcp = (Uint16 *)(from); \ |
|||
Uint16 *dstp = (Uint16 *)(to); \ |
|||
- Uint32 ALPHA = 0x7C00; \
|
|||
+ volatile Uint32 ALPHA = 0x7C00; \
|
|||
movd_m2r(*(&ALPHA), mm1); \ |
|||
punpcklwd_r2r(mm1, mm1); \ |
|||
punpcklwd_r2r(mm1, mm1); \ |
|||
@@ -319,10 +321,10 @@
|
|||
punpcklwd_r2r(mm7, mm7); \ |
|||
punpcklwd_r2r(mm7, mm7); \ |
|||
alpha &= ~(1+2+4); \ |
|||
- i = (Uint32)alpha | (Uint32)alpha << 16; \
|
|||
+ *(&i) = (Uint32)alpha | (Uint32)alpha << 16; \
|
|||
movd_m2r(*(&i), mm0); \ |
|||
punpckldq_r2r(mm0, mm0); \ |
|||
- i = ((int)(length) & 3); \
|
|||
+ i = ((int)(length) & 3); \
|
|||
ALPHA = alpha >> 3; \ |
|||
for(; i > 0; --i) { \ |
|||
Uint32 s = *srcp++; \ |
|||
@@ -524,7 +526,7 @@
|
|||
do { \ |
|||
Uint32 *srcp = (Uint32 *)(from); \ |
|||
Uint32 *dstp = (Uint32 *)(to); \ |
|||
- int i = 0x00fefefe; \
|
|||
+ volatile int i = 0x00fefefe; \
|
|||
movd_m2r(*(&i), mm4); \ |
|||
punpckldq_r2r(mm4, mm4); \ |
|||
i = 0x00010101; \ |
|||