summaryrefslogtreecommitdiff
path: root/meta/packages/libsdl/files
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:11 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:57 +0100
commitd62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch)
treef36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/packages/libsdl/files
parentcaab7fc509bf27706ff3248689f6afd04225cfda (diff)
downloadopenembedded-core-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz
openembedded-core-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.bz2
openembedded-core-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.xz
openembedded-core-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.zip
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/libsdl/files')
-rw-r--r--meta/packages/libsdl/files/acinclude.m4189
-rw-r--r--meta/packages/libsdl/files/configure_tweak.patch1167
-rw-r--r--meta/packages/libsdl/files/directfb_obsolete_calls.patch33
-rw-r--r--meta/packages/libsdl/files/extra-keys.patch53
-rw-r--r--meta/packages/libsdl/files/kernel-asm-page.patch13
5 files changed, 0 insertions, 1455 deletions
diff --git a/meta/packages/libsdl/files/acinclude.m4 b/meta/packages/libsdl/files/acinclude.m4
deleted file mode 100644
index ca2df9d5e..000000000
--- a/meta/packages/libsdl/files/acinclude.m4
+++ /dev/null
@@ -1,189 +0,0 @@
-# Local macros for the SDL configure.in script
-
-dnl Function to link an architecture specific file
-dnl LINK_ARCH_SRC(source_dir, arch, source_file)
-AC_DEFUN([COPY_ARCH_SRC],
-[
- old="$srcdir/$1/$2/$3"
- new="$1/$3"
- if test ! -d $1; then
- echo "Creating directory $1"
- mkdir -p $1
- fi
- echo "Copying $old -> $new"
- cat >$new <<__EOF__
-/* WARNING: This file was automatically generated!
- * Original: $old
- */
-__EOF__
- cat >>$new <$old
-])
-
-#
-# --- esd.m4 ---
-#
-# Configure paths for ESD
-# Manish Singh 98-9-30
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-
-dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
-dnl
-AC_DEFUN([AM_PATH_ESD],
-[dnl
-dnl Get the cflags and libraries from the esd-config script
-dnl
-AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)],
- esd_prefix="$withval", esd_prefix="")
-AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
- esd_exec_prefix="$withval", esd_exec_prefix="")
-AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program],
- , enable_esdtest=yes)
-
- if test x$esd_exec_prefix != x ; then
- esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
- if test x${ESD_CONFIG+set} != xset ; then
- ESD_CONFIG=$esd_exec_prefix/bin/esd-config
- fi
- fi
- if test x$esd_prefix != x ; then
- esd_args="$esd_args --prefix=$esd_prefix"
- if test x${ESD_CONFIG+set} != xset ; then
- ESD_CONFIG=$esd_prefix/bin/esd-config
- fi
- fi
-
- AC_PATH_PROG(ESD_CONFIG, esd-config, no)
- min_esd_version=ifelse([$1], ,0.2.7,$1)
- AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
- no_esd=""
- if test "$ESD_CONFIG" = "no" ; then
- no_esd=yes
- else
- ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
- ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-
- esd_major_version=`$ESD_CONFIG $esd_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- esd_minor_version=`$ESD_CONFIG $esd_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_esdtest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $ESD_CFLAGS"
- LIBS="$LIBS $ESD_LIBS"
-dnl
-dnl Now check if the installed ESD is sufficiently new. (Also sanity
-dnl checks the results of esd-config to some extent
-dnl
- rm -f conf.esdtest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <esd.h>
-
-char*
-my_strdup (char *str)
-{
- char *new_str;
-
- if (str)
- {
- new_str = malloc ((strlen (str) + 1) * sizeof(char));
- strcpy (new_str, str);
- }
- else
- new_str = NULL;
-
- return new_str;
-}
-
-int main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.esdtest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = my_strdup("$min_esd_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
- printf("%s, bad version string\n", "$min_esd_version");
- exit(1);
- }
-
- if (($esd_major_version > major) ||
- (($esd_major_version == major) && ($esd_minor_version > minor)) ||
- (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
- printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
- printf("*** to point to the correct copy of esd-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
-
-],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_esd" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$ESD_CONFIG" = "no" ; then
- echo "*** The esd-config script installed by ESD could not be found"
- echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the ESD_CONFIG environment variable to the"
- echo "*** full path to esd-config."
- else
- if test -f conf.esdtest ; then
- :
- else
- echo "*** Could not run ESD test program, checking why..."
- CFLAGS="$CFLAGS $ESD_CFLAGS"
- LIBS="$LIBS $ESD_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include <esd.h>
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding ESD or finding the wrong"
- echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means ESD was incorrectly installed"
- echo "*** or that you have moved ESD since it was installed. In the latter case, you"
- echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- ESD_CFLAGS=""
- ESD_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(ESD_CFLAGS)
- AC_SUBST(ESD_LIBS)
- rm -f conf.esdtest
-])
-
diff --git a/meta/packages/libsdl/files/configure_tweak.patch b/meta/packages/libsdl/files/configure_tweak.patch
deleted file mode 100644
index 90a2888e5..000000000
--- a/meta/packages/libsdl/files/configure_tweak.patch
+++ /dev/null
@@ -1,1167 +0,0 @@
-Index: SDL-1.2.11/configure.in
-===================================================================
---- SDL-1.2.11.orig/configure.in 2006-06-27 05:48:33.000000000 +0100
-+++ SDL-1.2.11/configure.in 2008-02-21 19:48:47.000000000 +0000
-@@ -40,13 +40,13 @@
- AC_SUBST(LT_AGE)
-
- dnl Detect the canonical build and host environments
--AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
-+AC_CONFIG_AUX_DIR(./build-scripts)
- AC_CANONICAL_HOST
- AC_C_BIGENDIAN
- if test x$ac_cv_c_bigendian = xyes; then
-- AC_DEFINE(SDL_BYTEORDER, 4321)
-+ AC_DEFINE(SDL_BYTEORDER, 4321, "Byte Order")
- else
-- AC_DEFINE(SDL_BYTEORDER, 1234)
-+ AC_DEFINE(SDL_BYTEORDER, 1234, "Byte Order")
- fi
-
- dnl Set up the compiler and linker flags
-@@ -107,7 +107,7 @@
- AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]),
- , enable_libc=yes)
- if test x$enable_libc = xyes; then
-- AC_DEFINE(HAVE_LIBC)
-+ AC_DEFINE(HAVE_LIBC,1,"")
-
- dnl Check for C library headers
- AC_HEADER_STDC
-@@ -118,7 +118,7 @@
- if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then
- AC_CHECK_TYPE(int64_t)
- if test x$ac_cv_type_int64_t = xyes; then
-- AC_DEFINE(SDL_HAS_64BIT_TYPE)
-+ AC_DEFINE(SDL_HAS_64BIT_TYPE,1,"")
- fi
- have_inttypes=yes
- fi
-@@ -127,11 +127,11 @@
- AC_FUNC_ALLOCA
- AC_FUNC_MEMCMP
- if test x$ac_cv_func_memcmp_working = xyes; then
-- AC_DEFINE(HAVE_MEMCMP)
-+ AC_DEFINE(HAVE_MEMCMP,1,"")
- fi
- AC_FUNC_STRTOD
- if test x$ac_cv_func_strtod = xyes; then
-- AC_DEFINE(HAVE_STRTOD)
-+ AC_DEFINE(HAVE_STRTOD,1,"")
- fi
- 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)
-
-@@ -146,40 +146,40 @@
- AC_CHECK_SIZEOF(long, 4)
- AC_CHECK_SIZEOF(long long, 8)
- if test x$ac_cv_sizeof_char = x1; then
-- AC_DEFINE(int8_t, signed char)
-- AC_DEFINE(uint8_t, unsigned char)
-+ AC_DEFINE(int8_t, signed char,"")
-+ AC_DEFINE(uint8_t, unsigned char,"")
- fi
- if test x$ac_cv_sizeof_short = x2; then
-- AC_DEFINE(int16_t, signed short)
-- AC_DEFINE(uint16_t, unsigned short)
-+ AC_DEFINE(int16_t, signed short,"")
-+ AC_DEFINE(uint16_t, unsigned short,"")
- else
- if test x$ac_cv_sizeof_int = x2; then
-- AC_DEFINE(int16_t, signed int)
-- AC_DEFINE(uint16_t, unsigned int)
-+ AC_DEFINE(int16_t, signed int,"")
-+ AC_DEFINE(uint16_t, unsigned int,"")
- fi
- fi
- if test x$ac_cv_sizeof_int = x4; then
-- AC_DEFINE(int32_t, signed int)
-- AC_DEFINE(uint32_t, unsigned int)
-+ AC_DEFINE(int32_t, signed int,"")
-+ AC_DEFINE(uint32_t, unsigned int,"")
- else
- if test x$ac_cv_sizeof_long = x4; then
-- AC_DEFINE(int32_t, signed long)
-- AC_DEFINE(uint32_t, unsigned long)
-+ AC_DEFINE(int32_t, signed long,"")
-+ AC_DEFINE(uint32_t, unsigned long,"")
- fi
- fi
- if test x$ac_cv_sizeof_long = x8; then
-- AC_DEFINE(int64_t, signed long)
-- AC_DEFINE(uint64_t, unsigned long)
-- AC_DEFINE(SDL_HAS_64BIT_TYPE)
-+ AC_DEFINE(int64_t, signed long,"")
-+ AC_DEFINE(uint64_t, unsigned long,"")
-+ AC_DEFINE(SDL_HAS_64BIT_TYPE,"")
- else
- if test x$ac_cv_sizeof_long_long = x8; then
-- AC_DEFINE(int64_t, signed long long)
-- AC_DEFINE(uint64_t, unsigned long long)
-- AC_DEFINE(SDL_HAS_64BIT_TYPE)
-+ AC_DEFINE(int64_t, signed long long,"")
-+ AC_DEFINE(uint64_t, unsigned long long,"")
-+ AC_DEFINE(SDL_HAS_64BIT_TYPE,"")
- fi
- fi
-- AC_DEFINE(size_t, unsigned int)
-- AC_DEFINE(uintptr_t, unsigned long)
-+ AC_DEFINE(size_t, unsigned int,"")
-+ AC_DEFINE(uintptr_t, unsigned long,"")
- fi
-
- # Standard C sources
-@@ -201,67 +201,67 @@
- AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]),
- , enable_audio=yes)
- if test x$enable_audio != xyes; then
-- AC_DEFINE(SDL_AUDIO_DISABLED)
-+ AC_DEFINE(SDL_AUDIO_DISABLED,1,"")
- fi
- AC_ARG_ENABLE(video,
- AC_HELP_STRING([--enable-video], [Enable the video subsystem [[default=yes]]]),
- , enable_video=yes)
- if test x$enable_video != xyes; then
-- AC_DEFINE(SDL_VIDEO_DISABLED)
-+ AC_DEFINE(SDL_VIDEO_DISABLED,1,"")
- fi
- AC_ARG_ENABLE(events,
- AC_HELP_STRING([--enable-events], [Enable the events subsystem [[default=yes]]]),
- , enable_events=yes)
- if test x$enable_events != xyes; then
-- AC_DEFINE(SDL_EVENTS_DISABLED)
-+ AC_DEFINE(SDL_EVENTS_DISABLED,1,"")
- fi
- AC_ARG_ENABLE(joystick,
- AC_HELP_STRING([--enable-joystick], [Enable the joystick subsystem [[default=yes]]]),
- , enable_joystick=yes)
- if test x$enable_joystick != xyes; then
-- AC_DEFINE(SDL_JOYSTICK_DISABLED)
-+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"")
- fi
- AC_ARG_ENABLE(cdrom,
- AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),
- , enable_cdrom=yes)
- if test x$enable_cdrom != xyes; then
-- AC_DEFINE(SDL_CDROM_DISABLED)
-+ AC_DEFINE(SDL_CDROM_DISABLED,1,"")
- fi
- AC_ARG_ENABLE(threads,
- AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]),
- , enable_threads=yes)
- if test x$enable_threads != xyes; then
-- AC_DEFINE(SDL_THREADS_DISABLED)
-+ AC_DEFINE(SDL_THREADS_DISABLED,1,"")
- fi
- AC_ARG_ENABLE(timers,
- AC_HELP_STRING([--enable-timers], [Enable the timer subsystem [[default=yes]]]),
- , enable_timers=yes)
- if test x$enable_timers != xyes; then
-- AC_DEFINE(SDL_TIMERS_DISABLED)
-+ AC_DEFINE(SDL_TIMERS_DISABLED,1,"")
- fi
- AC_ARG_ENABLE(file,
- AC_HELP_STRING([--enable-file], [Enable the file subsystem [[default=yes]]]),
- , enable_file=yes)
- if test x$enable_file != xyes; then
-- AC_DEFINE(SDL_FILE_DISABLED)
-+ AC_DEFINE(SDL_FILE_DISABLED,1,"")
- fi
- AC_ARG_ENABLE(loadso,
- AC_HELP_STRING([--enable-loadso], [Enable the shared object loading subsystem [[default=yes]]]),
- , enable_loadso=yes)
- if test x$enable_loadso != xyes; then
-- AC_DEFINE(SDL_LOADSO_DISABLED)
-+ AC_DEFINE(SDL_LOADSO_DISABLED,1,"")
- fi
- AC_ARG_ENABLE(cpuinfo,
- AC_HELP_STRING([--enable-cpuinfo], [Enable the cpuinfo subsystem [[default=yes]]]),
- , enable_cpuinfo=yes)
- if test x$enable_cpuinfo != xyes; then
-- AC_DEFINE(SDL_CPUINFO_DISABLED)
-+ AC_DEFINE(SDL_CPUINFO_DISABLED,1,"")
- fi
- AC_ARG_ENABLE(assembly,
- AC_HELP_STRING([--enable-assembly], [Enable assembly routines [[default=yes]]]),
- , enable_assembly=yes)
- if test x$enable_assembly = xyes; then
-- AC_DEFINE(SDL_ASSEMBLY_ROUTINES)
-+ AC_DEFINE(SDL_ASSEMBLY_ROUTINES,1,"")
- fi
-
- dnl See if the OSS audio interface is supported
-@@ -289,12 +289,12 @@
- int arg = SNDCTL_DSP_SETFRAGMENT;
- ],[
- have_oss=yes
-- AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H,1,"")
- ])
- fi
- AC_MSG_RESULT($have_oss)
- if test x$have_oss = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_OSS)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_OSS,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c"
- SOURCES="$SOURCES $srcdir/src/audio/dma/*.c"
- have_audio=yes
-@@ -314,45 +314,7 @@
- AC_ARG_ENABLE(alsa,
- AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]),
- , enable_alsa=yes)
-- if test x$enable_audio = xyes -a x$enable_alsa = xyes; then
-- AM_PATH_ALSA(0.9.0, have_alsa=yes, have_alsa=no)
-- # Restore all flags from before the ALSA detection runs
-- CFLAGS="$alsa_save_CFLAGS"
-- LDFLAGS="$alsa_save_LDFLAGS"
-- LIBS="$alsa_save_LIBS"
-- if test x$have_alsa = xyes; then
-- AC_ARG_ENABLE(alsa-shared,
--AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
-- , enable_alsa_shared=yes)
-- if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
-- if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
-- ALSA_LIBS="-L/lib $ALSA_LIBS"
-- elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
-- ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
-- elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
-- ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
-- fi
-- fi
-- alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
-- alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
-- echo "-- $alsa_lib_spec -> $alsa_lib"
--
-- AC_DEFINE(SDL_AUDIO_DRIVER_ALSA)
-- SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
-- EXTRA_CFLAGS="$EXTRA_CFLAGS $ALSA_CFLAGS"
-- if test x$have_loadso != xyes && \
-- test x$enable_alsa_shared = xyes; then
-- AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ALSA loading])
-- fi
-- if test x$have_loadso = xyes && \
-- test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
-- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib")
-- else
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS"
-- fi
-- have_audio=yes
-- fi
-- fi
-+ enable_alsa=no
- }
-
- dnl Check whether we want to use IRIX 6.5+ native audio or not
-@@ -371,7 +333,7 @@
- AC_MSG_RESULT($have_dmedia)
- # Set up files for the audio library
- if test x$have_dmedia = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio"
- have_audio=yes
-@@ -408,7 +370,7 @@
- AC_MSG_RESULT($have_mme)
- # Set up files for the audio library
- if test x$have_mme = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/mme/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS"
-@@ -433,7 +395,7 @@
- esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
- echo "-- $esd_lib_spec -> $esd_lib"
-
-- AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_ESD,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS"
- if test x$have_loadso != xyes && \
-@@ -442,7 +404,7 @@
- fi
- if test x$have_loadso = xyes && \
- test x$enable_esd_shared = xyes && test x$esd_lib != x; then
-- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib")
-+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", "")
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS"
- fi
-@@ -485,7 +447,7 @@
- arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
- echo "-- $arts_lib_spec -> $arts_lib"
-
-- AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_ARTS,, "")
- SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS"
- if test x$have_loadso != xyes && \
-@@ -494,7 +456,7 @@
- fi
- if test x$have_loadso = xyes && \
- test x$enable_arts_shared = xyes && test x$arts_lib != x; then
-- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib")
-+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib",1,"")
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS"
- fi
-@@ -527,7 +489,7 @@
- fi
- AC_MSG_RESULT($have_nas)
- if test x$have_nas = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_NAS)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_NAS,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/nas/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS"
-@@ -543,7 +505,7 @@
- AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]),
- , enable_diskaudio=yes)
- if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_DISK)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_DISK,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/disk/*.c"
- fi
- }
-@@ -555,7 +517,7 @@
- AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]),
- , enable_dummyaudio=yes)
- if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c"
- fi
- }
-@@ -571,7 +533,7 @@
- AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes)
- if test x$have_mint_falcon_hdr = xyes; then
- mintaudio=yes
-- AC_DEFINE(SDL_AUDIO_DRIVER_MINT)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_MINT,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/mint/*.c"
- SOURCES="$SOURCES $srcdir/src/audio/mint/*.S"
- have_audio=yes
-@@ -602,7 +564,7 @@
- AC_PATH_PROG(NASM, nasm)
- fi
- if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
-- AC_DEFINE(SDL_HERMES_BLITTERS)
-+ AC_DEFINE(SDL_HERMES_BLITTERS,1,"")
- SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
- if test x"$NASMFLAGS" = x; then
- case $ARCH in
-@@ -713,9 +675,9 @@
- CFLAGS="$save_CFLAGS"
-
- if test x$have_gcc_altivec = xyes; then
-- AC_DEFINE(SDL_ALTIVEC_BLITTERS)
-+ AC_DEFINE(SDL_ALTIVEC_BLITTERS,1,"")
- if test x$have_altivec_h_hdr = xyes; then
-- AC_DEFINE(HAVE_ALTIVEC_H)
-+ AC_DEFINE(HAVE_ALTIVEC_H,1,"")
- fi
- EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS"
- fi
-@@ -758,7 +720,7 @@
-
- if test x$enable_ipod = xyes; then
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
-- AC_DEFINE(SDL_VIDEO_DRIVER_IPOD)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_IPOD,1,"")
- SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
- fi
- }
-@@ -792,7 +754,7 @@
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB"
- fi
-
-- AC_DEFINE(SDL_VIDEO_DRIVER_NANOX)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_NANOX,1,"")
- SOURCES="$SOURCES $srcdir/src/video/nanox/*.c"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X"
- have_video=yes
-@@ -881,7 +843,7 @@
- CFLAGS="$CFLAGS $X_CFLAGS"
- LDFLAGS="$LDFLAGS $X_LIBS"
-
-- AC_DEFINE(SDL_VIDEO_DRIVER_X11)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11,1,"")
- SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS"
-
-@@ -903,8 +865,8 @@
- test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then
- echo "-- dynamic libX11 -> $x11_lib"
- echo "-- dynamic libX11ext -> $x11ext_lib"
-- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib")
-- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib")
-+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib","")
-+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib","")
- else
- enable_x11_shared=no
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext"
-@@ -921,20 +883,20 @@
- AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]),
- , enable_video_dga=yes)
- if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_DGA)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_DGA,1,"")
- SOURCES="$SOURCES $srcdir/src/video/dga/*.c"
- fi
- AC_ARG_ENABLE(video-x11-dgamouse,
- AC_HELP_STRING([--enable-video-x11-dgamouse], [use X11 DGA for mouse events [[default=yes]]]),
- , enable_video_x11_dgamouse=yes)
- if test x$enable_dga = xyes -a x$enable_video_x11_dgamouse = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE,1,"")
- fi
- AC_ARG_ENABLE(video-x11-vm,
- AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[default=yes]]]),
- , enable_video_x11_vm=yes)
- if test x$enable_video_x11_vm = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE,1,"")
- SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
- fi
- AC_ARG_ENABLE(video-x11-xv,
-@@ -948,14 +910,14 @@
- AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),
- , enable_video_x11_xinerama=yes)
- if test x$enable_video_x11_xinerama = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA,1,"")
- SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c"
- fi
- AC_ARG_ENABLE(video-x11-xme,
- AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]),
- , enable_video_x11_xme=yes)
- if test x$enable_video_x11_xme = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME,1,"")
- SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c"
- fi
- AC_ARG_ENABLE(video-x11-xrandr,
-@@ -972,8 +934,8 @@
- if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then
- echo "-- dynamic libXrender -> $xrender_lib"
- echo "-- dynamic libXrandr -> $xrandr_lib"
-- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib")
-- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib")
-+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib","")
-+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib","")
- definitely_enable_video_x11_xrandr=yes
- else
- AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes)
-@@ -986,7 +948,7 @@
- fi
- fi
- if test x$definitely_enable_video_x11_xrandr = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR,1,"")
- fi
- AC_ARG_ENABLE(video-x11-dpms,
- AC_HELP_STRING([--enable-video-x11-dpms], [enable X11 DPMS extension [[default=yes]]]),
-@@ -998,7 +960,7 @@
- [#include <X11/Xlib.h>
- ])
- if test x$have_dpms_h_hdr = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_X11_DPMS)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_DPMS,1,"")
- fi
- fi
- fi
-@@ -1026,7 +988,7 @@
- ])
- AC_MSG_RESULT($video_photon)
- if test x$video_photon = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON,1,"")
- SOURCES="$SOURCES $srcdir/src/video/photon/*.c"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph"
- have_video=yes
-@@ -1040,7 +1002,7 @@
- CheckBWINDOW()
- {
- if test x$enable_video = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW,1,"")
- SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc"
- have_video=yes
- fi
-@@ -1063,7 +1025,7 @@
- ])
- AC_MSG_RESULT($have_carbon)
- if test x$have_carbon = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX,1,"")
- SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c"
- SOURCES="$SOURCES $srcdir/src/video/macrom/*.c"
- have_video=yes
-@@ -1092,7 +1054,7 @@
- AC_MSG_RESULT($have_cocoa)
- CFLAGS="$save_CFLAGS"
- if test x$have_cocoa = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ,1,"")
- SOURCES="$SOURCES $srcdir/src/video/quartz/*.m"
- have_video=yes
- fi
-@@ -1118,7 +1080,7 @@
- ])
- AC_MSG_RESULT($video_fbcon)
- if test x$video_fbcon = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_FBCON)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_FBCON,1,"")
- SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c"
- have_video=yes
- fi
-@@ -1163,7 +1125,7 @@
- fi
-
- if test x$video_directfb = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB,1,"")
- SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"
-@@ -1190,7 +1152,7 @@
- ])
- AC_MSG_RESULT($video_ps2gs)
- if test x$video_ps2gs = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS,1,"")
- SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c"
- have_video=yes
- fi
-@@ -1215,7 +1177,7 @@
- ])
- AC_MSG_RESULT($video_ggi)
- if test x$video_ggi = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_GGI)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_GGI,1,"")
- SOURCES="$SOURCES $srcdir/src/video/ggi/*.c"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg"
- have_video=yes
-@@ -1245,7 +1207,7 @@
- ])
- AC_MSG_RESULT($video_svga)
- if test x$video_svga = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB,1,"")
- SOURCES="$SOURCES $srcdir/src/video/svga/*.c"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga"
- have_video=yes
-@@ -1277,7 +1239,7 @@
- ])
- AC_MSG_RESULT($video_vgl)
- if test x$video_vgl = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_VGL)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_VGL,1,"")
- SOURCES="$SOURCES $srcdir/src/video/vgl/*.c"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl"
- have_video=yes
-@@ -1305,7 +1267,7 @@
- ])
- AC_MSG_RESULT($video_wscons)
- if test x$video_wscons = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS,1,"")
- SOURCES="$SOURCES $srcdir/src/video/wscons/*.c"
- have_video=yes
- fi
-@@ -1330,7 +1292,7 @@
- ])
- AC_MSG_RESULT($video_aalib)
- if test x$video_aalib = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_AALIB)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_AALIB,1,"")
- SOURCES="$SOURCES $srcdir/src/video/aalib/*.c"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa"
- have_video=yes
-@@ -1360,7 +1322,7 @@
- CXXFLAGS="$OLD_CXX"
- AC_MSG_RESULT($video_qtopia)
- if test x$video_qtopia = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA,1,"")
- SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc"
- SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $QTOPIA_FLAGS"
-@@ -1389,7 +1351,7 @@
- ])
- AC_MSG_RESULT($video_picogui)
- if test x$video_picogui = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI,1,"")
- SOURCES="$SOURCES $srcdir/src/video/picogui/*.c"
- SDL_LIBS="$SDL_LIBS -lpgui"
- have_video=yes
-@@ -1413,7 +1375,7 @@
- video_xbios=no
- if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then
- video_xbios=yes
-- AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS,1,"")
- SOURCES="$SOURCES $srcdir/src/video/xbios/*.c"
- have_video=yes
- fi
-@@ -1431,7 +1393,7 @@
- AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes)
- if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then
- video_gem=yes
-- AC_DEFINE(SDL_VIDEO_DRIVER_GEM)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_GEM,1,"")
- SOURCES="$SOURCES $srcdir/src/video/gem/*.c"
- SDL_LIBS="$SDL_LIBS -lgem"
- have_video=yes
-@@ -1446,7 +1408,7 @@
- AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]),
- , enable_video_dummy=yes)
- if test x$enable_video_dummy = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY,1,"")
- SOURCES="$SOURCES $srcdir/src/video/dummy/*.c"
- have_video=yes
- fi
-@@ -1472,8 +1434,8 @@
- ])
- AC_MSG_RESULT($video_opengl)
- if test x$video_opengl = xyes; then
-- AC_DEFINE(SDL_VIDEO_OPENGL)
-- AC_DEFINE(SDL_VIDEO_OPENGL_GLX)
-+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
-+ AC_DEFINE(SDL_VIDEO_OPENGL_GLX,1,"")
- fi
- fi
- }
-@@ -1492,7 +1454,7 @@
- ])
- AC_MSG_RESULT($video_opengl)
- if test x$video_opengl = xyes; then
-- AC_DEFINE(SDL_VIDEO_OPENGL)
-+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
- fi
- fi
-@@ -1502,8 +1464,8 @@
- CheckWIN32GL()
- {
- if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
-- AC_DEFINE(SDL_VIDEO_OPENGL)
-- AC_DEFINE(SDL_VIDEO_OPENGL_WGL)
-+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
-+ AC_DEFINE(SDL_VIDEO_OPENGL_WGL,1,"")
- fi
- }
-
-@@ -1511,7 +1473,7 @@
- CheckBeGL()
- {
- if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
-- AC_DEFINE(SDL_VIDEO_OPENGL)
-+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL"
- fi
- }
-@@ -1520,7 +1482,7 @@
- CheckMacGL()
- {
- if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
-- AC_DEFINE(SDL_VIDEO_OPENGL)
-+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
- case "$host" in
- *-*-darwin*)
- if test x$enable_video_cocoa = xyes; then
-@@ -1552,8 +1514,8 @@
- OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags`
- OSMESA_LIBS=`$OSMESA_CONFIG --libs`
- fi
-- AC_DEFINE(SDL_VIDEO_OPENGL)
-- AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA)
-+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"")
-+ AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA,1,"")
- SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS"
- SDL_LIBS="$SDL_LIBS $OSMESA_LIBS"
-
-@@ -1563,7 +1525,7 @@
- if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then
- # Dynamic linking
- if test "x$have_osmesa_hdr" = "xyes"; then
-- AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC)
-+ AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC,1,"")
- fi
- fi
- fi
-@@ -1590,7 +1552,7 @@
- ])
- AC_MSG_RESULT($use_input_events)
- if test x$use_input_events = xyes; then
-- AC_DEFINE(SDL_INPUT_LINUXEV)
-+ AC_DEFINE(SDL_INPUT_LINUXEV,1,"")
- fi
- fi
- }
-@@ -1612,7 +1574,7 @@
- ])
- AC_MSG_RESULT($enable_input_tslib)
- if test x$enable_input_tslib = xyes; then
-- AC_DEFINE(SDL_INPUT_TSLIB)
-+ AC_DEFINE(SDL_INPUT_TSLIB,1,"")
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts"
- fi
- fi
-@@ -1635,7 +1597,7 @@
- AC_MSG_CHECKING(pth)
- AC_MSG_RESULT($use_pth)
- if test "x$use_pth" = xyes; then
-- AC_DEFINE(SDL_THREAD_PTH)
-+ AC_DEFINE(SDL_THREAD_PTH,1,"")
- SOURCES="$SOURCES $srcdir/src/thread/pth/*.c"
- SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c"
- SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`"
-@@ -1741,7 +1703,7 @@
-
- # Do futher testing if we have pthread support...
- if test x$use_pthreads = xyes; then
-- AC_DEFINE(SDL_THREAD_PTHREAD)
-+ AC_DEFINE(SDL_THREAD_PTHREAD,1,"")
- EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib"
- SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags"
-@@ -1763,7 +1725,7 @@
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- ],[
- has_recursive_mutexes=yes
-- AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX)
-+ AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX,1,"")
- ])
- fi
- if test x$has_recursive_mutexes = xno; then
-@@ -1774,7 +1736,7 @@
- pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
- ],[
- has_recursive_mutexes=yes
-- AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP)
-+ AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP,1,"")
- ])
- fi
- AC_MSG_RESULT($has_recursive_mutexes)
-@@ -1849,7 +1811,7 @@
- fi
-
- if test x$enable_video = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB,1,"")
- SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c"
- SOURCES="$SOURCES $srcdir/src/video/windib/*.c"
- have_video=yes
-@@ -1871,7 +1833,7 @@
- have_directx=yes
- fi
- if test x$enable_video = xyes -a x$have_directx = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW,1,"")
- SOURCES="$SOURCES $srcdir/src/video/windx5/*.c"
- have_video=yes
- fi
-@@ -1904,9 +1866,9 @@
- AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl")))
- AC_CHECK_LIB(dl, dlvsym, have_dlvsym=yes)
- if test x$have_dlvsym = xyes; then
-- AC_DEFINE(HAVE_DLVSYM)
-+ AC_DEFINE(HAVE_DLVSYM,1,"")
- fi
-- AC_DEFINE(SDL_LOADSO_DLOPEN)
-+ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"")
- SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
- have_loadso=yes
- fi
-@@ -1923,7 +1885,7 @@
- AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes)
- AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem)
- if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then
-- AC_DEFINE(SDL_LOADSO_LDG)
-+ AC_DEFINE(SDL_LOADSO_LDG,1,"")
- SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c"
- SDL_LIBS="$SDL_LIBS -lldg -lgem"
- have_loadso=yes
-@@ -2049,11 +2011,11 @@
- have_machine_joystick=yes
- ])
- if test x$have_machine_joystick = xyes; then
-- AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H)
-+ AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H,1,"")
- fi
- AC_MSG_RESULT($have_machine_joystick)
-
-- AC_DEFINE(SDL_JOYSTICK_USBHID)
-+ AC_DEFINE(SDL_JOYSTICK_USBHID,1,"")
- SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS"
-@@ -2072,7 +2034,7 @@
- if test x$enable_clock_gettime = xyes; then
- AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes)
- if test x$have_clock_gettime = xyes; then
-- AC_DEFINE(HAVE_CLOCK_GETTIME)
-+ AC_DEFINE(HAVE_CLOCK_GETTIME,1,"")
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt"
- fi
- fi
-@@ -2103,7 +2065,7 @@
- CheckIPod
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
-- AC_DEFINE(SDL_TIMER_UNIX)
-+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
- SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
- have_timers=yes
- fi
-@@ -2166,17 +2128,17 @@
- if test x$enable_audio = xyes; then
- case $ARCH in
- sysv5|solaris|hpux)
-- AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
- have_audio=yes
- ;;
- netbsd|openbsd)
-- AC_DEFINE(SDL_AUDIO_DRIVER_BSD)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_BSD,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/bsd/*.c"
- have_audio=yes
- ;;
- aix)
-- AC_DEFINE(SDL_AUDIO_DRIVER_PAUD)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_PAUD,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c"
- have_audio=yes
- ;;
-@@ -2186,7 +2148,7 @@
- if test x$enable_joystick = xyes; then
- case $ARCH in
- linux)
-- AC_DEFINE(SDL_JOYSTICK_LINUX)
-+ AC_DEFINE(SDL_JOYSTICK_LINUX,1,"")
- SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c"
- have_joystick=yes
- ;;
-@@ -2196,32 +2158,32 @@
- if test x$enable_cdrom = xyes; then
- case $ARCH in
- linux|solaris)
-- AC_DEFINE(SDL_CDROM_LINUX)
-+ AC_DEFINE(SDL_CDROM_LINUX,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/linux/*.c"
- have_cdrom=yes
- ;;
- *freebsd*)
-- AC_DEFINE(SDL_CDROM_FREEBSD)
-+ AC_DEFINE(SDL_CDROM_FREEBSD,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/freebsd/*.c"
- have_cdrom=yes
- ;;
- *openbsd*|*netbsd*)
-- AC_DEFINE(SDL_CDROM_OPENBSD)
-+ AC_DEFINE(SDL_CDROM_OPENBSD,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/openbsd/*.c"
- have_cdrom=yes
- ;;
- bsdi)
-- AC_DEFINE(SDL_CDROM_BSDI)
-+ AC_DEFINE(SDL_CDROM_BSDI,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/bsdi/*.c"
- have_cdrom=yes
- ;;
- aix)
-- AC_DEFINE(SDL_CDROM_AIX)
-+ AC_DEFINE(SDL_CDROM_AIX,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/aix/*.c"
- have_cdrom=yes
- ;;
- osf)
-- AC_DEFINE(SDL_CDROM_OSF)
-+ AC_DEFINE(SDL_CDROM_OSF,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c"
- have_cdrom=yes
- ;;
-@@ -2229,7 +2191,7 @@
- fi
- # Set up files for the thread library
- if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
-- AC_DEFINE(SDL_THREAD_SPROC)
-+ AC_DEFINE(SDL_THREAD_SPROC,1,"")
- SOURCES="$SOURCES $srcdir/src/thread/irix/*.c"
- SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
- SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
-@@ -2237,7 +2199,7 @@
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
-- AC_DEFINE(SDL_TIMER_UNIX)
-+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
- SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
- have_timers=yes
- fi
-@@ -2256,20 +2218,20 @@
- CheckPTHREAD
- # Set up files for the audio library
- if test x$enable_audio = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/nto/*.c"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound"
- have_audio=yes
- fi
- # Set up files for the cdrom library
- if test x$enable_cdrom = xyes; then
-- AC_DEFINE(SDL_CDROM_QNX)
-+ AC_DEFINE(SDL_CDROM_QNX,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/qnx/*.c"
- have_cdrom=yes
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
-- AC_DEFINE(SDL_TIMER_UNIX)
-+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
- SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
- have_timers=yes
- fi
-@@ -2294,29 +2256,29 @@
- CheckNASM
- # Set up files for the audio library
- if test x$enable_audio = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/windib/*.c"
- if test x$have_directx = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c"
- fi
- have_audio=yes
- fi
- # Set up files for the joystick library
- if test x$enable_joystick = xyes; then
-- AC_DEFINE(SDL_JOYSTICK_WINMM)
-+ AC_DEFINE(SDL_JOYSTICK_WINMM,1,"")
- SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c"
- have_joystick=yes
- fi
- # Set up files for the cdrom library
- if test x$enable_cdrom = xyes; then
-- AC_DEFINE(SDL_CDROM_WIN32)
-+ AC_DEFINE(SDL_CDROM_WIN32,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/win32/*.c"
- have_cdrom=yes
- fi
- # Set up files for the thread library
- if test x$enable_threads = xyes; then
-- AC_DEFINE(SDL_THREAD_WIN32)
-+ AC_DEFINE(SDL_THREAD_WIN32,1,"")
- SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c"
- SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c"
- SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c"
-@@ -2325,13 +2287,13 @@
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
-- AC_DEFINE(SDL_TIMER_WIN32)
-+ AC_DEFINE(SDL_TIMER_WIN32,1,"")
- SOURCES="$SOURCES $srcdir/src/timer/win32/*.c"
- have_timers=yes
- fi
- # Set up files for the shared object loading library
- if test x$enable_loadso = xyes; then
-- AC_DEFINE(SDL_LOADSO_WIN32)
-+ AC_DEFINE(SDL_LOADSO_WIN32,1,"")
- SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c"
- have_loadso=yes
- fi
-@@ -2356,25 +2318,25 @@
- CheckBeGL
- # Set up files for the audio library
- if test x$enable_audio = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/baudio/*.cc"
- have_audio=yes
- fi
- # Set up files for the joystick library
- if test x$enable_joystick = xyes; then
-- AC_DEFINE(SDL_JOYSTICK_BEOS)
-+ AC_DEFINE(SDL_JOYSTICK_BEOS,1,"")
- SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc"
- have_joystick=yes
- fi
- # Set up files for the cdrom library
- if test x$enable_cdrom = xyes; then
-- AC_DEFINE(SDL_CDROM_BEOS)
-+ AC_DEFINE(SDL_CDROM_BEOS,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/beos/*.cc"
- have_cdrom=yes
- fi
- # Set up files for the thread library
- if test x$enable_threads = xyes; then
-- AC_DEFINE(SDL_THREAD_BEOS)
-+ AC_DEFINE(SDL_THREAD_BEOS,1,"")
- SOURCES="$SOURCES $srcdir/src/thread/beos/*.c"
- SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c"
- SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c"
-@@ -2382,13 +2344,13 @@
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
-- AC_DEFINE(SDL_TIMER_BEOS)
-+ AC_DEFINE(SDL_TIMER_BEOS,1,"")
- SOURCES="$SOURCES $srcdir/src/timer/beos/*.c"
- have_timers=yes
- fi
- # Set up files for the shared object loading library
- if test x$enable_loadso = xyes; then
-- AC_DEFINE(SDL_LOADSO_BEOS)
-+ AC_DEFINE(SDL_LOADSO_BEOS,1,"")
- SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
- have_loadso=yes
- fi
-@@ -2425,7 +2387,7 @@
- # Set up files for the shared object loading library
- # (this needs to be done before the dynamic X11 check)
- if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then
-- AC_DEFINE(SDL_LOADSO_DLCOMPAT)
-+ AC_DEFINE(SDL_LOADSO_DLCOMPAT,1,"")
- SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
- have_loadso=yes
- fi
-@@ -2443,28 +2405,28 @@
-
- # Set up files for the audio library
- if test x$enable_audio = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c"
-- AC_DEFINE(SDL_AUDIO_DRIVER_SNDMGR)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_SNDMGR,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/macrom/*.c"
- have_audio=yes
- fi
- # Set up files for the joystick library
- if test x$enable_joystick = xyes; then
-- AC_DEFINE(SDL_JOYSTICK_IOKIT)
-+ AC_DEFINE(SDL_JOYSTICK_IOKIT,1,"")
- SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
- have_joystick=yes
- fi
- # Set up files for the cdrom library
- if test x$enable_cdrom = xyes; then
-- AC_DEFINE(SDL_CDROM_MACOSX)
-+ AC_DEFINE(SDL_CDROM_MACOSX,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/macosx/*.c"
- have_cdrom=yes
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
-- AC_DEFINE(SDL_TIMER_UNIX)
-+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
- SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
- have_timers=yes
- fi
-@@ -2500,30 +2462,30 @@
- # Set up files for the audio library
- if test x$enable_threads = xyes -a x$enable_pth = xyes; then
- if test x$enable_audio = xyes; then
-- AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO)
-+ AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"")
- SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
- have_audio=yes
- fi
- fi
- # Set up files for the joystick library
- if test x$enable_joystick = xyes; then
-- AC_DEFINE(SDL_JOYSTICK_MINT)
-+ AC_DEFINE(SDL_JOYSTICK_MINT,1,"")
- SOURCES="$SOURCES $srcdir/src/joystick/mint/*.c"
- have_joystick=yes
- fi
- # Set up files for the cdrom library
- if test x$enable_cdrom = xyes; then
-- AC_DEFINE(SDL_CDROM_MINT)
-+ AC_DEFINE(SDL_CDROM_MINT,1,"")
- SOURCES="$SOURCES $srcdir/src/cdrom/mint/*.c"
- have_cdrom=yes
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
- if test x$enable_threads = xyes -a x$enable_pth = xyes; then
-- AC_DEFINE(SDL_TIMER_UNIX)
-+ AC_DEFINE(SDL_TIMER_UNIX,1,"")
- SOURCES="$SOURCES $srcdir/src/timer/unix/*.c"
- else
-- AC_DEFINE(SDL_TIMER_MINT)
-+ AC_DEFINE(SDL_TIMER_MIN,1,""T)
- SOURCES="$SOURCES $srcdir/src/timer/mint/*.c"
- SOURCES="$SOURCES $srcdir/src/timer/mint/*.S"
- fi
-@@ -2536,20 +2498,20 @@
- CheckPTHREAD
- # Set up files for the video library
- if test x$enable_video = xyes; then
-- AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS)
-+ AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS,1,"")
- SOURCES="$SOURCES $srcdir/src/video/riscos/*.c"
- SOURCES="$SOURCES $srcdir/src/video/riscos/*.S"
- have_video=yes
- fi
- # Set up files for the joystick library
- if test x$enable_joystick = xyes; then
-- AC_DEFINE(SDL_JOYSTICK_RISCOS)
-+ AC_DEFINE(SDL_JOYSTICK_RISCOS,1,"")
- SOURCES="$SOURCES $srcdir/src/joystick/riscos/*.c"
- have_joystick=yes
- fi
- # Set up files for the timer library
- if test x$enable_timers = xyes; then
-- AC_DEFINE(SDL_TIMER_RISCOS)
-+ AC_DEFINE(SDL_TIMER_RISCOS,1,"")
- SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c"
- have_timers=yes
- fi
-@@ -2566,31 +2528,31 @@
- # Verify that we have all the platform specific files we need
- if test x$have_joystick != xyes; then
- if test x$enable_joystick = xyes; then
-- AC_DEFINE(SDL_JOYSTICK_DISABLED)
-+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"")
- fi
- SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c"
- fi
- if test x$have_cdrom != xyes; then
- if test x$enable_cdrom = xyes; then
-- AC_DEFINE(SDL_CDROM_DISABLED)
-+ AC_DEFINE(SDL_CDROM_DISABLED,1,"")
- fi
- SOURCES="$SOURCES $srcdir/src/cdrom/dummy/*.c"
- fi
- if test x$have_threads != xyes; then
- if test x$enable_threads = xyes; then
-- AC_DEFINE(SDL_THREADS_DISABLED)
-+ AC_DEFINE(SDL_THREADS_DISABLED,1,"")
- fi
- SOURCES="$SOURCES $srcdir/src/thread/generic/*.c"
- fi
- if test x$have_timers != xyes; then
- if test x$enable_timers = xyes; then
-- AC_DEFINE(SDL_TIMERS_DISABLED)
-+ AC_DEFINE(SDL_TIMERS_DISABLED,1,"")
- fi
- SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c"
- fi
- if test x$have_loadso != xyes; then
- if test x$enable_loadso = xyes; then
-- AC_DEFINE(SDL_LOADSO_DISABLED)
-+ AC_DEFINE(SDL_LOADSO_DISABLED,1,"")
- fi
- SOURCES="$SOURCES $srcdir/src/loadso/dummy/*.c"
- fi
diff --git a/meta/packages/libsdl/files/directfb_obsolete_calls.patch b/meta/packages/libsdl/files/directfb_obsolete_calls.patch
deleted file mode 100644
index f3f422cde..000000000
--- a/meta/packages/libsdl/files/directfb_obsolete_calls.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_DirectFB_video.c 2007-02-18 11:40:38.000000000 -0500
-+++ SDL/src/video/directfb/SDL_DirectFB_video.c 2007-02-18 11:00:07.000000000 -0500
-@@ -376,7 +376,7 @@
- {
- int i;
- DFBResult ret;
-- DFBCardCapabilities caps;
-+ DFBGraphicsDeviceDescription caps;
- DFBDisplayLayerConfig dlc;
- struct DirectFBEnumRect *rect;
- IDirectFB *dfb = NULL;
-@@ -448,7 +448,7 @@
-
-
- /* Query card capabilities to get the video memory size */
-- dfb->GetCardCapabilities (dfb, &caps);
-+ dfb->GetDeviceDescription (dfb, &caps);
-
- this->info.wm_available = 1;
- this->info.hw_available = 1;
-diff -u'rNF^function' tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_Direct
-/SDL_DirectFB_events.c
---- tmp/work/armv5te-angstrom-linux-gnueabi/libsdl-directfb-1.2.9-r1/SDL-1.2.9/src/video/directfb/SDL_DirectFB_events.c 2004-0
-+++ SDL/src/video/directfb/SDL_DirectFB_events.c 2007-02-18 11:00:07.000000000 -0500
-@@ -161,7 +161,7 @@
- keymap[DIKI_SHIFT_L - DIKI_UNKNOWN] = SDLK_LSHIFT;
- keymap[DIKI_SHIFT_R - DIKI_UNKNOWN] = SDLK_RSHIFT;
- keymap[DIKI_ALT_L - DIKI_UNKNOWN] = SDLK_LALT;
-- keymap[DIKI_ALTGR - DIKI_UNKNOWN] = SDLK_RALT;
-+ keymap[DIKI_ALT_R - DIKI_UNKNOWN] = SDLK_RALT;
- keymap[DIKI_TAB - DIKI_UNKNOWN] = SDLK_TAB;
- keymap[DIKI_ENTER - DIKI_UNKNOWN] = SDLK_RETURN;
- keymap[DIKI_SPACE - DIKI_UNKNOWN] = SDLK_SPACE;
diff --git a/meta/packages/libsdl/files/extra-keys.patch b/meta/packages/libsdl/files/extra-keys.patch
deleted file mode 100644
index f12f0c7ef..000000000
--- a/meta/packages/libsdl/files/extra-keys.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -upr --exclude=configure --exclude=Makefile --exclude=Makefile.in libsdl1.2-1.2.4/include/SDL_keysym.h libsdl1.2-1.2.4-arm/include/SDL_keysym.h
---- libsdl1.2-1.2.4/include/SDL_keysym.h 2002-03-06 11:23:01.000000000 +0000
-+++ libsdl1.2-1.2.4-arm/include/SDL_keysym.h 2002-11-08 20:43:09.000000000 +0000
-@@ -286,6 +286,12 @@ typedef enum {
- SDLK_EURO = 321, /* Some european keyboards */
- SDLK_UNDO = 322, /* Atari keyboard has Undo */
-
-+ SDLK_RECORD = 322,
-+ SDLK_CALENDAR = 323,
-+ SDLK_TELEPHONE = 324,
-+ SDLK_MAIL = 325,
-+ SDLK_START = 326,
-+
- /* Add any other keys here */
-
- SDLK_LAST
-diff -upr --exclude=configure --exclude=Makefile --exclude=Makefile.in libsdl1.2-1.2.4/src/video/x11/SDL_x11events.c libsdl1.2-1.2.4-arm/src/video/x11/SDL_x11events.c
---- libsdl1.2-1.2.4/src/video/x11/SDL_x11events.c 2002-03-06 11:23:08.000000000 +0000
-+++ libsdl1.2-1.2.4-arm/src/video/x11/SDL_x11events.c 2002-11-08 21:01:41.000000000 +0000
-@@ -34,6 +34,7 @@ static char rcsid =
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/keysym.h>
-+#include <X11/XF86keysym.h>
- #ifdef __SVR4
- #include <X11/Sunkeysym.h>
- #endif
-@@ -655,6 +656,25 @@ SDL_keysym *X11_TranslateKey(Display *di
- case 0xFF:
- keysym->sym = MISC_keymap[xsym&0xFF];
- break;
-+ case 0x1008ff:
-+ switch (xsym) {
-+ case XF86XK_AudioRecord:
-+ keysym->sym = SDLK_RECORD;
-+ break;
-+ case XF86XK_PowerDown:
-+ keysym->sym = SDLK_POWER;
-+ break;
-+ case XF86XK_Calendar:
-+ keysym->sym = SDLK_CALENDAR;
-+ break;
-+ case XF86XK_Mail:
-+ keysym->sym = SDLK_MAIL;
-+ break;
-+ case XF86XK_Start:
-+ keysym->sym = SDLK_START;
-+ break;
-+ }
-+ break;
- default:
- fprintf(stderr,
- "X11: Unknown xsym, sym = 0x%04x\n",
diff --git a/meta/packages/libsdl/files/kernel-asm-page.patch b/meta/packages/libsdl/files/kernel-asm-page.patch
deleted file mode 100644
index 42bceadfd..000000000
--- a/meta/packages/libsdl/files/kernel-asm-page.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c
-index 4e3d662..de38a3c 100644
---- a/src/video/Xext/Xxf86dga/XF86DGA.c
-+++ b/src/video/Xext/Xxf86dga/XF86DGA.c
-@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
- #define HAS_MMAP_ANON
- #include <sys/types.h>
- #include <sys/mman.h>
--#include <asm/page.h> /* PAGE_SIZE */
-+#include <unistd.h>
- #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
- #define HAS_GETPAGESIZE
- #endif /* linux */