summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2012-10-20 19:21:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-23 12:28:33 +0100
commit72d7f8dc2736518a6f1f1d3538b20615ef43505e (patch)
treef877d54f12e7557246be2530ca2625b7fb1b3698 /meta
parent8255558613883aa5dcfba63bab20c283a242a166 (diff)
downloadpoky-72d7f8dc2736518a6f1f1d3538b20615ef43505e.tar.gz
libsdl: fix inconditional alsa disabling.
Without that fix ALSA is inconditionally disabled, reguardless of the fact that alsa is in the distribution feature or not. This patch has been tested on the om-gta04 target with both alsa distribution feature enabled(libsdl can then play sound), and disabled(it fails to play some sound trough alsa). (From OE-Core rev: b635e47a2b8b711d5ddae3b3e5a5656402aee845) Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch211
-rw-r--r--meta/recipes-graphics/libsdl/libsdl_1.2.15.bb4
2 files changed, 90 insertions, 125 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch b/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch
index 07bda6df02..3f97639533 100644
--- a/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch
+++ b/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch
@@ -1,8 +1,10 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2 2
3--- SDL-1.2.14/configure.in.orig 2011-10-18 14:51:32.044167004 +0800 3Index: SDL-1.2.15/configure.in
4+++ SDL-1.2.14/configure.in 2011-10-18 14:51:42.374167009 +0800 4===================================================================
5@@ -48,9 +48,9 @@ 5--- SDL-1.2.15.orig/configure.in
6+++ SDL-1.2.15/configure.in
7@@ -48,9 +48,9 @@ AC_CONFIG_AUX_DIR([build-scripts])
6 dnl AC_CANONICAL_HOST 8 dnl AC_CANONICAL_HOST
7 AC_C_BIGENDIAN 9 AC_C_BIGENDIAN
8 if test x$ac_cv_c_bigendian = xyes; then 10 if test x$ac_cv_c_bigendian = xyes; then
@@ -14,7 +16,7 @@ Upstream-Status: Inappropriate [configuration]
14 fi 16 fi
15 17
16 dnl Check for tools 18 dnl Check for tools
17@@ -139,7 +139,7 @@ 19@@ -134,7 +134,7 @@ AC_ARG_ENABLE(libc,
18 AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]), 20 AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]),
19 , enable_libc=yes) 21 , enable_libc=yes)
20 if test x$enable_libc = xyes; then 22 if test x$enable_libc = xyes; then
@@ -23,7 +25,7 @@ Upstream-Status: Inappropriate [configuration]
23 25
24 dnl Check for C library headers 26 dnl Check for C library headers
25 AC_HEADER_STDC 27 AC_HEADER_STDC
26@@ -150,7 +150,7 @@ 28@@ -145,7 +145,7 @@ if test x$enable_libc = xyes; then
27 if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then 29 if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then
28 AC_CHECK_TYPE(int64_t) 30 AC_CHECK_TYPE(int64_t)
29 if test x$ac_cv_type_int64_t = xyes; then 31 if test x$ac_cv_type_int64_t = xyes; then
@@ -32,7 +34,7 @@ Upstream-Status: Inappropriate [configuration]
32 fi 34 fi
33 have_inttypes=yes 35 have_inttypes=yes
34 fi 36 fi
35@@ -166,11 +166,11 @@ 37@@ -161,11 +161,11 @@ if test x$enable_libc = xyes; then
36 38
37 AC_FUNC_MEMCMP 39 AC_FUNC_MEMCMP
38 if test x$ac_cv_func_memcmp_working = xyes; then 40 if test x$ac_cv_func_memcmp_working = xyes; then
@@ -46,7 +48,7 @@ Upstream-Status: Inappropriate [configuration]
46 fi 48 fi
47 AC_CHECK_FUNC(mprotect, 49 AC_CHECK_FUNC(mprotect,
48 AC_TRY_COMPILE([ 50 AC_TRY_COMPILE([
49@@ -194,40 +194,40 @@ 51@@ -191,40 +191,40 @@ if test x$have_inttypes != xyes; then
50 AC_CHECK_SIZEOF(long, 4) 52 AC_CHECK_SIZEOF(long, 4)
51 AC_CHECK_SIZEOF(long long, 8) 53 AC_CHECK_SIZEOF(long long, 8)
52 if test x$ac_cv_sizeof_char = x1; then 54 if test x$ac_cv_sizeof_char = x1; then
@@ -105,7 +107,7 @@ Upstream-Status: Inappropriate [configuration]
105 fi 107 fi
106 108
107 # Standard C sources 109 # Standard C sources
108@@ -248,25 +248,25 @@ 110@@ -245,25 +245,25 @@ AC_ARG_ENABLE(audio,
109 AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]), 111 AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]),
110 , enable_audio=yes) 112 , enable_audio=yes)
111 if test x$enable_audio != xyes; then 113 if test x$enable_audio != xyes; then
@@ -135,7 +137,7 @@ Upstream-Status: Inappropriate [configuration]
135 else 137 else
136 SOURCES="$SOURCES $srcdir/src/joystick/*.c" 138 SOURCES="$SOURCES $srcdir/src/joystick/*.c"
137 fi 139 fi
138@@ -274,43 +274,43 @@ 140@@ -271,43 +271,43 @@ AC_ARG_ENABLE(cdrom,
139 AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]), 141 AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),
140 , enable_cdrom=yes) 142 , enable_cdrom=yes)
141 if test x$enable_cdrom != xyes; then 143 if test x$enable_cdrom != xyes; then
@@ -186,7 +188,7 @@ Upstream-Status: Inappropriate [configuration]
186 fi 188 fi
187 189
188 dnl See if the OSS audio interface is supported 190 dnl See if the OSS audio interface is supported
189@@ -338,12 +338,12 @@ 191@@ -335,12 +335,12 @@ AC_HELP_STRING([--enable-oss], [support
190 int arg = SNDCTL_DSP_SETFRAGMENT; 192 int arg = SNDCTL_DSP_SETFRAGMENT;
191 ],[ 193 ],[
192 have_oss=yes 194 have_oss=yes
@@ -201,44 +203,7 @@ Upstream-Status: Inappropriate [configuration]
201 SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c" 203 SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c"
202 SOURCES="$SOURCES $srcdir/src/audio/dma/*.c" 204 SOURCES="$SOURCES $srcdir/src/audio/dma/*.c"
203 have_audio=yes 205 have_audio=yes
204@@ -363,35 +363,7 @@ 206@@ -407,7 +407,7 @@ CheckDMEDIA()
205 AC_ARG_ENABLE(alsa,
206 AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]),
207 , enable_alsa=yes)
208- if test x$enable_audio = xyes -a x$enable_alsa = xyes; then
209- AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no)
210- # Restore all flags from before the ALSA detection runs
211- CFLAGS="$alsa_save_CFLAGS"
212- LDFLAGS="$alsa_save_LDFLAGS"
213- LIBS="$alsa_save_LIBS"
214- if test x$have_alsa = xyes; then
215- AC_ARG_ENABLE(alsa-shared,
216-AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
217- , enable_alsa_shared=yes)
218- alsa_lib=[`find_lib "libasound.so.*" "$ALSA_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
219-
220- AC_DEFINE(SDL_AUDIO_DRIVER_ALSA)
221- SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
222- EXTRA_CFLAGS="$EXTRA_CFLAGS $ALSA_CFLAGS"
223- if test x$have_loadso != xyes && \
224- test x$enable_alsa_shared = xyes; then
225- AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ALSA loading])
226- fi
227- if test x$have_loadso = xyes && \
228- test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
229- echo "-- dynamic libasound -> $alsa_lib"
230- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib")
231- else
232- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS"
233- fi
234- have_audio=yes
235- fi
236- fi
237+ enable_alsa=no
238 }
239
240 dnl Check whether we want to use IRIX 6.5+ native audio or not
241@@ -410,7 +382,7 @@
242 AC_MSG_RESULT($have_dmedia) 207 AC_MSG_RESULT($have_dmedia)
243 # Set up files for the audio library 208 # Set up files for the audio library
244 if test x$have_dmedia = xyes; then 209 if test x$have_dmedia = xyes; then
@@ -247,7 +212,7 @@ Upstream-Status: Inappropriate [configuration]
247 SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c" 212 SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
248 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio" 213 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio"
249 have_audio=yes 214 have_audio=yes
250@@ -447,7 +419,7 @@ 215@@ -444,7 +444,7 @@ CheckMME()
251 AC_MSG_RESULT($have_mme) 216 AC_MSG_RESULT($have_mme)
252 # Set up files for the audio library 217 # Set up files for the audio library
253 if test x$have_mme = xyes; then 218 if test x$have_mme = xyes; then
@@ -256,7 +221,7 @@ Upstream-Status: Inappropriate [configuration]
256 SOURCES="$SOURCES $srcdir/src/audio/mme/*.c" 221 SOURCES="$SOURCES $srcdir/src/audio/mme/*.c"
257 EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS" 222 EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS"
258 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS" 223 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS"
259@@ -470,7 +442,7 @@ 224@@ -467,7 +467,7 @@ AC_HELP_STRING([--enable-esd-shared], [d
260 , enable_esd_shared=yes) 225 , enable_esd_shared=yes)
261 esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] 226 esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
262 227
@@ -265,7 +230,7 @@ Upstream-Status: Inappropriate [configuration]
265 SOURCES="$SOURCES $srcdir/src/audio/esd/*.c" 230 SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
266 EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS" 231 EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS"
267 if test x$have_loadso != xyes && \ 232 if test x$have_loadso != xyes && \
268@@ -480,7 +452,7 @@ 233@@ -477,7 +477,7 @@ AC_HELP_STRING([--enable-esd-shared], [d
269 if test x$have_loadso = xyes && \ 234 if test x$have_loadso = xyes && \
270 test x$enable_esd_shared = xyes && test x$esd_lib != x; then 235 test x$enable_esd_shared = xyes && test x$esd_lib != x; then
271 echo "-- dynamic libesd -> $esd_lib" 236 echo "-- dynamic libesd -> $esd_lib"
@@ -274,7 +239,7 @@ Upstream-Status: Inappropriate [configuration]
274 else 239 else
275 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS" 240 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS"
276 fi 241 fi
277@@ -567,7 +539,7 @@ 242@@ -564,7 +564,7 @@ AC_HELP_STRING([--enable-arts-shared], [
278 , enable_arts_shared=yes) 243 , enable_arts_shared=yes)
279 arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] 244 arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
280 245
@@ -283,7 +248,7 @@ Upstream-Status: Inappropriate [configuration]
283 SOURCES="$SOURCES $srcdir/src/audio/arts/*.c" 248 SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
284 EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS" 249 EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS"
285 if test x$have_loadso != xyes && \ 250 if test x$have_loadso != xyes && \
286@@ -577,7 +549,7 @@ 251@@ -574,7 +574,7 @@ AC_HELP_STRING([--enable-arts-shared], [
287 if test x$have_loadso = xyes && \ 252 if test x$have_loadso = xyes && \
288 test x$enable_arts_shared = xyes && test x$arts_lib != x; then 253 test x$enable_arts_shared = xyes && test x$arts_lib != x; then
289 echo "-- dynamic libartsc -> $arts_lib" 254 echo "-- dynamic libartsc -> $arts_lib"
@@ -292,7 +257,7 @@ Upstream-Status: Inappropriate [configuration]
292 else 257 else
293 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS" 258 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS"
294 fi 259 fi
295@@ -637,7 +609,7 @@ 260@@ -634,7 +634,7 @@ AC_HELP_STRING([--enable-nas-shared], [d
296 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS" 261 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS"
297 fi 262 fi
298 263
@@ -301,7 +266,7 @@ Upstream-Status: Inappropriate [configuration]
301 SOURCES="$SOURCES $srcdir/src/audio/nas/*.c" 266 SOURCES="$SOURCES $srcdir/src/audio/nas/*.c"
302 EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS" 267 EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS"
303 have_audio=yes 268 have_audio=yes
304@@ -652,7 +624,7 @@ 269@@ -649,7 +649,7 @@ CheckDiskAudio()
305 AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]), 270 AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]),
306 , enable_diskaudio=yes) 271 , enable_diskaudio=yes)
307 if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then 272 if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
@@ -310,7 +275,7 @@ Upstream-Status: Inappropriate [configuration]
310 SOURCES="$SOURCES $srcdir/src/audio/disk/*.c" 275 SOURCES="$SOURCES $srcdir/src/audio/disk/*.c"
311 fi 276 fi
312 } 277 }
313@@ -664,7 +636,7 @@ 278@@ -661,7 +661,7 @@ CheckDummyAudio()
314 AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]), 279 AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]),
315 , enable_dummyaudio=yes) 280 , enable_dummyaudio=yes)
316 if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then 281 if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then
@@ -319,7 +284,7 @@ Upstream-Status: Inappropriate [configuration]
319 SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c" 284 SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c"
320 fi 285 fi
321 } 286 }
322@@ -680,7 +652,7 @@ 287@@ -677,7 +677,7 @@ AC_HELP_STRING([--enable-mintaudio], [su
323 AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes) 288 AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes)
324 if test x$have_mint_falcon_hdr = xyes; then 289 if test x$have_mint_falcon_hdr = xyes; then
325 mintaudio=yes 290 mintaudio=yes
@@ -328,16 +293,16 @@ Upstream-Status: Inappropriate [configuration]
328 SOURCES="$SOURCES $srcdir/src/audio/mint/*.c" 293 SOURCES="$SOURCES $srcdir/src/audio/mint/*.c"
329 SOURCES="$SOURCES $srcdir/src/audio/mint/*.S" 294 SOURCES="$SOURCES $srcdir/src/audio/mint/*.S"
330 have_audio=yes 295 have_audio=yes
331@@ -756,7 +728,7 @@ 296@@ -746,7 +746,7 @@ AC_HELP_STRING([--enable-nasm], [use nas
332 AC_PATH_PROG(NASM, nasm) 297 CompileNASM unquoted-sections || NASM=""
333 fi 298
334 if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then 299 if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
335- AC_DEFINE(SDL_HERMES_BLITTERS) 300- AC_DEFINE(SDL_HERMES_BLITTERS)
336+ AC_DEFINE(SDL_HERMES_BLITTERS,1,"") 301+ AC_DEFINE(SDL_HERMES_BLITTERS,1,"")
337 SOURCES="$SOURCES $srcdir/src/hermes/*.asm" 302 SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
338 NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/" 303 NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/"
339 304
340@@ -850,9 +822,9 @@ 305@@ -840,9 +840,9 @@ AC_HELP_STRING([--enable-altivec], [use
341 CFLAGS="$save_CFLAGS" 306 CFLAGS="$save_CFLAGS"
342 307
343 if test x$have_gcc_altivec = xyes; then 308 if test x$have_gcc_altivec = xyes; then
@@ -349,7 +314,7 @@ Upstream-Status: Inappropriate [configuration]
349 fi 314 fi
350 EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS" 315 EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS"
351 fi 316 fi
352@@ -895,7 +867,7 @@ 317@@ -920,7 +920,7 @@ AC_HELP_STRING([--enable-ipod], [configu
353 318
354 if test x$enable_ipod = xyes; then 319 if test x$enable_ipod = xyes; then
355 EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD" 320 EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
@@ -358,7 +323,7 @@ Upstream-Status: Inappropriate [configuration]
358 SOURCES="$SOURCES $srcdir/src/video/ipod/*.c" 323 SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
359 fi 324 fi
360 } 325 }
361@@ -929,7 +901,7 @@ 326@@ -954,7 +954,7 @@ CheckNANOX()
362 EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB" 327 EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB"
363 fi 328 fi
364 329
@@ -367,7 +332,7 @@ Upstream-Status: Inappropriate [configuration]
367 SOURCES="$SOURCES $srcdir/src/video/nanox/*.c" 332 SOURCES="$SOURCES $srcdir/src/video/nanox/*.c"
368 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X" 333 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X"
369 have_video=yes 334 have_video=yes
370@@ -995,7 +967,7 @@ 335@@ -1020,7 +1020,7 @@ AC_HELP_STRING([--enable-x11-shared], [d
371 CFLAGS="$CFLAGS $X_CFLAGS" 336 CFLAGS="$CFLAGS $X_CFLAGS"
372 LDFLAGS="$LDFLAGS $X_LIBS" 337 LDFLAGS="$LDFLAGS $X_LIBS"
373 338
@@ -376,7 +341,7 @@ Upstream-Status: Inappropriate [configuration]
376 SOURCES="$SOURCES $srcdir/src/video/x11/*.c" 341 SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
377 EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS" 342 EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
378 343
379@@ -1017,8 +989,8 @@ 344@@ -1042,8 +1042,8 @@ AC_HELP_STRING([--enable-x11-shared], [d
380 test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then 345 test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
381 echo "-- dynamic libX11 -> $x11_lib" 346 echo "-- dynamic libX11 -> $x11_lib"
382 echo "-- dynamic libX11ext -> $x11ext_lib" 347 echo "-- dynamic libX11ext -> $x11ext_lib"
@@ -387,7 +352,7 @@ Upstream-Status: Inappropriate [configuration]
387 else 352 else
388 enable_x11_shared=no 353 enable_x11_shared=no
389 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext" 354 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext"
390@@ -1035,20 +1007,20 @@ 355@@ -1060,20 +1060,20 @@ AC_HELP_STRING([--enable-dga], [allow us
391 AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]), 356 AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]),
392 , enable_video_dga=yes) 357 , enable_video_dga=yes)
393 if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then 358 if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then
@@ -411,7 +376,7 @@ Upstream-Status: Inappropriate [configuration]
411 SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c" 376 SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
412 fi 377 fi
413 AC_ARG_ENABLE(video-x11-xv, 378 AC_ARG_ENABLE(video-x11-xv,
414@@ -1062,14 +1034,14 @@ 379@@ -1087,14 +1087,14 @@ AC_HELP_STRING([--enable-video-x11-xv],
415 AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]), 380 AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),
416 , enable_video_x11_xinerama=yes) 381 , enable_video_x11_xinerama=yes)
417 if test x$enable_video_x11_xinerama = xyes; then 382 if test x$enable_video_x11_xinerama = xyes; then
@@ -428,7 +393,7 @@ Upstream-Status: Inappropriate [configuration]
428 SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c" 393 SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c"
429 fi 394 fi
430 AC_ARG_ENABLE(video-x11-xrandr, 395 AC_ARG_ENABLE(video-x11-xrandr,
431@@ -1086,8 +1058,8 @@ 396@@ -1111,8 +1111,8 @@ AC_HELP_STRING([--enable-video-x11-xrand
432 if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then 397 if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
433 echo "-- dynamic libXrender -> $xrender_lib" 398 echo "-- dynamic libXrender -> $xrender_lib"
434 echo "-- dynamic libXrandr -> $xrandr_lib" 399 echo "-- dynamic libXrandr -> $xrandr_lib"
@@ -439,7 +404,7 @@ Upstream-Status: Inappropriate [configuration]
439 definitely_enable_video_x11_xrandr=yes 404 definitely_enable_video_x11_xrandr=yes
440 else 405 else
441 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes) 406 AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
442@@ -1100,7 +1072,7 @@ 407@@ -1125,7 +1125,7 @@ AC_HELP_STRING([--enable-video-x11-xrand
443 fi 408 fi
444 fi 409 fi
445 if test x$definitely_enable_video_x11_xrandr = xyes; then 410 if test x$definitely_enable_video_x11_xrandr = xyes; then
@@ -448,7 +413,7 @@ Upstream-Status: Inappropriate [configuration]
448 fi 413 fi
449 fi 414 fi
450 fi 415 fi
451@@ -1127,7 +1099,7 @@ 416@@ -1152,7 +1152,7 @@ AC_HELP_STRING([--enable-video-photon],
452 ]) 417 ])
453 AC_MSG_RESULT($video_photon) 418 AC_MSG_RESULT($video_photon)
454 if test x$video_photon = xyes; then 419 if test x$video_photon = xyes; then
@@ -457,7 +422,7 @@ Upstream-Status: Inappropriate [configuration]
457 SOURCES="$SOURCES $srcdir/src/video/photon/*.c" 422 SOURCES="$SOURCES $srcdir/src/video/photon/*.c"
458 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph" 423 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph"
459 have_video=yes 424 have_video=yes
460@@ -1141,7 +1113,7 @@ 425@@ -1166,7 +1166,7 @@ dnl Set up the BWindow video driver if e
461 CheckBWINDOW() 426 CheckBWINDOW()
462 { 427 {
463 if test x$enable_video = xyes; then 428 if test x$enable_video = xyes; then
@@ -466,7 +431,7 @@ Upstream-Status: Inappropriate [configuration]
466 SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc" 431 SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc"
467 have_video=yes 432 have_video=yes
468 fi 433 fi
469@@ -1164,7 +1136,7 @@ 434@@ -1189,7 +1189,7 @@ AC_HELP_STRING([--enable-video-carbon],
470 ]) 435 ])
471 AC_MSG_RESULT($have_carbon) 436 AC_MSG_RESULT($have_carbon)
472 if test x$have_carbon = xyes; then 437 if test x$have_carbon = xyes; then
@@ -475,7 +440,7 @@ Upstream-Status: Inappropriate [configuration]
475 SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c" 440 SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c"
476 SOURCES="$SOURCES $srcdir/src/video/macrom/*.c" 441 SOURCES="$SOURCES $srcdir/src/video/macrom/*.c"
477 have_video=yes 442 have_video=yes
478@@ -1193,7 +1165,7 @@ 443@@ -1218,7 +1218,7 @@ AC_HELP_STRING([--enable-video-cocoa], [
479 AC_MSG_RESULT($have_cocoa) 444 AC_MSG_RESULT($have_cocoa)
480 CFLAGS="$save_CFLAGS" 445 CFLAGS="$save_CFLAGS"
481 if test x$have_cocoa = xyes; then 446 if test x$have_cocoa = xyes; then
@@ -484,7 +449,7 @@ Upstream-Status: Inappropriate [configuration]
484 SOURCES="$SOURCES $srcdir/src/video/quartz/*.m" 449 SOURCES="$SOURCES $srcdir/src/video/quartz/*.m"
485 have_video=yes 450 have_video=yes
486 fi 451 fi
487@@ -1220,7 +1192,7 @@ 452@@ -1245,7 +1245,7 @@ AC_HELP_STRING([--enable-video-fbcon], [
488 AC_MSG_RESULT($video_fbcon) 453 AC_MSG_RESULT($video_fbcon)
489 if test x$video_fbcon = xyes; then 454 if test x$video_fbcon = xyes; then
490 AC_CHECK_FUNCS(getpagesize) 455 AC_CHECK_FUNCS(getpagesize)
@@ -493,7 +458,7 @@ Upstream-Status: Inappropriate [configuration]
493 SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c" 458 SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c"
494 have_video=yes 459 have_video=yes
495 fi 460 fi
496@@ -1271,7 +1243,7 @@ 461@@ -1296,7 +1296,7 @@ AC_HELP_STRING([--enable-video-directfb]
497 AC_MSG_RESULT($video_directfb) 462 AC_MSG_RESULT($video_directfb)
498 463
499 if test x$video_directfb = xyes; then 464 if test x$video_directfb = xyes; then
@@ -502,7 +467,7 @@ Upstream-Status: Inappropriate [configuration]
502 SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" 467 SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
503 EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" 468 EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
504 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" 469 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
505@@ -1298,7 +1270,7 @@ 470@@ -1323,7 +1323,7 @@ AC_HELP_STRING([--enable-video-ps2gs], [
506 ]) 471 ])
507 AC_MSG_RESULT($video_ps2gs) 472 AC_MSG_RESULT($video_ps2gs)
508 if test x$video_ps2gs = xyes; then 473 if test x$video_ps2gs = xyes; then
@@ -511,7 +476,7 @@ Upstream-Status: Inappropriate [configuration]
511 SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c" 476 SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c"
512 have_video=yes 477 have_video=yes
513 fi 478 fi
514@@ -1350,7 +1322,7 @@ 479@@ -1376,7 +1376,7 @@ AC_HELP_STRING([--enable-video-ggi], [us
515 ]) 480 ])
516 AC_MSG_RESULT($video_ggi) 481 AC_MSG_RESULT($video_ggi)
517 if test x$video_ggi = xyes; then 482 if test x$video_ggi = xyes; then
@@ -520,7 +485,7 @@ Upstream-Status: Inappropriate [configuration]
520 SOURCES="$SOURCES $srcdir/src/video/ggi/*.c" 485 SOURCES="$SOURCES $srcdir/src/video/ggi/*.c"
521 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg" 486 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg"
522 have_video=yes 487 have_video=yes
523@@ -1380,7 +1352,7 @@ 488@@ -1406,7 +1406,7 @@ AC_HELP_STRING([--enable-video-svga], [u
524 ]) 489 ])
525 AC_MSG_RESULT($video_svga) 490 AC_MSG_RESULT($video_svga)
526 if test x$video_svga = xyes; then 491 if test x$video_svga = xyes; then
@@ -529,7 +494,7 @@ Upstream-Status: Inappropriate [configuration]
529 SOURCES="$SOURCES $srcdir/src/video/svga/*.c" 494 SOURCES="$SOURCES $srcdir/src/video/svga/*.c"
530 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga" 495 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga"
531 have_video=yes 496 have_video=yes
532@@ -1412,7 +1384,7 @@ 497@@ -1438,7 +1438,7 @@ AC_HELP_STRING([--enable-video-vgl], [us
533 ]) 498 ])
534 AC_MSG_RESULT($video_vgl) 499 AC_MSG_RESULT($video_vgl)
535 if test x$video_vgl = xyes; then 500 if test x$video_vgl = xyes; then
@@ -538,7 +503,7 @@ Upstream-Status: Inappropriate [configuration]
538 SOURCES="$SOURCES $srcdir/src/video/vgl/*.c" 503 SOURCES="$SOURCES $srcdir/src/video/vgl/*.c"
539 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl" 504 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl"
540 have_video=yes 505 have_video=yes
541@@ -1440,7 +1412,7 @@ 506@@ -1466,7 +1466,7 @@ AC_HELP_STRING([--enable-video-wscons],
542 ]) 507 ])
543 AC_MSG_RESULT($video_wscons) 508 AC_MSG_RESULT($video_wscons)
544 if test x$video_wscons = xyes; then 509 if test x$video_wscons = xyes; then
@@ -547,7 +512,7 @@ Upstream-Status: Inappropriate [configuration]
547 SOURCES="$SOURCES $srcdir/src/video/wscons/*.c" 512 SOURCES="$SOURCES $srcdir/src/video/wscons/*.c"
548 have_video=yes 513 have_video=yes
549 fi 514 fi
550@@ -1465,7 +1437,7 @@ 515@@ -1491,7 +1491,7 @@ AC_HELP_STRING([--enable-video-aalib], [
551 ]) 516 ])
552 AC_MSG_RESULT($video_aalib) 517 AC_MSG_RESULT($video_aalib)
553 if test x$video_aalib = xyes; then 518 if test x$video_aalib = xyes; then
@@ -556,7 +521,7 @@ Upstream-Status: Inappropriate [configuration]
556 SOURCES="$SOURCES $srcdir/src/video/aalib/*.c" 521 SOURCES="$SOURCES $srcdir/src/video/aalib/*.c"
557 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa" 522 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa"
558 have_video=yes 523 have_video=yes
559@@ -1527,7 +1499,7 @@ 524@@ -1553,7 +1553,7 @@ AC_HELP_STRING([--enable-video-qtopia],
560 CXXFLAGS="$OLD_CXX" 525 CXXFLAGS="$OLD_CXX"
561 AC_MSG_RESULT($video_qtopia) 526 AC_MSG_RESULT($video_qtopia)
562 if test x$video_qtopia = xyes; then 527 if test x$video_qtopia = xyes; then
@@ -564,8 +529,8 @@ Upstream-Status: Inappropriate [configuration]
564+ AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA,1,"") 529+ AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA,1,"")
565 SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc" 530 SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc"
566 SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc" 531 SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc"
567 EXTRA_CFLAGS="$EXTRA_CFLAGS $QTOPIA_FLAGS" 532 SDLMAIN_LDFLAGS="-static"
568@@ -1556,7 +1528,7 @@ 533@@ -1583,7 +1583,7 @@ AC_HELP_STRING([--enable-video-picogui],
569 ]) 534 ])
570 AC_MSG_RESULT($video_picogui) 535 AC_MSG_RESULT($video_picogui)
571 if test x$video_picogui = xyes; then 536 if test x$video_picogui = xyes; then
@@ -574,7 +539,7 @@ Upstream-Status: Inappropriate [configuration]
574 SOURCES="$SOURCES $srcdir/src/video/picogui/*.c" 539 SOURCES="$SOURCES $srcdir/src/video/picogui/*.c"
575 SDL_LIBS="$SDL_LIBS -lpgui" 540 SDL_LIBS="$SDL_LIBS -lpgui"
576 have_video=yes 541 have_video=yes
577@@ -1580,7 +1552,7 @@ 542@@ -1607,7 +1607,7 @@ AC_HELP_STRING([--enable-video-xbios], [
578 video_xbios=no 543 video_xbios=no
579 if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then 544 if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then
580 video_xbios=yes 545 video_xbios=yes
@@ -583,7 +548,7 @@ Upstream-Status: Inappropriate [configuration]
583 SOURCES="$SOURCES $srcdir/src/video/xbios/*.c" 548 SOURCES="$SOURCES $srcdir/src/video/xbios/*.c"
584 have_video=yes 549 have_video=yes
585 fi 550 fi
586@@ -1598,7 +1570,7 @@ 551@@ -1625,7 +1625,7 @@ AC_HELP_STRING([--enable-video-gem], [us
587 AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes) 552 AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes)
588 if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then 553 if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then
589 video_gem=yes 554 video_gem=yes
@@ -592,7 +557,7 @@ Upstream-Status: Inappropriate [configuration]
592 SOURCES="$SOURCES $srcdir/src/video/gem/*.c" 557 SOURCES="$SOURCES $srcdir/src/video/gem/*.c"
593 SDL_LIBS="$SDL_LIBS -lgem" 558 SDL_LIBS="$SDL_LIBS -lgem"
594 have_video=yes 559 have_video=yes
595@@ -1613,7 +1585,7 @@ 560@@ -1640,7 +1640,7 @@ CheckDummyVideo()
596 AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]), 561 AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]),
597 , enable_video_dummy=yes) 562 , enable_video_dummy=yes)
598 if test x$enable_video_dummy = xyes; then 563 if test x$enable_video_dummy = xyes; then
@@ -601,7 +566,7 @@ Upstream-Status: Inappropriate [configuration]
601 SOURCES="$SOURCES $srcdir/src/video/dummy/*.c" 566 SOURCES="$SOURCES $srcdir/src/video/dummy/*.c"
602 have_video=yes 567 have_video=yes
603 fi 568 fi
604@@ -1640,8 +1612,8 @@ 569@@ -1667,8 +1667,8 @@ CheckOpenGLX11()
605 ]) 570 ])
606 AC_MSG_RESULT($video_opengl) 571 AC_MSG_RESULT($video_opengl)
607 if test x$video_opengl = xyes; then 572 if test x$video_opengl = xyes; then
@@ -612,7 +577,7 @@ Upstream-Status: Inappropriate [configuration]
612 fi 577 fi
613 fi 578 fi
614 } 579 }
615@@ -1660,7 +1632,7 @@ 580@@ -1687,7 +1687,7 @@ CheckOpenGLQNX()
616 ]) 581 ])
617 AC_MSG_RESULT($video_opengl) 582 AC_MSG_RESULT($video_opengl)
618 if test x$video_opengl = xyes; then 583 if test x$video_opengl = xyes; then
@@ -621,7 +586,7 @@ Upstream-Status: Inappropriate [configuration]
621 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" 586 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
622 fi 587 fi
623 fi 588 fi
624@@ -1670,8 +1642,8 @@ 589@@ -1697,8 +1697,8 @@ dnl Check for Win32 OpenGL
625 CheckWIN32GL() 590 CheckWIN32GL()
626 { 591 {
627 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then 592 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
@@ -632,7 +597,7 @@ Upstream-Status: Inappropriate [configuration]
632 fi 597 fi
633 } 598 }
634 599
635@@ -1679,7 +1651,7 @@ 600@@ -1706,7 +1706,7 @@ dnl Check for BeOS OpenGL
636 CheckBeGL() 601 CheckBeGL()
637 { 602 {
638 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then 603 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
@@ -641,7 +606,7 @@ Upstream-Status: Inappropriate [configuration]
641 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" 606 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
642 fi 607 fi
643 } 608 }
644@@ -1688,7 +1660,7 @@ 609@@ -1715,7 +1715,7 @@ dnl Check for MacOS OpenGL
645 CheckMacGL() 610 CheckMacGL()
646 { 611 {
647 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then 612 if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
@@ -650,7 +615,7 @@ Upstream-Status: Inappropriate [configuration]
650 case "$host" in 615 case "$host" in
651 *-*-darwin*) 616 *-*-darwin*)
652 if test x$enable_video_cocoa = xyes; then 617 if test x$enable_video_cocoa = xyes; then
653@@ -1720,8 +1692,8 @@ 618@@ -1747,8 +1747,8 @@ CheckAtariOSMesa()
654 OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags` 619 OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags`
655 OSMESA_LIBS=`$OSMESA_CONFIG --libs` 620 OSMESA_LIBS=`$OSMESA_CONFIG --libs`
656 fi 621 fi
@@ -661,7 +626,7 @@ Upstream-Status: Inappropriate [configuration]
661 SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS" 626 SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS"
662 SDL_LIBS="$SDL_LIBS $OSMESA_LIBS" 627 SDL_LIBS="$SDL_LIBS $OSMESA_LIBS"
663 628
664@@ -1731,7 +1703,7 @@ 629@@ -1758,7 +1758,7 @@ AC_HELP_STRING([--enable-osmesa-shared],
665 if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then 630 if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then
666 # Dynamic linking 631 # Dynamic linking
667 if test "x$have_osmesa_hdr" = "xyes"; then 632 if test "x$have_osmesa_hdr" = "xyes"; then
@@ -670,7 +635,7 @@ Upstream-Status: Inappropriate [configuration]
670 fi 635 fi
671 fi 636 fi
672 fi 637 fi
673@@ -1765,7 +1737,7 @@ 638@@ -1792,7 +1792,7 @@ AC_HELP_STRING([--enable-input-events],
674 ]) 639 ])
675 AC_MSG_RESULT($use_input_events) 640 AC_MSG_RESULT($use_input_events)
676 if test x$use_input_events = xyes; then 641 if test x$use_input_events = xyes; then
@@ -679,7 +644,7 @@ Upstream-Status: Inappropriate [configuration]
679 fi 644 fi
680 fi 645 fi
681 } 646 }
682@@ -1787,7 +1759,7 @@ 647@@ -1814,7 +1814,7 @@ AC_HELP_STRING([--enable-input-tslib], [
683 ]) 648 ])
684 AC_MSG_RESULT($enable_input_tslib) 649 AC_MSG_RESULT($enable_input_tslib)
685 if test x$enable_input_tslib = xyes; then 650 if test x$enable_input_tslib = xyes; then
@@ -688,7 +653,7 @@ Upstream-Status: Inappropriate [configuration]
688 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts" 653 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts"
689 fi 654 fi
690 fi 655 fi
691@@ -1810,7 +1782,7 @@ 656@@ -1837,7 +1837,7 @@ AC_HELP_STRING([--enable-pth], [use GNU
692 AC_MSG_CHECKING(pth) 657 AC_MSG_CHECKING(pth)
693 AC_MSG_RESULT($use_pth) 658 AC_MSG_RESULT($use_pth)
694 if test "x$use_pth" = xyes; then 659 if test "x$use_pth" = xyes; then
@@ -697,7 +662,7 @@ Upstream-Status: Inappropriate [configuration]
697 SOURCES="$SOURCES $srcdir/src/thread/pth/*.c" 662 SOURCES="$SOURCES $srcdir/src/thread/pth/*.c"
698 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c" 663 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c"
699 SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`" 664 SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`"
700@@ -1916,7 +1888,7 @@ 665@@ -1943,7 +1943,7 @@ AC_HELP_STRING([--enable-pthread-sem], [
701 666
702 # Do futher testing if we have pthread support... 667 # Do futher testing if we have pthread support...
703 if test x$use_pthreads = xyes; then 668 if test x$use_pthreads = xyes; then
@@ -706,7 +671,7 @@ Upstream-Status: Inappropriate [configuration]
706 EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags" 671 EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags"
707 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib" 672 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib"
708 SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags" 673 SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags"
709@@ -1938,7 +1910,7 @@ 674@@ -1965,7 +1965,7 @@ AC_HELP_STRING([--enable-pthread-sem], [
710 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); 675 pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
711 ],[ 676 ],[
712 has_recursive_mutexes=yes 677 has_recursive_mutexes=yes
@@ -715,7 +680,7 @@ Upstream-Status: Inappropriate [configuration]
715 ]) 680 ])
716 fi 681 fi
717 if test x$has_recursive_mutexes = xno; then 682 if test x$has_recursive_mutexes = xno; then
718@@ -1949,7 +1921,7 @@ 683@@ -1976,7 +1976,7 @@ AC_HELP_STRING([--enable-pthread-sem], [
719 pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP); 684 pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
720 ],[ 685 ],[
721 has_recursive_mutexes=yes 686 has_recursive_mutexes=yes
@@ -724,7 +689,7 @@ Upstream-Status: Inappropriate [configuration]
724 ]) 689 ])
725 fi 690 fi
726 AC_MSG_RESULT($has_recursive_mutexes) 691 AC_MSG_RESULT($has_recursive_mutexes)
727@@ -2024,7 +1996,7 @@ 692@@ -2065,7 +2065,7 @@ AC_HELP_STRING([--enable-stdio-redirect]
728 fi 693 fi
729 694
730 if test x$enable_video = xyes; then 695 if test x$enable_video = xyes; then
@@ -733,7 +698,7 @@ Upstream-Status: Inappropriate [configuration]
733 SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c" 698 SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c"
734 SOURCES="$SOURCES $srcdir/src/video/windib/*.c" 699 SOURCES="$SOURCES $srcdir/src/video/windib/*.c"
735 have_video=yes 700 have_video=yes
736@@ -2046,7 +2018,7 @@ 701@@ -2087,7 +2087,7 @@ AC_HELP_STRING([--enable-directx], [use
737 have_directx=yes 702 have_directx=yes
738 fi 703 fi
739 if test x$enable_video = xyes -a x$have_directx = xyes; then 704 if test x$enable_video = xyes -a x$have_directx = xyes; then
@@ -742,7 +707,7 @@ Upstream-Status: Inappropriate [configuration]
742 SOURCES="$SOURCES $srcdir/src/video/windx5/*.c" 707 SOURCES="$SOURCES $srcdir/src/video/windx5/*.c"
743 have_video=yes 708 have_video=yes
744 fi 709 fi
745@@ -2077,7 +2049,7 @@ 710@@ -2118,7 +2118,7 @@ AC_HELP_STRING([--enable-sdl-dlopen], [u
746 AC_CHECK_LIB(c, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS", 711 AC_CHECK_LIB(c, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS",
747 AC_CHECK_LIB(dl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl", 712 AC_CHECK_LIB(dl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl",
748 AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl"))) 713 AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl")))
@@ -751,7 +716,7 @@ Upstream-Status: Inappropriate [configuration]
751 SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" 716 SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
752 have_loadso=yes 717 have_loadso=yes
753 fi 718 fi
754@@ -2094,7 +2066,7 @@ 719@@ -2135,7 +2135,7 @@ AC_HELP_STRING([--enable-atari-ldg], [us
755 AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes) 720 AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes)
756 AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem) 721 AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem)
757 if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then 722 if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then
@@ -760,7 +725,7 @@ Upstream-Status: Inappropriate [configuration]
760 SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c" 725 SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c"
761 SDL_LIBS="$SDL_LIBS -lldg -lgem" 726 SDL_LIBS="$SDL_LIBS -lldg -lgem"
762 have_loadso=yes 727 have_loadso=yes
763@@ -2225,11 +2197,11 @@ 728@@ -2266,11 +2266,11 @@ CheckUSBHID()
764 have_machine_joystick=yes 729 have_machine_joystick=yes
765 ]) 730 ])
766 if test x$have_machine_joystick = xyes; then 731 if test x$have_machine_joystick = xyes; then
@@ -774,7 +739,7 @@ Upstream-Status: Inappropriate [configuration]
774 SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c" 739 SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c"
775 EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS" 740 EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS"
776 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS" 741 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS"
777@@ -2248,7 +2220,7 @@ 742@@ -2289,7 +2289,7 @@ AC_HELP_STRING([--enable-clock_gettime],
778 if test x$enable_clock_gettime = xyes; then 743 if test x$enable_clock_gettime = xyes; then
779 AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes) 744 AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes)
780 if test x$have_clock_gettime = xyes; then 745 if test x$have_clock_gettime = xyes; then
@@ -783,7 +748,7 @@ Upstream-Status: Inappropriate [configuration]
783 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt" 748 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
784 fi 749 fi
785 fi 750 fi
786@@ -2279,7 +2251,7 @@ 751@@ -2320,7 +2320,7 @@ case "$host" in
787 CheckIPod 752 CheckIPod
788 # Set up files for the timer library 753 # Set up files for the timer library
789 if test x$enable_timers = xyes; then 754 if test x$enable_timers = xyes; then
@@ -792,7 +757,7 @@ Upstream-Status: Inappropriate [configuration]
792 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" 757 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
793 have_timers=yes 758 have_timers=yes
794 fi 759 fi
795@@ -2345,17 +2317,17 @@ 760@@ -2386,17 +2386,17 @@ case "$host" in
796 if test x$enable_audio = xyes; then 761 if test x$enable_audio = xyes; then
797 case $ARCH in 762 case $ARCH in
798 sysv5|solaris|hpux) 763 sysv5|solaris|hpux)
@@ -813,7 +778,7 @@ Upstream-Status: Inappropriate [configuration]
813 SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c" 778 SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c"
814 have_audio=yes 779 have_audio=yes
815 ;; 780 ;;
816@@ -2365,7 +2337,7 @@ 781@@ -2406,7 +2406,7 @@ case "$host" in
817 if test x$enable_joystick = xyes; then 782 if test x$enable_joystick = xyes; then
818 case $ARCH in 783 case $ARCH in
819 linux) 784 linux)
@@ -822,7 +787,7 @@ Upstream-Status: Inappropriate [configuration]
822 SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c" 787 SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c"
823 have_joystick=yes 788 have_joystick=yes
824 ;; 789 ;;
825@@ -2375,32 +2347,32 @@ 790@@ -2416,32 +2416,32 @@ case "$host" in
826 if test x$enable_cdrom = xyes; then 791 if test x$enable_cdrom = xyes; then
827 case $ARCH in 792 case $ARCH in
828 linux|solaris) 793 linux|solaris)
@@ -861,7 +826,7 @@ Upstream-Status: Inappropriate [configuration]
861 SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c" 826 SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c"
862 have_cdrom=yes 827 have_cdrom=yes
863 ;; 828 ;;
864@@ -2408,7 +2380,7 @@ 829@@ -2449,7 +2449,7 @@ case "$host" in
865 fi 830 fi
866 # Set up files for the thread library 831 # Set up files for the thread library
867 if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then 832 if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
@@ -870,7 +835,7 @@ Upstream-Status: Inappropriate [configuration]
870 SOURCES="$SOURCES $srcdir/src/thread/irix/*.c" 835 SOURCES="$SOURCES $srcdir/src/thread/irix/*.c"
871 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" 836 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
872 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" 837 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
873@@ -2416,7 +2388,7 @@ 838@@ -2457,7 +2457,7 @@ case "$host" in
874 fi 839 fi
875 # Set up files for the timer library 840 # Set up files for the timer library
876 if test x$enable_timers = xyes; then 841 if test x$enable_timers = xyes; then
@@ -879,7 +844,7 @@ Upstream-Status: Inappropriate [configuration]
879 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" 844 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
880 have_timers=yes 845 have_timers=yes
881 fi 846 fi
882@@ -2435,20 +2407,20 @@ 847@@ -2476,20 +2476,20 @@ case "$host" in
883 CheckPTHREAD 848 CheckPTHREAD
884 # Set up files for the audio library 849 # Set up files for the audio library
885 if test x$enable_audio = xyes; then 850 if test x$enable_audio = xyes; then
@@ -903,7 +868,7 @@ Upstream-Status: Inappropriate [configuration]
903 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" 868 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
904 have_timers=yes 869 have_timers=yes
905 fi 870 fi
906@@ -2473,29 +2445,29 @@ 871@@ -2514,29 +2514,29 @@ case "$host" in
907 CheckNASM 872 CheckNASM
908 # Set up files for the audio library 873 # Set up files for the audio library
909 if test x$enable_audio = xyes; then 874 if test x$enable_audio = xyes; then
@@ -938,7 +903,7 @@ Upstream-Status: Inappropriate [configuration]
938 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" 903 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c"
939 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" 904 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c"
940 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" 905 SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c"
941@@ -2504,13 +2476,13 @@ 906@@ -2545,13 +2545,13 @@ case "$host" in
942 fi 907 fi
943 # Set up files for the timer library 908 # Set up files for the timer library
944 if test x$enable_timers = xyes; then 909 if test x$enable_timers = xyes; then
@@ -954,7 +919,7 @@ Upstream-Status: Inappropriate [configuration]
954 SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" 919 SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
955 have_loadso=yes 920 have_loadso=yes
956 fi 921 fi
957@@ -2579,25 +2551,25 @@ 922@@ -2622,25 +2622,25 @@ case "$host" in
958 CheckBeGL 923 CheckBeGL
959 # Set up files for the audio library 924 # Set up files for the audio library
960 if test x$enable_audio = xyes; then 925 if test x$enable_audio = xyes; then
@@ -984,7 +949,7 @@ Upstream-Status: Inappropriate [configuration]
984 SOURCES="$SOURCES $srcdir/src/thread/beos/*.c" 949 SOURCES="$SOURCES $srcdir/src/thread/beos/*.c"
985 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" 950 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
986 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" 951 SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
987@@ -2605,7 +2577,7 @@ 952@@ -2648,7 +2648,7 @@ case "$host" in
988 fi 953 fi
989 # Set up files for the timer library 954 # Set up files for the timer library
990 if test x$enable_timers = xyes; then 955 if test x$enable_timers = xyes; then
@@ -993,7 +958,7 @@ Upstream-Status: Inappropriate [configuration]
993 SOURCES="$SOURCES $srcdir/src/timer/beos/*.c" 958 SOURCES="$SOURCES $srcdir/src/timer/beos/*.c"
994 have_timers=yes 959 have_timers=yes
995 fi 960 fi
996@@ -2613,11 +2585,11 @@ 961@@ -2656,11 +2656,11 @@ case "$host" in
997 if test x$enable_loadso = xyes; then 962 if test x$enable_loadso = xyes; then
998 case "$host" in 963 case "$host" in
999 *-*-beos*) 964 *-*-beos*)
@@ -1007,7 +972,7 @@ Upstream-Status: Inappropriate [configuration]
1007 SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" 972 SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
1008 ;; 973 ;;
1009 esac 974 esac
1010@@ -2653,7 +2625,7 @@ 975@@ -2696,7 +2696,7 @@ case "$host" in
1011 # Set up files for the shared object loading library 976 # Set up files for the shared object loading library
1012 # (this needs to be done before the dynamic X11 check) 977 # (this needs to be done before the dynamic X11 check)
1013 if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then 978 if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
@@ -1016,7 +981,7 @@ Upstream-Status: Inappropriate [configuration]
1016 SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c" 981 SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
1017 have_loadso=yes 982 have_loadso=yes
1018 fi 983 fi
1019@@ -2671,26 +2643,26 @@ 984@@ -2714,26 +2714,26 @@ case "$host" in
1020 985
1021 # Set up files for the audio library 986 # Set up files for the audio library
1022 if test x$enable_audio = xyes; then 987 if test x$enable_audio = xyes; then
@@ -1047,7 +1012,7 @@ Upstream-Status: Inappropriate [configuration]
1047 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" 1012 SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
1048 have_timers=yes 1013 have_timers=yes
1049 fi 1014 fi
1050@@ -2731,30 +2703,30 @@ 1015@@ -2775,30 +2775,30 @@ case "$host" in
1051 # Set up files for the audio library 1016 # Set up files for the audio library
1052 if test x$enable_threads = xyes -a x$enable_pth = xyes; then 1017 if test x$enable_threads = xyes -a x$enable_pth = xyes; then
1053 if test x$enable_audio = xyes; then 1018 if test x$enable_audio = xyes; then
@@ -1083,7 +1048,7 @@ Upstream-Status: Inappropriate [configuration]
1083 SOURCES="$SOURCES $srcdir/src/timer/mint/*.c" 1048 SOURCES="$SOURCES $srcdir/src/timer/mint/*.c"
1084 SOURCES="$SOURCES $srcdir/src/timer/mint/*.S" 1049 SOURCES="$SOURCES $srcdir/src/timer/mint/*.S"
1085 fi 1050 fi
1086@@ -2767,20 +2739,20 @@ 1051@@ -2811,20 +2811,20 @@ case "$host" in
1087 CheckPTHREAD 1052 CheckPTHREAD
1088 # Set up files for the video library 1053 # Set up files for the video library
1089 if test x$enable_video = xyes; then 1054 if test x$enable_video = xyes; then
@@ -1107,7 +1072,7 @@ Upstream-Status: Inappropriate [configuration]
1107 SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c" 1072 SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c"
1108 have_timers=yes 1073 have_timers=yes
1109 fi 1074 fi
1110@@ -2799,31 +2771,31 @@ 1075@@ -2846,31 +2846,31 @@ CheckWarnAll
1111 if test x$enable_joystick = xyes; then 1076 if test x$enable_joystick = xyes; then
1112 if test x$have_joystick != xyes; then 1077 if test x$have_joystick != xyes; then
1113 # Wants joystick subsystem, but doesn't have a platform-specific backend... 1078 # Wants joystick subsystem, but doesn't have a platform-specific backend...
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index b05840a2fc..d5c127d2c5 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -18,7 +18,7 @@ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
18 tslib" 18 tslib"
19DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" 19DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
20 20
21PR = "r0" 21PR = "r1"
22 22
23SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ 23SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
24 file://configure_tweak.patch \ 24 file://configure_tweak.patch \
@@ -47,7 +47,7 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
47 --disable-pulseaudio" 47 --disable-pulseaudio"
48 48
49PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 49PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
50PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib," 50PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
51 51
52PARALLEL_MAKE = "" 52PARALLEL_MAKE = ""
53 53
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 16:40:58 +0000