[Pkg-sdl-commits] r261 - in unstable/libsdl1.2/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2010-01-12 18:41:40 +0000 (Tue, 12 Jan 2010)
New Revision: 261

Added:
   unstable/libsdl1.2/debian/patches/222_joystick_crash.diff
Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/control
   unstable/libsdl1.2/debian/patches/series
   unstable/libsdl1.2/debian/rules
Log:
  * Add build-dep on libglu1-mesa-dev to enable OpenGL support. (LP: #328932)
  * Disable Playstation 3 Cell driver on PPC. (Closes: #564846).
    + Thanks to Scott Kitterman at Ubuntu for finding fix from Gentoo.
  * 222_joystick_crash.diff - Fix crash with dpad joystick. (Closes: #564831).
    + Thanks to Tarek Soliman for catching the fix from upstream.


Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2010-01-11 16:47:24 UTC (rev 260)
+++ unstable/libsdl1.2/debian/changelog	2010-01-12 18:41:40 UTC (rev 261)
@@ -1,3 +1,14 @@
+libsdl1.2 (1.2.14-3) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * Add build-dep on libglu1-mesa-dev to enable OpenGL support. (LP: #328932)
+  * Disable Playstation 3 Cell driver on PPC. (Closes: #564846).
+    + Thanks to Scott Kitterman at Ubuntu for finding fix from Gentoo.
+  * 222_joystick_crash.diff - Fix crash with dpad joystick. (Closes: #564831).
+    + Thanks to Tarek Soliman for catching the fix from upstream.
+
+ -- Barry deFreese <bdefreese at debian.org>  Tue, 12 Jan 2010 12:25:04 -0500
+
 libsdl1.2 (1.2.14-2) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control	2010-01-11 16:47:24 UTC (rev 260)
+++ unstable/libsdl1.2/debian/control	2010-01-12 18:41:40 UTC (rev 261)
@@ -4,7 +4,7 @@
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>, Barry deFreese <bdefreese at debian.org>
 Standards-Version: 3.8.3
-Build-Depends: dpkg (>= 1.13.2), debhelper (>= 5.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x11proto-core-dev, libaudiofile-dev, libesd0-dev, libpulse-dev, libgl1-mesa-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libcaca-dev, libdirectfb-dev (>= 1.0) [!hurd-i386], libusbhid-dev [kfreebsd-i386 kfreebsd-amd64]
+Build-Depends: dpkg (>= 1.13.2), debhelper (>= 5.0), quilt, nasm [i386 kfreebsd-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x11proto-core-dev, libaudiofile-dev, libesd0-dev, libpulse-dev, libgl1-mesa-dev, libsvga1-dev [amd64 i386], libarts1-dev, libartsc0-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudio-dev, libcaca-dev, libdirectfb-dev (>= 1.0) [!hurd-i386], libusbhid-dev [kfreebsd-i386 kfreebsd-amd64], libglu1-mesa-dev
 Vcs-Svn: svn://svn.debian.org/pkg-sdl/unstable/libsdl.2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-sdl/unstable/libsdl1.2/
 Homepage: http://www.libsdl.org/

Added: unstable/libsdl1.2/debian/patches/222_joystick_crash.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/222_joystick_crash.diff	                        (rev 0)
+++ unstable/libsdl1.2/debian/patches/222_joystick_crash.diff	2010-01-12 18:41:40 UTC (rev 261)
@@ -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;

Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series	2010-01-11 16:47:24 UTC (rev 260)
+++ unstable/libsdl1.2/debian/patches/series	2010-01-12 18:41:40 UTC (rev 261)
@@ -13,4 +13,5 @@
 215_kfreebsd_gnu.diff
 217_x11_keytounicode.diff
 221_check_SDL_NOKBD_environment_variable.diff
+222_joystick_crash.diff
 300_dont_propagate_lpthread.diff

Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules	2010-01-11 16:47:24 UTC (rev 260)
+++ unstable/libsdl1.2/debian/rules	2010-01-12 18:41:40 UTC (rev 261)
@@ -67,6 +67,11 @@
   confflags += --enable-nasm
 endif
 
+# Don't use PlayStation 3 Cell driver on powerpc
+ifeq ($(DEB_BUILD_ARCH_CPU),powerpc)
+  confflags += --enable-video-ps3=no
+endif
+
 # Only build ALSA support on Linux targets
 ifeq ($(DEB_BUILD_ARCH_OS),linux)
   FLAVOURS += alsa