[Swfdec] Branch 'as' - 5 commits - configure.ac libswfdec/Makefile.am NEWS

[Benjamin Otte]

 NEWS                  |    6 ++++++
 configure.ac          |    9 +++++++--
 libswfdec/Makefile.am |    1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
diff-tree 4aec39b9f9a750efe75864a54b035ed872ab6644 (from parents)
Merge: 774031e0bb34710e971ab143aac62300907486d3 5280befc62bf5c6dabcc61d3db6cad8e64a1164c
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Jun 13 17:48:21 2007 +0200

    Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec into as
    
    Conflicts:
    
    	configure.ac

diff --cc configure.ac
index e60dcd9,52e58a5..e1a6e47
@@@ -37,9 -37,11 +37,14 @@@
  AC_SUBST(SWFDEC_LIBVERSION)
  AM_PROG_LIBTOOL
  
 +dnl C99 is only required to get definitions for NAN and INFINITY.
 +GLOBAL_CFLAGS="$GLOBAL_CFLAGS -std=c99"
 +
+ dnl ensures the library is linked against the internal Mozilla
+ dnl if this doesn't work on your platform, I'll take patches :)
+ SYMBOLIC_LDFLAGS="-Wl,-Bsymbolic"
+ AC_SUBST(SYMBOLIC_LDFLAGS)
+ 
  dnl Add parameters for aclocal
  dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
  #ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS"
diff-tree 5280befc62bf5c6dabcc61d3db6cad8e64a1164c (from parents)
Merge: d7ea6d995e918f14039bae7fb34178c6c9f01c6d a48590a73150a019cbdaf0acdf358be74e9b7756
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Jun 8 20:22:40 2007 +0200

    Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec

diff-tree d7ea6d995e918f14039bae7fb34178c6c9f01c6d (from 5484f3084c9d717f098e1706bdef6767a0eb97c9)
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Jun 8 20:19:15 2007 +0200

    release 0.4.5

diff --git a/configure.ac b/configure.ac
index 7270afc..52e58a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.58])
-AC_INIT(swfdec,0.4.4.1)
+AC_INIT(swfdec,0.4.5)
 
 [nano=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\.*//')]
 if test x"$nano" = x1 ; then
@@ -33,7 +33,7 @@ else
 fi
 AC_DEFINE_UNQUOTED(SWFDEC_LEVEL_DEFAULT, $DEFAULT_DEBUG_LEVEL, [Default debug level used])
 
-SWFDEC_LIBVERSION="3:0:0"
+SWFDEC_LIBVERSION="3:0:1"
 AC_SUBST(SWFDEC_LIBVERSION)
 AM_PROG_LIBTOOL
 
diff-tree 5484f3084c9d717f098e1706bdef6767a0eb97c9 (from 17dda94d6a65d4bb72405f9f17b61c755fd132b3)
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Jun 8 20:07:58 2007 +0200

    update NEWS

diff --git a/NEWS b/NEWS
index 114721b..8713fb7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
 
+ 0.4.5 ("Death of the Desktop")
+
+This is strictly a bugfix release. Have fun.
+- fix linking issues on Solaris/BSD.
+- fix various crashers.
+
  0.4.4 ("Birthday Cards")
 
 This is a stability release. The number of new supported Flash features
diff-tree 17dda94d6a65d4bb72405f9f17b61c755fd132b3 (from a87056c00a0b17289d65d1f00800eff3a992b5fb)
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri Jun 8 19:34:15 2007 +0200

    link with -Bsymbolic, so the mozilla plugin doesn't link to Moz's JS lib

diff --git a/configure.ac b/configure.ac
index 932aec1..7270afc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,11 @@ SWFDEC_LIBVERSION="3:0:0"
 AC_SUBST(SWFDEC_LIBVERSION)
 AM_PROG_LIBTOOL
 
+dnl ensures the library is linked against the internal Mozilla
+dnl if this doesn't work on your platform, I'll take patches :)
+SYMBOLIC_LDFLAGS="-Wl,-Bsymbolic"
+AC_SUBST(SYMBOLIC_LDFLAGS)
+
 dnl Add parameters for aclocal
 dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
 #ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS"
diff --git a/libswfdec/Makefile.am b/libswfdec/Makefile.am
index b3e81ac..a4219ea 100644
--- a/libswfdec/Makefile.am
+++ b/libswfdec/Makefile.am
@@ -95,6 +95,7 @@ libswfdec_ at SWFDEC_MAJORMINOR@_la_CFLAGS 
 	$(GST_CFLAGS) $(FFMPEG_CFLAGS) $(MAD_CFLAGS) \
 	-DG_LOG_DOMAIN=\"Swfdec\"
 libswfdec_ at SWFDEC_MAJORMINOR@_la_LDFLAGS = \
+	$(SYMBOLIC_LDFLAGS) \
 	-version-info $(SWFDEC_LIBVERSION) \
 	-export-symbols-regex '^(swfdec_.*)' \
 	$(CAIRO_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(LIBOIL_LIBS) -lz \