drop SDL(1)

This commit is contained in:
Stefan Saraev 2015-04-03 11:56:36 +03:00
parent c899f74e84
commit 7193fb68f9
10 changed files with 0 additions and 431 deletions

View File

@ -312,7 +312,6 @@ show_config() {
config_message="$config_message\n - XORG Composite support:\t\t $COMPOSITE_SUPPORT"
config_message="$config_message\n - WindowManager:\t\t\t $WINDOWMANAGER"
fi
config_message="$config_message\n - SDL support:\t\t\t\t $SDL_SUPPORT"
config_message="$config_message\n - OpenGL (GLX) support (provider):\t $OPENGL_SUPPORT ($OPENGL)"
config_message="$config_message\n - OpenGLES support (provider):\t\t $OPENGLES_SUPPORT ($OPENGLES)"
config_message="$config_message\n - uvesafb support:\t\t\t $UVESAFB_SUPPORT"

View File

@ -1,9 +1,3 @@
if [ "$DISPLAYSERVER" = "x11" ]; then
SDL_SUPPORT="yes"
else
SDL_SUPPORT="no"
fi
if [ "$OPENGL" = no ]; then
OPENGL_SUPPORT="no"
else
@ -16,10 +10,6 @@ else
OPENGLES_SUPPORT="yes"
fi
if [ "$SDL_SUPPORT" = no ]; then
JOYSTICK_SUPPORT="no"
fi
if [ "$OPENGL_SUPPORT" = no ]; then
KODI_SCR_RSXS="no"
KODI_VIS_PROJECTM="no"

View File

@ -1,212 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="SDL"
PKG_VERSION="1.2.15"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.libsdl.org/"
PKG_URL="http://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_HOST="yasm:host"
PKG_DEPENDS_TARGET="toolchain yasm:host alsa-lib"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="libsdl: A cross-platform Graphic API"
PKG_LONGDESC="Simple DirectMedia Layer is a cross-platform multimedia library designed to provide fast access to the graphics framebuffer and audio device. It is used by MPEG playback software, emulators, and many popular games, including the award winning Linux port of 'Civilization: Call To Power.' Simple DirectMedia Layer supports Linux, Win32, BeOS, MacOS, Solaris, IRIX, and FreeBSD."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
PKG_CONFIGURE_OPTS_HOST="--enable-rpath \
--enable-libc \
--disable-audio \
--disable-events \
--disable-joystick \
--disable-cdrom \
--enable-threads \
--enable-timers \
--enable-file \
--enable-loadso \
--enable-cpuinfo \
--enable-assembly \
--disable-oss \
--disable-alsa \
--disable-alsatest \
--disable-alsa-shared \
--disable-esd \
--disable-esdtest \
--disable-esd-shared \
--disable-pulseaudio \
--disable-pulseaudio-shared \
--disable-arts \
--disable-arts-shared \
--disable-nas \
--disable-diskaudio \
--disable-dummyaudio \
--disable-mintaudio \
--disable-nasm \
--disable-altivec \
--disable-ipod \
--disable-video \
--disable-x11-shared \
--disable-video-x11-dgamouse \
--disable-video-x11-xinerama \
--disable-video-x11-xme \
--disable-video-x11-xrandr \
--disable-video-x11 \
--disable-video-x11-vm \
--disable-video-x11-xv \
--without-x \
--disable-video-opengl \
--disable-video-nanox \
--disable-nanox-debug \
--disable-nanox-share-memory \
--disable-nanox-direct-fb \
--disable-dga \
--disable-video-dga \
--disable-video-photon \
--disable-video-carbon \
--disable-video-cocoa \
--disable-video-fbcon \
--disable-video-directfb \
--disable-video-ps2gs \
--disable-video-ggi \
--disable-video-svga \
--disable-video-vgl \
--disable-video-wscons \
--disable-video-aalib \
--disable-video-qtopia \
--disable-video-picogui \
--disable-video-dummy \
--disable-osmesa-shared \
--disable-input-events \
--disable-input-tslib \
--disable-pth \
--enable-pthreads \
--enable-pthread-sem \
--disable-stdio-redirect \
--disable-directx \
--enable-sdl-dlopen \
--disable-atari-ldg \
--disable-clock_gettime"
PKG_CONFIGURE_OPTS_TARGET="--disable-rpath \
--enable-libc \
--enable-audio \
--enable-events \
--enable-joystick \
--enable-cdrom \
--enable-threads \
--enable-timers \
--enable-file \
--enable-loadso \
--enable-cpuinfo \
--enable-assembly \
--disable-oss \
--enable-alsa \
--disable-alsatest \
--enable-alsa-shared \
--with-alsa-prefix=$SYSROOT_PREFIX/usr/lib \
--with-alsa-inc-prefix=$SYSROOT_PREFIX/usr/include \
--disable-esd \
--disable-esdtest \
--disable-esd-shared \
--disable-arts \
--disable-arts-shared \
--disable-nas \
--disable-diskaudio \
--disable-dummyaudio \
--disable-mintaudio \
--disable-nasm \
--disable-altivec \
--disable-ipod \
--disable-video-nanox \
--disable-nanox-debug \
--disable-nanox-share-memory \
--disable-nanox-direct-fb \
--disable-dga \
--disable-video-dga \
--disable-video-photon \
--disable-video-carbon \
--disable-video-cocoa \
--disable-video-fbcon \
--disable-video-directfb \
--disable-video-ps2gs \
--disable-video-ggi \
--disable-video-svga \
--disable-video-vgl \
--disable-video-wscons \
--disable-video-aalib \
--disable-video-qtopia \
--disable-video-picogui \
--disable-video-dummy \
--disable-osmesa-shared \
--enable-input-events \
--disable-input-tslib \
--disable-pth \
--enable-pthreads \
--enable-pthread-sem \
--disable-stdio-redirect \
--disable-directx \
--enable-sdl-dlopen \
--disable-atari-ldg \
--disable-clock_gettime"
if [ "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXrandr"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-video --enable-x11-shared --disable-video-x11-dgamouse"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-xinerama --disable-video-x11-xme"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-video-x11-xrandr --enable-video-x11"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-vm --disable-video-x11-xv --with-x"
else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video --disable-x11-shared --disable-video-x11-dgamouse"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-xinerama --disable-video-x11-xme"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-xrandr --disable-video-x11"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-x11-vm --disable-video-x11-xv --without-x"
fi
if [ ! "$OPENGL" = "no" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL glu"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-video-opengl"
else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-video-opengl"
fi
pre_configure_host() {
( cd $ROOT/$PKG_BUILD
# Skip autoheader because there is a problem with AC_DEFINE's in the configure.in in SDL 1.2.14.
# Added include directory 'acinclude' because SDL 1.2.14 has no Makefile.am in which to specify it.
AUTOHEADER=true autoreconf --verbose --install --force -I $SYSROOT_PREFIX/usr/share/aclocal -I acinclude
)
}
pre_configure_target() {
# todo: hack
pre_configure_host
}
post_makeinstall_target() {
mkdir -p $ROOT/$TOOLCHAIN/bin
cp $SYSROOT_PREFIX/usr/bin/sdl-config $ROOT/$TOOLCHAIN/bin
$SED "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $SYSROOT_PREFIX/usr/bin/sdl-config
rm -rf $INSTALL/usr/bin
}

View File

@ -1,13 +0,0 @@
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index ee43974..80e46e4 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
++joystick->nbuttons;
}
}
- for ( i=0; i<ABS_MISC; ++i ) {
+ for ( i=0; i<ABS_MAX; ++i ) {
/* Skip hats */
if ( i == ABS_HAT0X ) {
i = ABS_HAT3Y;

View File

@ -1,11 +0,0 @@
diff -Naur SDL-1.2.14-old/configure.in SDL-1.2.14-new/configure.in
--- SDL-1.2.14-old/configure.in 2009-10-17 10:35:03.000000000 -0700
+++ SDL-1.2.14-new/configure.in 2010-08-17 16:42:33.000000000 -0700
@@ -3,6 +3,7 @@
AC_CONFIG_HEADER(include/SDL_config.h)
AC_GNU_SOURCE
AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
+AC_CONFIG_MACRO_DIR([acinclude])
dnl Set various version strings - taken gratefully from the GTk sources
#

View File

@ -1,10 +0,0 @@
--- a/src/events/SDL_keyboard.c 2013-11-09 11:30:21.828161683 +0100
+++ b/src/events/SDL_keyboard.c 2013-11-09 11:30:54.284183206 +0100
@@ -417,6 +417,7 @@
keysym->mod = (SDLMod)modstate;
switch (keysym->sym) {
case SDLK_UNKNOWN:
+ repeatable = 1;
break;
case SDLK_NUMLOCK:
modstate ^= KMOD_NUM;

View File

@ -1,59 +0,0 @@
# HG changeset patch
# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
# Date 1370184533 -21600
# Node ID 91ad7b43317a6387e115ecdf63a49137f47e42c8
# Parent f7fd5c3951b9ed922fdf696f7182e71b58a13268
Fix compilation with libX11 >= 1.5.99.902.
These changes fixes bug #1769 for SDL 1.2
(http://bugzilla.libsdl.org/show_bug.cgi?id=1769).
diff -r f7fd5c3951b9 -r 91ad7b43317a configure.in
--- a/configure.in Wed Apr 17 00:56:53 2013 -0700
+++ b/configure.in Sun Jun 02 20:48:53 2013 +0600
@@ -1169,6 +1169,17 @@
if test x$definitely_enable_video_x11_xrandr = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
fi
+ AC_MSG_CHECKING(for const parameter to _XData32)
+ have_const_param_xdata32=no
+ AC_TRY_COMPILE([
+ #include <X11/Xlibint.h>
+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
+ ],[
+ ],[
+ have_const_param_xdata32=yes
+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
+ ])
+ AC_MSG_RESULT($have_const_param_xdata32)
fi
fi
}
diff -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in
--- a/include/SDL_config.h.in Wed Apr 17 00:56:53 2013 -0700
+++ b/include/SDL_config.h.in Sun Jun 02 20:48:53 2013 +0600
@@ -283,6 +283,7 @@
#undef SDL_VIDEO_DRIVER_WINDIB
#undef SDL_VIDEO_DRIVER_WSCONS
#undef SDL_VIDEO_DRIVER_X11
+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
#undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
diff -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h
--- a/src/video/x11/SDL_x11sym.h Wed Apr 17 00:56:53 2013 -0700
+++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:48:53 2013 +0600
@@ -165,7 +165,11 @@
*/
#ifdef LONG64
SDL_X11_MODULE(IO_32BIT)
+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+#else
SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
+#endif
SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
#endif

View File

@ -1,32 +0,0 @@
# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1255169641 0
# Node ID 8ec3036098dfd648a492a4a9e2c692c309188239
# Parent f2f8525e60c21beefa8956e43a07ea2f5c12bc33
Adapted from Debian patch: 320_activate_xrandr_on_default.diff
diff -r f2f8525e60c2 -r 8ec3036098df src/video/x11/SDL_x11modes.c
--- a/src/video/x11/SDL_x11modes.c Sat Oct 10 10:10:36 2009 +0000
+++ b/src/video/x11/SDL_x11modes.c Sat Oct 10 10:14:01 2009 +0000
@@ -421,11 +421,16 @@
return 0;
}
- /* This defaults off now, due to KDE window maximize problems */
- if ( !env ) {
+ /* This used to default off, due to KDE window maximize problems */
+ /* Reactivated since I haven't encountered such problems with KDE, but if
+ one does encounter such problems he/she can just set
+ SDL_VIDEO_X11_XRANDR to 0
+ Closes Debian bug: #450689
+ */
+/* if ( !env ) {
return 0;
}
-
+*/
if ( !SDL_X11_HAVE_XRANDR ) {
return 0;
}

View File

@ -1,13 +0,0 @@
diff -up SDL-1.2.13/include/SDL_stdinc.h~ SDL-1.2.13/include/SDL_stdinc.h
--- SDL-1.2.13/include/SDL_stdinc.h~ 2007-12-31 05:48:36.000000000 +0100
+++ SDL-1.2.13/include/SDL_stdinc.h 2009-02-13 11:01:34.000000000 +0100
@@ -320,7 +320,7 @@ do { \
#define SDL_memcpy4(dst, src, len) SDL_memcpy(dst, src, (len) << 2)
#endif
-#if defined(__GNUC__) && defined(i386)
+#if 0
#define SDL_revcpy(dst, src, len) \
do { \
int u0, u1, u2; \

View File

@ -1,70 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="SDL_image"
PKG_VERSION="1.2.12"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.libsdl.org/"
PKG_URL="http://www.libsdl.org/projects/SDL_image/release/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_HOST="SDL:host libpng:host libjpeg-turbo:host"
PKG_DEPENDS_TARGET="toolchain SDL libjpeg-turbo libpng tiff"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="libsdl_image: A cross-platform Graphic API"
PKG_LONGDESC="SDL_image is an image loading library that is used with the SDL library, and almost as portable. It allows a programmer to use multiple image formats without having to code all the loading and conversion algorithms themselves."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_HOST="--disable-bmp \
--disable-gif \
--enable-jpg \
--disable-jpg-shared \
--disable-lbm \
--disable-pcx \
--enable-png \
--disable-png-shared \
--disable-pnm \
--disable-tga \
--disable-tif \
--disable-tif-shared \
--disable-webp \
--disable-webp-shared \
--disable-xcf \
--disable-xpm \
--disable-xv \
--with-sdl-prefix=$ROOT/$TOOLCHAIN"
PKG_CONFIGURE_OPTS_TARGET="--enable-bmp \
--enable-gif \
--enable-jpg \
--disable-jpg-shared \
--disable-lbm \
--enable-pcx \
--enable-png \
--disable-png-shared \
--enable-pnm \
--enable-tga \
--enable-tif \
--disable-tif-shared \
--enable-xcf \
--enable-xpm \
--enable-xv \
--with-sdl-prefix=$SYSROOT_PREFIX/usr"