rpms/SDL/devel SDL-1.2.12-disable_yasm.patch, NONE, 1.1 SDL-1.2.12-preferalsa.patch, NONE, 1.1 SDL-1.2.12-x11dyn64.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 SDL.spec, 1.53, 1.54 SDL_config.h, 1.2, 1.3 sources, 1.14, 1.15

Thomas Woerner (twoerner) fedora-extras-commits at redhat.com
Mon Aug 27 16:33:05 UTC 2007 

Author: twoerner

Update of /cvs/pkgs/rpms/SDL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1420

Modified Files:
	.cvsignore SDL.spec SDL_config.h sources 
Added Files:
	SDL-1.2.12-disable_yasm.patch SDL-1.2.12-preferalsa.patch 
	SDL-1.2.12-x11dyn64.patch 
Log Message:
- new version 1.2.12
  fixes TEXTRELs (rhbz#179407)
- added arm support (rhbz#245411)
  Thanks to Lennert Buytenhek for the patch
- added alpha support (rhbz#246463)
  Thanks to Oliver Falk for the patch
- disabled yasm for SDL (rhbz#234823)
  Thanks to Nikolay Ulyanitsky for the patch



SDL-1.2.12-disable_yasm.patch:

--- NEW FILE SDL-1.2.12-disable_yasm.patch ---
diff -up SDL-1.2.12/configure.in.disable_yasm SDL-1.2.12/configure.in
--- SDL-1.2.12/configure.in.disable_yasm	2007-08-27 18:24:44.000000000 +0200
+++ SDL-1.2.12/configure.in	2007-08-27 18:25:04.000000000 +0200
@@ -715,7 +715,6 @@ AC_HELP_STRING([--enable-nasm], [use nas
             esac
         fi
 
-        AC_PATH_PROG(NASM, yasm)
         echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections
         echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections
         echo "%endif" >> unquoted-sections

SDL-1.2.12-preferalsa.patch:

--- NEW FILE SDL-1.2.12-preferalsa.patch ---
diff -up SDL-1.2.12/src/audio/SDL_audio.c.preferalsa SDL-1.2.12/src/audio/SDL_audio.c
--- SDL-1.2.12/src/audio/SDL_audio.c.preferalsa	2007-08-27 18:15:34.000000000 +0200
+++ SDL-1.2.12/src/audio/SDL_audio.c	2007-08-27 18:16:23.000000000 +0200
@@ -36,6 +36,15 @@
 
 /* Available audio drivers */
 static AudioBootStrap *bootstrap[] = {
+#if SDL_AUDIO_DRIVER_ALSA
+	&ALSA_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_ARTS
+	&ARTS_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_ESD
+	&ESD_bootstrap,
+#endif
 #if SDL_AUDIO_DRIVER_BSD
 	&BSD_AUDIO_bootstrap,
 #endif
@@ -43,9 +52,6 @@ static AudioBootStrap *bootstrap[] = {
 	&DSP_bootstrap,
 	&DMA_bootstrap,
 #endif
-#if SDL_AUDIO_DRIVER_ALSA
-	&ALSA_bootstrap,
-#endif
 #if SDL_AUDIO_DRIVER_PULSE
 	&PULSE_bootstrap,
 #endif
@@ -58,12 +64,6 @@ static AudioBootStrap *bootstrap[] = {
 #if SDL_AUDIO_DRIVER_DMEDIA
 	&DMEDIA_bootstrap,
 #endif
-#if SDL_AUDIO_DRIVER_ARTS
-	&ARTS_bootstrap,
-#endif
-#if SDL_AUDIO_DRIVER_ESD
-	&ESD_bootstrap,
-#endif
 #if SDL_AUDIO_DRIVER_NAS
 	&NAS_bootstrap,
 #endif

SDL-1.2.12-x11dyn64.patch:

--- NEW FILE SDL-1.2.12-x11dyn64.patch ---
diff -up SDL-1.2.12/configure.in.x11dyn64 SDL-1.2.12/configure.in
--- SDL-1.2.12/configure.in.x11dyn64	2007-08-27 18:18:28.000000000 +0200
+++ SDL-1.2.12/configure.in	2007-08-27 18:20:48.000000000 +0200
@@ -950,7 +950,8 @@ AC_HELP_STRING([--enable-x11-shared], [d
                     ;;
                 *)
                     x11_lib_path=[`echo $X_LIBS | sed 's/.*-L\([^ ]*\).*/\1/'`]
-                    for path in $x11_lib_path /usr/lib /usr/X11/lib /usr/X11R6/lib; do
+		    pfx=${libdir##*/}
+                    for path in $x11_lib_path /usr/${pfx} /usr/lib /usr/X11/lib /usr/X11R6/lib; do
                         if test "x$x11_lib" = "x"; then
                             x11_lib=[`ls -- $path/libX11.so.[0-9] 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`]
                             if test "x$x11_lib" = "x"; then


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	19 Mar 2007 17:54:55 -0000	1.14
+++ .cvsignore	27 Aug 2007 16:32:32 -0000	1.15
@@ -1,2 +1,3 @@
 SDL-1.2.10.tar.gz
 SDL-1.2.11.tar.gz
+SDL-1.2.12.tar.gz


Index: SDL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/SDL.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- SDL.spec	20 Mar 2007 14:20:50 -0000	1.53
+++ SDL.spec	27 Aug 2007 16:32:32 -0000	1.54
@@ -1,17 +1,18 @@
 Summary: A cross-platform multimedia library
 Name: SDL
-Version: 1.2.11
-Release: 2
+Version: 1.2.12
+Release: 1%{?dist}
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 Source2: SDL_config.h
 Patch0: SDL-1.2.10-byteorder.patch
 Patch17: SDL-1.2.10-libdir.patch
-Patch19: SDL-1.2.10-preferalsa.patch
-Patch20: SDL-1.2.10-pagesize.patch
+Patch19: SDL-1.2.12-preferalsa.patch
 Patch21: SDL-1.2.10-multilib.patch
 Patch22: SDL-1.2.11-fixman.patch
 Patch23: SDL-1.2.11-dynamic-esd.patch
-Patch24: SDL-1.2.11-x11dyn64.patch
+Patch24: SDL-1.2.12-x11dyn64.patch
+Patch25: SDL-1.2.12-disable_yasm.patch
+
 URL: http://www.libsdl.org/
 License: LGPL
 Group: System Environment/Libraries
@@ -55,11 +56,11 @@
 %patch0 -p1 -b .byteorder
 %patch17 -p1 -b .libdir
 %patch19 -p1 -b .preferalsa
-%patch20 -p1 -b .pagesize
 %patch21 -p1 -b .multilib
 %patch22 -p1 -b .fixman
 %patch23 -p1 -b .dynamic-esd
 %patch24 -p1 -b .x11dyn64
+%patch25 -p1 -b .disable_yasm
 
 %build
 aclocal
@@ -88,6 +89,10 @@
 %ifarch %{ix86}
 basearch=i386
 %endif
+# always use arm for arm*
+%ifarch %{arm}
+basearch=arm
+%endif
 # Rename SDL_config.h
 mv %{buildroot}/%{_includedir}/SDL/SDL_config.h %{buildroot}/%{_includedir}/SDL/SDL_config-${basearch}.h
 install -m644 %{SOURCE2} %{buildroot}/%{_includedir}/SDL/SDL_config.h
@@ -120,6 +125,16 @@
 %{_mandir}/man3/SDL*.3*
 
 %changelog
+* Mon Aug 27 2007 Thomas Woerner <twoerner at redhat.com> 1.2.12-1
+- new version 1.2.12
+  fixes TEXTRELs (rhbz#179407)
+- added arm support (rhbz#245411)
+  Thanks to Lennert Buytenhek for the patch
+- added alpha support (rhbz#246463)
+  Thanks to Oliver Falk for the patch
+- disabled yasm for SDL (rhbz#234823)
+  Thanks to Nikolay Ulyanitsky for the patch
+
 * Tue Mar 20 2007 Thomas Woerner <twoerner at redhat.com> 1.2.11-2
 - use X11 dlopen code for 64 bit architectures (rhbz#207903)
 


Index: SDL_config.h
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/SDL_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SDL_config.h	2 Nov 2006 17:50:17 -0000	1.2
+++ SDL_config.h	27 Aug 2007 16:32:32 -0000	1.3
@@ -49,6 +49,10 @@
 #include "SDL_config-s390.h"
 #elif defined(__x86_64__)
 #include "SDL_config-x86_64.h"
+#elif defined(__arm__)
+#include "SDL_config-arm.h"
+#elif defined(__alpha__)
+#include "SDL_config-alpha.h"
 #else
 #error "The SDL-devel package is not usable with the architecture."
 #endif


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/SDL/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	19 Mar 2007 17:54:55 -0000	1.14
+++ sources	27 Aug 2007 16:32:32 -0000	1.15
@@ -1 +1 @@
-418b42956b7cd103bfab1b9077ccc149  SDL-1.2.11.tar.gz
+544b4554986e51eed6d34435cf9c5f3f  SDL-1.2.12.tar.gz

More information about the fedora-extras-commits mailing list