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

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 2b8baba5f0593dd5347b5f0769368fee0b8eec1e
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jan 22 19:47:01 2012 +0000

    Remove patch kfreebsd_gnu.diff, it was applied upstream, picked from Debian (changeset 4537 cd344ebc14e9)

diff --git a/debian/patches/kfreebsd_gnu.diff b/debian/patches/kfreebsd_gnu.diff
deleted file mode 100644
index 801926b..0000000
--- a/debian/patches/kfreebsd_gnu.diff
+++ /dev/null
@@ -1,71 +0,0 @@
----
- 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);
diff --git a/debian/patches/series b/debian/patches/series
index 12bb0be..980a11c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-kfreebsd_gnu.diff
 x11_keytounicode.diff
 check_SDL_NOKBD_environment_variable.diff
 dont_propagate_lpthread.diff

-- 
Debian packaging of SDL 1.2