[Pkg-sdl-commits] [libsdl2] 05/09: Remove patch applied upstream: fix_ftbfs_kfreebsd.diff

[Manuel A. Fernandez Montecelo]

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

mafm pushed a commit to branch master
in repository libsdl2.

commit 8de5300818aa7af2dfb2a6352f4b81e6b73a3436
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Fri Mar 14 23:50:31 2014 +0000

    Remove patch applied upstream: fix_ftbfs_kfreebsd.diff
---
 debian/changelog                       |  1 +
 debian/patches/fix_ftbfs_kfreebsd.diff | 24 ------------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d0bac0..c5571f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libsdl2 (2.0.2+dfsg1-1) UNRELEASED; urgency=low
     - Add support for Wayland, including build-depends for
       libegl1-mesa-dev, libxkbcommon-dev and libwayland-dev
       (Closes: #714482)
+    - Remove patch applied upstream: fix_ftbfs_kfreebsd.diff
 
  -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Fri, 14 Mar 2014 23:28:54 +0000
 
diff --git a/debian/patches/fix_ftbfs_kfreebsd.diff b/debian/patches/fix_ftbfs_kfreebsd.diff
deleted file mode 100644
index 69deda9..0000000
--- a/debian/patches/fix_ftbfs_kfreebsd.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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 48accf9..b6f97fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 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