[Gnash-commit] [SCM] Gnash branch, master, updated. 721c40db91bb95e2b0bd56118a214f57d6fe6cd0

[John Wimer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  721c40db91bb95e2b0bd56118a214f57d6fe6cd0 (commit)
       via  d86e7f7659e9304d754c5381ec7c3fc093d8b494 (commit)
      from  9dcf46349b94ffd86ade4db18a2d01b753034877 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=721c40db91bb95e2b0bd56118a214f57d6fe6cd0


commit 721c40db91bb95e2b0bd56118a214f57d6fe6cd0
Author: John Wimer <address@hidden>
Date:   Fri Aug 20 10:57:08 2010 +0200

    update configure to automatically disable jemalloc on HURD. Patch from 
pinotree

diff --git a/configure.ac b/configure.ac
index 5862028..e88d50c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1430,7 +1430,7 @@ esac],jemalloc=yes)
 
 dnl There is some weird stuff going on with NetBSD and jemalloc, so don't 
 dnl build it for now.
-if test x"${netbsd}" = x"yes" -o x"${windows}" = x"yes" -o x"${freebsd}" = 
x"yes" -o x"${haiku}" = x"yes"; then
+if test x"${netbsd}" = x"yes" -o x"${windows}" = x"yes" -o x"${freebsd}" = 
x"yes" -o x"${haiku}" = x"yes" -o x"${gnu}" = x"yes"; then
   jemalloc=no
 fi
 dnl If the compiler doesn't have local thread storage enabled, don't try to

http://git.savannah.gnu.org/cgit//commit/?id=d86e7f7659e9304d754c5381ec7c3fc093d8b494


commit d86e7f7659e9304d754c5381ec7c3fc093d8b494
Author: John Wimer <address@hidden>
Date:   Fri Aug 20 10:24:46 2010 +0200

    Apply patch from pinotree to enable build on GNU HURD

diff --git a/configure.ac b/configure.ac
index aab5c82..5862028 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,10 @@ case "${host}" in
     DEFAULT_FLASH_PLATFORM_ID="HAIKU"
     DEFAULT_FLASH_SYSTEM_OS="Haiku"
     ;;    
+  *-gnu*)
+    DEFAULT_FLASH_PLATFORM_ID="GNU"
+    DEFAULT_FLASH_SYSTEM_OS="GNU/HURD"
+    ;;    
   *)
     DEFAULT_FLASH_PLATFORM_ID="UNK"
     DEFAULT_FLASH_SYSTEM_OS="Unknown"
@@ -180,6 +184,10 @@ case "${host}" in
     haiku=yes
     AC_DEFINE([HAIKU_HOST], [1], [this is a Haiku platform])
     ;;
+  *-gnu*)
+    gnu=yes
+    AC_DEFINE([GNU_HOST], [1], [this is a GNU platform])
+    ;;
 esac
 
 
diff --git a/gui/gtk/gtk_glue.h b/gui/gtk/gtk_glue.h
index 1935570..bd8aef2 100644
--- a/gui/gtk/gtk_glue.h
+++ b/gui/gtk/gtk_glue.h
@@ -24,7 +24,7 @@
 #include <cassert>
 
 #include <gtk/gtk.h>
-#if !defined(_WIN32) && !defined(__MACH__)
+#if !defined(_WIN32) && !defined(__APPLE__)
 #include <gdk/gdkx.h>
 #else
 #include <gdk/gdk.h>
diff --git a/libbase/tu_opengl_includes.h b/libbase/tu_opengl_includes.h
index 23808c8..230238e 100644
--- a/libbase/tu_opengl_includes.h
+++ b/libbase/tu_opengl_includes.h
@@ -60,17 +60,17 @@
 # include <GL/glu.h>
 #endif // WIN32
 
-#ifdef __MACH__
+#ifdef __APPLE__
 # include <OpenGL/gl.h>
 # include <OpenGL/glu.h>
 # define APIENTRY
-#endif // __MACH__
+#endif // __APPLE__
 
-#if !defined(WIN32) && (!defined(__MACH__) || defined(GUI_GTK))
+#if !defined(WIN32) && (!defined(__APPLE__) || defined(GUI_GTK))
 #ifndef GL_GLEXT_PROTOTYPES
 # define GL_GLEXT_PROTOTYPES 1
 #endif
-#ifdef __MACH__
+#ifdef __APPLE__
 # include <OpenGL/glext.h>
 #else
 # include <GL/gl.h>
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 288b200..8f1a278 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -11,6 +11,7 @@
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 SNAPSHOT_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed 
's/[()]//g')
@@ -68,7 +69,9 @@ patch-stamp:
 # These flags are the defaults Gnash uses when configuring, but we pass
 # them here explicitly because it makes it easier for non Gnash developers
 # to know what those defaults are.
-BUILD_FLAGS = --enable-jemalloc
+ifneq "$(DEB_HOST_ARCH_OS)" "hurd"
+       BUILD_FLAGS = --enable-jemalloc
+endif
 
 # this is where all the objects and executables go. We have to
 # redfine this, instead of just appending the path elements, as

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                 |   10 +++++++++-
 gui/gtk/gtk_glue.h           |    2 +-
 libbase/tu_opengl_includes.h |    8 ++++----
 packaging/debian/rules       |    5 ++++-
 4 files changed, 18 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash