- updated to 1.2.15

- updated acfix patch
- removed obsolete mmx-constraints patch

Changed files:
    SDL-acfix.patch -> 1.3
    SDL-mmx-constraints.patch -> 1.3
    crossmingw32-SDL.spec -> 1.29

diff --git a/SDL-acfix.patch b/SDL-acfix.patch
index c85fdb8848b7bb57a0e174a393252057f6a37531..ef4f6c4482c1b2bcf1c2d29734a392e18c7fb201 100644 (file)
--- a/SDL-acfix.patch
+++ b/SDL-acfix.patch
@@ -10,27 +10,3 @@
  dnl Set various version strings - taken gratefully from the GTk sources
  #
 
-Ideas for patch from:
-http://www.mythtv.org/wiki/Windows_Port#SDL_-_libtool_cannot_build_libtool_library_libSDL.la
---- SDL-1.2.14/Makefile.in.org 2010-03-29 21:58:23.768890123 +0200
-+++ SDL-1.2.14/Makefile.in     2010-03-29 21:59:23.177902456 +0200
-@@ -76,7 +76,7 @@
- include $(depend)
- 
- $(objects)/$(TARGET): $(OBJECTS)
--      $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-+      $(LIBTOOL) --mode=link $(CC) -o $@ $(subst version.o,version.lo,$(OBJECTS)) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
- 
- $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
-       $(AR) cru $@ $(SDLMAIN_OBJECTS)
---- SDL-1.2.14/build-scripts/makedep.sh.org    2010-03-29 22:07:03.642140221 +0200
-+++ SDL-1.2.14/build-scripts/makedep.sh        2010-03-29 22:07:54.638889840 +0200
-@@ -81,7 +81,7 @@
-         ;;
-         rc) cat >>${output}.new <<__EOF__
- 
--      \$(WINDRES) $src \$@
-+      \$(LIBTOOL)  --tag=RC --mode=compile \$(WINDRES) $src  -o \$@
- 
- __EOF__
-         ;;

diff --git a/SDL-mmx-constraints.patch b/SDL-mmx-constraints.patch
deleted file mode 100644 (file)
index 02aae36..0000000
--- a/SDL-mmx-constraints.patch
+++ /dev/null
@@ -1,207 +0,0 @@
---- SDL-1.2.7/src/video/mmx.h.orig     2003-08-22 07:51:19.000000000 +0200
-+++ SDL-1.2.7/src/video/mmx.h  2003-11-09 13:49:35.270218296 +0100
-@@ -246,15 +246,37 @@
-               printf(#op "_i2r(" #imm "=0x%08x%08x, ", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-               __asm__ __volatile__ ("movq %%" #reg ", %0" \
--                                    : "=X" (mmx_trace) \
-+                                    : "=m" (mmx_trace) \
-                                     : /* nothing */ ); \
-               printf(#reg "=0x%08x%08x) => ", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-               __asm__ __volatile__ (#op " %0, %%" #reg \
-                                     : /* nothing */ \
--                                    : "X" (imm)); \
-+                                    : "i" (imm)); \
-               __asm__ __volatile__ ("movq %%" #reg ", %0" \
--                                    : "=X" (mmx_trace) \
-+                                    : "=m" (mmx_trace) \
-+                                    : /* nothing */ ); \
-+              printf(#reg "=0x%08x%08x\n", \
-+                      mmx_trace.d[1], mmx_trace.d[0]); \
-+      }
-+
-+/* 32 bits or less */
-+#define       mmx_m2r32(op, mem, reg) \
-+      { \
-+              mmx_t mmx_trace; \
-+              mmx_trace = (mem); \
-+              printf(#op "_m2r(" #mem "=0x%08x%08x, ", \
-+                      mmx_trace.d[1], mmx_trace.d[0]); \
-+              __asm__ __volatile__ ("movq %%" #reg ", %0" \
-+                                    : "=m" (mmx_trace) \
-+                                    : /* nothing */ ); \
-+              printf(#reg "=0x%08x%08x) => ", \
-+                      mmx_trace.d[1], mmx_trace.d[0]); \
-+              __asm__ __volatile__ (#op " %0, %%" #reg \
-+                                    : /* nothing */ \
-+                                    : "mr" (mem)); \
-+              __asm__ __volatile__ ("movq %%" #reg ", %0" \
-+                                    : "=m" (mmx_trace) \
-                                     : /* nothing */ ); \
-               printf(#reg "=0x%08x%08x\n", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-@@ -267,25 +289,45 @@
-               printf(#op "_m2r(" #mem "=0x%08x%08x, ", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-               __asm__ __volatile__ ("movq %%" #reg ", %0" \
--                                    : "=X" (mmx_trace) \
-+                                    : "=m" (mmx_trace) \
-                                     : /* nothing */ ); \
-               printf(#reg "=0x%08x%08x) => ", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-               __asm__ __volatile__ (#op " %0, %%" #reg \
-                                     : /* nothing */ \
--                                    : "X" (mem)); \
-+                                    : "m" (mem)); \
-               __asm__ __volatile__ ("movq %%" #reg ", %0" \
--                                    : "=X" (mmx_trace) \
-+                                    : "=m" (mmx_trace) \
-                                     : /* nothing */ ); \
-               printf(#reg "=0x%08x%08x\n", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-       }
- 
-+/* 32 bits or less */
-+#define       mmx_r2m32(op, reg, mem) \
-+      { \
-+              mmx_t mmx_trace; \
-+              __asm__ __volatile__ ("movq %%" #reg ", %0" \
-+                                    : "=m" (mmx_trace) \
-+                                    : /* nothing */ ); \
-+              printf(#op "_r2m(" #reg "=0x%08x%08x, ", \
-+                      mmx_trace.d[1], mmx_trace.d[0]); \
-+              mmx_trace = (mem); \
-+              printf(#mem "=0x%08x%08x) => ", \
-+                      mmx_trace.d[1], mmx_trace.d[0]); \
-+              __asm__ __volatile__ (#op " %%" #reg ", %0" \
-+                                    : "=mr" (mem) \
-+                                    : /* nothing */ ); \
-+              mmx_trace = (mem); \
-+              printf(#mem "=0x%08x%08x\n", \
-+                      mmx_trace.d[1], mmx_trace.d[0]); \
-+      }
-+
- #define       mmx_r2m(op, reg, mem) \
-       { \
-               mmx_t mmx_trace; \
-               __asm__ __volatile__ ("movq %%" #reg ", %0" \
--                                    : "=X" (mmx_trace) \
-+                                    : "=m" (mmx_trace) \
-                                     : /* nothing */ ); \
-               printf(#op "_r2m(" #reg "=0x%08x%08x, ", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-@@ -293,7 +335,7 @@
-               printf(#mem "=0x%08x%08x) => ", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-               __asm__ __volatile__ (#op " %%" #reg ", %0" \
--                                    : "=X" (mem) \
-+                                    : "=m" (mem) \
-                                     : /* nothing */ ); \
-               mmx_trace = (mem); \
-               printf(#mem "=0x%08x%08x\n", \
-@@ -304,18 +346,18 @@
-       { \
-               mmx_t mmx_trace; \
-               __asm__ __volatile__ ("movq %%" #regs ", %0" \
--                                    : "=X" (mmx_trace) \
-+                                    : "=m" (mmx_trace) \
-                                     : /* nothing */ ); \
-               printf(#op "_r2r(" #regs "=0x%08x%08x, ", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-               __asm__ __volatile__ ("movq %%" #regd ", %0" \
--                                    : "=X" (mmx_trace) \
-+                                    : "=m" (mmx_trace) \
-                                     : /* nothing */ ); \
-               printf(#regd "=0x%08x%08x) => ", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-               __asm__ __volatile__ (#op " %" #regs ", %" #regd); \
-               __asm__ __volatile__ ("movq %%" #regd ", %0" \
--                                    : "=X" (mmx_trace) \
-+                                    : "=m" (mmx_trace) \
-                                     : /* nothing */ ); \
-               printf(#regd "=0x%08x%08x\n", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-@@ -333,8 +375,8 @@
-               __asm__ __volatile__ ("movq %0, %%mm0\n\t" \
-                                     #op " %1, %%mm0\n\t" \
-                                     "movq %%mm0, %0" \
--                                    : "=X" (memd) \
--                                    : "X" (mems)); \
-+                                    : "=my" (memd) \
-+                                    : "my" (mems)); \
-               mmx_trace = (memd); \
-               printf(#memd "=0x%08x%08x\n", \
-                       mmx_trace.d[1], mmx_trace.d[0]); \
-@@ -348,16 +390,28 @@
- #define       mmx_i2r(op, imm, reg) \
-       __asm__ __volatile__ (#op " %0, %%" #reg \
-                             : /* nothing */ \
--                            : "X" (imm) )
-+                            : "i" (imm) )
-+
-+/* 32 bits or less */
-+#define       mmx_m2r32(op, mem, reg) \
-+      __asm__ __volatile__ (#op " %0, %%" #reg \
-+                            : /* nothing */ \
-+                            : "mr" (mem))
- 
- #define       mmx_m2r(op, mem, reg) \
-       __asm__ __volatile__ (#op " %0, %%" #reg \
-                             : /* nothing */ \
-                             : "m" (mem))
-+
-+/* 32 bits or less */
-+#define       mmx_r2m32(op, reg, mem) \
-+      __asm__ __volatile__ (#op " %%" #reg ", %0" \
-+                            : "=mr" (mem) \
-+                            : /* nothing */ )
- 
- #define       mmx_r2m(op, reg, mem) \
-       __asm__ __volatile__ (#op " %%" #reg ", %0" \
--                            : "=X" (mem) \
-+                            : "=m" (mem) \
-                             : /* nothing */ )
- 
- #define       mmx_r2r(op, regs, regd) \
-@@ -367,8 +421,8 @@
-       __asm__ __volatile__ ("movq %0, %%mm0\n\t" \
-                             #op " %1, %%mm0\n\t" \
-                             "movq %%mm0, %0" \
--                            : "=X" (memd) \
--                            : "X" (mems))
-+                            : "=my" (memd) \
-+                            : "my" (mems))
- 
- #endif
- 
-@@ -383,8 +437,8 @@
- #define       movq(vars, vard) \
-       __asm__ __volatile__ ("movq %1, %%mm0\n\t" \
-                             "movq %%mm0, %0" \
--                            : "=X" (vard) \
--                            : "X" (vars))
-+                            : "=my" (vard) \
-+                            : "my" (vars))
- 
- 
- /*    1x32 MOVe Doubleword
-@@ -392,14 +446,14 @@
-        but is most useful for moving things between
-        mmx registers and ordinary registers)
- */
--#define       movd_m2r(var, reg)      mmx_m2r(movd, var, reg)
--#define       movd_r2m(reg, var)      mmx_r2m(movd, reg, var)
-+#define       movd_m2r(var, reg)      mmx_m2r32(movd, var, reg)
-+#define       movd_r2m(reg, var)      mmx_r2m32(movd, reg, var)
- #define       movd_r2r(regs, regd)    mmx_r2r(movd, regs, regd)
- #define       movd(vars, vard) \
-       __asm__ __volatile__ ("movd %1, %%mm0\n\t" \
-                             "movd %%mm0, %0" \
--                            : "=X" (vard) \
--                            : "X" (vars))
-+                            : "=mr" (vard) \
-+                            : "mr" (vars))
- 
- 
- /*    2x32, 4x16, and 8x8 Parallel ADDs

diff --git a/crossmingw32-SDL.spec b/crossmingw32-SDL.spec
index aa41f258d6ab9c5241992ca883906928f76887a6..dde022817fa6cfb5704d132ecb8a04316b00bf68 100644 (file)
--- a/crossmingw32-SDL.spec
+++ b/crossmingw32-SDL.spec
@@ -2,16 +2,15 @@
 Summary:       SDL (Simple DirectMedia Layer) - Game/Multimedia Library - MinGW32 cross version
 Summary(pl.UTF-8):     SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       1.2.14
+Version:       1.2.15
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.libsdl.org/release/%{realname}-%{version}.tar.gz
-# Source0-md5: e52086d1b508fa0b76c52ee30b55bec4
-Patch0:                %{realname}-mmx-constraints.patch
-Patch1:                %{realname}-acfix.patch
+# Source0-md5: 9d96df8417572a2afb781a7c4c811a85
+Patch0:                %{realname}-acfix.patch
 URL:           http://www.libsdl.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-runtime
@@ -94,7 +93,6 @@ SDL - biblioteka DLL dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}