[Pkg-sdl-commits] r277 - in unstable: . libsdl-1.3 libsdl-1.3/debian libsdl-1.3/debian/patches libsdl-1.3/debian/source libsdl1.2/debian
Samuel Hocevar
sho at alioth.debian.org
Sun Dec 4 03:05:05 UTC 2011
Author: sho
Date: 2011-12-04 15:05:04 +0000 (Sun, 04 Dec 2011)
New Revision: 277
Added:
unstable/libsdl-1.3/
unstable/libsdl-1.3/debian/
unstable/libsdl-1.3/debian/README.source
unstable/libsdl-1.3/debian/changelog
unstable/libsdl-1.3/debian/compat
unstable/libsdl-1.3/debian/control
unstable/libsdl-1.3/debian/copyright
unstable/libsdl-1.3/debian/docs
unstable/libsdl-1.3/debian/libsdl-1.3-0.install
unstable/libsdl-1.3/debian/libsdl-1.3-dev.docs
unstable/libsdl-1.3/debian/libsdl-1.3-dev.install
unstable/libsdl-1.3/debian/patches/
unstable/libsdl-1.3/debian/patches/001_autogen_autotools_fix.diff
unstable/libsdl-1.3/debian/patches/020_libcaca_new_api.diff
unstable/libsdl-1.3/debian/patches/030_pulseaudio_enable.diff
unstable/libsdl-1.3/debian/patches/040_propagate_pic_to_nasm.diff
unstable/libsdl-1.3/debian/patches/050_altivec_detection.diff
unstable/libsdl-1.3/debian/patches/060_disable_ipod.diff
unstable/libsdl-1.3/debian/patches/205_lock_keys.diff
unstable/libsdl-1.3/debian/patches/205_x11_keysym_fix.diff
unstable/libsdl-1.3/debian/patches/206_gcc4_compilation_fix.diff
unstable/libsdl-1.3/debian/patches/209_alsa_priority.diff
unstable/libsdl-1.3/debian/patches/214_missing_mmx_blit.diff
unstable/libsdl-1.3/debian/patches/215_kfreebsd_gnu.diff
unstable/libsdl-1.3/debian/patches/216_page_size.diff
unstable/libsdl-1.3/debian/patches/217_x11_keytounicode.diff
unstable/libsdl-1.3/debian/patches/218_double_free.diff
unstable/libsdl-1.3/debian/patches/218_joystick_memmove.diff
unstable/libsdl-1.3/debian/patches/219_pulseaudio_crackles.diff
unstable/libsdl-1.3/debian/patches/220_std_cld.diff
unstable/libsdl-1.3/debian/patches/221_check_SDL_NOKBD_environment_variable.diff
unstable/libsdl-1.3/debian/patches/222_joystick_crash.diff
unstable/libsdl-1.3/debian/patches/300_dont_propagate_lpthread.diff
unstable/libsdl-1.3/debian/patches/310_fixmouseclicks
unstable/libsdl-1.3/debian/patches/310_segfault_noGLX.diff
unstable/libsdl-1.3/debian/patches/320_activate_xrandr_on_default.diff
unstable/libsdl-1.3/debian/patches/320_disappearingcursor.diff
unstable/libsdl-1.3/debian/patches/series
unstable/libsdl-1.3/debian/rules
unstable/libsdl-1.3/debian/sdl-config.1
unstable/libsdl-1.3/debian/source/
unstable/libsdl-1.3/debian/source/format
unstable/libsdl-1.3/debian/sources
unstable/libsdl-1.3/debian/watch
Modified:
unstable/libsdl1.2/debian/changelog
Log:
libsdl-1.3 (1.3.0~20111204-1) experimental; urgency=low
* Initial upload from upstream snapshot.
-- Sam Hocevar <sho at debian.org> Sun, 04 Dec 2011 14:35:05 +0100
Property changes on: unstable/libsdl-1.3/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: unstable/libsdl-1.3/debian/README.source
===================================================================
--- unstable/libsdl-1.3/debian/README.source (rev 0)
+++ unstable/libsdl-1.3/debian/README.source 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
Added: unstable/libsdl-1.3/debian/changelog
===================================================================
--- unstable/libsdl-1.3/debian/changelog (rev 0)
+++ unstable/libsdl-1.3/debian/changelog 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,6 @@
+libsdl-1.3 (1.3.0~20111204-1) experimental; urgency=low
+
+ * Initial upload from upstream snapshot.
+
+ -- Sam Hocevar <sho at debian.org> Sun, 04 Dec 2011 14:35:05 +0100
+
Added: unstable/libsdl-1.3/debian/compat
===================================================================
--- unstable/libsdl-1.3/debian/compat (rev 0)
+++ unstable/libsdl-1.3/debian/compat 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1 @@
+5
Added: unstable/libsdl-1.3/debian/control
===================================================================
--- unstable/libsdl-1.3/debian/control (rev 0)
+++ unstable/libsdl-1.3/debian/control 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,70 @@
+Source: libsdl-1.3
+Priority: optional
+Section: libs
+Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
+Uploaders: Barry deFreese <bdefreese at debian.org>, Sam Hocevar <sho at debian.org>
+Standards-Version: 3.9.2
+Build-Depends: dpkg (>= 1.13.2),
+ debhelper (>= 5.0),
+ quilt,
+ libx11-dev,
+ libxext-dev,
+ libxt-dev,
+ x11proto-core-dev,
+ libaudiofile-dev,
+ libpulse-dev,
+ libgl1-mesa-dev,
+ libasound2-dev [linux-any],
+ libcaca-dev,
+ libdirectfb-dev (>= 1.0) [!hurd-i386],
+ libusbhid-dev [kfreebsd-any],
+ libglu1-mesa-dev
+Vcs-Svn: svn://svn.debian.org/pkg-sdl/unstable/libsdl-1.3
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-sdl/unstable/libsdl-1.3/
+Homepage: http://www.libsdl.org/
+
+Package: libsdl-1.3-0
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Simple DirectMedia Layer
+ SDL is a library that allows programs portable low level access to
+ a video framebuffer, audio output, mouse, and keyboard.
+ .
+ This version of SDL is compiled with X11, caca and DirectFB graphics
+ drivers and OSS, ALSA, NAS and PulseAudio sound drivers.
+
+Package: libsdl-1.3-0-udeb
+XC-Package-Type: udeb
+Architecture: any
+Section: debian-installer
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Simple DirectMedia Layer (with directfb graphics and no sound)
+ SDL is a library that allows programs portable low level access to a video
+ framebuffer, audio output, mouse, and keyboard.
+ .
+ This version of SDL is compiled with directfb graphics and no sound.
+
+Package: libsdl-1.3-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+ libsdl-1.3-0 (= ${binary:Version}),
+ libx11-dev,
+ libglu1-mesa-dev,
+ libasound2-dev [linux-any],
+ libpulse-dev,
+ libdirectfb-dev (>= 0.9.22),
+ libcaca-dev,
+ libusbhid-dev [kfreebsd-any],
+ libxt-dev,
+ libxext-dev
+Replaces: libsdl-dev, libsdl0.11-dev, libsdl1.0-dev, libsdl1.1-dev
+Conflicts: xlibs-pic (<< 4.1.0-10), libsdl-dev, libsdl0.11-dev, libsdl0.11, libsdl1.0-dev, libsdl1.1-dev, libsdl1.2-dev
+Provides: libsdl-dev
+Description: Simple DirectMedia Layer development files
+ SDL is a library that allows programs portable low level access to a video
+ framebuffer, audio output, mouse, and keyboard.
+ .
+ This package contains the files needed to compile and link programs which
+ use SDL.
Added: unstable/libsdl-1.3/debian/copyright
===================================================================
--- unstable/libsdl-1.3/debian/copyright (rev 0)
+++ unstable/libsdl-1.3/debian/copyright 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,29 @@
+This package was debianized by Fredrik Hallenberg hallon at debian.org on
+Fri, 2 Oct 1998 22:21:28 +0200.
+
+It was downloaded from http://www.libsdl.org/
+
+The package was converted to use DBS by Zephaniah Hull <warp at debian.org>
+on 18th January 2004.
+
+Copyright:
+ Copyright (c) 1997-2007 Sam Lantinga <slouken at libsdl.org>
+
+License:
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
Added: unstable/libsdl-1.3/debian/docs
===================================================================
--- unstable/libsdl-1.3/debian/docs (rev 0)
+++ unstable/libsdl-1.3/debian/docs 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,4 @@
+BUGS
+CREDITS
+README
+README-SDL.txt
Added: unstable/libsdl-1.3/debian/libsdl-1.3-0.install
===================================================================
--- unstable/libsdl-1.3/debian/libsdl-1.3-0.install (rev 0)
+++ unstable/libsdl-1.3/debian/libsdl-1.3-0.install 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1 @@
+usr/lib/*.so.*
Added: unstable/libsdl-1.3/debian/libsdl-1.3-dev.docs
===================================================================
Added: unstable/libsdl-1.3/debian/libsdl-1.3-dev.install
===================================================================
--- unstable/libsdl-1.3/debian/libsdl-1.3-dev.install (rev 0)
+++ unstable/libsdl-1.3/debian/libsdl-1.3-dev.install 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,7 @@
+usr/include/SDL
+usr/lib/*.a
+usr/lib/*.so
+usr/lib/*.la
+usr/lib/pkgconfig
+usr/bin/sdl-config
+usr/share/aclocal/*
Added: unstable/libsdl-1.3/debian/patches/001_autogen_autotools_fix.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/001_autogen_autotools_fix.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/001_autogen_autotools_fix.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,43 @@
+---
+ autogen.sh | 12 +++---------
+ test/autogen.sh | 11 ++---------
+ 2 files changed, 5 insertions(+), 18 deletions(-)
+
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -4,15 +4,9 @@
+ echo "This may take a while ..."
+
+ # Regenerate configuration files
+-cp acinclude.m4 aclocal.m4
+-found=false
+-for autoconf in autoconf autoconf259 autoconf-2.59
+-do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
+-done
+-if test x$found = xfalse; then
+- echo "Couldn't find autoconf, aborting"
+- exit 1
+-fi
++aclocal-1.9
++autoconf
++autoheader
+ (cd test; sh autogen.sh)
+
+ # Run configure for this platform
+--- a/test/autogen.sh
++++ b/test/autogen.sh
+@@ -1,12 +1,5 @@
+ #!/bin/sh
+ #
+ # Regenerate configuration files
+-cp acinclude.m4 aclocal.m4
+-found=false
+-for autoconf in autoconf autoconf259 autoconf-2.59
+-do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
+-done
+-if test x$found = xfalse; then
+- echo "Couldn't find autoconf, aborting"
+- exit 1
+-fi
++aclocal-1.9
++autoconf
Added: unstable/libsdl-1.3/debian/patches/020_libcaca_new_api.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/020_libcaca_new_api.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/020_libcaca_new_api.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,622 @@
+---
+ configure.in | 33 ++++
+ include/SDL_config.h.in | 1
+ src/video/SDL_sysvideo.h | 3
+ src/video/SDL_video.c | 3
+ src/video/caca/SDL_cacaevents.c | 101 ++++++++++++
+ src/video/caca/SDL_cacaevents_c.h | 35 ++++
+ src/video/caca/SDL_cacavideo.c | 304 ++++++++++++++++++++++++++++++++++++++
+ src/video/caca/SDL_cacavideo.h | 76 +++++++++
+ 8 files changed, 556 insertions(+)
+
+--- a/configure.in
++++ b/configure.in
+@@ -1437,6 +1437,38 @@
+ fi
+ }
+
++dnl Find the libcaca includes
++CheckCaca()
++{
++ AC_ARG_ENABLE(video-caca,
++AC_HELP_STRING([--enable-video-caca], [use libcaca video driver [[default=no]]]),
++ , enable_video_caca=no)
++ if test x$enable_video = xyes -a x$enable_video_caca = xyes; then
++ video_caca=no
++ AC_PATH_PROG(CACACONFIG, caca-config, no)
++ if test x$CACACONFIG != xno; then
++ AC_MSG_CHECKING(for libcaca support)
++ CACA_CFLAGS=`$CACACONFIG --cflags`
++ CACA_LDFLAGS=`$CACACONFIG --libs`
++ save_CFLAGS="$CFLAGS"
++ AC_TRY_COMPILE([
++ #include <caca.h>
++ ],[
++ ],[
++ video_caca=yes
++ ])
++ CFLAGS="$save_CFLAGS"
++ AC_MSG_RESULT($video_caca)
++ if test x$video_caca = xyes; then
++ AC_DEFINE(SDL_VIDEO_DRIVER_CACA)
++ EXTRA_CFLAGS="$EXTRA_CFLAGS $CACA_CFLAGS"
++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LDFLAGS"
++ SOURCES="$SOURCES $srcdir/src/video/caca/*.c"
++ fi
++ fi
++ fi
++}
++
+ dnl Set up the QTopia video driver if enabled
+ CheckQtopia()
+ {
+@@ -2258,6 +2290,7 @@
+ CheckVGL
+ CheckWscons
+ CheckAAlib
++ CheckCaca
+ CheckQtopia
+ CheckPicoGUI
+ CheckOpenGLX11
+--- a/src/video/SDL_video.c
++++ b/src/video/SDL_video.c
+@@ -120,6 +120,9 @@
+ #if SDL_VIDEO_DRIVER_AALIB
+ &AALIB_bootstrap,
+ #endif
++#if SDL_VIDEO_DRIVER_CACA
++ &CACA_bootstrap,
++#endif
+ #if SDL_VIDEO_DRIVER_DUMMY
+ &DUMMY_bootstrap,
+ #endif
+--- a/src/video/SDL_sysvideo.h
++++ b/src/video/SDL_sysvideo.h
+@@ -404,6 +404,9 @@
+ #if SDL_VIDEO_DRIVER_AALIB
+ extern VideoBootStrap AALIB_bootstrap;
+ #endif
++#if SDL_VIDEO_DRIVER_CACA
++extern VideoBootStrap CACA_bootstrap;
++#endif
+ #if SDL_VIDEO_DRIVER_DUMMY
+ extern VideoBootStrap DUMMY_bootstrap;
+ #endif
+--- /dev/null
++++ b/src/video/caca/SDL_cacaevents_c.h
+@@ -0,0 +1,35 @@
++/*
++ SDL - Simple DirectMedia Layer
++ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library 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
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public
++ License along with this library; if not, write to the Free
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++ Sam Lantinga
++ slouken at libsdl.org
++*/
++
++#ifdef SAVE_RCSID
++static char rcsid =
++ "@(#) $Id: libsdl-1.2.11-libcaca.patch,v 1.1 2006/09/18 16:06:06 mr_bones_ Exp $";
++#endif
++
++#include "SDL_cacavideo.h"
++
++/* Variables and functions exported by SDL_sysevents.c to other parts.
++ of the native video subsystem (SDL_sysvideo.c)
++*/
++extern void Caca_PumpEvents(_THIS);
++extern void Caca_InitOSKeymap(_THIS);
++
+--- /dev/null
++++ b/src/video/caca/SDL_cacaevents.c
+@@ -0,0 +1,101 @@
++/*
++ SDL - Simple DirectMedia Layer
++ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library 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
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public
++ License along with this library; if not, write to the Free
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++ Sam Lantinga
++ slouken at libsdl.org
++*/
++
++#ifdef SAVE_RCSID
++static char rcsid =
++ "@(#) $Id: libsdl-1.2.11-libcaca.patch,v 1.1 2006/09/18 16:06:06 mr_bones_ Exp $";
++#endif
++
++#include <stdio.h>
++
++#include <caca.h>
++#ifdef CACA_API_VERSION_1
++#include <caca0.h>
++#endif
++
++#include "SDL.h"
++#include "../../events/SDL_sysevents.h"
++#include "../../events/SDL_events_c.h"
++#include "SDL_cacavideo.h"
++#include "SDL_cacaevents_c.h"
++
++void Caca_PumpEvents(_THIS)
++{
++ int posted = 0;
++ int event;
++ SDL_keysym keysym;
++
++ if( ! this->screen ) /* Wait till we got the screen initialised */
++ return;
++
++ do {
++ posted = 0;
++
++ /* Get libcaca event */
++ SDL_mutexP(Caca_mutex);
++ event = caca_get_event(CACA_EVENT_ANY);
++ SDL_mutexV(Caca_mutex);
++
++ if ( event & (CACA_EVENT_KEY_PRESS | CACA_EVENT_KEY_RELEASE)) {
++ int key;
++ switch ( event & 0xffffff )
++ {
++ case CACA_KEY_LEFT: key = SDLK_LEFT; break;
++ case CACA_KEY_RIGHT: key = SDLK_RIGHT; break;
++ case CACA_KEY_UP: key = SDLK_UP; break;
++ case CACA_KEY_DOWN: key = SDLK_DOWN; break;
++ default: key = event & 0xff; break;
++ }
++ /* Key pressed */
++/* printf("Key pressed: %d (%c)\n", key, key); */
++ keysym.scancode = key;
++ keysym.sym = key;
++ keysym.mod = KMOD_NONE;
++ keysym.unicode = 0;
++ if ( SDL_TranslateUNICODE ) {
++ keysym.unicode = key;
++ }
++ posted += SDL_PrivateKeyboard((event & CACA_EVENT_KEY_PRESS) ? SDL_PRESSED : SDL_RELEASED, &keysym);
++ }
++ else if ( event & (CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE) ) {
++ /* FIXME: we currently ignore the button type! */
++ int button = event & 0x00ffffff;
++ if ( button > 3 ) {
++ button = 1;
++ }
++ posted += SDL_PrivateMouseButton((event & CACA_EVENT_MOUSE_PRESS) ? SDL_PRESSED : SDL_RELEASED, button, 0, 0);
++ }
++ else if ( event & CACA_EVENT_MOUSE_MOTION ) {
++ int new_x = 0, new_y = 0;
++ new_x = ((event & 0x00fff000) >> 12) * Caca_w / caca_get_width();
++ new_y = ((event & 0x00000fff) >> 0) * Caca_h / caca_get_height();
++ posted += SDL_PrivateMouseMotion(0, 0, new_x, new_y);
++ }
++ } while ( posted );
++}
++
++void Caca_InitOSKeymap(_THIS)
++{
++ return;
++}
++
++
+--- /dev/null
++++ b/src/video/caca/SDL_cacavideo.h
+@@ -0,0 +1,76 @@
++/*
++ SDL - Simple DirectMedia Layer
++ Copyright (C) 2003 Sam Hocevar
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library 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
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public
++ License along with this library; if not, write to the Free
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++ Sam Hocevar
++ sam at zoy.org
++*/
++
++#ifdef SAVE_RCSID
++static char rcsid =
++ "@(#) $Id: libsdl-1.2.11-libcaca.patch,v 1.1 2006/09/18 16:06:06 mr_bones_ Exp $";
++#endif
++
++#ifndef _SDL_cacavideo_h
++#define _SDL_cacavideo_h
++
++#include "SDL_mouse.h"
++#include "../SDL_sysvideo.h"
++#include "SDL_mutex.h"
++
++#include <sys/time.h>
++#include <time.h>
++
++#include <caca.h>
++#ifdef CACA_API_VERSION_1
++#include <caca0.h>
++#endif
++
++/* Hidden "this" pointer for the video functions */
++#define _THIS SDL_VideoDevice *this
++
++#define SDL_NUMMODES 6
++
++/* Private display data */
++struct SDL_PrivateVideoData {
++ SDL_Rect *SDL_modelist[SDL_NUMMODES+1];
++ SDL_mutex *mutex;
++
++ struct caca_bitmap *bitmap;
++ void *buffer;
++ int w, h;
++
++ int lastkey;
++ struct timeval lasttime;
++};
++
++/* Old variable names */
++#define SDL_modelist (this->hidden->SDL_modelist)
++#define Caca_palette (this->hidden->palette)
++#define Caca_bitmap (this->hidden->bitmap)
++#define Caca_buffer (this->hidden->buffer)
++
++#define Caca_w (this->hidden->w)
++#define Caca_h (this->hidden->h)
++
++#define Caca_lastkey (this->hidden->lastkey)
++#define Caca_lasttime (this->hidden->lasttime)
++
++#define Caca_mutex (this->hidden->mutex)
++
++#endif /* _SDL_cacavideo_h */
++
+--- /dev/null
++++ b/src/video/caca/SDL_cacavideo.c
+@@ -0,0 +1,304 @@
++/*
++ SDL - Simple DirectMedia Layer
++ Copyright (C) 2003 Sam Hocevar
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library 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
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public
++ License along with this library; if not, write to the Free
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++ Sam Hocevar
++ sam at zoy.org
++*/
++
++#ifdef SAVE_RCSID
++static char rcsid =
++ "@(#) $Id: libsdl-1.2.11-libcaca.patch,v 1.1 2006/09/18 16:06:06 mr_bones_ Exp $";
++#endif
++
++/* libcaca based SDL video driver implementation.
++*/
++
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <unistd.h>
++#include <sys/stat.h>
++
++
++#include "SDL.h"
++#include "SDL_error.h"
++#include "SDL_video.h"
++#include "SDL_mouse.h"
++#include "../SDL_sysvideo.h"
++#include "../SDL_pixels_c.h"
++#include "../../events/SDL_events_c.h"
++
++#include "SDL_cacavideo.h"
++#include "SDL_cacaevents_c.h"
++
++#include <caca.h>
++#ifdef CACA_API_VERSION_1
++#include <caca0.h>
++#endif
++
++/* Initialization/Query functions */
++static int Caca_VideoInit(_THIS, SDL_PixelFormat *vformat);
++static SDL_Rect **Caca_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags);
++static SDL_Surface *Caca_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags);
++static void Caca_VideoQuit(_THIS);
++
++/* Hardware surface functions */
++static int Caca_AllocHWSurface(_THIS, SDL_Surface *surface);
++static int Caca_LockHWSurface(_THIS, SDL_Surface *surface);
++static int Caca_FlipHWSurface(_THIS, SDL_Surface *surface);
++static void Caca_UnlockHWSurface(_THIS, SDL_Surface *surface);
++static void Caca_FreeHWSurface(_THIS, SDL_Surface *surface);
++
++/* Cache the VideoDevice struct */
++static struct SDL_VideoDevice *local_this;
++
++/* libcaca driver bootstrap functions */
++
++static int Caca_Available(void)
++{
++ return 1; /* Always available ! */
++}
++
++static void Caca_DeleteDevice(SDL_VideoDevice *device)
++{
++ free(device->hidden);
++ free(device);
++}
++static SDL_VideoDevice *Caca_CreateDevice(int devindex)
++{
++ SDL_VideoDevice *device;
++
++ /* Initialize all variables that we clean on shutdown */
++ device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice));
++ if ( device ) {
++ memset(device, 0, (sizeof *device));
++ device->hidden = (struct SDL_PrivateVideoData *)
++ malloc((sizeof *device->hidden));
++ }
++ if ( (device == NULL) || (device->hidden == NULL) ) {
++ SDL_OutOfMemory();
++ if ( device ) {
++ free(device);
++ }
++ return(0);
++ }
++ memset(device->hidden, 0, (sizeof *device->hidden));
++
++ /* Set the function pointers */
++ device->VideoInit = Caca_VideoInit;
++ device->ListModes = Caca_ListModes;
++ device->SetVideoMode = Caca_SetVideoMode;
++ device->CreateYUVOverlay = NULL;
++ device->SetColors = NULL;
++ device->UpdateRects = NULL;
++ device->VideoQuit = Caca_VideoQuit;
++ device->AllocHWSurface = Caca_AllocHWSurface;
++ device->CheckHWBlit = NULL;
++ device->FillHWRect = NULL;
++ device->SetHWColorKey = NULL;
++ device->SetHWAlpha = NULL;
++ device->LockHWSurface = Caca_LockHWSurface;
++ device->UnlockHWSurface = Caca_UnlockHWSurface;
++ device->FlipHWSurface = NULL;
++ device->FreeHWSurface = Caca_FreeHWSurface;
++ device->SetCaption = NULL;
++ device->SetIcon = NULL;
++ device->IconifyWindow = NULL;
++ device->GrabInput = NULL;
++ device->GetWMInfo = NULL;
++ device->InitOSKeymap = Caca_InitOSKeymap;
++ device->PumpEvents = Caca_PumpEvents;
++
++ device->free = Caca_DeleteDevice;
++
++ return device;
++}
++
++VideoBootStrap CACA_bootstrap = {
++ "caca", "Color ASCII Art Library",
++ Caca_Available, Caca_CreateDevice
++};
++
++int Caca_VideoInit(_THIS, SDL_PixelFormat *vformat)
++{
++ int i;
++
++ /* Initialize all variables that we clean on shutdown */
++ for ( i=0; i<SDL_NUMMODES; ++i ) {
++ SDL_modelist[i] = malloc(sizeof(SDL_Rect));
++ SDL_modelist[i]->x = SDL_modelist[i]->y = 0;
++ }
++ /* Modes sorted largest to smallest */
++ SDL_modelist[0]->w = 1024; SDL_modelist[0]->h = 768;
++ SDL_modelist[1]->w = 800; SDL_modelist[1]->h = 600;
++ SDL_modelist[2]->w = 640; SDL_modelist[2]->h = 480;
++ SDL_modelist[3]->w = 320; SDL_modelist[3]->h = 400;
++ SDL_modelist[4]->w = 320; SDL_modelist[4]->h = 240;
++ SDL_modelist[5]->w = 320; SDL_modelist[5]->h = 200;
++ SDL_modelist[6] = NULL;
++
++ Caca_mutex = SDL_CreateMutex();
++
++ /* Initialize the library */
++ if ( caca_init() != 0 ) {
++ SDL_SetError("Unable to initialize libcaca");
++ return(-1);
++ }
++
++ /* Initialize private variables */
++ Caca_lastkey = 0;
++ Caca_bitmap = NULL;
++ Caca_buffer = NULL;
++
++ local_this = this;
++
++ /* Determine the screen depth (use default 8-bit depth) */
++ vformat->BitsPerPixel = 8;
++ vformat->BytesPerPixel = 1;
++
++ /* We're done! */
++ return(0);
++}
++
++SDL_Rect **Caca_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags)
++{
++ if(format->BitsPerPixel != 8)
++ return NULL;
++
++ if ( flags & SDL_FULLSCREEN ) {
++ return SDL_modelist;
++ } else {
++ return (SDL_Rect **) -1;
++ }
++}
++
++/* Various screen update functions available */
++static void Caca_DirectUpdate(_THIS, int numrects, SDL_Rect *rects);
++
++SDL_Surface *Caca_SetVideoMode(_THIS, SDL_Surface *current,
++ int width, int height, int bpp, Uint32 flags)
++{
++ if ( Caca_buffer ) {
++ free( Caca_buffer );
++ Caca_buffer = NULL;
++ }
++
++ if ( Caca_bitmap ) {
++ caca_free_bitmap( Caca_bitmap );
++ Caca_bitmap = NULL;
++ }
++
++ Caca_buffer = malloc(2 * ((width + 15) & ~15) * height);
++ if ( ! Caca_buffer ) {
++ SDL_SetError("Couldn't allocate buffer for requested mode");
++ return(NULL);
++ }
++
++ memset(Caca_buffer, 0, 2 * ((width + 15) & ~15) * height);
++
++ /* Allocate the new pixel format for the screen */
++ if ( ! SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0) ) {
++ return(NULL);
++ }
++
++ /* Set up the new mode framebuffer */
++ current->flags = SDL_FULLSCREEN;
++ Caca_w = current->w = width;
++ Caca_h = current->h = height;
++ current->pitch = 2 * ((width + 15) & ~15);
++ current->pixels = Caca_buffer;
++
++ /* Create the libcaca bitmap */
++ Caca_bitmap = caca_create_bitmap( 16, width, height, current->pitch, 0xf800, 0x07e0, 0x001f, 0x0000 );
++ if ( ! Caca_bitmap ) {
++ SDL_SetError("Couldn't allocate libcaca bitmap");
++ return(NULL);
++ }
++
++ /* Set the blit function */
++ this->UpdateRects = Caca_DirectUpdate;
++
++ /* We're done */
++ return(current);
++}
++
++/* We don't actually allow hardware surfaces other than the main one */
++static int Caca_AllocHWSurface(_THIS, SDL_Surface *surface)
++{
++ return(-1);
++}
++static void Caca_FreeHWSurface(_THIS, SDL_Surface *surface)
++{
++ return;
++}
++
++/* We need to wait for vertical retrace on page flipped displays */
++static int Caca_LockHWSurface(_THIS, SDL_Surface *surface)
++{
++ /* TODO ? */
++ return(0);
++}
++static void Caca_UnlockHWSurface(_THIS, SDL_Surface *surface)
++{
++ return;
++}
++
++/* FIXME: How is this done with libcaca? */
++static int Caca_FlipHWSurface(_THIS, SDL_Surface *surface)
++{
++ SDL_mutexP(Caca_mutex);
++ caca_refresh();
++ SDL_mutexV(Caca_mutex);
++ return(0);
++}
++
++static void Caca_DirectUpdate(_THIS, int numrects, SDL_Rect *rects)
++{
++ SDL_mutexP(Caca_mutex);
++ caca_draw_bitmap( 0, 0, caca_get_width() - 1, caca_get_height() - 1,
++ Caca_bitmap, Caca_buffer );
++ caca_refresh();
++ SDL_mutexV(Caca_mutex);
++ return;
++}
++
++/* Note: If we are terminated, this could be called in the middle of
++ another SDL video routine -- notably UpdateRects.
++*/
++void Caca_VideoQuit(_THIS)
++{
++ int i;
++
++ /* Free video mode lists */
++ for ( i=0; i<SDL_NUMMODES; ++i ) {
++ if ( SDL_modelist[i] != NULL ) {
++ free(SDL_modelist[i]);
++ SDL_modelist[i] = NULL;
++ }
++ }
++
++ if ( Caca_bitmap ) {
++ caca_free_bitmap( Caca_bitmap );
++ Caca_bitmap = NULL;
++ }
++
++ caca_end();
++
++ SDL_DestroyMutex(Caca_mutex);
++}
++
+--- a/include/SDL_config.h.in
++++ b/include/SDL_config.h.in
+@@ -253,6 +253,7 @@
+ /* 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
+ #undef SDL_VIDEO_DRIVER_DGA
Added: unstable/libsdl-1.3/debian/patches/030_pulseaudio_enable.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/030_pulseaudio_enable.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/030_pulseaudio_enable.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,40 @@
+---
+ configure.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/configure.in
++++ b/configure.in
+@@ -479,8 +479,8 @@
+ {
+ AC_ARG_ENABLE(pulseaudio,
+ AC_HELP_STRING([--enable-pulseaudio], [use PulseAudio [[default=yes]]]),
+- , enable_pulse=yes)
+- if test x$enable_audio = xyes -a x$enable_pulse = xyes; then
++ , enable_pulseaudio=yes)
++ if test x$enable_audio = xyes -a x$enable_pulseaudio = xyes; then
+ audio_pulse=no
+
+ PULSE_REQUIRED_VERSION=0.9
+@@ -499,7 +499,7 @@
+ if test x$audio_pulse = xyes; then
+ AC_ARG_ENABLE(pulseaudio-shared,
+ AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]),
+- , enable_pulse_shared=yes)
++ , enable_pulseaudio_shared=yes)
+ if test "x`echo $PULSE_LIBS | grep -- -L`" = "x"; then
+ if test "x`ls /lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
+ PULSE_LIBS="-L/lib $PULSE_LIBS"
+@@ -517,11 +517,11 @@
+ SOURCES="$SOURCES $srcdir/src/audio/pulse/*.c"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS $PULSE_CFLAGS"
+ if test x$have_loadso != xyes && \
+- test x$enable_pulse_shared = xyes; then
++ test x$enable_pulseaudio_shared = xyes; then
+ AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic PulseAudio loading])
+ fi
+ if test x$have_loadso = xyes && \
+- test x$enable_pulse_shared = xyes && test x$pulse_lib != x; then
++ test x$enable_pulseaudio_shared = xyes && test x$pulse_lib != x; then
+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSE_DYNAMIC, "$pulse_lib")
+ else
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSE_LIBS"
Added: unstable/libsdl-1.3/debian/patches/040_propagate_pic_to_nasm.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/040_propagate_pic_to_nasm.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/040_propagate_pic_to_nasm.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,17 @@
+---
+ build-scripts/strip_fPIC.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/build-scripts/strip_fPIC.sh
++++ b/build-scripts/strip_fPIC.sh
+@@ -5,8 +5,8 @@
+ command=""
+ while [ $# -gt 0 ]; do
+ case "$1" in
+- -?PIC)
+- # Ignore -fPIC and -DPIC options
++ -fPIC)
++ # Ignore -fPIC option
+ ;;
+ -fno-common)
+ # Ignore -fPIC and -DPIC options
Added: unstable/libsdl-1.3/debian/patches/050_altivec_detection.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/050_altivec_detection.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/050_altivec_detection.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,120 @@
+Index: libsdl1.2-1.2.13/configure.in
+===================================================================
+--- libsdl1.2-1.2.13.orig/configure.in 2008-10-21 16:19:05.000000000 +0200
++++ libsdl1.2-1.2.13/configure.in 2008-10-21 16:27:11.000000000 +0200
+@@ -749,64 +749,66 @@
+ AC_HELP_STRING([--enable-altivec], [use altivec assembly blitters on PPC [[default=yes]]]),
+ , enable_altivec=yes)
+ if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_altivec = xyes; then
+- have_altivec_h_hdr=no
+- AC_CHECK_HEADER(altivec.h, have_altivec_h_hdr=yes)
+-
+ save_CFLAGS="$CFLAGS"
+ have_gcc_altivec=no
+- AC_MSG_CHECKING(for Altivec with GCC -maltivec option)
++ have_altivec_h_hdr=no
+ altivec_CFLAGS="-maltivec"
+ CFLAGS="$save_CFLAGS $altivec_CFLAGS"
+
+- if test x$have_altivec_h_hdr = xyes; then
+- AC_TRY_COMPILE([
+- #include <altivec.h>
+- vector unsigned int vzero() {
+- return vec_splat_u32(0);
+- }
+- ],[
+- ],[
+- have_gcc_altivec=yes
+- ])
+- AC_MSG_RESULT($have_gcc_altivec)
+- else
+- AC_TRY_COMPILE([
+- vector unsigned int vzero() {
+- return vec_splat_u32(0);
+- }
+- ],[
+- ],[
+- have_gcc_altivec=yes
+- ])
+- AC_MSG_RESULT($have_gcc_altivec)
++ AC_MSG_CHECKING(for Altivec with GCC altivec.h and -maltivec option)
++ AC_TRY_COMPILE([
++ #include <altivec.h>
++ vector unsigned int vzero() {
++ return vec_splat_u32(0);
++ }
++ ],[
++ ],[
++ have_gcc_altivec=yes
++ have_altivec_h_hdr=yes
++ ])
++ AC_MSG_RESULT($have_gcc_altivec)
++
++ if test x$have_gcc_altivec = xno; then
++ AC_MSG_CHECKING(for Altivec with GCC -maltivec option)
++ AC_TRY_COMPILE([
++ vector unsigned int vzero() {
++ return vec_splat_u32(0);
++ }
++ ],[
++ ],[
++ have_gcc_altivec=yes
++ ])
++ AC_MSG_RESULT($have_gcc_altivec)
+ fi
+
+ if test x$have_gcc_altivec = xno; then
+- AC_MSG_CHECKING(for Altivec with GCC -faltivec option)
++ AC_MSG_CHECKING(for Altivec with GCC altivec.h and -faltivec option)
+ altivec_CFLAGS="-faltivec"
+ CFLAGS="$save_CFLAGS $altivec_CFLAGS"
+- if test x$have_altivec_h_hdr = xyes; then
+- AC_TRY_COMPILE([
+- #include <altivec.h>
+- vector unsigned int vzero() {
+- return vec_splat_u32(0);
+- }
+- ],[
+- ],[
+- have_gcc_altivec=yes
+- ])
+- AC_MSG_RESULT($have_gcc_altivec)
+- else
+- AC_TRY_COMPILE([
+- vector unsigned int vzero() {
+- return vec_splat_u32(0);
+- }
+- ],[
+- ],[
+- have_gcc_altivec=yes
+- ])
+- AC_MSG_RESULT($have_gcc_altivec)
+- fi
++ AC_TRY_COMPILE([
++ #include <altivec.h>
++ vector unsigned int vzero() {
++ return vec_splat_u32(0);
++ }
++ ],[
++ ],[
++ have_gcc_altivec=yes
++ have_altivec_h_hdr=yes
++ ])
++ AC_MSG_RESULT($have_gcc_altivec)
++ fi
++
++ if test x$have_gcc_altivec = xno; then
++ AC_MSG_CHECKING(for Altivec with GCC -faltivec option)
++ AC_TRY_COMPILE([
++ vector unsigned int vzero() {
++ return vec_splat_u32(0);
++ }
++ ],[
++ ],[
++ have_gcc_altivec=yes
++ ])
++ AC_MSG_RESULT($have_gcc_altivec)
+ fi
+ CFLAGS="$save_CFLAGS"
+
+
Added: unstable/libsdl-1.3/debian/patches/060_disable_ipod.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/060_disable_ipod.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/060_disable_ipod.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,37 @@
+Index: SDL-1.2.14/configure.in
+===================================================================
+--- SDL-1.2.14.orig/configure.in 2009-11-27 15:01:50.000000000 -0500
++++ SDL-1.2.14/configure.in 2009-11-27 15:01:50.000000000 -0500
+@@ -882,19 +882,19 @@
+ }
+
+
+-dnl Do the iPod thing
+-CheckIPod()
+-{
+- AC_ARG_ENABLE(ipod,
+-AC_HELP_STRING([--enable-ipod], [configure SDL to work with iPodLinux [[default=no]]]),
+- , enable_ipod=no)
+-
+- if test x$enable_ipod = xyes; then
+- EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
+- AC_DEFINE(SDL_VIDEO_DRIVER_IPOD)
+- SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
+- fi
+-}
++#dnl Do the iPod thing
++#CheckIPod()
++#{
++# AC_ARG_ENABLE(ipod,
++#AC_HELP_STRING([--enable-ipod], [configure SDL to work with iPodLinux [[default=no]]]),
++# , enable_ipod=no)
++#
++# if test x$enable_ipod = xyes; then
++# EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
++# AC_DEFINE(SDL_VIDEO_DRIVER_IPOD)
++# SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
++# fi
++#}
+
+ dnl Find the nanox include and library directories
+ CheckNANOX()
Added: unstable/libsdl-1.3/debian/patches/205_lock_keys.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/205_lock_keys.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/205_lock_keys.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,64 @@
+---
+ src/events/SDL_keyboard.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/src/events/SDL_keyboard.c
++++ b/src/events/SDL_keyboard.c
+@@ -32,6 +32,7 @@
+ /* Global keystate information */
+ static Uint8 SDL_KeyState[SDLK_LAST];
+ static SDLMod SDL_ModState;
++static char *SDL_UseLockKeys;
+ int SDL_TranslateUNICODE = 0;
+
+ static const char *keynames[SDLK_LAST]; /* Array of keycode names */
+@@ -64,6 +65,7 @@
+ video->InitOSKeymap(this);
+
+ SDL_EnableKeyRepeat(0, 0);
++ SDL_UseLockKeys = getenv("SDL_DISABLE_LOCK_KEYS");
+
+ /* Fill in the blanks in keynames */
+ keynames[SDLK_BACKSPACE] = "backspace";
+@@ -375,6 +377,7 @@
+ SDL_Event event;
+ int posted, repeatable;
+ Uint16 modstate;
++ int use_lock_keys;
+
+ SDL_memset(&event, 0, sizeof(event));
+
+@@ -386,6 +389,7 @@
+ modstate = (Uint16)SDL_ModState;
+
+ repeatable = 0;
++ use_lock_keys = ( SDL_UseLockKeys && *SDL_UseLockKeys );
+
+ if ( state == SDL_PRESSED ) {
+ keysym->mod = (SDLMod)modstate;
+@@ -393,12 +397,16 @@
+ case SDLK_UNKNOWN:
+ break;
+ case SDLK_NUMLOCK:
++ if ( ! use_lock_keys )
++ break;
+ modstate ^= KMOD_NUM;
+ if ( ! (modstate&KMOD_NUM) )
+ state = SDL_RELEASED;
+ keysym->mod = (SDLMod)modstate;
+ break;
+ case SDLK_CAPSLOCK:
++ if ( ! use_lock_keys )
++ break;
+ modstate ^= KMOD_CAPS;
+ if ( ! (modstate&KMOD_CAPS) )
+ state = SDL_RELEASED;
+@@ -441,6 +449,8 @@
+ break;
+ case SDLK_NUMLOCK:
+ case SDLK_CAPSLOCK:
++ if (! use_lock_keys )
++ break;
+ /* Only send keydown events */
+ return(0);
+ case SDLK_LCTRL:
Added: unstable/libsdl-1.3/debian/patches/205_x11_keysym_fix.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/205_x11_keysym_fix.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/205_x11_keysym_fix.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,21 @@
+---
+ src/video/x11/SDL_x11events.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/src/video/x11/SDL_x11events.c
++++ b/src/video/x11/SDL_x11events.c
+@@ -1098,7 +1098,13 @@
+ KeySym xsym;
+ SDLKey key;
+
+- xsym = XKeycodeToKeysym(display, kc, 0);
++// if ( xkey ) {
++// /* Until we handle the IM protocol, use XLookupString() */
++// unsigned char keybuf[32];
++// XLookupString(xkey, keybuf, sizeof(keybuf), &xsym, NULL);
++// } else {
++ xsym = XKeycodeToKeysym(display, kc, 0);
++// }
+ #ifdef DEBUG_KEYS
+ fprintf(stderr, "Translating key code %d -> 0x%.4x\n", kc, xsym);
+ #endif
Added: unstable/libsdl-1.3/debian/patches/206_gcc4_compilation_fix.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/206_gcc4_compilation_fix.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/206_gcc4_compilation_fix.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,24 @@
+---
+ include/SDL_events.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/SDL_events.h
++++ b/include/SDL_events.h
+@@ -44,7 +44,7 @@
+ #define SDL_PRESSED 1
+
+ /* Event enumerations */
+-typedef enum {
++typedef enum SDL_Events {
+ SDL_NOEVENT = 0, /* Unused (do not remove) */
+ SDL_ACTIVEEVENT, /* Application loses/gains visibility */
+ SDL_KEYDOWN, /* Keys pressed */
+@@ -79,7 +79,7 @@
+
+ /* Predefined event masks */
+ #define SDL_EVENTMASK(X) (1<<(X))
+-typedef enum {
++typedef enum SDL_EventMasks {
+ SDL_ACTIVEEVENTMASK = SDL_EVENTMASK(SDL_ACTIVEEVENT),
+ SDL_KEYDOWNMASK = SDL_EVENTMASK(SDL_KEYDOWN),
+ SDL_KEYUPMASK = SDL_EVENTMASK(SDL_KEYUP),
Added: unstable/libsdl-1.3/debian/patches/209_alsa_priority.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/209_alsa_priority.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/209_alsa_priority.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,25 @@
+---
+ src/audio/SDL_audio.c | 6 +++---
+ src/audio/SDL_sysaudio.h | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+Index: SDL-1.2.14/src/audio/SDL_audio.c
+===================================================================
+--- SDL-1.2.14.orig/src/audio/SDL_audio.c 2009-10-13 06:25:35.000000000 -0400
++++ SDL-1.2.14/src/audio/SDL_audio.c 2009-11-28 09:09:36.000000000 -0500
+@@ -39,12 +39,12 @@
+ #if SDL_AUDIO_DRIVER_BSD
+ &BSD_AUDIO_bootstrap,
+ #endif
+-#if SDL_AUDIO_DRIVER_PULSE
+- &PULSE_bootstrap,
+-#endif
+ #if SDL_AUDIO_DRIVER_ALSA
+ &ALSA_bootstrap,
+ #endif
++#if SDL_AUDIO_DRIVER_PULSE
++ &PULSE_bootstrap,
++#endif
+ #if SDL_AUDIO_DRIVER_OSS
+ &DSP_bootstrap,
+ &DMA_bootstrap,
Added: unstable/libsdl-1.3/debian/patches/214_missing_mmx_blit.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/214_missing_mmx_blit.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/214_missing_mmx_blit.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,15 @@
+---
+ src/video/SDL_blit_N.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/src/video/SDL_blit_N.c
++++ b/src/video/SDL_blit_N.c
+@@ -2333,6 +2333,8 @@
+ { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000001F,0x000003E0,0x00007C00,
+ 0, ConvertX86p32_16BGR555, ConvertX86, NO_ALPHA },
+ { 0x00FF0000,0x0000FF00,0x000000FF, 3, 0x00FF0000,0x0000FF00,0x000000FF,
++ 1, ConvertMMXpII32_24RGB888, ConvertMMX, NO_ALPHA },
++ { 0x00FF0000,0x0000FF00,0x000000FF, 3, 0x00FF0000,0x0000FF00,0x000000FF,
+ 0, ConvertX86p32_24RGB888, ConvertX86, NO_ALPHA },
+ { 0x00FF0000,0x0000FF00,0x000000FF, 3, 0x000000FF,0x0000FF00,0x00FF0000,
+ 0, ConvertX86p32_24BGR888, ConvertX86, NO_ALPHA },
Added: unstable/libsdl-1.3/debian/patches/215_kfreebsd_gnu.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/215_kfreebsd_gnu.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/215_kfreebsd_gnu.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,71 @@
+---
+ src/joystick/bsd/SDL_sysjoystick.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+Index: libsdl1.2-1.2.14/src/joystick/bsd/SDL_sysjoystick.c
+===================================================================
+--- libsdl1.2-1.2.14.orig/src/joystick/bsd/SDL_sysjoystick.c 2009-10-13 01:07:13.000000000 +0200
++++ libsdl1.2-1.2.14/src/joystick/bsd/SDL_sysjoystick.c 2010-01-09 17:32:25.000000000 +0100
+@@ -59,7 +59,7 @@
+ #include <libusbhid.h>
+ #endif
+
+-#ifdef __FREEBSD__
++#if defined(__FREEBSD__) || defined(__FreeBSD_kernel__)
+ #ifndef __DragonFly__
+ #include <osreldate.h>
+ #endif
+@@ -78,7 +78,7 @@
+ #define MAX_JOY_JOYS 2
+ #define MAX_JOYS (MAX_UHID_JOYS + MAX_JOY_JOYS)
+
+-#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
++#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063) && false
+ struct usb_ctl_report {
+ int ucr_report;
+ u_char ucr_data[1024]; /* filled data size will vary */
+@@ -148,7 +148,7 @@
+ static int report_alloc(struct report *, struct report_desc *, int);
+ static void report_free(struct report *);
+
+-#if defined(USBHID_UCR_DATA) || (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
++#if defined(USBHID_UCR_DATA) || (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)) || defined(__FreeBSD_kernel__)
+ #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
+ #else
+ #define REP_BUF_DATA(rep) ((rep)->buf->data)
+@@ -303,7 +303,7 @@
+ strerror(errno));
+ goto usberr;
+ }
+-#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
++#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063) || defined(__FreeBSD_kernel__)
+ rep->rid = hid_get_report_id(fd);
+ if (rep->rid < 0) {
+ #else
+@@ -321,7 +321,7 @@
+ goto usberr;
+ }
+
+-#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111)
++#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111) || defined(__FreeBSD_kernel__)
+ hdata = hid_start_parse(hw->repdesc, 1 << hid_input, rep->rid);
+ #else
+ hdata = hid_start_parse(hw->repdesc, 1 << hid_input);
+@@ -405,7 +405,7 @@
+ int nbutton, naxe = -1;
+ Sint32 v;
+
+-#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
++#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H || defined(__FreeBSD_kernel__)
+ struct joystick gameport;
+
+ if (joy->hwdata->type == BSDJOY_JOY) {
+@@ -460,7 +460,7 @@
+ if (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) != rep->size) {
+ return;
+ }
+-#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111)
++#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111) || defined(__FreeBSD_kernel__)
+ hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
+ #else
+ hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
Added: unstable/libsdl-1.3/debian/patches/216_page_size.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/216_page_size.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/216_page_size.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,15 @@
+---
+ src/video/ps2gs/SDL_gsyuv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/video/ps2gs/SDL_gsyuv.c
++++ b/src/video/ps2gs/SDL_gsyuv.c
+@@ -180,7 +180,7 @@
+
+ /* Allocate a DMA area for pixel conversion */
+ bpp = this->screen->format->BytesPerPixel;
+- map_offset = (mapped_len + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1);
++ map_offset = (mapped_len + (sysconf(_SC_PAGESIZE) - 1)) & ~(sysconf(_SC_PAGESIZE) - 1);
+ hwdata->dma_len = hwdata->macroblocks * (16 * 16 + 8 * 8 + 8 * 8) +
+ width * height * bpp +
+ hwdata->macroblocks * (16 * sizeof(long long)) +
Added: unstable/libsdl-1.3/debian/patches/217_x11_keytounicode.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/217_x11_keytounicode.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/217_x11_keytounicode.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,33 @@
+---
+ src/video/x11/SDL_x11events.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+Index: SDL-1.2.14/src/video/x11/SDL_x11events.c
+===================================================================
+--- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c 2009-10-12 19:07:15.000000000 -0400
++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2009-11-28 09:19:15.000000000 -0500
+@@ -1228,8 +1228,11 @@
+ * sequences (dead accents, compose key sequences) will not work since the
+ * state has been irrevocably lost.
+ */
++extern DECLSPEC Uint16 SDLCALL X11_KeyToUnicode(SDLKey, SDLMod);
++
+ Uint16 X11_KeyToUnicode(SDLKey keysym, SDLMod modifiers)
+ {
++ static int warning = 1;
+ struct SDL_VideoDevice *this = current_video;
+ char keybuf[32];
+ int i;
+@@ -1237,6 +1240,12 @@
+ XKeyEvent xkey;
+ Uint16 unicode;
+
++ if ( warning ) {
++ warning = 0;
++ fprintf(stderr, "WARNING: Application is using X11_KeyToUnicode().\n");
++ fprintf(stderr, "This is not an official SDL function, please report this as a bug.\n");
++ }
++
+ if ( !this || !SDL_Display ) {
+ return 0;
+ }
Added: unstable/libsdl-1.3/debian/patches/218_double_free.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/218_double_free.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/218_double_free.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,22 @@
+Index: libsdl1.2-1.2.11/src/cdrom/linux/SDL_syscdrom.c
+===================================================================
+--- libsdl1.2-1.2.11.orig/src/cdrom/linux/SDL_syscdrom.c 2007-02-09 16:13:16.000000000 +0100
++++ libsdl1.2-1.2.11/src/cdrom/linux/SDL_syscdrom.c 2007-02-09 16:13:22.000000000 +0100
+@@ -218,7 +218,7 @@
+ if ( SDL_strcmp(mnt_type, MNTTYPE_SUPER) == 0 ) {
+ tmp = SDL_strstr(mntent->mnt_opts, "fs=");
+ if ( tmp ) {
+- SDL_free(mnt_type);
++ SDL_stack_free(mnt_type);
+ mnt_type = SDL_strdup(tmp + SDL_strlen("fs="));
+ if ( mnt_type ) {
+ tmp = SDL_strchr(mnt_type, ',');
+@@ -229,7 +229,7 @@
+ }
+ tmp = SDL_strstr(mntent->mnt_opts, "dev=");
+ if ( tmp ) {
+- SDL_free(mnt_dev);
++ SDL_stack_free(mnt_dev);
+ mnt_dev = SDL_strdup(tmp + SDL_strlen("dev="));
+ if ( mnt_dev ) {
+ tmp = SDL_strchr(mnt_dev, ',');
Added: unstable/libsdl-1.3/debian/patches/218_joystick_memmove.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/218_joystick_memmove.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/218_joystick_memmove.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,15 @@
+---
+ src/joystick/SDL_joystick.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/joystick/SDL_joystick.c
++++ b/src/joystick/SDL_joystick.c
+@@ -373,7 +373,7 @@
+ /* Remove joystick from list */
+ for ( i=0; SDL_joysticks[i]; ++i ) {
+ if ( joystick == SDL_joysticks[i] ) {
+- SDL_memcpy(&SDL_joysticks[i], &SDL_joysticks[i+1],
++ SDL_memmove(&SDL_joysticks[i], &SDL_joysticks[i+1],
+ (SDL_numjoysticks-i)*sizeof(joystick));
+ break;
+ }
Added: unstable/libsdl-1.3/debian/patches/219_pulseaudio_crackles.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/219_pulseaudio_crackles.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/219_pulseaudio_crackles.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,21 @@
+---
+ src/audio/pulse/SDL_pulseaudio.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/src/audio/pulse/SDL_pulseaudio.c
++++ b/src/audio/pulse/SDL_pulseaudio.c
+@@ -340,11 +340,10 @@
+ SDL_memset(mixbuf, spec->silence, spec->size);
+
+ /* Reduced prebuffering compared to the defaults. */
+- paattr.tlength = mixlen;
++ paattr.tlength = mixlen*2;
+ paattr.minreq = mixlen;
+- paattr.fragsize = mixlen;
+- paattr.prebuf = mixlen;
+- paattr.maxlength = mixlen * 4;
++ paattr.prebuf = mixlen * 2;
++ paattr.maxlength = mixlen * 2;
+
+ /* The SDL ALSA output hints us that we use Windows' channel mapping */
+ /* http://bugzilla.libsdl.org/show_bug.cgi?id=110 */
Added: unstable/libsdl-1.3/debian/patches/220_std_cld.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/220_std_cld.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/220_std_cld.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,14 @@
+---
+ include/SDL_stdinc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/include/SDL_stdinc.h
++++ b/include/SDL_stdinc.h
+@@ -331,6 +331,7 @@
+ __asm__ __volatile__ ( \
+ "std\n\t" \
+ "rep ; movsl\n\t" \
++ "cld\n\t" \
+ : "=&c" (u0), "=&D" (u1), "=&S" (u2) \
+ : "0" (n >> 2), \
+ "1" (dstp+(n-4)), "2" (srcp+(n-4)) \
Added: unstable/libsdl-1.3/debian/patches/221_check_SDL_NOKBD_environment_variable.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/221_check_SDL_NOKBD_environment_variable.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/221_check_SDL_NOKBD_environment_variable.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,60 @@
+ 1.2.13-4+nmu2: Closes: #438915
+---
+ src/video/fbcon/SDL_fbvideo.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+Index: SDL-1.2.14/src/video/fbcon/SDL_fbvideo.c
+===================================================================
+--- SDL-1.2.14.orig/src/video/fbcon/SDL_fbvideo.c 2009-10-12 19:07:15.000000000 -0400
++++ SDL-1.2.14/src/video/fbcon/SDL_fbvideo.c 2009-11-28 09:20:05.000000000 -0500
+@@ -792,14 +792,19 @@
+ }
+ }
+
+- /* Enable mouse and keyboard support */
+- if ( FB_OpenKeyboard(this) < 0 ) {
+- FB_VideoQuit(this);
+- return(-1);
+- }
++ if (!SDL_getenv("SDL_NOKBD"))
++ {
++ fprintf(stderr, "init kbd.\n");
++ /* Enable mouse and keyboard support */
++ if ( FB_OpenKeyboard(this) < 0 ) {
++ FB_VideoQuit(this);
++ return(-1);
++ }
++ }
+ if ( FB_OpenMouse(this) < 0 ) {
+ const char *sdl_nomouse;
+
++ fprintf(stderr, "init mouse failed.\n");
+ sdl_nomouse = SDL_getenv("SDL_NOMOUSE");
+ if ( ! sdl_nomouse ) {
+ SDL_SetError("Unable to open mouse");
+@@ -1009,7 +1014,6 @@
+
+ /* Set the terminal into graphics mode */
+ if ( FB_EnterGraphicsMode(this) < 0 ) {
+- return(NULL);
+ }
+
+ /* Restore the original palette */
+@@ -1910,7 +1914,7 @@
+
+ if ( this->screen ) {
+ /* Clear screen and tell SDL not to free the pixels */
+- if ( this->screen->pixels && FB_InGraphicsMode(this) ) {
++ if ( this->screen->pixels && (FB_InGraphicsMode(this) || SDL_getenv("SDL_NOKBD")) ) {
+ #if defined(__powerpc__) || defined(__ia64__) /* SIGBUS when using SDL_memset() ?? */
+ Uint8 *rowp = (Uint8 *)this->screen->pixels;
+ int left = this->screen->pitch*this->screen->h;
+@@ -1959,7 +1963,7 @@
+ }
+
+ /* Restore the original video mode and palette */
+- if ( FB_InGraphicsMode(this) ) {
++ if ( FB_InGraphicsMode(this) || SDL_getenv("SDL_NOKBD") ) {
+ FB_RestorePalette(this);
+ ioctl(console_fd, FBIOPUT_VSCREENINFO, &saved_vinfo);
+ }
Added: unstable/libsdl-1.3/debian/patches/222_joystick_crash.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/222_joystick_crash.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/222_joystick_crash.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,14 @@
+Description: Fix crash with joystick detection.
+Index: libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c
+===================================================================
+--- libsdl1.2-1.2.14.orig/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:37:36.000000000 -0500
++++ libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:38:27.000000000 -0500
+@@ -700,7 +700,7 @@
+ continue;
+ }
+ if ( test_bit(i, absbit) ) {
+- int values[5];
++ int values[6];
+
+ if ( ioctl(fd, EVIOCGABS(i), values) < 0 )
+ continue;
Added: unstable/libsdl-1.3/debian/patches/300_dont_propagate_lpthread.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/300_dont_propagate_lpthread.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/300_dont_propagate_lpthread.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,30 @@
+---
+ sdl-config.in | 2 +-
+ sdl.pc.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: SDL-1.2.14/sdl.pc.in
+===================================================================
+--- SDL-1.2.14.orig/sdl.pc.in 2009-10-12 19:07:20.000000000 -0400
++++ SDL-1.2.14/sdl.pc.in 2009-11-28 09:21:57.000000000 -0500
+@@ -10,6 +10,6 @@
+ Version: @SDL_VERSION@
+ Requires:
+ Conflicts:
+-Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
++Libs: -L${libdir} @SDL_RLD_FLAGS@ -lSDL
+ Libs.private: @SDL_STATIC_LIBS@
+ Cflags: -I${includedir}/SDL @SDL_CFLAGS@
+Index: SDL-1.2.14/sdl-config.in
+===================================================================
+--- SDL-1.2.14.orig/sdl-config.in 2009-10-12 19:07:20.000000000 -0400
++++ SDL-1.2.14/sdl-config.in 2009-11-28 09:21:04.000000000 -0500
+@@ -45,7 +45,7 @@
+ echo -I at includedir@/SDL @SDL_CFLAGS@
+ ;;
+ @ENABLE_SHARED_TRUE@ --libs)
+- at ENABLE_SHARED_TRUE@ echo -L at libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
++ at ENABLE_SHARED_TRUE@ echo -L at libdir@ @SDL_RLD_FLAGS@ -lSDL
+ @ENABLE_SHARED_TRUE@ ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
Added: unstable/libsdl-1.3/debian/patches/310_fixmouseclicks
===================================================================
--- unstable/libsdl-1.3/debian/patches/310_fixmouseclicks (rev 0)
+++ unstable/libsdl-1.3/debian/patches/310_fixmouseclicks 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,25 @@
+Index: libsdl1.2-1.2.14/src/video/x11/SDL_x11events.c
+===================================================================
+--- libsdl1.2-1.2.14.orig/src/video/x11/SDL_x11events.c 2010-04-06 19:29:05.000000000 +0100
++++ libsdl1.2-1.2.14/src/video/x11/SDL_x11events.c 2010-04-06 19:29:46.000000000 +0100
+@@ -423,12 +423,15 @@
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+- if ( this->input_grab == SDL_GRAB_OFF ) {
+- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++ if ( (xevent.xcrossing.mode != NotifyGrab) &&
++ (xevent.xcrossing.mode != NotifyUngrab) ) {
++ if ( this->input_grab == SDL_GRAB_OFF ) {
++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
++ }
++ posted = SDL_PrivateMouseMotion(0, 0,
++ xevent.xcrossing.x,
++ xevent.xcrossing.y);
+ }
+- posted = SDL_PrivateMouseMotion(0, 0,
+- xevent.xcrossing.x,
+- xevent.xcrossing.y);
+ }
+ break;
+
Added: unstable/libsdl-1.3/debian/patches/310_segfault_noGLX.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/310_segfault_noGLX.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/310_segfault_noGLX.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,16 @@
+Index: libsdl1.2-1.2.13/src/video/x11/SDL_x11gl.c
+===================================================================
+--- libsdl1.2-1.2.13.orig/src/video/x11/SDL_x11gl.c 2009-10-01 16:53:43.000000000 -0400
++++ libsdl1.2-1.2.13/src/video/x11/SDL_x11gl.c 2009-10-01 16:55:39.000000000 -0400
+@@ -70,6 +70,11 @@
+ /* It takes a bit of care to be fool-proof about parsing the
+ * OpenGL extensions string. Don't be fooled by sub-strings, etc.
+ */
++
++ /* http://bugs.debian.org/537487 */
++ if (extensions == NULL) {
++ return 0;
++ }
+
+ start = extensions;
+
Added: unstable/libsdl-1.3/debian/patches/320_activate_xrandr_on_default.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/320_activate_xrandr_on_default.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/320_activate_xrandr_on_default.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,22 @@
+Index: libsdl1.2-1.2.13/src/video/x11/SDL_x11modes.c
+===================================================================
+--- libsdl1.2-1.2.13.orig/src/video/x11/SDL_x11modes.c 2009-10-02 10:07:12.000000000 -0400
++++ libsdl1.2-1.2.13/src/video/x11/SDL_x11modes.c 2009-10-02 10:07:59.000000000 -0400
+@@ -392,11 +392,14 @@
+ return 0;
+ }
+
+- /* This defaults off now, due to KDE window maximize problems */
+- if ( !env ) {
++ // deactivated 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: #450689
++/* if ( !env ) {
+ return 0;
+ }
+-
++*/
+ if ( !SDL_X11_HAVE_XRANDR ) {
+ return 0;
+ }
Added: unstable/libsdl-1.3/debian/patches/320_disappearingcursor.diff
===================================================================
--- unstable/libsdl-1.3/debian/patches/320_disappearingcursor.diff (rev 0)
+++ unstable/libsdl-1.3/debian/patches/320_disappearingcursor.diff 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,17 @@
+Index: SDL-1.2.14/src/video/x11/SDL_x11events.c
+===================================================================
+--- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400
++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400
+@@ -444,8 +444,10 @@
+ if ( xevent.xcrossing.mode == NotifyUngrab )
+ printf("Mode: NotifyUngrab\n");
+ #endif
+- if ( xevent.xcrossing.detail != NotifyInferior ) {
+- if ( this->input_grab == SDL_GRAB_OFF ) {
++ if ( (xevent.xcrossing.mode != NotifyGrab) &&
++ (xevent.xcrossing.mode != NotifyUngrab) &&
++ (xevent.xcrossing.detail != NotifyInferior) ) {
++ if ( this->input_grab == SDL_GRAB_OFF ) {
+ posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+ } else {
+ posted = SDL_PrivateMouseMotion(0, 0,
Added: unstable/libsdl-1.3/debian/patches/series
===================================================================
--- unstable/libsdl-1.3/debian/patches/series (rev 0)
+++ unstable/libsdl-1.3/debian/patches/series 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,14 @@
+#020_libcaca_new_api.diff
+#030_pulseaudio_enable.diff
+#040_propagate_pic_to_nasm.diff
+#050_altivec_detection.diff
+####060_disable_ipod.diff
+#206_gcc4_compilation_fix.diff
+#209_alsa_priority.diff - Refreshed but should pulse be before ALSA?
+####215_kfreebsd_gnu.diff
+####217_x11_keytounicode.diff
+####221_check_SDL_NOKBD_environment_variable.diff
+####222_joystick_crash.diff
+300_dont_propagate_lpthread.diff
+####310_fixmouseclicks
+####320_disappearingcursor.diff
Added: unstable/libsdl-1.3/debian/rules
===================================================================
--- unstable/libsdl-1.3/debian/rules (rev 0)
+++ unstable/libsdl-1.3/debian/rules 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,145 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+MAKE=make
+
+# Support multiple makes at once based on number of processors
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+NJOBS := 1
+endif
+
+export SHLIBVER=1.3.0~20111204-1
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+export DEB_HOST_GNU_TYPE
+export DEB_BUILD_GNU_TYPE
+
+confflags = --prefix=/usr
+confflags += --disable-rpath --enable-sdl-dlopen --disable-loadso \
+ --disable-video-ggi --disable-video-svga --disable-video-aalib \
+ --disable-nas --disable-esd --disable-arts \
+ --disable-alsa-shared --disable-pulseaudio-shared \
+ --disable-x11-shared \
+ --enable-video-directfb
+all_confflags = --enable-video-caca
+udeb_confflags = --enable-video-directfb \
+ --disable-video-x11 \
+ --disable-dga --disable-video-photon \
+ --disable-video-fbcon --disable-video-ps2gs \
+ --disable-video-opengl --disable-video-xbios \
+ --disable-video-gem --disable-video-caca \
+ --disable-audio \
+ --disable-oss --disable-alsa --disable-pulseaudio
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+# Support for DEB_BUILD_OPTIONS
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ confflags += --enable-debug
+else
+ confflags += --disable-debug
+endif
+
+# Only use NASM routines on x86 CPUs
+ifeq ($(DEB_HOST_ARCH_CPU),i386)
+ confflags += --enable-nasm
+endif
+
+# Don't use PlayStation 3 Cell driver on powerpc
+ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
+ confflags += --enable-video-ps3=no \
+ --disable-altivec
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ touch configure # Fix timestamp
+ for dir in all udeb; do \
+ if ( [ "$$dir" = "all" ] ); then \
+ SWITCHES="$(all_confflags)"; \
+ elif ( [ "$$dir" = "udeb" ] ); then \
+ SWITCHES="$(udeb_confflags)"; \
+ else \
+ SWITCHES=""; \
+ fi; \
+ mkdir -p builddir/$$dir; \
+ (cd builddir/$$dir; ../../configure $(confflags) $$SWITCHES); \
+ done
+ touch configure-stamp
+
+build: build-stamp
+build-arch: build
+build-indep: build
+build-stamp: configure-stamp
+ dh_testdir
+ for dir in all udeb; do \
+ $(MAKE) -j $(NJOBS) -C builddir/$$dir || exit 1; \
+ done
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -Rf builddir
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ rm -rf .pc
+ rm -f build-stamp configure-stamp
+ dh_clean
+
+install:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ $(MAKE) -C builddir/all install DESTDIR=`pwd`/debian/tmp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs -A BUGS CREDITS README README-SDL.txt
+ dh_installexamples -plibsdl-1.3-dev test
+ rm debian/libsdl-1.3-dev/usr/share/doc/libsdl-1.3-dev/examples/test/COPYING
+ cd debian/libsdl-1.3-dev/usr/share/doc/libsdl-1.3-dev/examples; \
+ tar cf examples.tar test; \
+ rm -rf test
+ #mkdir -p debian/libsdl-1.3-dev/usr/share/man/man3
+ #cd debian/libsdl-1.3-dev/usr/share/doc/libsdl-1.3-dev/docs; \
+ # mv man3/* ../../../man/man3/; rmdir man3
+ dh_installman -plibsdl-1.3-dev debian/sdl-config.1
+ dh_installchangelogs
+ dh_install --sourcedir=debian/tmp
+ sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl-1.3-dev/usr/lib/libSDL.la
+ dh_install --sourcedir=builddir/udeb/ -plibsdl-1.3-0-udeb build/.libs/*.so.* usr/lib/;
+ rm -rf debian/libsdl-1.3-0/usr/include
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs -V"libsdl-1.3-0 (>= $(SHLIBVER))" --add-udeb=libsdl-1.3-0-udeb
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
Property changes on: unstable/libsdl-1.3/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: unstable/libsdl-1.3/debian/sdl-config.1
===================================================================
--- unstable/libsdl-1.3/debian/sdl-config.1 (rev 0)
+++ unstable/libsdl-1.3/debian/sdl-config.1 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,86 @@
+.TH sdl-config 1 "2011-12-04" "SDL 1.3"
+.SH NAME
+sdl-config \- script to get information about the installed version of SDL
+.SH SYNOPSIS
+.B sdl-config
+[ --prefix=
+.IR DIR ]
+[ --exec-prefix=
+.IR DIR ]
+[ --version ] [ --libs | --library-libs | --plugin-libs ] [ --cflags ]
+.SH DESCRIPTION
+.B sdl-config
+is a tool that is used to configure and determine the compiler and linker
+flags that should be used to compile and link progams, libraries, and
+plugins that use SDL. It is also used internally by the m4 macros that are
+included with SDL.
+.SH OPTIONS
+.TP
+.B --cflags
+Print the compiler flags that are necessary to compile a program or library
+that uses SDL.
+.TP
+.BI --exec-prefix= DIR
+If specified, use
+.I DIR
+instead of the installation exec prefix that SDL was build with when
+computing the output for the --cflags, --libs, --library-libs, and
+--plugin-libs options. This option must be specified before any of the
+--cflags, --libs, --library-libs, and --plugin-libs options.
+.TP
+.B --libs
+Print the linker flags that are necessary to link a program that uses SDL.
+.TP
+.B --static-libs
+Print the linker flags that are necessary to statically link a program that uses SDL.
+.TP
+.B --library-libs
+Print the linker flags that are necessary to link a library that uses SDL.
+(This excludes any static objects required for linking, since these must be
+linked only by executable programs.)
+.TP
+.B --plugin-libs
+Print the linker flags that are necessary to link an SDL-using object that
+is to be accessed via
+.IR dlopen (3).
+This may include static objects with PIC symbol information. This option
+should
+.B not
+be used for ordinary shared libraries or standalone applications.
+.TP
+.BI --prefix= DIR
+If specified, use PREFIX instead of the installation prefix that SDL was
+built with when computing the output for the --cflags, --libs,
+--library-libs, and --plugin-libs options. This option is also used for
+the exec prefix if --exec-prefix was not specified. This option must be
+specified before any of the --cflags, --libs, --library-libs, and
+--plugin-libs options.
+.TP
+.B --version
+Prints the currently installed version of SDL on standard output.
+.SH EXAMPLES
+.TP
+gcc -o main.o $(sdl-config --cflags) main.c
+is how you might use
+.B sdl-config
+to compile a C source file for an executable program.
+.TP
+gcc -o my_app $(sdl-config --libs) main.o util.o
+is how you might use
+.B sdl-config
+to link compiled objects into an executable program.
+.TP
+gcc -o libSDL_nifty-1.3.so.0.0.1 $(sdl --library-libs) read.o write.o munge.o
+is how you might use
+.B sdl-config
+to link compiled objects into a shared library.
+.TP
+gcc -o libnifty_xmms.so $(sdl --plugin-libs) stream.o blit.o deinterlace.o
+is how you might use
+.B sdl-config
+to link compiled objects into a plugin for use by another program.
+.SH AUTHOR
+The Simple DirectMedia Layer (SDL) library was written by Sam Lantinga.
+.PP
+This manual page was written by Branden Robinson, originally for Progeny
+Linux Systems, Inc., and the Debian Project.
Added: unstable/libsdl-1.3/debian/source/format
===================================================================
--- unstable/libsdl-1.3/debian/source/format (rev 0)
+++ unstable/libsdl-1.3/debian/source/format 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1 @@
+1.0
Added: unstable/libsdl-1.3/debian/sources
===================================================================
--- unstable/libsdl-1.3/debian/sources (rev 0)
+++ unstable/libsdl-1.3/debian/sources 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1 @@
+upstream tar SDL-1.2.2004.01.12.tar.gz
Added: unstable/libsdl-1.3/debian/watch
===================================================================
--- unstable/libsdl-1.3/debian/watch (rev 0)
+++ unstable/libsdl-1.3/debian/watch 2011-12-04 15:05:04 UTC (rev 277)
@@ -0,0 +1,2 @@
+version=3
+http://www.libsdl.org/release/SDL-([\d.]+)\.tar\.gz
Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog 2011-12-04 13:28:01 UTC (rev 276)
+++ unstable/libsdl1.2/debian/changelog 2011-12-04 15:05:04 UTC (rev 277)
@@ -1,7 +1,7 @@
libsdl1.2 (1.2.14-6.4) unstable; urgency=low
* Non-maintainer upload.
- * Build improvements from Guillem Jover that should really have gone
+ * Build improvements from Guillem Jover that should really have gone
with the previous upload. Closes: #614332.
+ Line-wrap build-depends.
+ Use -any syntax for architecture-specific stuff.
@@ -18,9 +18,9 @@
libsdl1.2 (1.2.14-6.3) unstable; urgency=low
* Non-maintainer upload with maintainer’s approval.
- * Merge all builds into a single one, there is no more a reason to
+ * Merge all builds into a single one, there is no more a reason to
keep all these packages.
- * Remove support for libaa (there’s libcaca), libsvga (directfb
+ * Remove support for libaa (there’s libcaca), libsvga (directfb
supports more architectures) and libesd (pulseaudio does much more).
* Remove obsolete sys-build.mk from source directory.
@@ -34,7 +34,7 @@
- Remove libsdl1.2debian-arts.
- Remove references to arts in other packages that this source provides.
- Pass --disable-arts to the configure script.
-
+
[ Ana Beatriz Guerrero Lopez ]
* Update uploaders, remove aurel32, joss and sho.
@@ -73,7 +73,7 @@
libsdl1.2 (1.2.14-4) unstable; urgency=low
- * Move -dev Recommends back to Depends, as other packages may want to
+ * Move -dev Recommends back to Depends, as other packages may want to
statically link with libsdl.a. (Closes: #565579).
-- Aurelien Jarno <aurel32 at debian.org> Sun, 31 Jan 2010 11:57:35 +0100
@@ -127,7 +127,7 @@
* Remove duplicate sections from binary packages.
* Bump debhelper build-dep version and compat to 5.
* Bump Standards Version to 3.8.3
-
+
[ Aurelien Jarno ]
* 100_config_update.diff: update config.guess/sub. (Closes: #549240).
@@ -144,7 +144,7 @@
libsdl1.2 (1.2.13-3) unstable; urgency=low
- * Remove patch 1.2.13 to 1.2.12 downgrade from the diff.gz (Closes:
+ * Remove patch 1.2.13 to 1.2.12 downgrade from the diff.gz (Closes:
#472094, #467225).
* debian/patches/211_mprotect.diff
+ Update.
@@ -155,7 +155,7 @@
* debian/control:
+ Set policy to 3.8.0.
+ Switch build-dependency to libgl1-mesa-dev from xlibmesa-gl-dev.
- + Switch dependency of libsdl1.2-dev to libglu1-mesa-dev from
+ + Switch dependency of libsdl1.2-dev to libglu1-mesa-dev from
libglu1-xorg-dev.
+ Increase the number of flavour to seven from four in the description
of libsdl1.2debian (Closes: #469378).
@@ -365,7 +365,7 @@
* debian/rules, debian/control:
- Enable libsvga1 support on amd64.
- - Explicitely disable libsvga support on other architectures to make
+ - Explicitely disable libsvga support on other architectures to make
sure that the resulting library will not be linked with libsvga1 if
libsvga1-dev is installed on the system.
@@ -519,7 +519,7 @@
* debian/patches/015_kfreebsd_gnu.diff:
+ New patch: Fixes for joystick support on GNU/kFreeBSD.
-
+
-- Aurelien Jarno <aurel32 at debian.org> Fri, 3 Mar 2006 20:14:19 +0100
libsdl1.2 (1.2.9-3) unstable; urgency=low
@@ -679,7 +679,7 @@
disc is mounted in the filesystem. Removing O_EXCL from open()
call fixes this.
* gcc4 compilation (patch 006_gcc4_compilation_fix.diff) (Closes: 294475)
- * add ppc64 arch to libasound2-dev build depends (add ppc64 to
+ * add ppc64 arch to libasound2-dev build depends (add ppc64 to
debian/control and control.in) (Closes: 304527)
-- Lawrence Williams <lawrence_cecil_williams at hotmail.com> Mon, 30 May 2005 17:15:10 -0330
@@ -739,10 +739,10 @@
* Updated to 07/10/2004 CVS.
* Added --static-libs to sdl-config manpage.
* Added NAS support.
- * Provide debian patches for autogen.sh ( needs automake 1.7 ) and
+ * Provide debian patches for autogen.sh ( needs automake 1.7 ) and
configure.in ( fix for NAS support ).
* Added libaudio-dev, automake1.7 to Build-Depends.
- * Added ./autogen.sh call in debian/rules ( makes package more portable
+ * Added ./autogen.sh call in debian/rules ( makes package more portable
and easier to maintain in the future ).
* (Closes: 273895, 217516, 220407, 252897, 159110, 170548, 203843)
(Closes: 238981, 264436, 159410, 137751, 213624)
@@ -751,7 +751,7 @@
libsdl1.2 (1.2.7-10) unstable; urgency=low
- * Fix bashism in vars.build, patch from Andreas Metzler. (Closes: #269855)
+ * Fix bashism in vars.build, patch from Andreas Metzler. (Closes: #269855)
-- Matthew Danish <mrd at debian.org> Sat, 4 Sep 2004 15:44:18 -0400
@@ -763,7 +763,7 @@
libsdl1.2 (1.2.7-8) unstable; urgency=low
- * Two patches from Robert Millan: (Closes: #263543)
+ * Two patches from Robert Millan: (Closes: #263543)
- ALSA dependency fix for certain platforms.
- Updated libtool.
* Removed gcc-3.4 patch, causing display bugs. (Closes: #257257)
@@ -796,7 +796,7 @@
* Make libsdl1.2-dev depend upon libsvga1-dev only on i386
(Patch thanks to Andreas Metzler) (Closes: #240907).
* Revert Lamont's incorrect solution to #240907.
- * Remove arch-exclusions on certain build-time libs
+ * Remove arch-exclusions on certain build-time libs
that don't need it anymore. (from Lamont Jones).
-- Matthew Danish <mrd at debian.org> Fri, 2 Apr 2004 23:22:23 -0500
@@ -849,7 +849,7 @@
libsdl1.2 (1.2.6-3) unstable; urgency=low
- * Patch to fix powerpc fullscreen mode. (Closes: #210406)
+ * Patch to fix powerpc fullscreen mode. (Closes: #210406)
-- Matthew Danish <mrd at debian.org> Sun, 25 Jan 2004 18:32:51 -0500
@@ -873,13 +873,13 @@
* Removed -L/usr/lib from sdl-config --libs output (Closes: #185521).
* Added Build-Conflicts on automake1.7 to work-around a FTBFS bug for now
(Closes: #206575).
- * Updated config.{sub,guess}
+ * Updated config.{sub,guess}
-- Matthew Danish <mrd at debian.org> Tue, 9 Sep 2003 00:29:00 -0400
libsdl1.2 (1.2.5-8) unstable; urgency=low
- * Fix stupid-shell-quoting error in generating shlib file (Closes: #196875)
+ * Fix stupid-shell-quoting error in generating shlib file (Closes: #196875)
-- Matthew Danish <mrd at debian.org> Tue, 10 Jun 2003 17:50:26 -0400
More information about the pkg-sdl-commits
mailing list