[Pkg-sdl-commits] r18 - in unstable/libsdl1.2/debian: . patches
Sam Hocevar
sho at costa.debian.org
Tue Feb 28 11:20:19 UTC 2006
Author: sho
Date: 2006-02-28 11:20:18 +0000 (Tue, 28 Feb 2006)
New Revision: 18
Added:
unstable/libsdl1.2/debian/patches/008_aalib_keys.diff
unstable/libsdl1.2/debian/patches/009_alsa_priority.diff
Modified:
unstable/libsdl1.2/debian/changelog
unstable/libsdl1.2/debian/control
unstable/libsdl1.2/debian/rules
Log:
* debian/control:
+ Build-depend on NASM.
* debian/rules:
+ Build optimised blitting routines using NASM.
* debian/patches/008_aalib_keys.diff:
+ Arrow keys and the numeric keypad conflict in the aalib driver, make the
former take precedence (Closes: #170548).
+ Fix a crash when aa_getevent returns a scancode value bigger than 400.
* debian/patches/009_alsa_priority.diff:
+ When both are available, try the ALSA output driver before the OSS one.
Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog 2006-02-28 03:43:18 UTC (rev 17)
+++ unstable/libsdl1.2/debian/changelog 2006-02-28 11:20:18 UTC (rev 18)
@@ -1,3 +1,20 @@
+libsdl1.2 (1.2.9-4) unstable; urgency=low
+
+ * debian/control:
+ + Build-depend on NASM.
+ * debian/rules:
+ + Build optimised blitting routines using NASM.
+
+ * debian/patches/008_aalib_keys.diff:
+ + Arrow keys and the numeric keypad conflict in the aalib driver, make the
+ former take precedence (Closes: #170548).
+ + Fix a crash when aa_getevent returns a scancode value bigger than 400.
+
+ * debian/patches/009_alsa_priority.diff:
+ + When both are available, try the ALSA output driver before the OSS one.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 28 Feb 2006 01:48:50 +0100
+
libsdl1.2 (1.2.9-3) unstable; urgency=low
* debian/rules:
Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control 2006-02-28 03:43:18 UTC (rev 17)
+++ unstable/libsdl1.2/debian/control 2006-02-28 11:20:18 UTC (rev 18)
@@ -4,7 +4,7 @@
Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
Uploaders: Matthew Danish <mrd at debian.org>, Zephaniah E. Hull <warp at debian.org>, Lawrence Williams <lawrence_cecil_williams at hotmail.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
Standards-Version: 3.6.2
-Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), dbs, libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [i386], libarts1-dev, libartsc0-dev, libasound2-dev [linux-any], libaudio-dev, libdirectfb-dev (>= 0.9.22)
+Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), dbs, nasm [i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [i386], libarts1-dev, libartsc0-dev, libasound2-dev [linux-any], libaudio-dev, libdirectfb-dev (>= 0.9.22)
Package: libsdl1.2debian
Architecture: any
Added: unstable/libsdl1.2/debian/patches/008_aalib_keys.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/008_aalib_keys.diff 2006-02-28 03:43:18 UTC (rev 17)
+++ unstable/libsdl1.2/debian/patches/008_aalib_keys.diff 2006-02-28 11:20:18 UTC (rev 18)
@@ -0,0 +1,37 @@
+diff -puriN SDL-1.2.9.orig/src/video/aalib/SDL_aaevents.c SDL-1.2.9/src/video/aalib/SDL_aaevents.c
+--- SDL-1.2.9.orig/src/video/aalib/SDL_aaevents.c 2004-01-04 17:49:23 +0100
++++ SDL-1.2.9/src/video/aalib/SDL_aaevents.c 2006-02-28 02:17:45 +0100
+@@ -130,12 +130,6 @@ void AA_InitOSKeymap(_THIS)
+ for ( i=0; i<SDL_TABLESIZE(keymap); ++i )
+ keymap[i] = SDLK_UNKNOWN;
+
+- keymap[AA_ESC] = SDLK_ESCAPE;
+- keymap[AA_UP] = SDLK_UP;
+- keymap[AA_DOWN] = SDLK_DOWN;
+- keymap[AA_LEFT] = SDLK_LEFT;
+- keymap[AA_RIGHT] = SDLK_RIGHT;
+-
+ /* Alphabet keys */
+ for ( i = 0; i<26; ++i ){
+ keymap['a' + i] = SDLK_a+i;
+@@ -183,10 +177,20 @@ void AA_InitOSKeymap(_THIS)
+ keymap[293] = SDLK_KP7;
+ keymap[295] = SDLK_KP8;
+ keymap[298] = SDLK_KP9;
++
++ keymap[AA_ESC] = SDLK_ESCAPE;
++ keymap[AA_UP] = SDLK_UP;
++ keymap[AA_DOWN] = SDLK_DOWN;
++ keymap[AA_LEFT] = SDLK_LEFT;
++ keymap[AA_RIGHT] = SDLK_RIGHT;
+ }
+
+ static SDL_keysym *TranslateKey(int scancode, SDL_keysym *keysym)
+ {
++ /* Sanity check */
++ if ( scancode > 400 )
++ scancode = AA_UNKNOWN;
++
+ /* Set the keysym information */
+ keysym->scancode = scancode;
+ keysym->sym = keymap[scancode];
Added: unstable/libsdl1.2/debian/patches/009_alsa_priority.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/009_alsa_priority.diff 2006-02-28 03:43:18 UTC (rev 17)
+++ unstable/libsdl1.2/debian/patches/009_alsa_priority.diff 2006-02-28 11:20:18 UTC (rev 18)
@@ -0,0 +1,40 @@
+diff -puriN SDL-1.2.9.orig/src/audio/SDL_audio.c SDL-1.2.9/src/audio/SDL_audio.c
+--- SDL-1.2.9.orig/src/audio/SDL_audio.c 2004-09-17 15:20:10 +0200
++++ SDL-1.2.9/src/audio/SDL_audio.c 2006-02-28 03:05:09 +0100
+@@ -43,13 +43,13 @@ static AudioBootStrap *bootstrap[] = {
+ #ifdef OPENBSD_AUDIO_SUPPORT
+ &OPENBSD_AUDIO_bootstrap,
+ #endif
++#ifdef ALSA_SUPPORT
++ &ALSA_bootstrap,
++#endif
+ #ifdef OSS_SUPPORT
+ &DSP_bootstrap,
+ &DMA_bootstrap,
+ #endif
+-#ifdef ALSA_SUPPORT
+- &ALSA_bootstrap,
+-#endif
+ #ifdef QNXNTOAUDIO_SUPPORT
+ &QNXNTOAUDIO_bootstrap,
+ #endif
+diff -puriN SDL-1.2.9.orig/src/audio/SDL_sysaudio.h SDL-1.2.9/src/audio/SDL_sysaudio.h
+--- SDL-1.2.9.orig/src/audio/SDL_sysaudio.h 2004-08-21 05:21:44 +0200
++++ SDL-1.2.9/src/audio/SDL_sysaudio.h 2006-02-28 03:05:43 +0100
+@@ -107,13 +107,13 @@ typedef struct AudioBootStrap {
+ #ifdef OPENBSD_AUDIO_SUPPORT
+ extern AudioBootStrap OPENBSD_AUDIO_bootstrap;
+ #endif
++#ifdef ALSA_SUPPORT
++extern AudioBootStrap ALSA_bootstrap;
++#endif
+ #ifdef OSS_SUPPORT
+ extern AudioBootStrap DSP_bootstrap;
+ extern AudioBootStrap DMA_bootstrap;
+ #endif
+-#ifdef ALSA_SUPPORT
+-extern AudioBootStrap ALSA_bootstrap;
+-#endif
+ #ifdef QNXNTOAUDIO_SUPPORT
+ extern AudioBootStrap QNXNTOAUDIO_bootstrap;
+ #endif
Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules 2006-02-28 03:43:18 UTC (rev 17)
+++ unstable/libsdl1.2/debian/rules 2006-02-28 11:20:18 UTC (rev 18)
@@ -39,8 +39,9 @@
confflags += --disable-debug
endif
-# Only build SVGA support on x86 architectures
+# Only build SVGA support and use NASM routines on linux-x86
ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
+ confflags += --enable-nasm
all_confflags += --enable-video-svga
LIBSVGA1-DEV = libsvga1-dev
endif
More information about the Pkg-sdl-commits
mailing list