[Pkg-sdl-commits] [libsdl2] 01/01: Fix FTBFS on kFreeBSD.

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository libsdl2.

commit d7f8a3665e4c8c62da14427e64f1ca96943e90d8
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Jan 5 13:46:06 2014 +0100

    Fix FTBFS on kFreeBSD.
    
    * Fix FTBFS on kFreeBSD.
      - Add fix_ftbfs_kfreebsd.diff to extend a __FreeBSD__ check to
        __FreeBSD_kernel__.
---
 debian/changelog                       |  8 ++++++++
 debian/patches/fix_ftbfs_kfreebsd.diff | 24 ++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a6a2af5..e78748d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libsdl2 (2.0.1+dfsg1-2) unstable; urgency=medium
+
+  * Fix FTBFS on kFreeBSD.
+    - Add fix_ftbfs_kfreebsd.diff to extend a __FreeBSD__ check to
+      __FreeBSD_kernel__.
+
+ -- Felix Geyer <fgeyer at debian.org>  Sun, 05 Jan 2014 13:42:59 +0100
+
 libsdl2 (2.0.1+dfsg1-1) unstable; urgency=medium
 
   * New upstream release (Closes: #728974)
diff --git a/debian/patches/fix_ftbfs_kfreebsd.diff b/debian/patches/fix_ftbfs_kfreebsd.diff
new file mode 100644
index 0000000..69deda9
--- /dev/null
+++ b/debian/patches/fix_ftbfs_kfreebsd.diff
@@ -0,0 +1,24 @@
+Description: Fix FTBFS on Debian GNU/kFreeBSD.
+Author: Felix Geyer <fgeyer at debian.org>
+Bug: https://bugzilla.libsdl.org/show_bug.cgi?id=2335
+
+--- libsdl2-2.0.1+dfsg1.orig/src/cpuinfo/SDL_cpuinfo.c
++++ libsdl2-2.0.1+dfsg1/src/cpuinfo/SDL_cpuinfo.c
+@@ -621,7 +621,7 @@ SDL_GetSystemRAM(void)
+ #endif
+ #ifdef HAVE_SYSCTLBYNAME
+         if (SDL_SystemRAM <= 0) {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #ifdef HW_REALMEM
+             int mib[2] = {CTL_HW, HW_REALMEM};
+ #else
+@@ -630,7 +630,7 @@ SDL_GetSystemRAM(void)
+ #endif /* HW_REALMEM */
+ #else
+             int mib[2] = {CTL_HW, HW_MEMSIZE};
+-#endif /* __FreeBSD__ */
++#endif /* __FreeBSD__ || __FreeBSD_kernel__ */
+             Uint64 memsize = 0;
+             size_t len = sizeof(memsize);
+             
diff --git a/debian/patches/series b/debian/patches/series
index b6f97fc..48accf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 SDL2_dont_propagate_lpthread.diff
 fix_joystick_misc_axes.diff
+fix_ftbfs_kfreebsd.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2.git