packages: crossmingw32-SDL/crossmingw32-SDL.spec, crossmingw32-SDL/SDL-acfi...

[lkrotowski]

Author: lkrotowski                   Date: Mon Mar 29 20:20:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.2.14

---- Files affected:
packages/crossmingw32-SDL:
   crossmingw32-SDL.spec (1.25 -> 1.26) , SDL-acfix.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/crossmingw32-SDL/crossmingw32-SDL.spec
diff -u packages/crossmingw32-SDL/crossmingw32-SDL.spec:1.25 packages/crossmingw32-SDL/crossmingw32-SDL.spec:1.26
--- packages/crossmingw32-SDL/crossmingw32-SDL.spec:1.25	Mon Jan 14 20:24:24 2008
+++ packages/crossmingw32-SDL/crossmingw32-SDL.spec	Mon Mar 29 22:20:42 2010
@@ -3,12 +3,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/
@@ -144,7 +144,7 @@
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/SDL.dll
+%{_dlldir}/libSDL-1-2-0.dll
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -152,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2010/03/29 20:20:42  lkrotowski
+- up to 1.2.14
+
 Revision 1.25  2008/01/14 19:24:24  qboosh
 - unified macros order
 

================================================================
Index: packages/crossmingw32-SDL/SDL-acfix.patch
diff -u packages/crossmingw32-SDL/SDL-acfix.patch:1.1 packages/crossmingw32-SDL/SDL-acfix.patch:1.2
--- packages/crossmingw32-SDL/SDL-acfix.patch:1.1	Fri May 19 20:55:04 2006
+++ packages/crossmingw32-SDL/SDL-acfix.patch	Mon Mar 29 22:20:42 2010
@@ -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__
+         ;;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-SDL/crossmingw32-SDL.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-SDL/SDL-acfix.patch?r1=1.1&r2=1.2&f=u