Bug#640912: bsnes: FTBFS on non-Linux archs

[Pino Toscano]

Package: bsnes
Severity: important
Tags: patch

Hi,

currently bsnes fails to build on kFreeBSD and Hurd.
The attached patch fixes all the general non-Linux issues, making bsnes
compile on kFreeBSD at least (still few remain for Hurd, which need to
be handled separately):
- detect kFreeBSD and Hurd as "X platforms" also in (the various copies
  of) detect.hpp
- compile the ALSA audio output only on Linux systems

Could you please forward this upstream?

Thanks,
-- 
Pino
-------------- next part --------------
--- a/bsnes/nall/detect.hpp
+++ b/bsnes/nall/detect.hpp
@@ -15,7 +15,7 @@
   #define PLATFORM_WIN
 #elif defined(__APPLE__)
   #define PLATFORM_OSX
-#elif defined(linux) || defined(__sun__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(linux) || defined(__sun__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
   #define PLATFORM_X
 #endif
 
--- a/bsnes/ui/Makefile
+++ b/bsnes/ui/Makefile
@@ -16,9 +16,13 @@
   endif
 
   ruby := video.glx video.xv video.sdl
-  ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao
+  ruby += audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao
   ruby += input.sdl input.x
 
+  ifneq ($(findstring Linux,$(uname)),)
+    ruby += audio.alsa
+  endif
+
   link += $(if $(findstring audio.openal,$(ruby)),-lopenal)
 else ifeq ($(platform),osx)
   phoenix_compile = $(call compile,-DPHOENIX_QT)
--- a/snesfilter/nall/detect.hpp
+++ b/snesfilter/nall/detect.hpp
@@ -15,7 +15,7 @@
   #define PLATFORM_WIN
 #elif defined(__APPLE__)
   #define PLATFORM_OSX
-#elif defined(linux) || defined(__sun__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(linux) || defined(__sun__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
   #define PLATFORM_X
 #endif
 
--- a/snespurify/nall/detect.hpp
+++ b/snespurify/nall/detect.hpp
@@ -15,7 +15,7 @@
   #define PLATFORM_WIN
 #elif defined(__APPLE__)
   #define PLATFORM_OSX
-#elif defined(linux) || defined(__sun__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(linux) || defined(__sun__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
   #define PLATFORM_X
 #endif
 
--- a/snespurify/phoenix/nall/detect.hpp
+++ b/snespurify/phoenix/nall/detect.hpp
@@ -15,7 +15,7 @@
   #define PLATFORM_WIN
 #elif defined(__APPLE__)
   #define PLATFORM_OSX
-#elif defined(linux) || defined(__sun__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(linux) || defined(__sun__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
   #define PLATFORM_X
 #endif