summaryrefslogtreecommitdiff
path: root/devel/sdl/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/sdl/files')
-rw-r--r--devel/sdl/files/patch-ac55
-rw-r--r--devel/sdl/files/patch-ae82
-rw-r--r--devel/sdl/files/patch-af45
-rw-r--r--devel/sdl/files/patch-an147
-rw-r--r--devel/sdl/files/patch-ao20
5 files changed, 0 insertions, 349 deletions
diff --git a/devel/sdl/files/patch-ac b/devel/sdl/files/patch-ac
deleted file mode 100644
index 3806f37749de..000000000000
--- a/devel/sdl/files/patch-ac
+++ /dev/null
@@ -1,55 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig Sat Mar 4 04:58:00 2000
-+++ configure Fri Mar 30 17:04:33 2001
-@@ -604,9 +604,9 @@
-
- # libtool versioning
- LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
--LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE`
-+LT_CURRENT=$SDL_INTERFACE_AGE
- LT_REVISION=$SDL_INTERFACE_AGE
--LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE`
-+LT_AGE=$SDL_INTERFACE_AGE
-
-
-
-@@ -4279,8 +4279,6 @@
- #include <vga.h>
- #include <vgamouse.h>
- #include <vgakeyboard.h>
-- #include <linux/kd.h>
-- #include <linux/keyboard.h>
-
- int main() {
-
-@@ -4324,7 +4322,7 @@
- ac_save_libs="$LIBS"
- case "$target" in
- *-*-freebsd*)
-- pthread_lib="-lc_r"
-+ pthread_lib="${PTHREAD_LIBS}"
- ;;
- *-*-openbsd*)
- pthread_lib="-lc_r"
-@@ -4364,7 +4362,7 @@
- echo "$ac_t""$use_pthreads" 1>&6
- if test x$use_pthreads = xyes; then
- CFLAGS="$CFLAGS -D_REENTRANT -DSDL_USE_PTHREADS"
-- SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT"
-+ SDL_CFLAGS="$SDL_CFLAGS -D_REENTRANT ${PTHREAD_CFLAGS}"
- SDL_LIBS="$SDL_LIBS $pthread_lib"
- fi
- fi
-@@ -4953,8 +4951,10 @@
- ;;
- *-*-freebsd*)
- ARCH=freebsd
-+ CheckNASM
- CheckESD
- CheckX11
-+ CheckSVGA
- CheckPTHREAD
- # Set up files for the main() stub
-
diff --git a/devel/sdl/files/patch-ae b/devel/sdl/files/patch-ae
deleted file mode 100644
index e879ae7decea..000000000000
--- a/devel/sdl/files/patch-ae
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/thread/SDL_thread.c.orig Fri Mar 3 01:24:35 2000
-+++ src/thread/SDL_thread.c Mon Apr 17 21:05:52 2000
-@@ -30,6 +30,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
-
- #include "SDL_error.h"
- #include "SDL_mutex.h"
-@@ -175,7 +176,7 @@
- int (*func)(void *);
- void *data;
- SDL_Thread *info;
-- SDL_mutex *wait;
-+ int wait;
- } thread_args;
-
- void SDL_RunThread(void *data)
-@@ -199,8 +200,8 @@
- userdata = args->data;
- statusloc = &args->info->status;
-
- /* Wake up the parent thread */
-- SDL_mutexV(args->wait);
-+ args->wait = 1;
-
- /* Run the function */
- *statusloc = userfunc(userdata);
-@@ -213,16 +214,16 @@
- int ret;
-
- /* Allocate memory for the thread info structure */
-- thread = (SDL_Thread *)malloc(sizeof(*thread));
-+ thread = (SDL_Thread *)malloc(sizeof(thread));
- if ( thread == NULL ) {
- SDL_OutOfMemory();
- return(NULL);
- }
-- memset(thread, 0, (sizeof *thread));
-+ memset(thread, 0, (sizeof thread));
- thread->status = -1;
-
- /* Set up the arguments for the thread */
-- args = (thread_args *)malloc(sizeof(*args));
-+ args = (thread_args *)malloc(sizeof(args));
- if ( args == NULL ) {
- SDL_OutOfMemory();
- free(thread);
-@@ -231,14 +232,7 @@
- args->func = fn;
- args->data = data;
- args->info = thread;
-- args->wait = SDL_CreateMutex();
-- if ( args->wait == NULL ) {
-- free(thread);
-- free(args);
-- SDL_OutOfMemory();
-- return(NULL);
-- }
-- SDL_mutexP(args->wait); /* We will block later */
-+ args->wait = 0;
-
- /* Add the thread to the list of available threads */
- SDL_AddThread(thread);
-@@ -247,14 +241,14 @@
- ret = SDL_SYS_CreateThread(thread, args);
- if ( ret >= 0 ) {
- /* Wait for the thread function to use arguments */
-- SDL_mutexP(args->wait);
-+ while (args->wait == 0)
-+ usleep(20000);
- } else {
- /* Oops, failed. Gotta free everything */
- SDL_DelThread(thread);
- free(thread);
- thread = NULL;
- }
-- SDL_DestroyMutex(args->wait);
- free(args);
-
- /* Everything is running now */
diff --git a/devel/sdl/files/patch-af b/devel/sdl/files/patch-af
deleted file mode 100644
index 28c3cfef4b85..000000000000
--- a/devel/sdl/files/patch-af
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/thread/linux/SDL_mutex.c.orig Tue Nov 23 20:01:41 1999
-+++ src/thread/linux/SDL_mutex.c Mon Apr 17 21:08:57 2000
-@@ -42,6 +42,7 @@
-
- #ifdef SDL_USE_PTHREADS
-
-+#include <errno.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <pthread.h>
-@@ -60,14 +61,14 @@
- SDL_mutex *mutex;
-
- /* Allocate the structure */
-- mutex = (SDL_mutex *)malloc(sizeof(*mutex));
-+ mutex = (SDL_mutex *)malloc(sizeof(mutex));
- if ( mutex == NULL ) {
- SDL_OutOfMemory();
- return(NULL);
- }
-
- if ( pthread_mutex_init(&mutex->id, NULL) != 0 ) {
-- SDL_SetError("Couldn't create mutex");
-+ SDL_SetError("Couldn't create mutex; reason: %d", errno);
- free(mutex);
- return(NULL);
- }
-@@ -82,7 +83,7 @@
- return(-1);
- }
- if ( pthread_mutex_lock(&mutex->id) != 0 ) {
-- SDL_SetError("Couldn't lock mutex");
-+ SDL_SetError("Couldn't lock mutex; reason: %d", errno);
- return(-1);
- }
- return(0);
-@@ -96,7 +97,7 @@
- return(-1);
- }
- if ( pthread_mutex_unlock(&mutex->id) != 0 ) {
-- SDL_SetError("Couldn't unlock mutex");
-+ SDL_SetError("Couldn't unlock mutex; reason: %d", errno);
- return(-1);
- }
- return(0);
diff --git a/devel/sdl/files/patch-an b/devel/sdl/files/patch-an
deleted file mode 100644
index 25d170673525..000000000000
--- a/devel/sdl/files/patch-an
+++ /dev/null
@@ -1,147 +0,0 @@
---- src/video/svga/SDL_svgaevents.c.orig Wed Nov 24 01:46:25 1999
-+++ src/video/svga/SDL_svgaevents.c Sun Sep 24 00:28:45 2000
-@@ -28,12 +28,14 @@
- /* Handle the event stream, converting X11 events into SDL events */
-
- #include <stdio.h>
-+#include <stdlib.h>
-
- #include <vga.h>
- #include <vgamouse.h>
- #include <vgakeyboard.h>
- #include <linux/kd.h>
- #include <linux/keyboard.h>
-+#include <sys/kbio.h>
-
- #include "SDL.h"
- #include "SDL_sysevents.h"
-@@ -42,9 +44,8 @@
- #include "SDL_svgaevents_c.h"
-
- /* The translation tables from a console scancode to a SDL keysym */
--#define NUM_VGAKEYMAPS (1<<KG_CAPSSHIFT)
--static Uint16 vga_keymap[NUM_VGAKEYMAPS][NR_KEYS];
- static SDLKey keymap[128];
-+keymap_t *vga_keymap = NULL;
- static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym);
-
- /* Ugh, we have to duplicate the kernel's keysym mapping code...
-@@ -54,69 +55,10 @@
- */
- void SVGA_initkeymaps(int fd)
- {
-- struct kbentry entry;
-- int map, i;
--
-- /* Load all the keysym mappings */
-- for ( map=0; map<NUM_VGAKEYMAPS; ++map ) {
-- memset(vga_keymap[map], 0, NR_KEYS*sizeof(Uint16));
-- for ( i=0; i<NR_KEYS; ++i ) {
-- entry.kb_table = map;
-- entry.kb_index = i;
-- if ( ioctl(fd, KDGKBENT, &entry) == 0 ) {
-- /* The "Enter" key is a special case */
-- if ( entry.kb_value == K_ENTER ) {
-- entry.kb_value = K(KT_ASCII,13);
-- }
-- /* Handle numpad specially as well */
-- if ( KTYP(entry.kb_value) == KT_PAD ) {
-- switch ( entry.kb_value ) {
-- case K_P0:
-- case K_P1:
-- case K_P2:
-- case K_P3:
-- case K_P4:
-- case K_P5:
-- case K_P6:
-- case K_P7:
-- case K_P8:
-- case K_P9:
-- vga_keymap[map][i]=entry.kb_value;
-- vga_keymap[map][i]+= '0';
-- break;
-- case K_PPLUS:
-- vga_keymap[map][i]=K(KT_ASCII,'+');
-- break;
-- case K_PMINUS:
-- vga_keymap[map][i]=K(KT_ASCII,'-');
-- break;
-- case K_PSTAR:
-- vga_keymap[map][i]=K(KT_ASCII,'*');
-- break;
-- case K_PSLASH:
-- vga_keymap[map][i]=K(KT_ASCII,'/');
-- break;
-- case K_PENTER:
-- vga_keymap[map][i]=K(KT_ASCII,'\r');
-- break;
-- case K_PCOMMA:
-- vga_keymap[map][i]=K(KT_ASCII,',');
-- break;
-- case K_PDOT:
-- vga_keymap[map][i]=K(KT_ASCII,'.');
-- break;
-- default:
-- break;
-- }
-- }
-- /* Do the normal key translation */
-- if ( (KTYP(entry.kb_value) == KT_LATIN) ||
-- (KTYP(entry.kb_value) == KT_ASCII) ||
-- (KTYP(entry.kb_value) == KT_LETTER) ) {
-- vga_keymap[map][i] = entry.kb_value;
-- }
-- }
-- }
-+ vga_keymap = malloc(sizeof(keymap_t));
-+ if (ioctl(fd, GIO_KEYMAP, vga_keymap) == -1) {
-+ free(vga_keymap);
-+ vga_keymap = NULL;
- }
- }
-
-@@ -312,38 +254,24 @@
- keysym->sym = keymap[scancode];
- keysym->mod = KMOD_NONE;
-
-- /* If UNICODE is on, get the UNICODE value for the key */
- keysym->unicode = 0;
-- if ( SDL_TranslateUNICODE ) {
-+ if ( (SDL_TranslateUNICODE) && (vga_keymap != NULL) ) {
- int map;
- SDLMod modstate;
-
- modstate = SDL_GetModState();
- map = 0;
- if ( modstate & KMOD_SHIFT ) {
-- map |= (1<<KG_SHIFT);
-+ map += 1;
- }
- if ( modstate & KMOD_CTRL ) {
-- map |= (1<<KG_CTRL);
-+ map += 2;
- }
- if ( modstate & KMOD_ALT ) {
-- map |= (1<<KG_ALT);
-- }
-- if ( modstate & KMOD_MODE ) {
-- map |= (1<<KG_ALTGR);
-- }
-- if ( KTYP(vga_keymap[map][scancode]) == KT_LETTER ) {
-- if ( modstate & KMOD_CAPS ) {
-- map ^= (1<<KG_SHIFT);
-- }
-- }
-- if ( KTYP(vga_keymap[map][scancode]) == KT_PAD ) {
-- if ( modstate & KMOD_NUM ) {
-- keysym->unicode=KVAL(vga_keymap[map][scancode]);
-- }
-- } else {
-- keysym->unicode = KVAL(vga_keymap[map][scancode]);
-+ map += 4;
- }
-+ if ( !(vga_keymap->key[scancode].spcl & (0x80 >> map)) )
-+ keysym->unicode = vga_keymap->key[scancode].map[map];
- }
- return(keysym);
- }
diff --git a/devel/sdl/files/patch-ao b/devel/sdl/files/patch-ao
deleted file mode 100644
index d5c4f96f703d..000000000000
--- a/devel/sdl/files/patch-ao
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/video/svga/SDL_svgavideo.c.orig Wed Nov 24 01:46:25 1999
-+++ src/video/svga/SDL_svgavideo.c Wed Sep 6 13:32:37 2000
-@@ -33,7 +33,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
-
--#include <linux/vt.h>
-+#include <sys/consio.h>
- #include <vga.h>
- #include <vgamouse.h>
- #include <vgakeyboard.h>
-@@ -328,7 +328,7 @@
- vga_modeinfo *modeinfo;
-
- /* Since SVGAlib 1.40 leaks the mouse here, we have to close it */
-- mouse_close();
-+ /* mouse_close(); */
-
- /* Try to set the requested linear video mode */
- bpp = (bpp+7)/8-1;
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-06 14:44:52 +0000