aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/sdl12/Makefile11
-rw-r--r--devel/sdl12/distinfo4
-rw-r--r--devel/sdl12/files/extra-patch-src_audio_SDL__mixer__MMX.c155
-rw-r--r--devel/sdl12/files/extra-patch-src_cpuinfo_SDL__cpuinfo.c74
-rw-r--r--devel/sdl12/files/extra-patch-src_video_SDL__yuv__mmx.c89
-rw-r--r--devel/sdl12/files/patch-al10
-rw-r--r--devel/sdl12/pkg-plist1
7 files changed, 339 insertions, 5 deletions
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 019c4dd552d7..e851e38ad81b 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -6,8 +6,9 @@
#
PORTNAME= sdl
-PORTVERSION= 1.2.8
-PORTEPOCH= 1
+PORTVERSION= 1.2.7
+PORTREVISION= 3
+PORTEPOCH= 2
CATEGORIES= devel
MASTER_SITES= http://www.libsdl.org/release/
DISTNAME= SDL-${PORTVERSION}
@@ -43,6 +44,12 @@ OPTIONS= NAS "Include support for the Network Audio System" Off \
.include <bsd.port.pre.mk>
+.if ${OSVERSION} > 500000
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_audio_SDL__mixer__MMX.c \
+ ${FILESDIR}/extra-patch-src_cpuinfo_SDL__cpuinfo.c \
+ ${FILESDIR}/extra-patch-src_video_SDL__yuv__mmx.c
+.endif
+
.if exists(/usr/lib/libvgl.so.3)
CONFIGURE_ARGS+=--enable-video-vgl
DISPLAY_MSG= ${CAT} ${PKGMESSAGE}
diff --git a/devel/sdl12/distinfo b/devel/sdl12/distinfo
index 8f4766fd163c..db7e423b1626 100644
--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@@ -1,2 +1,2 @@
-MD5 (SDL-1.2.8.tar.gz) = 37aaf9f069f9c2c18856022f35de9f8c
-SIZE (SDL-1.2.8.tar.gz) = 2602449
+MD5 (SDL-1.2.7.tar.gz) = d29b34b6ba3ed213893fc9d8d35e357a
+SIZE (SDL-1.2.7.tar.gz) = 2470936
diff --git a/devel/sdl12/files/extra-patch-src_audio_SDL__mixer__MMX.c b/devel/sdl12/files/extra-patch-src_audio_SDL__mixer__MMX.c
new file mode 100644
index 000000000000..1e4b3c33e1da
--- /dev/null
+++ b/devel/sdl12/files/extra-patch-src_audio_SDL__mixer__MMX.c
@@ -0,0 +1,155 @@
+--- src/audio/SDL_mixer_MMX.c.orig Sat Nov 9 07:13:28 2002
++++ src/audio/SDL_mixer_MMX.c Sun May 16 19:19:47 2004
+@@ -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
diff --git a/devel/sdl12/files/extra-patch-src_cpuinfo_SDL__cpuinfo.c b/devel/sdl12/files/extra-patch-src_cpuinfo_SDL__cpuinfo.c
new file mode 100644
index 000000000000..358af949e993
--- /dev/null
+++ b/devel/sdl12/files/extra-patch-src_cpuinfo_SDL__cpuinfo.c
@@ -0,0 +1,74 @@
+--- src/cpuinfo/SDL_cpuinfo.c.orig Tue Feb 10 16:31:35 2004
++++ src/cpuinfo/SDL_cpuinfo.c Sun May 16 19:19:48 2004
+@@ -22,7 +22,7 @@
+
+ #ifdef SAVE_RCSID
+ static char rcsid =
+- "@(#) $Id: SDL_cpuinfo.c,v 1.14 2004/02/10 15:31:35 slouken Exp $";
++ "@(#) $Id: SDL_cpuinfo.c,v 1.16 2004/05/16 17:19:48 slouken Exp $";
+ #endif
+
+ /* CPU feature detection for SDL */
+@@ -81,6 +81,26 @@
+ :
+ : "%eax", "%ecx"
+ );
++#elif defined(__GNUC__) && defined(__x86_64__)
++/* Technically, if this is being compiled under __x86_64__ then it has
++CPUid by definition. But it's nice to be able to prove it. :) */
++ __asm__ (
++" pushfq # Get original EFLAGS \n"
++" popq %%rax \n"
++" movq %%rax,%%rcx \n"
++" xorl $0x200000,%%eax # Flip ID bit in EFLAGS \n"
++" pushq %%rax # Save new EFLAGS value on stack \n"
++" popfq # Replace current EFLAGS value \n"
++" pushfq # Get new EFLAGS \n"
++" popq %%rax # Store new EFLAGS in EAX \n"
++" xorl %%ecx,%%eax # Can not toggle ID bit, \n"
++" jz 1f # Processor=80486 \n"
++" movl $1,%0 # We have CPUID support \n"
++"1: \n"
++ : "=m" (has_CPUID)
++ :
++ : "%rax", "%rcx"
++ );
+ #elif defined(_MSC_VER)
+ __asm {
+ pushfd ; Get original EFLAGS
+@@ -103,7 +123,7 @@
+ static __inline__ int CPU_getCPUIDFeatures()
+ {
+ int features = 0;
+-#if defined(__GNUC__) && defined(i386)
++#if defined(__GNUC__) && ( defined(i386) || defined(__x86_64__) )
+ __asm__ (
+ " movl %%ebx,%%edi\n"
+ " xorl %%eax,%%eax # Set up for CPUID instruction \n"
+@@ -118,7 +138,7 @@
+ " movl %%edi,%%ebx\n"
+ : "=m" (features)
+ :
+- : "%eax", "%ebx", "%ecx", "%edx", "%edi"
++ : "%eax", "%ecx", "%edx", "%edi"
+ );
+ #elif defined(_MSC_VER)
+ __asm {
+@@ -139,7 +159,7 @@
+ static __inline__ int CPU_getCPUIDFeaturesExt()
+ {
+ int features = 0;
+-#if defined(__GNUC__) && defined(i386)
++#if defined(__GNUC__) && (defined(i386) || defined (__x86_64__) )
+ __asm__ (
+ " movl %%ebx,%%edi\n"
+ " movl $0x80000000,%%eax # Query for extended functions \n"
+@@ -153,7 +173,7 @@
+ " movl %%edi,%%ebx\n"
+ : "=m" (features)
+ :
+- : "%eax", "%ebx", "%ecx", "%edx", "%edi"
++ : "%eax", "%ecx", "%edx", "%edi"
+ );
+ #elif defined(_MSC_VER)
+ __asm {
diff --git a/devel/sdl12/files/extra-patch-src_video_SDL__yuv__mmx.c b/devel/sdl12/files/extra-patch-src_video_SDL__yuv__mmx.c
new file mode 100644
index 000000000000..8e993b550936
--- /dev/null
+++ b/devel/sdl12/files/extra-patch-src_video_SDL__yuv__mmx.c
@@ -0,0 +1,89 @@
+--- src/video/SDL_yuv_mmx.c.orig Wed Feb 18 18:22:04 2004
++++ src/video/SDL_yuv_mmx.c Sun May 16 19:19:48 2004
+@@ -22,7 +22,7 @@
+
+ #ifdef SAVE_RCSID
+ static char rcsid =
+- "@(#) $Id: SDL_yuv_mmx.c,v 1.5 2004/01/04 16:49:22 slouken Exp $";
++ "@(#) $Id: SDL_yuv_mmx.c,v 1.6 2004/05/16 17:19:48 slouken Exp $";
+ #endif
+
+
+@@ -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)
+ );
+ }
+
diff --git a/devel/sdl12/files/patch-al b/devel/sdl12/files/patch-al
new file mode 100644
index 000000000000..c9e196be7ec7
--- /dev/null
+++ b/devel/sdl12/files/patch-al
@@ -0,0 +1,10 @@
+--- src/joystick/bsd/SDL_sysjoystick.c Wed Feb 18 09:22:01 2004
++++ src/joystick/bsd/SDL_sysjoystick.c Sun Oct 31 06:55:00 2004
+@@ -160,6 +160,7 @@
+ SDL_numjoysticks++;
+ } else {
+ free(joynames[nj.index]);
++ joynames[nj.index] = NULL;
+ }
+ }
+ for (i = 0; i < MAX_JOY_JOYS; i++) {
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index cb8217df7f59..d561035aff90 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -64,7 +64,6 @@ share/aclocal/sdl11.m4
%%EXAMPLESDIR%%/testcpuinfo.c
%%EXAMPLESDIR%%/testdyngl.c
%%EXAMPLESDIR%%/testerror.c
-%%EXAMPLESDIR%%/testendian.c
%%EXAMPLESDIR%%/testgamma.c
%%EXAMPLESDIR%%/testgl.c
%%EXAMPLESDIR%%/testhread.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-26 01:18:14 +0000