[Gnash-dev] Haiku support

[Adrian Panasiuk]

Hi!

In context of http://bzr.savannah.gnu.org/r/gnash/haiku/, here are
some more changes needed for Haiku support:




=== modified file 'configure.ac'
--- configure.ac        2010-02-17 02:59:52 +0000
+++ configure.ac        2010-02-17 15:16:54 +0000
@@ -206,13 +206,9 @@
 dnl like pentium->geode, which can use the same compiler, but have
 dnl different development libraries.

-dnl I want to depreciate this option for the new sysroot name to be
+dnl I want to depreciate this option for the new "sysroot" name to be
 dnl consistant with other tools. This will be left for a while as
 dnl a transistion.
-dnl For Haiku, we know the sysroot is in a non-standard place
-if test x"${haiku}" = xyes; then
-  with_top_level="/boot/common"
-fi
 AC_ARG_WITH(top_level,
   AC_HELP_STRING([--with-top-level],
   [top level directory for cross compiling files]),
@@ -225,6 +221,11 @@
   with_top_level=${withval} ;
   cross_compiling=yes)

+dnl For Haiku, we know the sysroot is in a non-standard place
+if test x"${haiku}" = xyes; then
+  with_top_level="/boot/common"
+fi
+
 soldir=/tmp
 AC_ARG_WITH(soldir,
  AC_HELP_STRING([--with-soldir],
@@ -289,7 +290,7 @@
 esac],jemalloc=yes)

 dnl There is some weird stuff going on with NetBSD and jemalloc, so
don't build it for now.
-if test x"${netbsd}" = x"yes" -o x"${windows}" = x"yes" -o
x"${freebsd}" = x"yes"; then
+if test x"${netbsd}" = x"yes" -o x"${windows}" = x"yes" -o
x"${freebsd}" = x"yes" -o x"${haiku}" = x"yes"; then
   jemalloc=no
 fi
 dnl If the compiler doesn't have local thread storage enabled, don't try to
@@ -650,7 +651,7 @@
 if test x"${haiku}" = xyes; then
   build_haiku=yes;
   build_gtk=no;
-  build_kde3=no;
+  build_qt4=no;
   build_kde4=no;
 fi

@@ -2505,12 +2506,6 @@
   echo "        Intel 810 LOD bias hack disabled (default). Use
--enable-i810-lod-bias to enable."
 fi

-if test x"$pthreads" = x"yes"; then
-  echo "        POSIX Threads support enabled (default)"
-else
-  echo "        POSIX Thread support disabled."
-fi
-
 if test x"$dmalloc" = x"yes"; then
   echo "        DMalloc support enabled"
   echo "        For a list of the command-line options enter: dmalloc --usage"
@@ -3063,10 +3058,10 @@
   fi
   if test x"$PTHREAD_LIBS" != x; then
     echo "        POSIX Threads lib is: $PTHREAD_LIBS"
-  else
-    if test x$cross_compiling = xno; then
-      echo "ERROR: No pthread development package installed!" >&3
-    fi
+  fi
+else
+  if test x$cross_compiling = xno; then
+    echo "ERROR: No pthread development package installed!" >&3
   fi
 fi

@@ -3475,7 +3470,7 @@
 fi

 if test x"${build_all_as3}" = x"yes"; then
-  echo "        Building the entire ActionScript class libary"
+  echo "        Building the entire ActionScript class library"
 else
   echo "        Only building these ActionScript classes into the library:"
   echo "     ${classlist}"

=== modified file 'libbase/SharedMem.cpp'
--- libbase/SharedMem.cpp       2010-02-11 12:15:10 +0000
+++ libbase/SharedMem.cpp       2010-02-17 15:46:12 +0000
@@ -25,15 +25,17 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <fcntl.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
-#include <sys/mman.h>
-#include <sys/shm.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#elif !defined(__riscos__) && !defined(__OS2__)
-#include <windows.h>
-#include <process.h>
-#include <io.h>
+#if !defined(__riscos__) && !defined(__OS2__) && !defined(HAIKU_HOST)
+#  if defined(HAVE_WINSOCK_H)
+#    include <windows.h>
+#    include <process.h>
+#    include <io.h>
+#  else
+#    include <sys/mman.h>
+#    include <sys/shm.h>
+#    include <sys/ipc.h>
+#    include <sys/sem.h>
+#  endif
 #endif
 #include <string>
 #include <vector>
@@ -64,6 +66,33 @@
 {
 }

+#ifdef HAIKU_HOST
+SharedMem::~SharedMem()
+{
+       log_error(_("unimplemented"));
+}
+
+bool
+SharedMem::lock()
+{
+       log_error(_("unimplemented"));
+       return false;
+}
+
+bool
+SharedMem::unlock()
+{
+       log_error(_("unimplemented"));
+       return false;
+}
+
+bool
+SharedMem::attach()
+{
+       log_error(_("unimplemented"));
+       return false;
+}
+#else
 SharedMem::~SharedMem()
 {
 #ifndef _WIN32
@@ -221,6 +250,8 @@
 #endif
 }

+#endif // HAIKU_HOST
+


 } // end of gnash namespace

=== modified file 'libbase/SharedMem.h'
--- libbase/SharedMem.h 2010-02-12 12:29:55 +0000
+++ libbase/SharedMem.h 2010-02-17 15:40:57 +0000
@@ -23,14 +23,16 @@
 #include <boost/cstdint.hpp>

 #include <sys/types.h>
-#if !defined(HAVE_WINSOCK_H) && !defined(__riscos__) && !defined(__OS2__)
-# include <sys/ipc.h>
-# include <sys/shm.h>
-#elif !defined(__riscos__) && !defined(__OS2__)
-# include <windows.h>
-# include <process.h>
-# include <fcntl.h>
-# include <io.h>
+#if !defined(__riscos__) && !defined(__OS2__) && !defined(HAIKU_HOST)
+#  if defined(HAVE_WINSOCK_H)
+#    include <windows.h>
+#    include <process.h>
+#    include <io.h>
+#    include <fcntl.h>
+#  else
+#    include <sys/shm.h>
+#    include <sys/ipc.h>
+#  endif
 #endif

 // Forward declarations

=== modified file 'libbase/rc.cpp'
--- libbase/rc.cpp      2010-02-17 02:31:29 +0000
+++ libbase/rc.cpp      2010-02-17 15:22:18 +0000
@@ -157,7 +157,7 @@
 #endif

     // Check the users home directory
-    char *home = 0;
+    const char *home = 0;
     //on AmigaOS we have a GNASH: assign that point to program dir
 #if defined (__amigaos4__)
     home = "/gnash";

=== modified file 'libbase/rc.h'
--- libbase/rc.h        2010-02-17 02:31:29 +0000
+++ libbase/rc.h        2010-02-17 14:53:29 +0000
@@ -29,9 +29,11 @@
 #include <boost/cstdint.hpp>
 #include <boost/tokenizer.hpp>

-#ifndef _WIN32
-#include <sys/shm.h>
-#else
+#if !defined(_WIN32) && !defined(HAIKU_HOST)
+#  include <sys/shm.h>
+#endif
+
+#ifdef _WIN32
 typedef boost::uint32_t key_t;
 #endif // _WIN32


=== modified file 'macros/agg.m4'
--- macros/agg.m4       2010-02-05 21:50:22 +0000
+++ macros/agg.m4       2010-02-17 13:56:56 +0000
@@ -54,7 +54,7 @@
     for i in $incllist; do
       if test -f $i/agg2/agg_gradient_lut.h; then
         ac_cv_path_agg_incl="-I$i/agg2"
-        agg_include_dir=$i/agg2
+        agg_include_dir="$i/agg2"
              agg25=yes
         break
       fi

=== modified file 'macros/ffmpeg.m4'
--- macros/ffmpeg.m4    2010-01-15 02:03:37 +0000
+++ macros/ffmpeg.m4    2010-02-17 13:37:49 +0000
@@ -285,7 +285,7 @@
     AC_DEFINE(HAVE_LIBSWSCALE_SWSCALE_H, 1, [Define if swscale.h is found])
   fi

-  if test x"$have_ffmpeg_swscale" = "xno" -a $ffmpeg_num_version -ge
520000; then
+  if test x"$have_ffmpeg_swscale" = "xno" -a 1$ffmpeg_num_version -ge
1"520000"; then
      AC_MSG_WARN([Cannot find swscale.h, required for ffmpeg versions
>= 52.0.0 (detected version: $ffmpeg_version)])
      ffmpeg_version_check=
   fi

=== modified file 'macros/freetype.m4'
--- macros/freetype.m4  2010-01-01 17:48:26 +0000
+++ macros/freetype.m4  2010-02-17 14:08:12 +0000
@@ -36,11 +36,13 @@

   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_freetype_incl}" = x; then
-    for i in $incllist; do
-      if test -f $i/freetype2/freetype/freetype.h; then
-        ac_cv_path_freetype_incl="-I$i/freetype2"
-             break
-      fi
+    for freetype_top_incl in $incllist; do
+               for i in freetype2/freetype freetype; do
+                       if test -f $freetype_top_incl/$i/freetype.h; then
+                       ac_cv_path_freetype_incl="-I$freetype_top_incl/$i"
+                       break
+                       fi
+               done
     done

     if test x"${ac_cv_path_freetype_incl}" = x ; then
@@ -90,7 +92,7 @@
   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_freetype_lib}" = x; then
     dnl freetype-config gives us way too many libraries, which create
nasty linking
-    dnl dependancy issue, so we strip them off here. The real dependencies are
+    dnl dependancy issues, so we strip them off here. The real dependencies are
     dnl are taken care of by other config tests.
     AC_MSG_CHECKING([for ${libname} library])
     for i in $libslist; do

=== modified file 'macros/incllist'
--- macros/incllist     2008-04-30 15:06:33 +0000
+++ macros/incllist     2010-02-17 14:39:45 +0000
@@ -1,1 +1,1 @@
-${with_top_level}/include ${prefix}/${host_alias}/include
${prefix}/include /sw/include /usr/nekoware/include
/usr/freeware/include /usr/pkg/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /opt/mesa/include
/opt/include /usr/X11R6/include /usr/X11/include /usr/include
/usr/pkg/include /usr/local/olpc/include
+${with_top_level}/include ${prefix}/${host_alias}/include
${prefix}/include /sw/include /usr/nekoware/include
/usr/freeware/include /usr/pkg/include /opt/local/include
/usr/local/include /home/latest/include /opt/include /opt/mesa/include
/opt/include /usr/X11R6/include /usr/X11/include /usr/include
/usr/pkg/include /usr/local/olpc/include /boot/common/include
/boot/develop/headers/3rdparty

=== modified file 'macros/libslist'
--- macros/libslist     2008-11-14 22:22:01 +0000
+++ macros/libslist     2010-02-17 14:45:38 +0000
@@ -1,1 +1,1 @@
-${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64
${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64
/usr/lib32 /usr/lib /usr/nekoware/lib /usr/freeware/lib /usr/lib
/sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib
/usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64
/opt/mesa/lib /opt/mesa/lib64 .. ../..
+${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64
${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64
/usr/lib32 /usr/lib /usr/nekoware/lib /usr/freeware/lib /usr/lib
/sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib
/usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64
/opt/mesa/lib /opt/mesa/lib64 /boot/common/lib /boot/system/lib/gcc4
/boot/system/lib .. ../..

=== modified file 'macros/pthreads.m4'
--- macros/pthreads.m4  2010-01-01 17:48:26 +0000
+++ macros/pthreads.m4  2010-02-17 14:24:08 +0000
@@ -110,15 +110,19 @@
     ;;
 esac

-for flag in $pthread_flags; do\
+pthreads=no
+
+for flag in $pthread_flags; do
     case $flag in
       none)
         AC_MSG_CHECKING([whether pthreads work without any flags])
+        PTHREAD_CFLAGS=""
+        PTHREAD_LIBS=""
         ;;
       -*)
         AC_MSG_CHECKING([whether pthreads work with $flag])
         PTHREAD_CFLAGS="$flag"
-             PTHREAD_LIBS=""
+           PTHREAD_LIBS=""
         ;;

       pth-config)
@@ -179,7 +183,7 @@
 done

 dnl Try a manual search, useful for cross-compiling
-if test x"${PTHREAD_LIBS}" = "x"; then
+if test x"$pthreads" != xyes; then
   AC_MSG_CHECKING([searching for pthread library])
   for i in $libslist; do
     if test -f $i/libpthread.a -o -f $i/libpthread.${shlibext} -o -f
$i/libpthread.dylib; then
@@ -203,6 +207,7 @@
   done
   if test x"${PTHREAD_LIBS}" = "x"; then
     AC_MSG_RESULT(not found)
+    pthreads=no
   fi
 fi