summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/libsdl
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2011-10-19 02:32:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-20 16:13:40 (GMT)
commitb4ac21c58a95d757ed1354ed5dae3fc1a4a81be8 (patch)
tree79360658cf1fa2cdd5ea784521b51409817985c0 /meta/recipes-graphics/libsdl
parent0c864219a50867731ea526ff95b7d8144136ce39 (diff)
downloadpoky-b4ac21c58a95d757ed1354ed5dae3fc1a4a81be8.tar.gz
libsdl: update to 1.2.14
Update libsdl to 1.2.14 * update configure_tweak.patch * update bb file, including add configure option --disable-video-ps3, drop acinclude.m4 and kernel-asm-page.patch and remove old libtool macros (From OE-Core rev: 4466055d83384fd12565e1de4e968330bff42ca2) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/libsdl')
-rw-r--r--meta/recipes-graphics/libsdl/files/acinclude.m4189
-rw-r--r--meta/recipes-graphics/libsdl/files/configure_tweak.patch281
-rw-r--r--meta/recipes-graphics/libsdl/files/kernel-asm-page.patch15
-rw-r--r--meta/recipes-graphics/libsdl/libsdl_1.2.14.bb (renamed from meta/recipes-graphics/libsdl/libsdl_1.2.11.bb)17
4 files changed, 139 insertions, 363 deletions
diff --git a/meta/recipes-graphics/libsdl/files/acinclude.m4 b/meta/recipes-graphics/libsdl/files/acinclude.m4
deleted file mode 100644
index ca2df9d..0000000
--- a/meta/recipes-graphics/libsdl/files/acinclude.m4
+++ /dev/null
@@ -1,189 +0,0 @@
1# Local macros for the SDL configure.in script
2
3dnl Function to link an architecture specific file
4dnl LINK_ARCH_SRC(source_dir, arch, source_file)
5AC_DEFUN([COPY_ARCH_SRC],
6[
7 old="$srcdir/$1/$2/$3"
8 new="$1/$3"
9 if test ! -d $1; then
10 echo "Creating directory $1"
11 mkdir -p $1
12 fi
13 echo "Copying $old -> $new"
14 cat >$new <<__EOF__
15/* WARNING: This file was automatically generated!
16 * Original: $old
17 */
18__EOF__
19 cat >>$new <$old
20])
21
22#
23# --- esd.m4 ---
24#
25# Configure paths for ESD
26# Manish Singh 98-9-30
27# stolen back from Frank Belew
28# stolen from Manish Singh
29# Shamelessly stolen from Owen Taylor
30
31dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
32dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
33dnl
34AC_DEFUN([AM_PATH_ESD],
35[dnl
36dnl Get the cflags and libraries from the esd-config script
37dnl
38AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)],
39 esd_prefix="$withval", esd_prefix="")
40AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
41 esd_exec_prefix="$withval", esd_exec_prefix="")
42AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program],
43 , enable_esdtest=yes)
44
45 if test x$esd_exec_prefix != x ; then
46 esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
47 if test x${ESD_CONFIG+set} != xset ; then
48 ESD_CONFIG=$esd_exec_prefix/bin/esd-config
49 fi
50 fi
51 if test x$esd_prefix != x ; then
52 esd_args="$esd_args --prefix=$esd_prefix"
53 if test x${ESD_CONFIG+set} != xset ; then
54 ESD_CONFIG=$esd_prefix/bin/esd-config
55 fi
56 fi
57
58 AC_PATH_PROG(ESD_CONFIG, esd-config, no)
59 min_esd_version=ifelse([$1], ,0.2.7,$1)
60 AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
61 no_esd=""
62 if test "$ESD_CONFIG" = "no" ; then
63 no_esd=yes
64 else
65 ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
66 ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
67
68 esd_major_version=`$ESD_CONFIG $esd_args --version | \
69 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
70 esd_minor_version=`$ESD_CONFIG $esd_args --version | \
71 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
72 esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
73 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
74 if test "x$enable_esdtest" = "xyes" ; then
75 ac_save_CFLAGS="$CFLAGS"
76 ac_save_LIBS="$LIBS"
77 CFLAGS="$CFLAGS $ESD_CFLAGS"
78 LIBS="$LIBS $ESD_LIBS"
79dnl
80dnl Now check if the installed ESD is sufficiently new. (Also sanity
81dnl checks the results of esd-config to some extent
82dnl
83 rm -f conf.esdtest
84 AC_TRY_RUN([
85#include <stdio.h>
86#include <stdlib.h>
87#include <string.h>
88#include <esd.h>
89
90char*
91my_strdup (char *str)
92{
93 char *new_str;
94
95 if (str)
96 {
97 new_str = malloc ((strlen (str) + 1) * sizeof(char));
98 strcpy (new_str, str);
99 }
100 else
101 new_str = NULL;
102
103 return new_str;
104}
105
106int main ()
107{
108 int major, minor, micro;
109 char *tmp_version;
110
111 system ("touch conf.esdtest");
112
113 /* HP/UX 9 (%@#!) writes to sscanf strings */
114 tmp_version = my_strdup("$min_esd_version");
115 if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
116 printf("%s, bad version string\n", "$min_esd_version");
117 exit(1);
118 }
119
120 if (($esd_major_version > major) ||
121 (($esd_major_version == major) && ($esd_minor_version > minor)) ||
122 (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
123 {
124 return 0;
125 }
126 else
127 {
128 printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
129 printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
130 printf("*** best to upgrade to the required version.\n");
131 printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
132 printf("*** to point to the correct copy of esd-config, and remove the file\n");
133 printf("*** config.cache before re-running configure\n");
134 return 1;
135 }
136}
137
138],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
139 CFLAGS="$ac_save_CFLAGS"
140 LIBS="$ac_save_LIBS"
141 fi
142 fi
143 if test "x$no_esd" = x ; then
144 AC_MSG_RESULT(yes)
145 ifelse([$2], , :, [$2])
146 else
147 AC_MSG_RESULT(no)
148 if test "$ESD_CONFIG" = "no" ; then
149 echo "*** The esd-config script installed by ESD could not be found"
150 echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
151 echo "*** your path, or set the ESD_CONFIG environment variable to the"
152 echo "*** full path to esd-config."
153 else
154 if test -f conf.esdtest ; then
155 :
156 else
157 echo "*** Could not run ESD test program, checking why..."
158 CFLAGS="$CFLAGS $ESD_CFLAGS"
159 LIBS="$LIBS $ESD_LIBS"
160 AC_TRY_LINK([
161#include <stdio.h>
162#include <esd.h>
163], [ return 0; ],
164 [ echo "*** The test program compiled, but did not run. This usually means"
165 echo "*** that the run-time linker is not finding ESD or finding the wrong"
166 echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
167 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
168 echo "*** to the installed location Also, make sure you have run ldconfig if that"
169 echo "*** is required on your system"
170 echo "***"
171 echo "*** If you have an old version installed, it is best to remove it, although"
172 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
173 [ echo "*** The test program failed to compile or link. See the file config.log for the"
174 echo "*** exact error that occured. This usually means ESD was incorrectly installed"
175 echo "*** or that you have moved ESD since it was installed. In the latter case, you"
176 echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
177 CFLAGS="$ac_save_CFLAGS"
178 LIBS="$ac_save_LIBS"
179 fi
180 fi
181 ESD_CFLAGS=""
182 ESD_LIBS=""
183 ifelse([$3], , :, [$3])
184 fi
185 AC_SUBST(ESD_CFLAGS)
186 AC_SUBST(ESD_LIBS)
187 rm -f conf.esdtest
188])
189
diff --git a/meta/recipes-graphics/libsdl/files/configure_tweak.patch b/meta/recipes-graphics/libsdl/files/configure_tweak.patch
index 90a2888..55d203a 100644
--- a/meta/recipes-graphics/libsdl/files/configure_tweak.patch
+++ b/meta/recipes-graphics/libsdl/files/configure_tweak.patch
@@ -1,14 +1,7 @@
1Index: SDL-1.2.11/configure.in 1--- SDL-1.2.14/configure.in.orig 2011-10-18 14:51:32.044167004 +0800
2=================================================================== 2+++ SDL-1.2.14/configure.in 2011-10-18 14:51:42.374167009 +0800
3--- SDL-1.2.11.orig/configure.in 2006-06-27 05:48:33.000000000 +0100 3@@ -48,9 +48,9 @@
4+++ SDL-1.2.11/configure.in 2008-02-21 19:48:47.000000000 +0000 4 dnl AC_CANONICAL_HOST
5@@ -40,13 +40,13 @@
6 AC_SUBST(LT_AGE)
7
8 dnl Detect the canonical build and host environments
9-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
10+AC_CONFIG_AUX_DIR(./build-scripts)
11 AC_CANONICAL_HOST
12 AC_C_BIGENDIAN 5 AC_C_BIGENDIAN
13 if test x$ac_cv_c_bigendian = xyes; then 6 if test x$ac_cv_c_bigendian = xyes; then
14- AC_DEFINE(SDL_BYTEORDER, 4321) 7- AC_DEFINE(SDL_BYTEORDER, 4321)
@@ -18,8 +11,8 @@ Index: SDL-1.2.11/configure.in
18+ AC_DEFINE(SDL_BYTEORDER, 1234, "Byte Order") 11+ AC_DEFINE(SDL_BYTEORDER, 1234, "Byte Order")
19 fi 12 fi
20 13
21 dnl Set up the compiler and linker flags 14 dnl Check for tools
22@@ -107,7 +107,7 @@ 15@@ -139,7 +139,7 @@
23 AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]), 16 AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]),
24 , enable_libc=yes) 17 , enable_libc=yes)
25 if test x$enable_libc = xyes; then 18 if test x$enable_libc = xyes; then
@@ -28,7 +21,7 @@ Index: SDL-1.2.11/configure.in
28 21
29 dnl Check for C library headers 22 dnl Check for C library headers
30 AC_HEADER_STDC 23 AC_HEADER_STDC
31@@ -118,7 +118,7 @@ 24@@ -150,7 +150,7 @@
32 if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then 25 if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then
33 AC_CHECK_TYPE(int64_t) 26 AC_CHECK_TYPE(int64_t)
34 if test x$ac_cv_type_int64_t = xyes; then 27 if test x$ac_cv_type_int64_t = xyes; then
@@ -37,8 +30,8 @@ Index: SDL-1.2.11/configure.in
37 fi 30 fi
38 have_inttypes=yes 31 have_inttypes=yes
39 fi 32 fi
40@@ -127,11 +127,11 @@ 33@@ -166,11 +166,11 @@
41 AC_FUNC_ALLOCA 34
42 AC_FUNC_MEMCMP 35 AC_FUNC_MEMCMP
43 if test x$ac_cv_func_memcmp_working = xyes; then 36 if test x$ac_cv_func_memcmp_working = xyes; then
44- AC_DEFINE(HAVE_MEMCMP) 37- AC_DEFINE(HAVE_MEMCMP)
@@ -49,9 +42,9 @@ Index: SDL-1.2.11/configure.in
49- AC_DEFINE(HAVE_STRTOD) 42- AC_DEFINE(HAVE_STRTOD)
50+ AC_DEFINE(HAVE_STRTOD,1,"") 43+ AC_DEFINE(HAVE_STRTOD,1,"")
51 fi 44 fi
52 AC_CHECK_FUNCS(malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strlcpy strlcat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp sscanf snprintf vsnprintf iconv sigaction setjmp nanosleep) 45 AC_CHECK_FUNC(mprotect,
53 46 AC_TRY_COMPILE([
54@@ -146,40 +146,40 @@ 47@@ -194,40 +194,40 @@
55 AC_CHECK_SIZEOF(long, 4) 48 AC_CHECK_SIZEOF(long, 4)
56 AC_CHECK_SIZEOF(long long, 8) 49 AC_CHECK_SIZEOF(long long, 8)
57 if test x$ac_cv_sizeof_char = x1; then 50 if test x$ac_cv_sizeof_char = x1; then
@@ -110,7 +103,7 @@ Index: SDL-1.2.11/configure.in
110 fi 103 fi
111 104
112 # Standard C sources 105 # Standard C sources
113@@ -201,67 +201,67 @@ 106@@ -248,25 +248,25 @@
114 AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]), 107 AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]),
115 , enable_audio=yes) 108 , enable_audio=yes)
116 if test x$enable_audio != xyes; then 109 if test x$enable_audio != xyes; then
@@ -137,8 +130,10 @@ Index: SDL-1.2.11/configure.in
137 if test x$enable_joystick != xyes; then 130 if test x$enable_joystick != xyes; then
138- AC_DEFINE(SDL_JOYSTICK_DISABLED) 131- AC_DEFINE(SDL_JOYSTICK_DISABLED)
139+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"") 132+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"")
133 else
134 SOURCES="$SOURCES $srcdir/src/joystick/*.c"
140 fi 135 fi
141 AC_ARG_ENABLE(cdrom, 136@@ -274,43 +274,43 @@
142 AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]), 137 AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),
143 , enable_cdrom=yes) 138 , enable_cdrom=yes)
144 if test x$enable_cdrom != xyes; then 139 if test x$enable_cdrom != xyes; then
@@ -189,7 +184,7 @@ Index: SDL-1.2.11/configure.in
189 fi 184 fi
190 185
191 dnl See if the OSS audio interface is supported 186 dnl See if the OSS audio interface is supported
192@@ -289,12 +289,12 @@ 187@@ -338,12 +338,12 @@
193 int arg = SNDCTL_DSP_SETFRAGMENT; 188 int arg = SNDCTL_DSP_SETFRAGMENT;
194 ],[ 189 ],[
195 have_oss=yes 190 have_oss=yes
@@ -204,7 +199,7 @@ Index: SDL-1.2.11/configure.in
204 SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c" 199 SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c"
205 SOURCES="$SOURCES $srcdir/src/audio/dma/*.c" 200 SOURCES="$SOURCES $srcdir/src/audio/dma/*.c"
206 have_audio=yes 201 have_audio=yes
207@@ -314,45 +314,7 @@ 202@@ -363,35 +363,7 @@
208 AC_ARG_ENABLE(alsa, 203 AC_ARG_ENABLE(alsa,
209 AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]), 204 AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]),
210 , enable_alsa=yes) 205 , enable_alsa=yes)
@@ -218,18 +213,7 @@ Index: SDL-1.2.11/configure.in
218- AC_ARG_ENABLE(alsa-shared, 213- AC_ARG_ENABLE(alsa-shared,
219-AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]), 214-AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
220- , enable_alsa_shared=yes) 215- , enable_alsa_shared=yes)
221- if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then 216- alsa_lib=[`find_lib "libasound.so.*" "$ALSA_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
222- if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
223- ALSA_LIBS="-L/lib $ALSA_LIBS"
224- elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
225- ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
226- elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
227- ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
228- fi
229- fi
230- alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
231- alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
232- echo "-- $alsa_lib_spec -> $alsa_lib"
233- 217-
234- AC_DEFINE(SDL_AUDIO_DRIVER_ALSA) 218- AC_DEFINE(SDL_AUDIO_DRIVER_ALSA)
235- SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c" 219- SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
@@ -240,6 +224,7 @@ Index: SDL-1.2.11/configure.in
240- fi 224- fi
241- if test x$have_loadso = xyes && \ 225- if test x$have_loadso = xyes && \
242- test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then 226- test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
227- echo "-- dynamic libasound -> $alsa_lib"
243- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib") 228- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib")
244- else 229- else
245- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS" 230- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS"
@@ -251,7 +236,7 @@ Index: SDL-1.2.11/configure.in
251 } 236 }
252 237
253 dnl Check whether we want to use IRIX 6.5+ native audio or not 238 dnl Check whether we want to use IRIX 6.5+ native audio or not
254@@ -371,7 +333,7 @@ 239@@ -410,7 +382,7 @@
255 AC_MSG_RESULT($have_dmedia) 240 AC_MSG_RESULT($have_dmedia)
256 # Set up files for the audio library 241 # Set up files for the audio library
257 if test x$have_dmedia = xyes; then 242 if test x$have_dmedia = xyes; then
@@ -260,7 +245,7 @@ Index: SDL-1.2.11/configure.in
260 SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c" 245 SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
261 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio" 246 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio"
262 have_audio=yes 247 have_audio=yes
263@@ -408,7 +370,7 @@ 248@@ -447,7 +419,7 @@
264 AC_MSG_RESULT($have_mme) 249 AC_MSG_RESULT($have_mme)
265 # Set up files for the audio library 250 # Set up files for the audio library
266 if test x$have_mme = xyes; then 251 if test x$have_mme = xyes; then
@@ -269,52 +254,52 @@ Index: SDL-1.2.11/configure.in
269 SOURCES="$SOURCES $srcdir/src/audio/mme/*.c" 254 SOURCES="$SOURCES $srcdir/src/audio/mme/*.c"
270 EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS" 255 EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS"
271 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS" 256 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS"
272@@ -433,7 +395,7 @@ 257@@ -470,7 +442,7 @@
273 esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 258 , enable_esd_shared=yes)
274 echo "-- $esd_lib_spec -> $esd_lib" 259 esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
275 260
276- AC_DEFINE(SDL_AUDIO_DRIVER_ESD) 261- AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
277+ AC_DEFINE(SDL_AUDIO_DRIVER_ESD,1,"") 262+ AC_DEFINE(SDL_AUDIO_DRIVER_ESD,1,"")
278 SOURCES="$SOURCES $srcdir/src/audio/esd/*.c" 263 SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
279 EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS" 264 EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS"
280 if test x$have_loadso != xyes && \ 265 if test x$have_loadso != xyes && \
281@@ -442,7 +404,7 @@ 266@@ -480,7 +452,7 @@
282 fi
283 if test x$have_loadso = xyes && \ 267 if test x$have_loadso = xyes && \
284 test x$enable_esd_shared = xyes && test x$esd_lib != x; then 268 test x$enable_esd_shared = xyes && test x$esd_lib != x; then
269 echo "-- dynamic libesd -> $esd_lib"
285- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib") 270- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib")
286+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", "") 271+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", "")
287 else 272 else
288 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS" 273 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS"
289 fi 274 fi
290@@ -485,7 +447,7 @@ 275@@ -567,7 +539,7 @@
291 arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 276 , enable_arts_shared=yes)
292 echo "-- $arts_lib_spec -> $arts_lib" 277 arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
293 278
294- AC_DEFINE(SDL_AUDIO_DRIVER_ARTS) 279- AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
295+ AC_DEFINE(SDL_AUDIO_DRIVER_ARTS,, "") 280+ AC_DEFINE(SDL_AUDIO_DRIVER_ARTS,, "")
296 SOURCES="$SOURCES $srcdir/src/audio/arts/*.c" 281 SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
297 EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS" 282 EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS"
298 if test x$have_loadso != xyes && \ 283 if test x$have_loadso != xyes && \
299@@ -494,7 +456,7 @@ 284@@ -577,7 +549,7 @@
300 fi
301 if test x$have_loadso = xyes && \ 285 if test x$have_loadso = xyes && \
302 test x$enable_arts_shared = xyes && test x$arts_lib != x; then 286 test x$enable_arts_shared = xyes && test x$arts_lib != x; then
287 echo "-- dynamic libartsc -> $arts_lib"
303- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib") 288- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib")
304+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib",1,"") 289+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib",1,"")
305 else 290 else
306 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS" 291 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS"
307 fi 292 fi
308@@ -527,7 +489,7 @@ 293@@ -637,7 +609,7 @@
309 fi 294 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS"
310 AC_MSG_RESULT($have_nas) 295 fi
311 if test x$have_nas = xyes; then 296
312- AC_DEFINE(SDL_AUDIO_DRIVER_NAS) 297- AC_DEFINE(SDL_AUDIO_DRIVER_NAS)
313+ AC_DEFINE(SDL_AUDIO_DRIVER_NAS,1,"") 298+ AC_DEFINE(SDL_AUDIO_DRIVER_NAS,1,"")
314 SOURCES="$SOURCES $srcdir/src/audio/nas/*.c" 299 SOURCES="$SOURCES $srcdir/src/audio/nas/*.c"
315 EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS" 300 EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS"
316 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS" 301 have_audio=yes
317@@ -543,7 +505,7 @@ 302@@ -652,7 +624,7 @@
318 AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]), 303 AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]),
319 , enable_diskaudio=yes) 304 , enable_diskaudio=yes)
320 if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then 305 if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
@@ -323,7 +308,7 @@ Index: SDL-1.2.11/configure.in
323 SOURCES="$SOURCES $srcdir/src/audio/disk/*.c" 308 SOURCES="$SOURCES $srcdir/src/audio/disk/*.c"
324 fi 309 fi
325 } 310 }
326@@ -555,7 +517,7 @@ 311@@ -664,7 +636,7 @@
327 AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]), 312 AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]),
328 , enable_dummyaudio=yes) 313 , enable_dummyaudio=yes)
329 if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then 314 if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then
@@ -332,7 +317,7 @@ Index: SDL-1.2.11/configure.in
332 SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c" 317 SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c"
333 fi 318 fi
334 } 319 }
335@@ -571,7 +533,7 @@ 320@@ -680,7 +652,7 @@
336 AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes) 321 AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes)
337 if test x$have_mint_falcon_hdr = xyes; then 322 if test x$have_mint_falcon_hdr = xyes; then
338 mintaudio=yes 323 mintaudio=yes
@@ -341,16 +326,16 @@ Index: SDL-1.2.11/configure.in
341 SOURCES="$SOURCES $srcdir/src/audio/mint/*.c" 326 SOURCES="$SOURCES $srcdir/src/audio/mint/*.c"
342 SOURCES="$SOURCES $srcdir/src/audio/mint/*.S" 327 SOURCES="$SOURCES $srcdir/src/audio/mint/*.S"
343 have_audio=yes 328 have_audio=yes
344@@ -602,7 +564,7 @@ 329@@ -756,7 +728,7 @@
345 AC_PATH_PROG(NASM, nasm) 330 AC_PATH_PROG(NASM, nasm)
346 fi 331 fi
347 if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then 332 if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
348- AC_DEFINE(SDL_HERMES_BLITTERS) 333- AC_DEFINE(SDL_HERMES_BLITTERS)
349+ AC_DEFINE(SDL_HERMES_BLITTERS,1,"") 334+ AC_DEFINE(SDL_HERMES_BLITTERS,1,"")
350 SOURCES="$SOURCES $srcdir/src/hermes/*.asm" 335 SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
351 if test x"$NASMFLAGS" = x; then 336 NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/"
352 case $ARCH in 337
353@@ -713,9 +675,9 @@ 338@@ -850,9 +822,9 @@
354 CFLAGS="$save_CFLAGS" 339 CFLAGS="$save_CFLAGS"
355 340
356 if test x$have_gcc_altivec = xyes; then 341 if test x$have_gcc_altivec = xyes; then
@@ -362,7 +347,7 @@ Index: SDL-1.2.11/configure.in
362 fi 347 fi
363 EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS" 348 EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS"
364 fi 349 fi
365@@ -758,7 +720,7 @@ 350@@ -895,7 +867,7 @@
366 351
367 if test x$enable_ipod = xyes; then 352 if test x$enable_ipod = xyes; then
368 EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD" 353 EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
@@ -371,7 +356,7 @@ Index: SDL-1.2.11/configure.in
371 SOURCES="$SOURCES $srcdir/src/video/ipod/*.c" 356 SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
372 fi 357 fi
373 } 358 }
374@@ -792,7 +754,7 @@ 359@@ -929,7 +901,7 @@
375 EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB" 360 EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB"
376 fi 361 fi
377 362
@@ -380,7 +365,7 @@ Index: SDL-1.2.11/configure.in
380 SOURCES="$SOURCES $srcdir/src/video/nanox/*.c" 365 SOURCES="$SOURCES $srcdir/src/video/nanox/*.c"
381 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X" 366 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X"
382 have_video=yes 367 have_video=yes
383@@ -881,7 +843,7 @@ 368@@ -995,7 +967,7 @@
384 CFLAGS="$CFLAGS $X_CFLAGS" 369 CFLAGS="$CFLAGS $X_CFLAGS"
385 LDFLAGS="$LDFLAGS $X_LIBS" 370 LDFLAGS="$LDFLAGS $X_LIBS"
386 371
@@ -389,7 +374,7 @@ Index: SDL-1.2.11/configure.in
389 SOURCES="$SOURCES $srcdir/src/video/x11/*.c" 374 SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
390 EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS" 375 EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
391 376
392@@ -903,8 +865,8 @@ 377@@ -1017,8 +989,8 @@
393 test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then 378 test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
394 echo "-- dynamic libX11 -> $x11_lib" 379 echo "-- dynamic libX11 -> $x11_lib"
395 echo "-- dynamic libX11ext -> $x11ext_lib" 380 echo "-- dynamic libX11ext -> $x11ext_lib"
@@ -400,7 +385,7 @@ Index: SDL-1.2.11/configure.in
400 else 385 else
401 enable_x11_shared=no 386 enable_x11_shared=no
402 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext" 387 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext"
403@@ -921,20 +883,20 @@ 388@@ -1035,20 +1007,20 @@
404 AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]), 389 AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]),
405 , enable_video_dga=yes) 390 , enable_video_dga=yes)
406 if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then 391 if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then
@@ -424,7 +409,7 @@ Index: SDL-1.2.11/configure.in
424 SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c" 409 SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
425 fi 410 fi
426 AC_ARG_ENABLE(video-x11-xv, 411 AC_ARG_ENABLE(video-x11-xv,
427@@ -948,14 +910,14 @@ 412@@ -1062,14 +1034,14 @@
428 AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]), 413 AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),
429 , enable_video_x11_xinerama=yes) 414 , enable_video_x11_xinerama=yes)
430 if test x$enable_video_x11_xinerama = xyes; then 415 if test x$enable_video_x11_xinerama = xyes; then
@@ -441,7 +426,7 @@ Index: SDL-1.2.11/configure.in
441 SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c" 426 SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c"
442 fi 427 fi
443 AC_ARG_ENABLE(video-x11-xrandr, 428 AC_ARG_ENABLE(video-x11-xrandr,
444@@ -972,8 +934,8 @@ 429@@ -1086,8 +1058,8 @@
445 if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then 430 if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
446 echo "-- dynamic libXrender -> $xrender_lib" 431 echo "-- dynamic libXrender -> $xrender_lib"
447 echo "-- dynamic libXrandr -> $xrandr_lib" 432 echo "-- dynamic libXrandr -> $xrandr_lib"
@@ -452,25 +437,16 @@ Index: SDL-1.2.11/configure.in
452 definitely_enable_video_x11_xrandr=yes 437 definitely_enable_video_x11_xrandr=yes
453 else 438 else
454 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes) 439 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
455@@ -986,7 +948,7 @@ 440@@ -1100,7 +1072,7 @@
456 fi 441 fi
457 fi 442 fi
458 if test x$definitely_enable_video_x11_xrandr = xyes; then 443 if test x$definitely_enable_video_x11_xrandr = xyes; then
459- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) 444- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
460+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR,1,"") 445+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR,1,"")
461 fi 446 fi
462 AC_ARG_ENABLE(video-x11-dpms,
463 AC_HELP_STRING([--enable-video-x11-dpms], [enable X11 DPMS extension [[default=yes]]]),
464@@ -998,7 +960,7 @@
465 [#include <X11/Xlib.h>
466 ])
467 if test x$have_dpms_h_hdr = xyes; then
468- AC_DEFINE(SDL_VIDEO_DRIVER_X11_DPMS)
469+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_DPMS,1,"")
470 fi
471 fi
472 fi 447 fi
473@@ -1026,7 +988,7 @@ 448 fi
449@@ -1127,7 +1099,7 @@
474 ]) 450 ])
475 AC_MSG_RESULT($video_photon) 451 AC_MSG_RESULT($video_photon)
476 if test x$video_photon = xyes; then 452 if test x$video_photon = xyes; then
@@ -479,7 +455,7 @@ Index: SDL-1.2.11/configure.in
479 SOURCES="$SOURCES $srcdir/src/video/photon/*.c" 455 SOURCES="$SOURCES $srcdir/src/video/photon/*.c"
480 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph" 456 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph"
481 have_video=yes 457 have_video=yes
482@@ -1040,7 +1002,7 @@ 458@@ -1141,7 +1113,7 @@
483 CheckBWINDOW() 459 CheckBWINDOW()
484 { 460 {
485 if test x$enable_video = xyes; then 461 if test x$enable_video = xyes; then
@@ -488,7 +464,7 @@ Index: SDL-1.2.11/configure.in
488 SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc" 464 SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc"
489 have_video=yes 465 have_video=yes
490 fi 466 fi
491@@ -1063,7 +1025,7 @@ 467@@ -1164,7 +1136,7 @@
492 ]) 468 ])
493 AC_MSG_RESULT($have_carbon) 469 AC_MSG_RESULT($have_carbon)
494 if test x$have_carbon = xyes; then 470 if test x$have_carbon = xyes; then
@@ -497,7 +473,7 @@ Index: SDL-1.2.11/configure.in
497 SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c" 473 SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c"
498 SOURCES="$SOURCES $srcdir/src/video/macrom/*.c" 474 SOURCES="$SOURCES $srcdir/src/video/macrom/*.c"
499 have_video=yes 475 have_video=yes
500@@ -1092,7 +1054,7 @@ 476@@ -1193,7 +1165,7 @@
501 AC_MSG_RESULT($have_cocoa) 477 AC_MSG_RESULT($have_cocoa)
502 CFLAGS="$save_CFLAGS" 478 CFLAGS="$save_CFLAGS"
503 if test x$have_cocoa = xyes; then 479 if test x$have_cocoa = xyes; then
@@ -506,17 +482,17 @@ Index: SDL-1.2.11/configure.in
506 SOURCES="$SOURCES $srcdir/src/video/quartz/*.m" 482 SOURCES="$SOURCES $srcdir/src/video/quartz/*.m"
507 have_video=yes 483 have_video=yes
508 fi 484 fi
509@@ -1118,7 +1080,7 @@ 485@@ -1220,7 +1192,7 @@
510 ])
511 AC_MSG_RESULT($video_fbcon) 486 AC_MSG_RESULT($video_fbcon)
512 if test x$video_fbcon = xyes; then 487 if test x$video_fbcon = xyes; then
488 AC_CHECK_FUNCS(getpagesize)
513- AC_DEFINE(SDL_VIDEO_DRIVER_FBCON) 489- AC_DEFINE(SDL_VIDEO_DRIVER_FBCON)
514+ AC_DEFINE(SDL_VIDEO_DRIVER_FBCON,1,"") 490+ AC_DEFINE(SDL_VIDEO_DRIVER_FBCON,1,"")
515 SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c" 491 SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c"
516 have_video=yes 492 have_video=yes
517 fi 493 fi
518@@ -1163,7 +1125,7 @@ 494@@ -1271,7 +1243,7 @@
519 fi 495 AC_MSG_RESULT($video_directfb)
520 496
521 if test x$video_directfb = xyes; then 497 if test x$video_directfb = xyes; then
522- AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB) 498- AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB)
@@ -524,7 +500,7 @@ Index: SDL-1.2.11/configure.in
524 SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" 500 SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
525 EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" 501 EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
526 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" 502 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
527@@ -1190,7 +1152,7 @@ 503@@ -1298,7 +1270,7 @@
528 ]) 504 ])
529 AC_MSG_RESULT($video_ps2gs) 505 AC_MSG_RESULT($video_ps2gs)
530 if test x$video_ps2gs = xyes; then 506 if test x$video_ps2gs = xyes; then
@@ -533,7 +509,7 @@ Index: SDL-1.2.11/configure.in
533 SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c" 509 SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c"
534 have_video=yes 510 have_video=yes
535 fi 511 fi
536@@ -1215,7 +1177,7 @@ 512@@ -1350,7 +1322,7 @@
537 ]) 513 ])
538 AC_MSG_RESULT($video_ggi) 514 AC_MSG_RESULT($video_ggi)
539 if test x$video_ggi = xyes; then 515 if test x$video_ggi = xyes; then
@@ -542,7 +518,7 @@ Index: SDL-1.2.11/configure.in
542 SOURCES="$SOURCES $srcdir/src/video/ggi/*.c" 518 SOURCES="$SOURCES $srcdir/src/video/ggi/*.c"
543 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg" 519 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg"
544 have_video=yes 520 have_video=yes
545@@ -1245,7 +1207,7 @@ 521@@ -1380,7 +1352,7 @@
546 ]) 522 ])
547 AC_MSG_RESULT($video_svga) 523 AC_MSG_RESULT($video_svga)
548 if test x$video_svga = xyes; then 524 if test x$video_svga = xyes; then
@@ -551,7 +527,7 @@ Index: SDL-1.2.11/configure.in
551 SOURCES="$SOURCES $srcdir/src/video/svga/*.c" 527 SOURCES="$SOURCES $srcdir/src/video/svga/*.c"
552 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga" 528 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga"
553 have_video=yes 529 have_video=yes
554@@ -1277,7 +1239,7 @@ 530@@ -1412,7 +1384,7 @@
555 ]) 531 ])
556 AC_MSG_RESULT($video_vgl) 532 AC_MSG_RESULT($video_vgl)
557 if test x$video_vgl = xyes; then 533 if test x$video_vgl = xyes; then
@@ -560,7 +536,7 @@ Index: SDL-1.2.11/configure.in
560 SOURCES="$SOURCES $srcdir/src/video/vgl/*.c" 536 SOURCES="$SOURCES $srcdir/src/video/vgl/*.c"
561 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl" 537 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl"
562 have_video=yes 538 have_video=yes
563@@ -1305,7 +1267,7 @@ 539@@ -1440,7 +1412,7 @@
564 ]) 540 ])
565 AC_MSG_RESULT($video_wscons) 541 AC_MSG_RESULT($video_wscons)
566 if test x$video_wscons = xyes; then 542 if test x$video_wscons = xyes; then
@@ -569,7 +545,7 @@ Index: SDL-1.2.11/configure.in
569 SOURCES="$SOURCES $srcdir/src/video/wscons/*.c" 545 SOURCES="$SOURCES $srcdir/src/video/wscons/*.c"
570 have_video=yes 546 have_video=yes
571 fi 547 fi
572@@ -1330,7 +1292,7 @@ 548@@ -1465,7 +1437,7 @@
573 ]) 549 ])
574 AC_MSG_RESULT($video_aalib) 550 AC_MSG_RESULT($video_aalib)
575 if test x$video_aalib = xyes; then 551 if test x$video_aalib = xyes; then
@@ -578,7 +554,7 @@ Index: SDL-1.2.11/configure.in
578 SOURCES="$SOURCES $srcdir/src/video/aalib/*.c" 554 SOURCES="$SOURCES $srcdir/src/video/aalib/*.c"
579 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa" 555 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa"
580 have_video=yes 556 have_video=yes
581@@ -1360,7 +1322,7 @@ 557@@ -1527,7 +1499,7 @@
582 CXXFLAGS="$OLD_CXX" 558 CXXFLAGS="$OLD_CXX"
583 AC_MSG_RESULT($video_qtopia) 559 AC_MSG_RESULT($video_qtopia)
584 if test x$video_qtopia = xyes; then 560 if test x$video_qtopia = xyes; then
@@ -587,7 +563,7 @@ Index: SDL-1.2.11/configure.in
587 SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc" 563 SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc"
588 SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc" 564 SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc"
589 EXTRA_CFLAGS="$EXTRA_CFLAGS $QTOPIA_FLAGS" 565 EXTRA_CFLAGS="$EXTRA_CFLAGS $QTOPIA_FLAGS"
590@@ -1389,7 +1351,7 @@ 566@@ -1556,7 +1528,7 @@
591 ]) 567 ])
592 AC_MSG_RESULT($video_picogui) 568 AC_MSG_RESULT($video_picogui)
593 if test x$video_picogui = xyes; then 569 if test x$video_picogui = xyes; then
@@ -596,7 +572,7 @@ Index: SDL-1.2.11/configure.in
596 SOURCES="$SOURCES $srcdir/src/video/picogui/*.c" 572 SOURCES="$SOURCES $srcdir/src/video/picogui/*.c"
597 SDL_LIBS="$SDL_LIBS -lpgui" 573 SDL_LIBS="$SDL_LIBS -lpgui"
598 have_video=yes 574 have_video=yes
599@@ -1413,7 +1375,7 @@ 575@@ -1580,7 +1552,7 @@
600 video_xbios=no 576 video_xbios=no
601 if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then 577 if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then
602 video_xbios=yes 578 video_xbios=yes
@@ -605,7 +581,7 @@ Index: SDL-1.2.11/configure.in
605 SOURCES="$SOURCES $srcdir/src/video/xbios/*.c" 581 SOURCES="$SOURCES $srcdir/src/video/xbios/*.c"
606 have_video=yes 582 have_video=yes
607 fi 583 fi
608@@ -1431,7 +1393,7 @@ 584@@ -1598,7 +1570,7 @@
609 AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes) 585 AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes)
610 if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then 586 if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then
611 video_gem=yes 587 video_gem=yes
@@ -614,7 +590,7 @@ Index: SDL-1.2.11/configure.in
614 SOURCES="$SOURCES $srcdir/src/video/gem/*.c" 590 SOURCES="$SOURCES $srcdir/src/video/gem/*.c"
615 SDL_LIBS="$SDL_LIBS -lgem" 591 SDL_LIBS="$SDL_LIBS -lgem"
616 have_video=yes 592 have_video=yes
617@@ -1446,7 +1408,7 @@ 593@@ -1613,7 +1585,7 @@
618 AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]), 594 AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]),
619 , enable_video_dummy=yes) 595 , enable_video_dummy=yes)
620 if test x$enable_video_dummy = xyes; then 596 if test x$enable_video_dummy = xyes; then
@@ -623,7 +599,7 @@ Index: SDL-1.2.11/configure.in
623 SOURCES="$SOURCES $srcdir/src/video/dummy/*.c" 599 SOURCES="$SOURCES $srcdir/src/video/dummy/*.c"
624 have_video=yes 600 have_video=yes
625 fi 601 fi
626@@ -1472,8 +1434,8 @@ 602@@ -1640,8 +1612,8 @@
627 ]) 603 ])
628 AC_MSG_RESULT($video_opengl) 604 AC_MSG_RESULT($video_opengl)
629 if test x$video_opengl = xyes; then 605 if test x$video_opengl = xyes; then
@@ -634,7 +610,7 @@ Index: SDL-1.2.11/configure.in
634 fi 610 fi
635 fi 611 fi
636 } 612 }
637@@ -1492,7 +1454,7 @@ 613@@ -1660,7 +1632,7 @@
638 ]) 614 ])
639 AC_MSG_RESULT($video_opengl) 615 AC_MSG_RESULT($video_opengl)
640 if test x$video_opengl = xyes; then 616 if test x$video_opengl = xyes; then
@@ -643,7 +619,7 @@ Index: SDL-1.2.11/configure.in
643 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" 619 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
644 fi 620 fi
645 fi 621 fi
646@@ -1502,8 +1464,8 @@ 622@@ -1670,8 +1642,8 @@
647 CheckWIN32GL() 623 CheckWIN32GL()
648 { 624 {
649 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then 625 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
@@ -654,7 +630,7 @@ Index: SDL-1.2.11/configure.in
654 fi 630 fi
655 } 631 }
656 632
657@@ -1511,7 +1473,7 @@ 633@@ -1679,7 +1651,7 @@
658 CheckBeGL() 634 CheckBeGL()
659 { 635 {
660 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then 636 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
@@ -663,7 +639,7 @@ Index: SDL-1.2.11/configure.in
663 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" 639 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
664 fi 640 fi
665 } 641 }
666@@ -1520,7 +1482,7 @@ 642@@ -1688,7 +1660,7 @@
667 CheckMacGL() 643 CheckMacGL()
668 { 644 {
669 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then 645 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
@@ -672,7 +648,7 @@ Index: SDL-1.2.11/configure.in
672 case "$host" in 648 case "$host" in
673 *-*-darwin*) 649 *-*-darwin*)
674 if test x$enable_video_cocoa = xyes; then 650 if test x$enable_video_cocoa = xyes; then
675@@ -1552,8 +1514,8 @@ 651@@ -1720,8 +1692,8 @@
676 OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags` 652 OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags`
677 OSMESA_LIBS=`$OSMESA_CONFIG --libs` 653 OSMESA_LIBS=`$OSMESA_CONFIG --libs`
678 fi 654 fi
@@ -683,7 +659,7 @@ Index: SDL-1.2.11/configure.in
683 SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS" 659 SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS"
684 SDL_LIBS="$SDL_LIBS $OSMESA_LIBS" 660 SDL_LIBS="$SDL_LIBS $OSMESA_LIBS"
685 661
686@@ -1563,7 +1525,7 @@ 662@@ -1731,7 +1703,7 @@
687 if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then 663 if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then
688 # Dynamic linking 664 # Dynamic linking
689 if test "x$have_osmesa_hdr" = "xyes"; then 665 if test "x$have_osmesa_hdr" = "xyes"; then
@@ -692,7 +668,7 @@ Index: SDL-1.2.11/configure.in
692 fi 668 fi
693 fi 669 fi
694 fi 670 fi
695@@ -1590,7 +1552,7 @@ 671@@ -1765,7 +1737,7 @@
696 ]) 672 ])
697 AC_MSG_RESULT($use_input_events) 673 AC_MSG_RESULT($use_input_events)
698 if test x$use_input_events = xyes; then 674 if test x$use_input_events = xyes; then
@@ -701,7 +677,7 @@ Index: SDL-1.2.11/configure.in
701 fi 677 fi
702 fi 678 fi
703 } 679 }
704@@ -1612,7 +1574,7 @@ 680@@ -1787,7 +1759,7 @@
705 ]) 681 ])
706 AC_MSG_RESULT($enable_input_tslib) 682 AC_MSG_RESULT($enable_input_tslib)
707 if test x$enable_input_tslib = xyes; then 683 if test x$enable_input_tslib = xyes; then
@@ -710,7 +686,7 @@ Index: SDL-1.2.11/configure.in
710 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts" 686 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts"
711 fi 687 fi
712 fi 688 fi
713@@ -1635,7 +1597,7 @@ 689@@ -1810,7 +1782,7 @@
714 AC_MSG_CHECKING(pth) 690 AC_MSG_CHECKING(pth)
715 AC_MSG_RESULT($use_pth) 691 AC_MSG_RESULT($use_pth)
716 if test "x$use_pth" = xyes; then 692 if test "x$use_pth" = xyes; then
@@ -719,7 +695,7 @@ Index: SDL-1.2.11/configure.in
719 SOURCES="$SOURCES $srcdir/src/thread/pth/*.c" 695 SOURCES="$SOURCES $srcdir/src/thread/pth/*.c"
720 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c" 696 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c"
721 SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`" 697 SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`"
722@@ -1741,7 +1703,7 @@ 698@@ -1916,7 +1888,7 @@
723 699
724 # Do futher testing if we have pthread support... 700 # Do futher testing if we have pthread support...
725 if test x$use_pthreads = xyes; then 701 if test x$use_pthreads = xyes; then
@@ -728,7 +704,7 @@ Index: SDL-1.2.11/configure.in
728 EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags" 704 EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags"
729 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib" 705 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib"
730 SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags" 706 SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags"
731@@ -1763,7 +1725,7 @@ 707@@ -1938,7 +1910,7 @@
732 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); 708 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
733 ],[ 709 ],[
734 has_recursive_mutexes=yes 710 has_recursive_mutexes=yes
@@ -737,7 +713,7 @@ Index: SDL-1.2.11/configure.in
737 ]) 713 ])
738 fi 714 fi
739 if test x$has_recursive_mutexes = xno; then 715 if test x$has_recursive_mutexes = xno; then
740@@ -1774,7 +1736,7 @@ 716@@ -1949,7 +1921,7 @@
741 pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP); 717 pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
742 ],[ 718 ],[
743 has_recursive_mutexes=yes 719 has_recursive_mutexes=yes
@@ -746,7 +722,7 @@ Index: SDL-1.2.11/configure.in
746 ]) 722 ])
747 fi 723 fi
748 AC_MSG_RESULT($has_recursive_mutexes) 724 AC_MSG_RESULT($has_recursive_mutexes)
749@@ -1849,7 +1811,7 @@ 725@@ -2024,7 +1996,7 @@
750 fi 726 fi
751 727
752 if test x$enable_video = xyes; then 728 if test x$enable_video = xyes; then
@@ -755,7 +731,7 @@ Index: SDL-1.2.11/configure.in
755 SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c" 731 SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c"
756 SOURCES="$SOURCES $srcdir/src/video/windib/*.c" 732 SOURCES="$SOURCES $srcdir/src/video/windib/*.c"
757 have_video=yes 733 have_video=yes
758@@ -1871,7 +1833,7 @@ 734@@ -2046,7 +2018,7 @@
759 have_directx=yes 735 have_directx=yes
760 fi 736 fi
761 if test x$enable_video = xyes -a x$have_directx = xyes; then 737 if test x$enable_video = xyes -a x$have_directx = xyes; then
@@ -764,19 +740,16 @@ Index: SDL-1.2.11/configure.in
764 SOURCES="$SOURCES $srcdir/src/video/windx5/*.c" 740 SOURCES="$SOURCES $srcdir/src/video/windx5/*.c"
765 have_video=yes 741 have_video=yes
766 fi 742 fi
767@@ -1904,9 +1866,9 @@ 743@@ -2077,7 +2049,7 @@
744 AC_CHECK_LIB(c, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS",
745 AC_CHECK_LIB(dl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl",
768 AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl"))) 746 AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl")))
769 AC_CHECK_LIB(dl, dlvsym, have_dlvsym=yes)
770 if test x$have_dlvsym = xyes; then
771- AC_DEFINE(HAVE_DLVSYM)
772+ AC_DEFINE(HAVE_DLVSYM,1,"")
773 fi
774- AC_DEFINE(SDL_LOADSO_DLOPEN) 747- AC_DEFINE(SDL_LOADSO_DLOPEN)
775+ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"") 748+ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"")
776 SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" 749 SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
777 have_loadso=yes 750 have_loadso=yes
778 fi 751 fi
779@@ -1923,7 +1885,7 @@ 752@@ -2094,7 +2066,7 @@
780 AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes) 753 AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes)
781 AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem) 754 AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem)
782 if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then 755 if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then
@@ -785,7 +758,7 @@ Index: SDL-1.2.11/configure.in
785 SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c" 758 SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c"
786 SDL_LIBS="$SDL_LIBS -lldg -lgem" 759 SDL_LIBS="$SDL_LIBS -lldg -lgem"
787 have_loadso=yes 760 have_loadso=yes
788@@ -2049,11 +2011,11 @@ 761@@ -2225,11 +2197,11 @@
789 have_machine_joystick=yes 762 have_machine_joystick=yes
790 ]) 763 ])
791 if test x$have_machine_joystick = xyes; then 764 if test x$have_machine_joystick = xyes; then
@@ -799,7 +772,7 @@ Index: SDL-1.2.11/configure.in
799 SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c" 772 SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c"
800 EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS" 773 EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS"
801 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS" 774 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS"
802@@ -2072,7 +2034,7 @@ 775@@ -2248,7 +2220,7 @@
803 if test x$enable_clock_gettime = xyes; then 776 if test x$enable_clock_gettime = xyes; then
804 AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes) 777 AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes)
805 if test x$have_clock_gettime = xyes; then 778 if test x$have_clock_gettime = xyes; then
@@ -808,7 +781,7 @@ Index: SDL-1.2.11/configure.in
808 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt" 781 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
809 fi 782 fi
810 fi 783 fi
811@@ -2103,7 +2065,7 @@ 784@@ -2279,7 +2251,7 @@
812 CheckIPod 785 CheckIPod
813 # Set up files for the timer library 786 # Set up files for the timer library
814 if test x$enable_timers = xyes; then 787 if test x$enable_timers = xyes; then
@@ -817,7 +790,7 @@ Index: SDL-1.2.11/configure.in
817 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" 790 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
818 have_timers=yes 791 have_timers=yes
819 fi 792 fi
820@@ -2166,17 +2128,17 @@ 793@@ -2345,17 +2317,17 @@
821 if test x$enable_audio = xyes; then 794 if test x$enable_audio = xyes; then
822 case $ARCH in 795 case $ARCH in
823 sysv5|solaris|hpux) 796 sysv5|solaris|hpux)
@@ -838,7 +811,7 @@ Index: SDL-1.2.11/configure.in
838 SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c" 811 SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c"
839 have_audio=yes 812 have_audio=yes
840 ;; 813 ;;
841@@ -2186,7 +2148,7 @@ 814@@ -2365,7 +2337,7 @@
842 if test x$enable_joystick = xyes; then 815 if test x$enable_joystick = xyes; then
843 case $ARCH in 816 case $ARCH in
844 linux) 817 linux)
@@ -847,7 +820,7 @@ Index: SDL-1.2.11/configure.in
847 SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c" 820 SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c"
848 have_joystick=yes 821 have_joystick=yes
849 ;; 822 ;;
850@@ -2196,32 +2158,32 @@ 823@@ -2375,32 +2347,32 @@
851 if test x$enable_cdrom = xyes; then 824 if test x$enable_cdrom = xyes; then
852 case $ARCH in 825 case $ARCH in
853 linux|solaris) 826 linux|solaris)
@@ -886,7 +859,7 @@ Index: SDL-1.2.11/configure.in
886 SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c" 859 SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c"
887 have_cdrom=yes 860 have_cdrom=yes
888 ;; 861 ;;
889@@ -2229,7 +2191,7 @@ 862@@ -2408,7 +2380,7 @@
890 fi 863 fi
891 # Set up files for the thread library 864 # Set up files for the thread library
892 if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then 865 if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
@@ -895,7 +868,7 @@ Index: SDL-1.2.11/configure.in
895 SOURCES="$SOURCES $srcdir/src/thread/irix/*.c" 868 SOURCES="$SOURCES $srcdir/src/thread/irix/*.c"
896 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" 869 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
897 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" 870 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
898@@ -2237,7 +2199,7 @@ 871@@ -2416,7 +2388,7 @@
899 fi 872 fi
900 # Set up files for the timer library 873 # Set up files for the timer library
901 if test x$enable_timers = xyes; then 874 if test x$enable_timers = xyes; then
@@ -904,7 +877,7 @@ Index: SDL-1.2.11/configure.in
904 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" 877 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
905 have_timers=yes 878 have_timers=yes
906 fi 879 fi
907@@ -2256,20 +2218,20 @@ 880@@ -2435,20 +2407,20 @@
908 CheckPTHREAD 881 CheckPTHREAD
909 # Set up files for the audio library 882 # Set up files for the audio library
910 if test x$enable_audio = xyes; then 883 if test x$enable_audio = xyes; then
@@ -928,7 +901,7 @@ Index: SDL-1.2.11/configure.in
928 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" 901 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
929 have_timers=yes 902 have_timers=yes
930 fi 903 fi
931@@ -2294,29 +2256,29 @@ 904@@ -2473,29 +2445,29 @@
932 CheckNASM 905 CheckNASM
933 # Set up files for the audio library 906 # Set up files for the audio library
934 if test x$enable_audio = xyes; then 907 if test x$enable_audio = xyes; then
@@ -963,7 +936,7 @@ Index: SDL-1.2.11/configure.in
963 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" 936 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c"
964 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" 937 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c"
965 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" 938 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c"
966@@ -2325,13 +2287,13 @@ 939@@ -2504,13 +2476,13 @@
967 fi 940 fi
968 # Set up files for the timer library 941 # Set up files for the timer library
969 if test x$enable_timers = xyes; then 942 if test x$enable_timers = xyes; then
@@ -979,7 +952,7 @@ Index: SDL-1.2.11/configure.in
979 SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" 952 SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
980 have_loadso=yes 953 have_loadso=yes
981 fi 954 fi
982@@ -2356,25 +2318,25 @@ 955@@ -2579,25 +2551,25 @@
983 CheckBeGL 956 CheckBeGL
984 # Set up files for the audio library 957 # Set up files for the audio library
985 if test x$enable_audio = xyes; then 958 if test x$enable_audio = xyes; then
@@ -1009,7 +982,7 @@ Index: SDL-1.2.11/configure.in
1009 SOURCES="$SOURCES $srcdir/src/thread/beos/*.c" 982 SOURCES="$SOURCES $srcdir/src/thread/beos/*.c"
1010 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" 983 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
1011 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" 984 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
1012@@ -2382,13 +2344,13 @@ 985@@ -2605,7 +2577,7 @@
1013 fi 986 fi
1014 # Set up files for the timer library 987 # Set up files for the timer library
1015 if test x$enable_timers = xyes; then 988 if test x$enable_timers = xyes; then
@@ -1018,14 +991,21 @@ Index: SDL-1.2.11/configure.in
1018 SOURCES="$SOURCES $srcdir/src/timer/beos/*.c" 991 SOURCES="$SOURCES $srcdir/src/timer/beos/*.c"
1019 have_timers=yes 992 have_timers=yes
1020 fi 993 fi
1021 # Set up files for the shared object loading library 994@@ -2613,11 +2585,11 @@
1022 if test x$enable_loadso = xyes; then 995 if test x$enable_loadso = xyes; then
1023- AC_DEFINE(SDL_LOADSO_BEOS) 996 case "$host" in
1024+ AC_DEFINE(SDL_LOADSO_BEOS,1,"") 997 *-*-beos*)
1025 SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c" 998- AC_DEFINE(SDL_LOADSO_BEOS)
1026 have_loadso=yes 999+ AC_DEFINE(SDL_LOADSO_BEOS,1,"")
1027 fi 1000 SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
1028@@ -2425,7 +2387,7 @@ 1001 ;;
1002 *-*-haiku*)
1003- AC_DEFINE(SDL_LOADSO_DLOPEN)
1004+ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"")
1005 SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
1006 ;;
1007 esac
1008@@ -2653,7 +2625,7 @@
1029 # Set up files for the shared object loading library 1009 # Set up files for the shared object loading library
1030 # (this needs to be done before the dynamic X11 check) 1010 # (this needs to be done before the dynamic X11 check)
1031 if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then 1011 if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
@@ -1034,16 +1014,13 @@ Index: SDL-1.2.11/configure.in
1034 SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c" 1014 SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
1035 have_loadso=yes 1015 have_loadso=yes
1036 fi 1016 fi
1037@@ -2443,28 +2405,28 @@ 1017@@ -2671,26 +2643,26 @@
1038 1018
1039 # Set up files for the audio library 1019 # Set up files for the audio library
1040 if test x$enable_audio = xyes; then 1020 if test x$enable_audio = xyes; then
1041- AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO) 1021- AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO)
1042+ AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO,1,"") 1022+ AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO,1,"")
1043 SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c" 1023 SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c"
1044- AC_DEFINE(SDL_AUDIO_DRIVER_SNDMGR)
1045+ AC_DEFINE(SDL_AUDIO_DRIVER_SNDMGR,1,"")
1046 SOURCES="$SOURCES $srcdir/src/audio/macrom/*.c"
1047 have_audio=yes 1024 have_audio=yes
1048 fi 1025 fi
1049 # Set up files for the joystick library 1026 # Set up files for the joystick library
@@ -1051,8 +1028,8 @@ Index: SDL-1.2.11/configure.in
1051- AC_DEFINE(SDL_JOYSTICK_IOKIT) 1028- AC_DEFINE(SDL_JOYSTICK_IOKIT)
1052+ AC_DEFINE(SDL_JOYSTICK_IOKIT,1,"") 1029+ AC_DEFINE(SDL_JOYSTICK_IOKIT,1,"")
1053 SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c" 1030 SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c"
1054 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
1055 have_joystick=yes 1031 have_joystick=yes
1032 need_iokit_framework=yes
1056 fi 1033 fi
1057 # Set up files for the cdrom library 1034 # Set up files for the cdrom library
1058 if test x$enable_cdrom = xyes; then 1035 if test x$enable_cdrom = xyes; then
@@ -1068,7 +1045,7 @@ Index: SDL-1.2.11/configure.in
1068 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" 1045 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
1069 have_timers=yes 1046 have_timers=yes
1070 fi 1047 fi
1071@@ -2500,30 +2462,30 @@ 1048@@ -2731,30 +2703,30 @@
1072 # Set up files for the audio library 1049 # Set up files for the audio library
1073 if test x$enable_threads = xyes -a x$enable_pth = xyes; then 1050 if test x$enable_threads = xyes -a x$enable_pth = xyes; then
1074 if test x$enable_audio = xyes; then 1051 if test x$enable_audio = xyes; then
@@ -1104,7 +1081,7 @@ Index: SDL-1.2.11/configure.in
1104 SOURCES="$SOURCES $srcdir/src/timer/mint/*.c" 1081 SOURCES="$SOURCES $srcdir/src/timer/mint/*.c"
1105 SOURCES="$SOURCES $srcdir/src/timer/mint/*.S" 1082 SOURCES="$SOURCES $srcdir/src/timer/mint/*.S"
1106 fi 1083 fi
1107@@ -2536,20 +2498,20 @@ 1084@@ -2767,20 +2739,20 @@
1108 CheckPTHREAD 1085 CheckPTHREAD
1109 # Set up files for the video library 1086 # Set up files for the video library
1110 if test x$enable_video = xyes; then 1087 if test x$enable_video = xyes; then
@@ -1128,14 +1105,14 @@ Index: SDL-1.2.11/configure.in
1128 SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c" 1105 SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c"
1129 have_timers=yes 1106 have_timers=yes
1130 fi 1107 fi
1131@@ -2566,31 +2528,31 @@ 1108@@ -2799,31 +2771,31 @@
1132 # Verify that we have all the platform specific files we need 1109 if test x$enable_joystick = xyes; then
1133 if test x$have_joystick != xyes; then 1110 if test x$have_joystick != xyes; then
1134 if test x$enable_joystick = xyes; then 1111 # Wants joystick subsystem, but doesn't have a platform-specific backend...
1135- AC_DEFINE(SDL_JOYSTICK_DISABLED) 1112- AC_DEFINE(SDL_JOYSTICK_DUMMY)
1136+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"") 1113+ AC_DEFINE(SDL_JOYSTICK_DUMMY,1,"")
1137 fi
1138 SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c" 1114 SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
1115 fi
1139 fi 1116 fi
1140 if test x$have_cdrom != xyes; then 1117 if test x$have_cdrom != xyes; then
1141 if test x$enable_cdrom = xyes; then 1118 if test x$enable_cdrom = xyes; then
diff --git a/meta/recipes-graphics/libsdl/files/kernel-asm-page.patch b/meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
deleted file mode 100644
index e698167..0000000
--- a/meta/recipes-graphics/libsdl/files/kernel-asm-page.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Pending
2
3diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c
4index 4e3d662..de38a3c 100644
5--- a/src/video/Xext/Xxf86dga/XF86DGA.c
6+++ b/src/video/Xext/Xxf86dga/XF86DGA.c
7@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
8 #define HAS_MMAP_ANON
9 #include <sys/types.h>
10 #include <sys/mman.h>
11-#include <asm/page.h> /* PAGE_SIZE */
12+#include <unistd.h>
13 #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
14 #define HAS_GETPAGESIZE
15 #endif /* linux */
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 74489b0..6b23344 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.11.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -13,17 +13,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
13DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender" 13DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender"
14DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk" 14DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
15 15
16PR = "r8" 16PR = "r0"
17 17
18SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ 18SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
19 file://acinclude.m4 \
20 file://configure_tweak.patch \ 19 file://configure_tweak.patch \
21 file://kernel-asm-page.patch " 20 "
22 21
23S = "${WORKDIR}/SDL-${PV}" 22S = "${WORKDIR}/SDL-${PV}"
24 23
25SRC_URI[md5sum] = "418b42956b7cd103bfab1b9077ccc149" 24SRC_URI[md5sum] = "e52086d1b508fa0b76c52ee30b55bec4"
26SRC_URI[sha256sum] = "6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730" 25SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6"
27 26
28inherit autotools binconfig pkgconfig 27inherit autotools binconfig pkgconfig
29 28
@@ -31,7 +30,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
31 --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \ 30 --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
32 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ 31 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
33 --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ 32 --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
34 --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \ 33 --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
35 --disable-video-xbios --disable-video-gem --disable-video-dummy \ 34 --disable-video-xbios --disable-video-gem --disable-video-dummy \
36 --enable-input-events --enable-pthreads \ 35 --enable-input-events --enable-pthreads \
37 ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ 36 ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
@@ -41,7 +40,11 @@ EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-thread
41PARALLEL_MAKE = "" 40PARALLEL_MAKE = ""
42 41
43do_configure_prepend() { 42do_configure_prepend() {
44 cp ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4 43 # Remove old libtool macros.
44 MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
45 for i in ${MACROS}; do
46 rm -f acinclude/$i
47 done
45} 48}
46 49
47BBCLASSEXTEND = "nativesdk" 50BBCLASSEXTEND = "nativesdk"