diff --git a/x11-packages/sdl/SDL-1.2.15_configure.patch b/x11-packages/sdl/SDL-1.2.15_configure.patch new file mode 100644 index 000000000..963f87850 --- /dev/null +++ b/x11-packages/sdl/SDL-1.2.15_configure.patch @@ -0,0 +1,33 @@ +diff -uNr SDL-1.2.15/configure SDL-1.2.15.mod/configure +--- SDL-1.2.15/configure 2012-01-19 08:30:12.000000000 +0200 ++++ SDL-1.2.15.mod/configure 2018-10-26 23:22:05.229411961 +0300 +@@ -20265,10 +20265,9 @@ + LDFLAGS="$LDFLAGS $ALSA_LIBS" + fi + +-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" ++ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl" + LIBS=`echo $LIBS | sed 's/-lm//'` + LIBS=`echo $LIBS | sed 's/-ldl//'` +-LIBS=`echo $LIBS | sed 's/-lpthread//'` + LIBS=`echo $LIBS | sed 's/ //'` + LIBS="$ALSA_LIBS $LIBS" + { echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 +@@ -26923,7 +26922,7 @@ + case "$host" in + *-*-linux*|*-*-uclinux*) + pthread_cflags="-D_REENTRANT" +- pthread_lib="-lpthread" ++ pthread_lib="" + ;; + *-*-bsdi*) + pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" +@@ -26980,7 +26979,7 @@ + ;; + *) + pthread_cflags="-D_REENTRANT" +- pthread_lib="-lpthread" ++ pthread_lib="" + ;; + esac + if test x$enable_threads = xyes -a x$enable_pthreads = xyes -a x$enable_ipod != xyes; then diff --git a/x11-packages/sdl/SDL-1.2.15_src_cdrom_linux_SDL_syscdrom.c.patch b/x11-packages/sdl/SDL-1.2.15_src_cdrom_linux_SDL_syscdrom.c.patch index 0735da577..2d401afb9 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_cdrom_linux_SDL_syscdrom.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_cdrom_linux_SDL_syscdrom.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/cdrom/linux/SDL_syscdrom.c SDL-1.2.15.mod/src/cdrom/linux/SDL_syscdrom.c --- SDL-1.2.15/src/cdrom/linux/SDL_syscdrom.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/cdrom/linux/SDL_syscdrom.c 2017-11-26 00:28:55.341353617 +0200 ++++ SDL-1.2.15.mod/src/cdrom/linux/SDL_syscdrom.c 2018-10-26 23:20:45.205391150 +0300 @@ -68,12 +68,12 @@ #ifdef MNTTAB #define _PATH_MNTTAB MNTTAB diff --git a/x11-packages/sdl/SDL-1.2.15_src_joystick_linux_SDL_sysjoystick.c.patch b/x11-packages/sdl/SDL-1.2.15_src_joystick_linux_SDL_sysjoystick.c.patch index 03e9ac089..932b62d1d 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_joystick_linux_SDL_sysjoystick.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_joystick_linux_SDL_sysjoystick.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/joystick/linux/SDL_sysjoystick.c SDL-1.2.15.mod/src/joystick/linux/SDL_sysjoystick.c --- SDL-1.2.15/src/joystick/linux/SDL_sysjoystick.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/joystick/linux/SDL_sysjoystick.c 2017-11-26 00:27:30.421353677 +0200 ++++ SDL-1.2.15.mod/src/joystick/linux/SDL_sysjoystick.c 2018-10-26 23:20:45.208724512 +0300 @@ -1106,6 +1106,9 @@ } break; diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_SDL_gamma.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_SDL_gamma.c.patch index 5ae496916..2a82ca52d 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_SDL_gamma.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_SDL_gamma.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/SDL_gamma.c SDL-1.2.15.mod/src/video/SDL_gamma.c --- SDL-1.2.15/src/video/SDL_gamma.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/SDL_gamma.c 2017-11-26 00:27:46.551353666 +0200 ++++ SDL-1.2.15.mod/src/video/SDL_gamma.c 2018-10-26 23:20:45.222057960 +0300 @@ -92,22 +92,11 @@ int SDL_SetGamma(float red, float green, float blue) diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_SDL_yuv_sw.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_SDL_yuv_sw.c.patch index e77d12c95..92665f58e 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_SDL_yuv_sw.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_SDL_yuv_sw.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/SDL_yuv_sw.c SDL-1.2.15.mod/src/video/SDL_yuv_sw.c --- SDL-1.2.15/src/video/SDL_yuv_sw.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/SDL_yuv_sw.c 2017-11-26 00:28:05.331353652 +0200 ++++ SDL-1.2.15.mod/src/video/SDL_yuv_sw.c 2018-10-26 23:20:45.225391322 +0300 @@ -89,6 +89,8 @@ #include "SDL_yuvfuncs.h" #include "SDL_yuv_sw_c.h" diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_fbcon_SDL_fbvideo.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_fbcon_SDL_fbvideo.c.patch index 327f17171..5997e053a 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_fbcon_SDL_fbvideo.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_fbcon_SDL_fbvideo.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/fbcon/SDL_fbvideo.c SDL-1.2.15.mod/src/video/fbcon/SDL_fbvideo.c --- SDL-1.2.15/src/video/fbcon/SDL_fbvideo.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/fbcon/SDL_fbvideo.c 2017-12-08 17:33:10.990346779 +0200 ++++ SDL-1.2.15.mod/src/video/fbcon/SDL_fbvideo.c 2018-10-26 23:20:45.212057874 +0300 @@ -27,6 +27,7 @@ #include #include @@ -29,18 +29,6 @@ diff -uNr SDL-1.2.15/src/video/fbcon/SDL_fbvideo.c SDL-1.2.15.mod/src/video/fbco #endif /* FB_TYPE_VGA_PLANES */ /* A list of video resolutions that we query for (sorted largest to smallest) */ -@@ -541,7 +541,7 @@ - case FB_TYPE_VGA_PLANES: - /* VGA16 is supported, but that's it */ - if ( finfo.type_aux == FB_AUX_VGA_PLANES_VGA4 ) { -- if ( ioperm(0x3b4, 0x3df - 0x3b4 + 1, 1) < 0 ) { -+ if ( syscall(__NR_ioperm, 0x3b4, 0x3df - 0x3b4 + 1, 1) < 0 ) { - SDL_SetError("No I/O port permissions"); - FB_VideoQuit(this); - return(-1); -diff -uNr SDL-1.2.15/src/video/fbcon/SDL_fbvideo.c SDL-1.2.15.mod/src/video/fbcon/SDL_fbvideo.c ---- SDL-1.2.15/src/video/fbcon/SDL_fbvideo.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/fbcon/SDL_fbvideo.c 2017-11-26 00:29:03.621353611 +0200 @@ -280,7 +280,7 @@ FB_Available, FB_CreateDevice }; @@ -50,3 +38,12 @@ diff -uNr SDL-1.2.15/src/video/fbcon/SDL_fbvideo.c SDL-1.2.15.mod/src/video/fbco static int read_fbmodes_line(FILE*f, char* line, int length) { +@@ -541,7 +541,7 @@ + case FB_TYPE_VGA_PLANES: + /* VGA16 is supported, but that's it */ + if ( finfo.type_aux == FB_AUX_VGA_PLANES_VGA4 ) { +- if ( ioperm(0x3b4, 0x3df - 0x3b4 + 1, 1) < 0 ) { ++ if ( syscall(__NR_ioperm, 0x3b4, 0x3df - 0x3b4 + 1, 1) < 0 ) { + SDL_SetError("No I/O port permissions"); + FB_VideoQuit(this); + return(-1); diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_ipod_SDL_ipodvideo.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_ipod_SDL_ipodvideo.c.patch index a16ce362b..6f97e6d60 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_ipod_SDL_ipodvideo.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_ipod_SDL_ipodvideo.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/ipod/SDL_ipodvideo.c SDL-1.2.15.mod/src/video/ipod/SDL_ipodvideo.c --- SDL-1.2.15/src/video/ipod/SDL_ipodvideo.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/ipod/SDL_ipodvideo.c 2017-11-26 00:29:07.331353608 +0200 ++++ SDL-1.2.15.mod/src/video/ipod/SDL_ipodvideo.c 2018-10-26 23:20:45.212057874 +0300 @@ -170,7 +170,7 @@ static const char * const vcs[] = { "/dev/vc/%d", "/dev/tty%d", 0 }; int i, tty0_fd; diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_photon_SDL_ph_gl.h.patch b/x11-packages/sdl/SDL-1.2.15_src_video_photon_SDL_ph_gl.h.patch index 23d220bae..4be4ab3e7 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_photon_SDL_ph_gl.h.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_photon_SDL_ph_gl.h.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/photon/SDL_ph_gl.h SDL-1.2.15.mod/src/video/photon/SDL_ph_gl.h --- SDL-1.2.15/src/video/photon/SDL_ph_gl.h 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/photon/SDL_ph_gl.h 2017-11-26 00:30:06.831353565 +0200 ++++ SDL-1.2.15.mod/src/video/photon/SDL_ph_gl.h 2018-10-26 23:20:45.215391237 +0300 @@ -26,7 +26,7 @@ #include "SDL_ph_video.h" diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events.c.patch index ddd4380ad..25fa5e2cc 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/x11/SDL_x11events.c SDL-1.2.15.mod/src/video/x11/SDL_x11events.c --- SDL-1.2.15/src/video/x11/SDL_x11events.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/x11/SDL_x11events.c 2017-11-26 00:28:11.471353648 +0200 ++++ SDL-1.2.15.mod/src/video/x11/SDL_x11events.c 2018-10-26 23:20:45.228724684 +0300 @@ -57,12 +57,6 @@ static SDLKey MISC_keymap[256]; SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events_c.h.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events_c.h.patch index ee1fac3f3..94c001d74 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events_c.h.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11events_c.h.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/x11/SDL_x11events_c.h SDL-1.2.15.mod/src/video/x11/SDL_x11events_c.h --- SDL-1.2.15/src/video/x11/SDL_x11events_c.h 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/x11/SDL_x11events_c.h 2017-11-26 00:27:59.091353657 +0200 ++++ SDL-1.2.15.mod/src/video/x11/SDL_x11events_c.h 2018-10-26 23:20:45.225391322 +0300 @@ -27,8 +27,3 @@ extern void X11_InitOSKeymap(_THIS); extern void X11_PumpEvents(_THIS); diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11gl.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11gl.c.patch index 9912c9cb1..c67995cca 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11gl.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11gl.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/x11/SDL_x11gl.c SDL-1.2.15.mod/src/video/x11/SDL_x11gl.c --- SDL-1.2.15/src/video/x11/SDL_x11gl.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/x11/SDL_x11gl.c 2017-11-26 00:31:13.221353518 +0200 ++++ SDL-1.2.15.mod/src/video/x11/SDL_x11gl.c 2018-10-26 23:20:45.228724684 +0300 @@ -30,7 +30,7 @@ /* IRIX doesn't have a GL library versioning system */ #define DEFAULT_OPENGL "libGL.so" diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11modes.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11modes.c.patch index 53d57bc05..e0b4643f0 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11modes.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11modes.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/x11/SDL_x11modes.c SDL-1.2.15.mod/src/video/x11/SDL_x11modes.c --- SDL-1.2.15/src/video/x11/SDL_x11modes.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/x11/SDL_x11modes.c 2017-11-26 00:30:52.121353533 +0200 ++++ SDL-1.2.15.mod/src/video/x11/SDL_x11modes.c 2018-10-26 23:20:45.232058046 +0300 @@ -458,7 +458,7 @@ if ( SDL_strcmp(ServerVendor(SDL_Display), "Metro Link Incorporated") == 0 ) { FILE *metro_fp; diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11sym.h.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11sym.h.patch index 94f5059e4..2690f1ac0 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11sym.h.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11sym.h.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/x11/SDL_x11sym.h SDL-1.2.15.mod/src/video/x11/SDL_x11sym.h --- SDL-1.2.15/src/video/x11/SDL_x11sym.h 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/x11/SDL_x11sym.h 2017-11-26 00:27:23.321353682 +0200 ++++ SDL-1.2.15.mod/src/video/x11/SDL_x11sym.h 2018-10-26 23:20:45.232058046 +0300 @@ -165,7 +165,7 @@ */ #ifdef LONG64 diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11video.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11video.c.patch index 98ccbae6f..f32ae643f 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11video.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11video.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/x11/SDL_x11video.c SDL-1.2.15.mod/src/video/x11/SDL_x11video.c --- SDL-1.2.15/src/video/x11/SDL_x11video.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/x11/SDL_x11video.c 2017-11-26 00:27:59.101353657 +0200 ++++ SDL-1.2.15.mod/src/video/x11/SDL_x11video.c 2018-10-26 23:20:45.235391408 +0300 @@ -1088,7 +1088,7 @@ } } diff --git a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11wm.c.patch b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11wm.c.patch index 9dc290c82..811f51c8f 100644 --- a/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11wm.c.patch +++ b/x11-packages/sdl/SDL-1.2.15_src_video_x11_SDL_x11wm.c.patch @@ -1,6 +1,6 @@ diff -uNr SDL-1.2.15/src/video/x11/SDL_x11wm.c SDL-1.2.15.mod/src/video/x11/SDL_x11wm.c --- SDL-1.2.15/src/video/x11/SDL_x11wm.c 2012-01-19 08:30:06.000000000 +0200 -+++ SDL-1.2.15.mod/src/video/x11/SDL_x11wm.c 2017-11-26 00:27:08.341353693 +0200 ++++ SDL-1.2.15.mod/src/video/x11/SDL_x11wm.c 2018-10-26 23:20:45.235391408 +0300 @@ -352,13 +352,14 @@ result = XGrabPointer(SDL_Display, SDL_Window, True, 0, GrabModeAsync, GrabModeAsync, diff --git a/x11-packages/sdl/build.sh b/x11-packages/sdl/build.sh index ddebc71fa..16c33e17d 100644 --- a/x11-packages/sdl/build.sh +++ b/x11-packages/sdl/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://www.libsdl.org TERMUX_PKG_DESCRIPTION="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" TERMUX_PKG_VERSION=1.2.15 -TERMUX_PKG_REVISION=12 +TERMUX_PKG_REVISION=13 TERMUX_PKG_SRCURL=https://www.libsdl.org/release/SDL-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00