diff options
Diffstat (limited to 'package/sdl')
| -rw-r--r-- | package/sdl/Makefile | 19 | ||||
| -rw-r--r-- | package/sdl/patches/patch-build-scripts_ltmain_sh | 11 | ||||
| -rw-r--r-- | package/sdl/patches/patch-include_SDL_config_h | 311 | ||||
| -rw-r--r-- | package/sdl/patches/patch-sdl-config_in | 16 | ||||
| -rw-r--r-- | package/sdl/patches/patch-sdl_pc_in | 10 |
5 files changed, 359 insertions, 8 deletions
diff --git a/package/sdl/Makefile b/package/sdl/Makefile index 9fb10463a..277be34b7 100644 --- a/package/sdl/Makefile +++ b/package/sdl/Makefile @@ -9,11 +9,16 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e52086d1b508fa0b76c52ee30b55bec4 PKG_DESCR:= Simple DirectMedia Layer PKG_SECTION:= libs -PKG_DEPENDS:= libusb alsa-lib libpthread tslib -PKG_BUILDDEP:= libusb alsa-lib tslib +PKG_DEPENDS:= libusb alsa-lib libpthread libx11 libxext +PKG_BUILDDEP:= libusb alsa-lib libX11 libXext PKG_URL:= http://www.libsdl.org/ PKG_SITES:= http://www.libsdl.org/release/ +PKG_FLAVOURS_LIBSDL:= WITH_TSLIB +PKGFD_WITH_TSLIB:= SDL with touchscreen support +PKGFS_WITH_TSLIB:= tslib +PKGFB_WITH_TSLIB:= tslib + PKG_SUBPKGS:= LIBSDL LIBSDL_DEV PKGSD_LIBSDL_DEV:= development files for libsdl PKGSC_LIBSDL_DEV:= devel @@ -26,20 +31,18 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSDL,libsdl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBSDL_DEV,libsdl-dev,$(PKG_VERSION)-${PKG_RELEASE},libsdl,${PKGSD_LIBSDL_DEV},${PKGSC_LIBSDL_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_DEV}+= libsdl-dev-install - +ifeq ($(ADK_PACKAGE_SDL_WITH_TSLIB),y) +CONFIGURE_ARGS+= --enable-input-tslib +endif CONFIGURE_ARGS+= --disable-esd \ --disable-oss \ --enable-alsa \ --enable-video-fbcon \ --disable-video-directfb \ --disable-video-opengl \ - --enable-input-tslib \ --with-x -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: $(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib $(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL)/usr/lib diff --git a/package/sdl/patches/patch-build-scripts_ltmain_sh b/package/sdl/patches/patch-build-scripts_ltmain_sh new file mode 100644 index 000000000..c2f950420 --- /dev/null +++ b/package/sdl/patches/patch-build-scripts_ltmain_sh @@ -0,0 +1,11 @@ +--- SDL-1.2.14.orig/build-scripts/ltmain.sh 2009-10-13 01:07:12.000000000 +0200 ++++ SDL-1.2.14/build-scripts/ltmain.sh 2011-01-14 23:31:20.000000000 +0100 +@@ -4766,7 +4766,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" diff --git a/package/sdl/patches/patch-include_SDL_config_h b/package/sdl/patches/patch-include_SDL_config_h new file mode 100644 index 000000000..371f7199f --- /dev/null +++ b/package/sdl/patches/patch-include_SDL_config_h @@ -0,0 +1,311 @@ +--- SDL-1.2.14.orig/include/SDL_config.h 2009-10-19 13:51:07.000000000 +0200 ++++ SDL-1.2.14/include/SDL_config.h 2011-01-12 11:57:30.000000000 +0100 +@@ -1,3 +1,4 @@ ++/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */ + /* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2009 Sam Lantinga +@@ -23,23 +24,288 @@ + #ifndef _SDL_config_h + #define _SDL_config_h + ++/* This is a set of defines to configure the SDL features */ ++ ++/* General platform specific identifiers */ + #include "SDL_platform.h" + +-/* Add any platform that doesn't build using the configure system */ +-#if defined(__DREAMCAST__) +-#include "SDL_config_dreamcast.h" +-#elif defined(__MACOS__) +-#include "SDL_config_macos.h" +-#elif defined(__MACOSX__) +-#include "SDL_config_macosx.h" +-#elif defined(__SYMBIAN32__) +-#include "SDL_config_symbian.h" /* must be before win32! */ +-#elif defined(__WIN32__) +-#include "SDL_config_win32.h" +-#elif defined(__OS2__) +-#include "SDL_config_os2.h" ++/* Make sure that this isn't included by Visual C++ */ ++#ifdef _MSC_VER ++#error You should copy include/SDL_config.h.default to include/SDL_config.h ++#endif ++ ++/* C language features */ ++/* #undef const */ ++/* #undef inline */ ++/* #undef volatile */ ++ ++/* C datatypes */ ++/* #undef size_t */ ++/* #undef int8_t */ ++/* #undef uint8_t */ ++/* #undef int16_t */ ++/* #undef uint16_t */ ++/* #undef int32_t */ ++/* #undef uint32_t */ ++/* #undef int64_t */ ++/* #undef uint64_t */ ++/* #undef uintptr_t */ ++#define SDL_HAS_64BIT_TYPE 1 ++ ++/* Endianness */ ++#define SDL_BYTEORDER 1234 ++ ++/* Comment this if you want to build without any C library requirements */ ++#define HAVE_LIBC 1 ++#if HAVE_LIBC ++ ++/* Useful headers */ ++#define HAVE_ALLOCA_H 1 ++#define HAVE_SYS_TYPES_H 1 ++#define HAVE_STDIO_H 1 ++#define STDC_HEADERS 1 ++#define HAVE_STDLIB_H 1 ++#define HAVE_STDARG_H 1 ++#define HAVE_MALLOC_H 1 ++#define HAVE_MEMORY_H 1 ++#define HAVE_STRING_H 1 ++#define HAVE_STRINGS_H 1 ++#define HAVE_INTTYPES_H 1 ++#define HAVE_STDINT_H 1 ++#define HAVE_CTYPE_H 1 ++#define HAVE_MATH_H 1 ++#define HAVE_ICONV_H 1 ++#define HAVE_SIGNAL_H 1 ++/* #undef HAVE_ALTIVEC_H */ ++ ++/* C library functions */ ++#define HAVE_MALLOC 1 ++#define HAVE_CALLOC 1 ++#define HAVE_REALLOC 1 ++#define HAVE_FREE 1 ++#define HAVE_ALLOCA 1 ++#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ ++#define HAVE_GETENV 1 ++#define HAVE_PUTENV 1 ++#define HAVE_UNSETENV 1 ++#endif ++#define HAVE_QSORT 1 ++#define HAVE_ABS 1 ++#define HAVE_BCOPY 1 ++#define HAVE_MEMSET 1 ++#define HAVE_MEMCPY 1 ++#define HAVE_MEMMOVE 1 ++/* #undef HAVE_MEMCMP */ ++#define HAVE_STRLEN 1 ++#define HAVE_STRLCPY 1 ++#define HAVE_STRLCAT 1 ++#define HAVE_STRDUP 1 ++/* #undef HAVE__STRREV */ ++/* #undef HAVE__STRUPR */ ++/* #undef HAVE__STRLWR */ ++/* #undef HAVE_INDEX */ ++/* #undef HAVE_RINDEX */ ++#define HAVE_STRCHR 1 ++#define HAVE_STRRCHR 1 ++#define HAVE_STRSTR 1 ++/* #undef HAVE_ITOA */ ++/* #undef HAVE__LTOA */ ++/* #undef HAVE__UITOA */ ++/* #undef HAVE__ULTOA */ ++#define HAVE_STRTOL 1 ++#define HAVE_STRTOUL 1 ++/* #undef HAVE__I64TOA */ ++/* #undef HAVE__UI64TOA */ ++#define HAVE_STRTOLL 1 ++#define HAVE_STRTOULL 1 ++/* #undef HAVE_STRTOD */ ++#define HAVE_ATOI 1 ++#define HAVE_ATOF 1 ++#define HAVE_STRCMP 1 ++#define HAVE_STRNCMP 1 ++/* #undef HAVE__STRICMP */ ++#define HAVE_STRCASECMP 1 ++/* #undef HAVE__STRNICMP */ ++#define HAVE_STRNCASECMP 1 ++#define HAVE_SSCANF 1 ++#define HAVE_SNPRINTF 1 ++#define HAVE_VSNPRINTF 1 ++/* #undef HAVE_ICONV */ ++#define HAVE_SIGACTION 1 ++#define HAVE_SETJMP 1 ++#define HAVE_NANOSLEEP 1 ++/* #undef HAVE_CLOCK_GETTIME */ ++#define HAVE_GETPAGESIZE 1 ++#define HAVE_MPROTECT 1 ++ + #else +-#include "SDL_config_minimal.h" +-#endif /* platform config */ ++/* We may need some replacement for stdarg.h here */ ++#include <stdarg.h> ++#endif /* HAVE_LIBC */ ++ ++/* Allow disabling of core subsystems */ ++/* #undef SDL_AUDIO_DISABLED */ ++/* #undef SDL_CDROM_DISABLED */ ++/* #undef SDL_CPUINFO_DISABLED */ ++/* #undef SDL_EVENTS_DISABLED */ ++/* #undef SDL_FILE_DISABLED */ ++/* #undef SDL_JOYSTICK_DISABLED */ ++/* #undef SDL_LOADSO_DISABLED */ ++/* #undef SDL_THREADS_DISABLED */ ++/* #undef SDL_TIMERS_DISABLED */ ++/* #undef SDL_VIDEO_DISABLED */ ++ ++/* Enable various audio drivers */ ++#define SDL_AUDIO_DRIVER_ALSA 1 ++#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2" ++/* #undef SDL_AUDIO_DRIVER_ARTS */ ++/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_BAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_BSD */ ++/* #undef SDL_AUDIO_DRIVER_COREAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_DART */ ++/* #undef SDL_AUDIO_DRIVER_DC */ ++#define SDL_AUDIO_DRIVER_DISK 1 ++#define SDL_AUDIO_DRIVER_DUMMY 1 ++/* #undef SDL_AUDIO_DRIVER_DMEDIA */ ++/* #undef SDL_AUDIO_DRIVER_DSOUND */ ++/* #undef SDL_AUDIO_DRIVER_PULSE */ ++/* #undef SDL_AUDIO_DRIVER_PULSE_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_ESD */ ++/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_MINT */ ++/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_NAS */ ++/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */ ++/* #undef SDL_AUDIO_DRIVER_OSS */ ++/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */ ++/* #undef SDL_AUDIO_DRIVER_PAUD */ ++/* #undef SDL_AUDIO_DRIVER_QNXNTO */ ++/* #undef SDL_AUDIO_DRIVER_SNDMGR */ ++/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */ ++/* #undef SDL_AUDIO_DRIVER_WAVEOUT */ ++ ++/* Enable various cdrom drivers */ ++/* #undef SDL_CDROM_AIX */ ++/* #undef SDL_CDROM_BEOS */ ++/* #undef SDL_CDROM_BSDI */ ++/* #undef SDL_CDROM_DC */ ++/* #undef SDL_CDROM_DUMMY */ ++/* #undef SDL_CDROM_FREEBSD */ ++#define SDL_CDROM_LINUX 1 ++/* #undef SDL_CDROM_MACOS */ ++/* #undef SDL_CDROM_MACOSX */ ++/* #undef SDL_CDROM_MINT */ ++/* #undef SDL_CDROM_OPENBSD */ ++/* #undef SDL_CDROM_OS2 */ ++/* #undef SDL_CDROM_OSF */ ++/* #undef SDL_CDROM_QNX */ ++/* #undef SDL_CDROM_WIN32 */ ++ ++/* Enable various input drivers */ ++#define SDL_INPUT_LINUXEV 1 ++#define SDL_INPUT_TSLIB 1 ++/* #undef SDL_JOYSTICK_BEOS */ ++/* #undef SDL_JOYSTICK_DC */ ++/* #undef SDL_JOYSTICK_DUMMY */ ++/* #undef SDL_JOYSTICK_IOKIT */ ++#define SDL_JOYSTICK_LINUX 1 ++/* #undef SDL_JOYSTICK_MACOS */ ++/* #undef SDL_JOYSTICK_MINT */ ++/* #undef SDL_JOYSTICK_OS2 */ ++/* #undef SDL_JOYSTICK_RISCOS */ ++/* #undef SDL_JOYSTICK_WINMM */ ++/* #undef SDL_JOYSTICK_USBHID */ ++/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */ ++ ++/* Enable various shared object loading systems */ ++/* #undef SDL_LOADSO_BEOS */ ++/* #undef SDL_LOADSO_DLCOMPAT */ ++#define SDL_LOADSO_DLOPEN 1 ++/* #undef SDL_LOADSO_DUMMY */ ++/* #undef SDL_LOADSO_LDG */ ++/* #undef SDL_LOADSO_MACOS */ ++/* #undef SDL_LOADSO_OS2 */ ++/* #undef SDL_LOADSO_WIN32 */ ++ ++/* Enable various threading systems */ ++/* #undef SDL_THREAD_BEOS */ ++/* #undef SDL_THREAD_DC */ ++/* #undef SDL_THREAD_OS2 */ ++/* #undef SDL_THREAD_PTH */ ++#define SDL_THREAD_PTHREAD 1 ++#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 ++/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */ ++/* #undef SDL_THREAD_SPROC */ ++/* #undef SDL_THREAD_WIN32 */ ++ ++/* Enable various timer systems */ ++/* #undef SDL_TIMER_BEOS */ ++/* #undef SDL_TIMER_DC */ ++/* #undef SDL_TIMER_DUMMY */ ++/* #undef SDL_TIMER_MACOS */ ++/* #undef SDL_TIMER_MINT */ ++/* #undef SDL_TIMER_OS2 */ ++/* #undef SDL_TIMER_RISCOS */ ++#define SDL_TIMER_UNIX 1 ++/* #undef SDL_TIMER_WIN32 */ ++/* #undef SDL_TIMER_WINCE */ ++ ++/* Enable various video drivers */ ++/* #undef SDL_VIDEO_DRIVER_AALIB */ ++/* #undef SDL_VIDEO_DRIVER_BWINDOW */ ++/* #undef SDL_VIDEO_DRIVER_CACA */ ++/* #undef SDL_VIDEO_DRIVER_DC */ ++/* #undef SDL_VIDEO_DRIVER_DDRAW */ ++#define SDL_VIDEO_DRIVER_DGA 1 ++/* #undef SDL_VIDEO_DRIVER_DIRECTFB */ ++/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */ ++#define SDL_VIDEO_DRIVER_DUMMY 1 ++#define SDL_VIDEO_DRIVER_FBCON 1 ++/* #undef SDL_VIDEO_DRIVER_GAPI */ ++/* #undef SDL_VIDEO_DRIVER_GEM */ ++/* #undef SDL_VIDEO_DRIVER_GGI */ ++/* #undef SDL_VIDEO_DRIVER_IPOD */ ++/* #undef SDL_VIDEO_DRIVER_NANOX */ ++/* #undef SDL_VIDEO_DRIVER_OS2FS */ ++/* #undef SDL_VIDEO_DRIVER_PHOTON */ ++/* #undef SDL_VIDEO_DRIVER_PICOGUI */ ++/* #undef SDL_VIDEO_DRIVER_PS2GS */ ++/* #undef SDL_VIDEO_DRIVER_PS3 */ ++/* #undef SDL_VIDEO_DRIVER_QTOPIA */ ++/* #undef SDL_VIDEO_DRIVER_QUARTZ */ ++/* #undef SDL_VIDEO_DRIVER_RISCOS */ ++/* #undef SDL_VIDEO_DRIVER_SVGALIB */ ++/* #undef SDL_VIDEO_DRIVER_TOOLBOX */ ++/* #undef SDL_VIDEO_DRIVER_VGL */ ++/* #undef SDL_VIDEO_DRIVER_WINDIB */ ++/* #undef SDL_VIDEO_DRIVER_WSCONS */ ++#define SDL_VIDEO_DRIVER_X11 1 ++#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1 ++#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6" ++#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6" ++/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR */ ++/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER */ ++#define SDL_VIDEO_DRIVER_X11_VIDMODE 1 ++#define SDL_VIDEO_DRIVER_X11_XINERAMA 1 ++#define SDL_VIDEO_DRIVER_X11_XME 1 ++/* #undef SDL_VIDEO_DRIVER_X11_XRANDR */ ++#define SDL_VIDEO_DRIVER_X11_XV 1 ++/* #undef SDL_VIDEO_DRIVER_XBIOS */ ++ ++/* Enable OpenGL support */ ++/* #undef SDL_VIDEO_OPENGL */ ++/* #undef SDL_VIDEO_OPENGL_GLX */ ++/* #undef SDL_VIDEO_OPENGL_WGL */ ++/* #undef SDL_VIDEO_OPENGL_OSMESA */ ++/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */ ++ ++/* Disable screensaver */ ++#define SDL_VIDEO_DISABLE_SCREENSAVER 1 ++ ++/* Enable assembly routines */ ++#define SDL_ASSEMBLY_ROUTINES 1 ++#define SDL_HERMES_BLITTERS 1 ++/* #undef SDL_ALTIVEC_BLITTERS */ + + #endif /* _SDL_config_h */ diff --git a/package/sdl/patches/patch-sdl-config_in b/package/sdl/patches/patch-sdl-config_in new file mode 100644 index 000000000..4d3de58ed --- /dev/null +++ b/package/sdl/patches/patch-sdl-config_in @@ -0,0 +1,16 @@ +--- SDL-1.2.14.orig/sdl-config.in 2009-10-13 01:07:20.000000000 +0200 ++++ SDL-1.2.14/sdl-config.in 2011-01-12 21:46:41.000000000 +0100 +@@ -45,11 +45,11 @@ while test $# -gt 0; do + echo -I@includedir@/SDL @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) +-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ ++@ENABLE_SHARED_TRUE@ echo @SDL_LIBS@ + @ENABLE_SHARED_TRUE@ ;; + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) +-@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ ++@ENABLE_STATIC_TRUE@ echo @SDL_STATIC_LIBS@ + @ENABLE_STATIC_TRUE@ ;; + *) + echo "${usage}" 1>&2 diff --git a/package/sdl/patches/patch-sdl_pc_in b/package/sdl/patches/patch-sdl_pc_in new file mode 100644 index 000000000..fd0ae8d52 --- /dev/null +++ b/package/sdl/patches/patch-sdl_pc_in @@ -0,0 +1,10 @@ +--- SDL-1.2.14.orig/sdl.pc.in 2009-10-13 01:07:20.000000000 +0200 ++++ SDL-1.2.14/sdl.pc.in 2011-01-12 21:54:44.000000000 +0100 +@@ -10,6 +10,6 @@ Description: Simple DirectMedia Layer is + Version: @SDL_VERSION@ + Requires: + Conflicts: +-Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ ++Libs: @SDL_LIBS@ + Libs.private: @SDL_STATIC_LIBS@ + Cflags: -I${includedir}/SDL @SDL_CFLAGS@ |