[mupen64plus] 106/262: Don't stop compilation due to unknown OS kFreeBSD

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 8ebe4b9f97947496343098c98bee2037786f0134
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Tue Sep 1 17:58:49 2009 +0200

    Don't stop compilation due to unknown OS kFreeBSD
---
 debian/changelog                        |  2 ++
 debian/patches/117-ftbfs-kfreebsd.patch | 41 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 05e8d7f..361ee60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ mupen64plus (1.5+dfsg1-2) UNRELEASED; urgency=low
       for files for each user (Closes: #544428)
     - Add 116-ftbfs-dynarec.patch, Don't try to compile dynarec on architectures
       without dynarec support (Closes: #544548)
+    - Add 117-ftbfs-kfreebsd.patch, Don't stop compilation due to unknown OS
+      kFreeBSD (Closes: #544550)
   * debian/control:
     - Depend on libxdg-basedir-dev and pkg-config to support xdg-basedir
       specification
diff --git a/debian/patches/117-ftbfs-kfreebsd.patch b/debian/patches/117-ftbfs-kfreebsd.patch
new file mode 100644
index 0000000..b848a8a
--- /dev/null
+++ b/debian/patches/117-ftbfs-kfreebsd.patch
@@ -0,0 +1,41 @@
+From 6e07ea1d674c961fe49d33bfcacbdbcac027dd24 Mon Sep 17 00:00:00 2001
+From: Sven Eckelmann <sven.eckelmann at gmx.de>
+Date: Tue, 1 Sep 2009 17:55:59 +0200
+Subject: [PATCH] Don't stop build of kFreeBSD due to unknown OS
+
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
+---
+ glide64/Ini.cpp            |    2 +-
+ glide64/wrapper/glidesys.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glide64/Ini.cpp b/glide64/Ini.cpp
+index bc4faee..23bacf1 100644
+--- a/glide64/Ini.cpp
++++ b/glide64/Ini.cpp
+@@ -74,7 +74,7 @@ BOOL INI_Open ()
+ #ifdef _WIN32
+     GetModuleFileName (hInstance, path, PATH_MAX);
+ #else // _WIN32
+-# ifdef __FreeBSD__
++# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+    int n = readlink("/proc/curproc/files", path, PATH_MAX);
+ #else
+    int n = readlink("/proc/self/exe", path, PATH_MAX);
+diff --git a/glide64/wrapper/glidesys.h b/glide64/wrapper/glidesys.h
+index c9716b9..d9138a4 100644
+--- a/glide64/wrapper/glidesys.h
++++ b/glide64/wrapper/glidesys.h
+@@ -111,7 +111,7 @@ n** -----------------------------------------------------------------------
+ /* Check for OS */
+ #if defined(__IRIX__) || defined(__sparc__) || defined(__linux__) || \
+     defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
+-    defined(__APPLE__)
++    defined(__APPLE__) || defined(__FreeBSD_kernel__)
+ #  define GLIDE_OS        GLIDE_OS_UNIX
+ #elif defined(__DOS__)
+ #  define GLIDE_OS        GLIDE_OS_DOS32
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
index f769f4c..80c7cfb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 114-fix-7z-subfolder.patch
 115-xdg-basedir.patch
 116-ftbfs-dynarec.patch
+117-ftbfs-kfreebsd.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git