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

[Aurelien Jarno]

Author: aurel32
Date: 2006-03-02 00:35:54 +0000 (Thu, 02 Mar 2006)
New Revision: 30

Added:
   unstable/libsdl1.2/debian/patches/015_kfreebsd_gnu.diff
Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/control
Log:
  * debian/control
    + Build-depends on libusbhid-dev on all kfreebsd platforms for joystick
      support.

  * debian/patches/015_kfreebsd_gnu.diff:
    + New patch: Fixes for joystick support on GNU/kFreeBSD.


Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2006-03-01 20:55:56 UTC (rev 29)
+++ unstable/libsdl1.2/debian/changelog	2006-03-02 00:35:54 UTC (rev 30)
@@ -52,9 +52,15 @@
   [ Aurelien Jarno ]
   * debian/control:
     + Build-depends on NASM for all i386 platforms
+    + Build-depends on libusbhid-dev on all kfreebsd platforms for joystick
+      support.
+    
   * debian/rules:
     + Use NASM on all i386 platforms.
     + Build SVGA support on linux i386 only.
+    
+  * debian/patches/015_kfreebsd_gnu.diff:
+    + New patch: Fixes for joystick support on GNU/kFreeBSD.
 
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue, 28 Feb 2006 01:48:50 +0100
 

Modified: unstable/libsdl1.2/debian/control
===================================================================
--- unstable/libsdl1.2/debian/control	2006-03-01 20:55:56 UTC (rev 29)
+++ unstable/libsdl1.2/debian/control	2006-03-02 00:35:54 UTC (rev 30)
@@ -4,7 +4,7 @@
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
 Uploaders: Matthew Danish <mrd at debian.org>, Zephaniah E. Hull <warp at debian.org>, Lawrence Williams <lawrence_cecil_williams at hotmail.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Aurelien Jarno <aurel32 at debian.org>, Josselin Mouette <joss at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), dbs, nasm [any-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [i386], libarts1-dev, libartsc0-dev, libasound2-dev [linux-any], libaudio-dev, libdirectfb-dev (>= 0.9.22)
+Build-Depends: dpkg (>= 1.13.2), debhelper (>= 4.0), dbs, nasm [any-i386], libaa1-dev, libx11-dev, libxext-dev, libxt-dev, libxv-dev, x-dev, libaudiofile-dev, libesd0-dev, xlibmesa-gl-dev | libgl-dev, libsvga1-dev [i386], libarts1-dev, libartsc0-dev, libasound2-dev [linux-any], libaudio-dev, libdirectfb-dev (>= 0.9.22), libusbhid-dev [kfreebsd-any]
 
 Package: libsdl1.2debian
 Architecture: any

Added: unstable/libsdl1.2/debian/patches/015_kfreebsd_gnu.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/015_kfreebsd_gnu.diff	2006-03-01 20:55:56 UTC (rev 29)
+++ unstable/libsdl1.2/debian/patches/015_kfreebsd_gnu.diff	2006-03-02 00:35:54 UTC (rev 30)
@@ -0,0 +1,49 @@
+--- SDL-1.2.9/configure	2006-03-02 00:53:21.000000000 +0100
++++ SDL-1.2.9/configure	2006-03-02 00:52:43.000000000 +0100
+@@ -29976,6 +29976,7 @@
+               JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la"
+ 	    ;;
+ 	    k*bsd-gnu)
++              CFLAGS="$CFLAGS -DHAVE_USBHID_H -DUSBHID_UCR_DATA -DUSBHID_NEW"
+               JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
+               JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
+ 	    ;;
+--- SDL-1.2.9/configure.in	2006-03-02 00:53:21.000000000 +0100
++++ SDL-1.2.9/configure.in	2006-03-02 00:51:22.000000000 +0100
+@@ -1935,6 +1935,7 @@
+               JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la"
+ 	    ;;
+ 	    k*bsd-gnu)
++              CFLAGS="$CFLAGS -DHAVE_USBHID_H -DUSBHID_UCR_DATA -DUSBHID_NEW"
+               JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
+               JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
+ 	    ;;
+--- SDL-1.2.9/src/joystick/bsd/SDL_sysjoystick.c	2004-11-12 22:24:46.000000000 +0100
++++ SDL-1.2.9/src/joystick/bsd/SDL_sysjoystick.c	2006-03-02 00:52:30.000000000 +0100
+@@ -55,7 +55,7 @@
+ #include <libusbhid.h>
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <osreldate.h>
+ #include <sys/joystick.h>
+ #endif
+@@ -370,7 +370,7 @@
+ 	int nbutton, naxe = -1;
+ 	Sint32 v;
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ 	struct joystick gameport;
+ 	static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
+  
+@@ -419,7 +419,7 @@
+ 		}
+ 		return;
+ 	}
+-#endif /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) */
++#endif /* defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) */
+ 	
+ 	rep = &joy->hwdata->inreport;
+