[Swfdec-commits] Branch '0.6' - 4 commits - configure.ac Makefile.am swfdec-gtk/swfdec_gtk_system.c swfdec-gtk/swfdec_playback_oss.c test/custom test/image test/trace

[Benjamin Otte]

 Makefile.am                      |    2 +-
 configure.ac                     |   22 ++++++++++++++++++++--
 swfdec-gtk/swfdec_gtk_system.c   |    8 ++++++--
 swfdec-gtk/swfdec_playback_oss.c |    1 +
 test/custom/Makefile.am          |    2 +-
 test/image/Makefile.am           |    2 +-
 test/trace/Makefile.am           |    2 +-
 7 files changed, 31 insertions(+), 8 deletions(-)

New commits:
commit 564dd7096da14303f90c917378fc34d356648095
Author: Riccardo Magliocchetti <riccardo at datahost.it>
Date:   Mon Mar 17 22:56:56 2008 +0100

    make oss audio backend compile

diff --git a/swfdec-gtk/swfdec_playback_oss.c b/swfdec-gtk/swfdec_playback_oss.c
index c2eb493..88ce8fd 100644
--- a/swfdec-gtk/swfdec_playback_oss.c
+++ b/swfdec-gtk/swfdec_playback_oss.c
@@ -22,6 +22,7 @@
 #include "config.h"
 #endif
 
+#include <sys/ioctl.h>
 #include <sys/soundcard.h>
 #include <fcntl.h>
 #include <unistd.h>
commit 4e26e2b2dced3b070240540898ba8d0098bd1ad1
Author: Benjamin Otte <otte at gnome.org>
Date:   Mon Mar 17 22:52:54 2008 +0100

    make timezone offset querying portable

diff --git a/configure.ac b/configure.ac
index 98b6f36..07fcddf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,24 @@ AC_PROG_AWK
 
 AC_HEADER_STDC
 
+AC_MSG_CHECKING([for timezone support])
+AC_COMPILE_IFELSE([
+  AC_LANG_PROGRAM([[
+    @%:@include <time.h>
+  ]], [[
+    time_t t;
+    localtime (&t)->tm_gmtoff;
+  ]])],
+  HAVE_TIMEZONE="yes",
+  HAVE_TIMEZONE="no")
+if test "x$HAVE_TIMEZONE" = "xyes"; then
+  AC_MSG_RESULT([yes])
+  AC_DEFINE(HAVE_TIMEZONE, 1, [Define if we can query the timezone])
+else
+  AC_MSG_RESULT([no])
+fi
+
+
 dnl ##############################
 dnl # Do automated configuration #
 dnl ##############################
diff --git a/swfdec-gtk/swfdec_gtk_system.c b/swfdec-gtk/swfdec_gtk_system.c
index c54feb7..7cc7c04 100644
--- a/swfdec-gtk/swfdec_gtk_system.c
+++ b/swfdec-gtk/swfdec_gtk_system.c
@@ -114,8 +114,12 @@ swfdec_gtk_system_get_language (void)
 static int
 swfdec_gtk_system_get_utc_offset (void)
 {
-  tzset ();
-  return timezone / 60;
+#if HAVE_TIMEZONE
+  time_t t = time (NULL);
+  return localtime (&t)->tm_gmtoff;
+#else
+  return 0;
+#endif
 }
 
 /*** PUBLIC API ***/
commit 89024fbf64528a8e06229029c48ebfe798d1c628
Author: Doug Goldstein <cardoe at gentoo.org>
Date:   Mon Mar 17 22:12:57 2008 +0100

    fix aclocal/autoconf/automake m4 directory reference

diff --git a/Makefile.am b/Makefile.am
index 012b3e7..9794eb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ SUBDIRS= \
 	test \
 	tools
 
-ACLOCAL_FLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST=depcomp \
 	AUTHORS \
diff --git a/configure.ac b/configure.ac
index 3ce9aa4..98b6f36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ SWFDEC_MAJORMINOR=0.6
 AC_SUBST(SWFDEC_MAJORMINOR)
 
 AM_CONFIG_HEADER(config.h)
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+AC_CONFIG_MACRO_DIR([m4])
 
 dnl decide on error flags
 dnl if we support them, we set them unconditionally
@@ -55,7 +55,7 @@ AM_PROG_CC_C_O
 AM_PROG_AS
 AC_PROG_AWK
 
-AC_HEADER_STDC([])
+AC_HEADER_STDC
 
 dnl ##############################
 dnl # Do automated configuration #
commit 2914847d298158715f8b2ed74683476293d834dd
Author: Benjamin Otte <otte at gnome.org>
Date:   Mon Mar 17 22:06:21 2008 +0100

    unbreak tests
    
    turns out check-hook doesn't exist

diff --git a/test/custom/Makefile.am b/test/custom/Makefile.am
index 7c5d334..531447e 100644
--- a/test/custom/Makefile.am
+++ b/test/custom/Makefile.am
@@ -1,4 +1,4 @@
-check-hook: ../swfdec-test
+check-local: ../swfdec-test
 	for file in $(srcdir)/*.sts; do \
 	  ../swfdec-test --script $$file $(srcdir)/`basename $$file .sts`*.swf || exit $?; \
 	done
diff --git a/test/image/Makefile.am b/test/image/Makefile.am
index 0fccee3..8349615 100644
--- a/test/image/Makefile.am
+++ b/test/image/Makefile.am
@@ -1,4 +1,4 @@
-check-hook: ../swfdec-test
+check-local: ../swfdec-test
 	../swfdec-test --script $(srcdir)/default.sts $(srcdir)/*.swf
 
 EXTRA_DIST = \
diff --git a/test/trace/Makefile.am b/test/trace/Makefile.am
index 0db63fa..3a26cbd 100644
--- a/test/trace/Makefile.am
+++ b/test/trace/Makefile.am
@@ -1,4 +1,4 @@
-check-hook: ../swfdec-test
+check-local: ../swfdec-test
 	../swfdec-test --script $(srcdir)/default.sts $(srcdir)/*.swf
 
 EXTRA_DIST = \