[Swfdec] 3 commits - configure.ac libswfdec/swfdec_debug.h swfdec-gtk.pc.in swfdec.pc.in

[Benjamin Otte]

 configure.ac             |   12 ++++++------
 libswfdec/swfdec_debug.h |    2 +-
 swfdec-gtk.pc.in         |    2 +-
 swfdec.pc.in             |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
diff-tree 086e5f3c4da50df4b485792da7ca49a25484aebc (from ca4b02b5852291d4bf3d11e71278229530d6e973)
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Apr 22 12:45:03 2007 +0200

    we require at least glib 2.4 for some queue functions
    
    There's probably an even higher version required, but I'll leave that to
    the bug reporters for now

diff --git a/configure.ac b/configure.ac
index 4a55cfc..b2da33d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_ARG_WITH(pkg-config-path, 
 dnl Check for essential libraries first:
 dnl ====================================
 
-GLIB_VER=2.0
+GLIB_VER=2.4
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_VER gobject-2.0 >= $GLIB_VER,
 		HAVE_GLIB=yes, HAVE_GLIB=no)
 if test "$HAVE_GLIB" = "no"; then
diff-tree ca4b02b5852291d4bf3d11e71278229530d6e973 (from 4d296a7ca8b484a19f38855cbbf7f3a4c1638614)
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Apr 22 12:43:59 2007 +0200

    replace all FOO_REQUIRES with FOO_VER

diff --git a/configure.ac b/configure.ac
index eafc8fb..4a55cfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ if test "$HAVE_GLIB" = "no"; then
 fi
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_REQUIRES)
+AC_SUBST(GLIB_VER)
 dnl FIXME: detect these executables correctly
 GLIB_GENMARSHAL=glib-genmarshal
 AC_SUBST(GLIB_GENMARSHAL)
@@ -92,17 +92,17 @@ AC_ARG_ENABLE(gtk,
 dnl 
 dnl GTK: We want this for swfdec-gtk
 dnl
-GTK_REQUIRES=2.8.0
-AC_SUBST(GTK_REQUIRES)
+GTK_VER=2.8.0
+AC_SUBST(GTK_VER)
 if test "$enable_gtk" = "yes"; then
-	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRES, HAVE_GTK=yes, HAVE_GTK=no)
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_VER, HAVE_GTK=yes, HAVE_GTK=no)
 	if test "$HAVE_GTK" = "no"; then
 	  AC_MSG_WARN([cannot find GTK+-2.0, player will be disabled])
 	fi
 	if test "x$HAVE_GTK" = xyes; then
 	  AC_DEFINE(HAVE_GTK, 1, [Define if Gtk is enabled])
 	else
-	  AC_MSG_ERROR([Couldn't find a suitable Gtk version. You need at least version $GTK_REQUIRES])
+	  AC_MSG_ERROR([Couldn't find a suitable Gtk version. You need at least version $GTK_VER])
 	fi
 else
 	AC_MSG_WARN([*** Gtk support was not enabled. ***])
diff --git a/swfdec-gtk.pc.in b/swfdec-gtk.pc.in
index 37e507b..39eb02e 100644
--- a/swfdec-gtk.pc.in
+++ b/swfdec-gtk.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@/swfdec- at SWFDEC_M
 Name: swfdec-gtk
 Description: Support for playing Flash files in Gtk using Swfdec
 Version: @VERSION@
-Requires: swfdec- at SWFDEC_MAJORMINOR@ = @PACKAGE_VERSION@ gtk+-2.0 >= @GTK_REQUIRES@
+Requires: swfdec- at SWFDEC_MAJORMINOR@ = @PACKAGE_VERSION@ gtk+-2.0 >= @GTK_VER@
 Libs: -L${libdir} -lswfdec-gtk- at SWFDEC_MAJORMINOR@
 Cflags: -I${includedir}
diff --git a/swfdec.pc.in b/swfdec.pc.in
index 2dfcd95..2e0e0d4 100644
--- a/swfdec.pc.in
+++ b/swfdec.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@/swfdec- at SWFDEC_M
 Name: swfdec
 Description: Decodes and Plays Flash files
 Version: @VERSION@
-Requires: glib-2.0 >= @GLIB_REQUIRES@ gobject-2.0 >= @GLIB_REQUIRES@ liboil-0.3 cairo pangocairo
+Requires: glib-2.0 >= @GLIB_VER@ gobject-2.0 >= @GLIB_VER@ liboil-0.3 cairo pangocairo
 Libs: -L${libdir} -lswfdec- at SWFDEC_MAJORMINOR@
 Cflags: -I${includedir}
diff-tree 4d296a7ca8b484a19f38855cbbf7f3a4c1638614 (from 240265e9d7ff72a51ff1c283805796df95547de2)
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Apr 20 23:49:21 2007 +0200

    use the right macro to get the function name

diff --git a/libswfdec/swfdec_debug.h b/libswfdec/swfdec_debug.h
index 565b2fa..913a4bd 100644
--- a/libswfdec/swfdec_debug.h
+++ b/libswfdec/swfdec_debug.h
@@ -48,7 +48,7 @@ enum {
 #define SWFDEC_DEBUG_LEVEL(level,...) (void) 0
 #else
 #define SWFDEC_DEBUG_LEVEL(level,...) \
-  swfdec_debug_log ((level), __FILE__, G_GNUC_FUNCTION, __LINE__, __VA_ARGS__)
+  swfdec_debug_log ((level), __FILE__, G_STRFUNC, __LINE__, __VA_ARGS__)
 #endif
 
 void swfdec_debug_log (guint level, const char *file, const char *function,