- up to 1.2.14

Changed files:
    SDL-acfix.patch -> 1.2
    crossmingw32-SDL.spec -> 1.26

diff --git a/SDL-acfix.patch b/SDL-acfix.patch
index 5013aa8241104b4d93d04c0662059175ccb19a2e..c85fdb8848b7bb57a0e174a393252057f6a37531 100644 (file)
--- a/SDL-acfix.patch
+++ b/SDL-acfix.patch
@@ -1,11 +1,36 @@
---- SDL-1.2.10/configure.in.orig       2006-05-17 05:16:07.000000000 +0200
-+++ SDL-1.2.10/configure.in    2006-05-19 19:47:50.209990750 +0200
-@@ -40,7 +40,7 @@
- AC_SUBST(LT_AGE)
- 
- dnl Detect the canonical build and host environments
+--- SDL-1.2.14/configure.in.org        2010-03-29 21:38:33.976889923 +0200
++++ SDL-1.2.14/configure.in    2010-03-29 21:38:58.236890584 +0200
+@@ -2,7 +2,7 @@
+ AC_INIT(README)
+ AC_CONFIG_HEADER(include/SDL_config.h)
+ AC_GNU_SOURCE
 -AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
 +AC_CONFIG_AUX_DIR([build-scripts])
- AC_CANONICAL_HOST
- AC_C_BIGENDIAN
- if test x$ac_cv_c_bigendian = xyes; then
+ 
+ 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/crossmingw32-SDL.spec b/crossmingw32-SDL.spec
index 2cf56ba5763200031737d1eb39836c13f362412e..1408162c739146f04544cb2dec353910a8eaca3a 100644 (file)
--- a/crossmingw32-SDL.spec
+++ b/crossmingw32-SDL.spec
@@ -2,12 +2,12 @@
 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.13
+Version:       1.2.14
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.libsdl.org/release/%{realname}-%{version}.tar.gz
-# Source0-md5: c6660feea2a6834de10bc71b2f8e4d88
+# Source0-md5: e52086d1b508fa0b76c52ee30b55bec4
 Patch0:                %{realname}-mmx-constraints.patch
 Patch1:                %{realname}-acfix.patch
 URL:           http://www.libsdl.org/
@@ -143,4 +143,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/SDL.dll
+%{_dlldir}/libSDL-1-2-0.dll