rpms/SDL/F-7 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
Thomas Woerner (twoerner)
fedora-extras-commits at redhat.com
Mon Aug 27 16:39:21 UTC 2007
Author: twoerner
Update of /cvs/pkgs/rpms/SDL/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1769
Added Files:
SDL-1.2.12-disable_yasm.patch SDL-1.2.12-preferalsa.patch
SDL-1.2.12-x11dyn64.patch
Log Message:
- add new patches
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
More information about the scm-commits
mailing list