[Pkg-sdl-commits] r70 - unstable/libsdl1.2/debian/patches

[Aurelien Jarno]

Author: aurel32
Date: 2006-05-30 05:34:02 +0000 (Tue, 30 May 2006)
New Revision: 70

Modified:
   unstable/libsdl1.2/debian/patches/015_kfreebsd_gnu.diff
   unstable/libsdl1.2/debian/patches/series
Log:
  * debian/patches/015_kfreebsd_gnu.diff:
    + Fixed and refreshed patches.



Modified: unstable/libsdl1.2/debian/patches/015_kfreebsd_gnu.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/015_kfreebsd_gnu.diff	2006-05-27 01:10:41 UTC (rev 69)
+++ unstable/libsdl1.2/debian/patches/015_kfreebsd_gnu.diff	2006-05-30 05:34:02 UTC (rev 70)
@@ -1,57 +1,57 @@
-Index: libsdl1.2-1.2.9+0/configure
-===================================================================
---- libsdl1.2-1.2.9+0.orig/configure	2006-05-13 18:17:25.000000000 +0200
-+++ libsdl1.2-1.2.9+0/configure	2006-05-13 18:18:24.000000000 +0200
-@@ -29976,6 +29976,8 @@
-               JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la"
- 	    ;;
- 	    k*bsd-gnu)
-+              CFLAGS="$CFLAGS -DHAVE_USBHID_H -DUSBHID_UCR_DATA -DUSBHID_NEW"
-+              SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
-               JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
-               JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
- 	    ;;
-Index: libsdl1.2-1.2.9+0/configure.in
-===================================================================
---- libsdl1.2-1.2.9+0.orig/configure.in	2006-05-13 18:17:35.000000000 +0200
-+++ libsdl1.2-1.2.9+0/configure.in	2006-05-13 18:18:24.000000000 +0200
-@@ -1935,6 +1935,8 @@
-               JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la"
- 	    ;;
- 	    k*bsd-gnu)
-+              CFLAGS="$CFLAGS -DHAVE_USBHID_H -DUSBHID_UCR_DATA -DUSBHID_NEW"
-+              SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid"
-               JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
-               JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
- 	    ;;
-Index: libsdl1.2-1.2.9+0/src/joystick/bsd/SDL_sysjoystick.c
-===================================================================
---- libsdl1.2-1.2.9+0.orig/src/joystick/bsd/SDL_sysjoystick.c	2004-11-12 22:24:46.000000000 +0100
-+++ libsdl1.2-1.2.9+0/src/joystick/bsd/SDL_sysjoystick.c	2006-05-13 18:18:24.000000000 +0200
+--- libsdl1.2-1.2.10.orig/src/joystick/bsd/SDL_sysjoystick.c
++++ libsdl1.2-1.2.10/src/joystick/bsd/SDL_sysjoystick.c
 @@ -55,7 +55,7 @@
  #include <libusbhid.h>
  #endif
  
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#ifdef __FREEBSD__
++#if defined(__FREEBSD__) || defined(__FreeBSD_kernel__)
+ #ifndef __DragonFly__
  #include <osreldate.h>
- #include <sys/joystick.h>
  #endif
-@@ -370,7 +370,7 @@
+@@ -294,7 +294,7 @@
+ 		goto usberr;
+ 	}
+ 
+-#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_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);
+@@ -378,7 +378,7 @@
  	int nbutton, naxe = -1;
  	Sint32 v;
  
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
++#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H || defined(__FreeBSD_kernel__)
  	struct joystick gameport;
  	static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
   
-@@ -419,7 +419,7 @@
+@@ -427,14 +427,14 @@
  		}
  		return;
  	}
--#endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) */
-+#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) */
+-#endif /* defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
++#endif /* defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H || defined(__FreeBSD_kernel__) */
  	
  	rep = &joy->hwdata->inreport;
  
+ 	if (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) != rep->size) {
+ 		return;
+ 	}
+-#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_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);
+@@ -530,8 +530,8 @@
+ #ifdef __DragonFly__
+ 	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
+ #elif __FREEBSD__
+-# if (__FreeBSD_version >= 460000)
+-#  if (__FreeBSD_version <= 500111)
++# if (__FreeBSD_kernel_version >= 460000) || defined(__FreeBSD_kernel__)
++#  if (__FreeBSD_kernel_version <= 500111)
+ 	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
+ #  else
+ 	len = hid_report_size(rd, repinfo[repind].kind, r->rid);

Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series	2006-05-27 01:10:41 UTC (rev 69)
+++ unstable/libsdl1.2/debian/patches/series	2006-05-30 05:34:02 UTC (rev 70)
@@ -10,4 +10,4 @@
 #011_mprotect.diff
 #013_hermes_pic_support.diff
 014_missing_mmx_blit.diff
-#015_kfreebsd_gnu.diff
+015_kfreebsd_gnu.diff