[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.2 branch, master, updated. debian/1.2.15-1-1-g90e7718

[Felix Geyer]

The following commit has been merged in the master branch:
commit 90e7718c7c115bfd684480ac0932784af6d1a0fc
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Thu Feb 16 16:20:33 2012 +0100

    Add fix_build_joystick_freebsd.diff by Robert Millan to fix build on kfreebsd. (Closes: #659615)

diff --git a/debian/changelog b/debian/changelog
index 0e08cc0..d70811d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libsdl1.2 (1.2.15-2) UNRELEASED; urgency=low
+
+  * Add fix_build_joystick_freebsd.diff by Robert Millan to fix build
+    on kfreebsd. (Closes: #659615)
+
+ -- Felix Geyer <debfx-pkg at fobos.de>  Thu, 16 Feb 2012 16:14:14 +0100
+
 libsdl1.2 (1.2.15-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/fix_build_joystick_freebsd.diff b/debian/patches/fix_build_joystick_freebsd.diff
new file mode 100644
index 0000000..f86c443
--- /dev/null
+++ b/debian/patches/fix_build_joystick_freebsd.diff
@@ -0,0 +1,20 @@
+Description: FreeBSD compile fix.
+ src/joystick/bsd/SDL_sysjoystick.c makes the invalid assumption that
+ __FreeBSD_kernel__ implies presence of "ucr_data" struct member.  This
+ breaks recent versions of FreeBSD 10-CURRENT, FreeBSD 9-STABLE and
+ Debian GNU/kFreeBSD "wheezy/sid".
+Origin: upstream, http://hg.libsdl.org/SDL/rev/62ff1c0a103f
+Author: Robert Millan <rmh at debian.org>
+
+diff -r 8e98c714bb2a -r 62ff1c0a103f src/joystick/bsd/SDL_sysjoystick.c
+--- a/src/joystick/bsd/SDL_sysjoystick.c	Sat Feb 04 18:12:20 2012 -0500
++++ b/src/joystick/bsd/SDL_sysjoystick.c	Wed Feb 15 21:06:08 2012 -0500
+@@ -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_kernel__)
++#if defined(USBHID_UCR_DATA)
+ #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
+ #elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
+ #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
diff --git a/debian/patches/series b/debian/patches/series
index 9208584..ac5fcf3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 x11_keytounicode.diff
 dont_propagate_lpthread.diff
 #check_SDL_NOKBD_environment_variable.diff
+fix_build_joystick_freebsd.diff

-- 
Debian packaging of SDL 1.2