[Gnash-commit] gnash ChangeLog configure.ac server/asobj/NetSt...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/02/22 16:19:53

Modified files:
        .              : ChangeLog configure.ac 
        server/asobj   : NetStreamGst.cpp 

Log message:
                * configure.ac: Check for gst_install_plugins_async, since 
that's the
                function we really need.
                * server/asobj/NetStreamGst.cpp: Only use
                gst_install_plugins_supported if it's available.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5726&r2=1.5727
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.483&r2=1.484
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.81&r2=1.82

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5726
retrieving revision 1.5727
diff -u -b -r1.5726 -r1.5727
--- ChangeLog   22 Feb 2008 16:13:21 -0000      1.5726
+++ ChangeLog   22 Feb 2008 16:19:51 -0000      1.5727
@@ -1,3 +1,10 @@
+2008-02-20 Bastiaan Jacques <address@hidden>
+
+       * configure.ac: Check for gst_install_plugins_async, since that's the
+       function we really need.
+       * server/asobj/NetStreamGst.cpp: Only use
+       gst_install_plugins_supported if it's available.
+
 2008-02-22 Sandro Santilli <address@hidden>
 
        * extensions/fileio/Makefile.am: don't try to build the

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -b -r1.483 -r1.484
--- configure.ac        22 Feb 2008 14:20:43 -0000      1.483
+++ configure.ac        22 Feb 2008 16:19:52 -0000      1.484
@@ -1544,7 +1544,7 @@
   AC_MSG_CHECKING([for modern pbutils])
   save_cflags=$CFLAGS
   CFLAGS=$GSTREAMER_CFLAGS
-  AC_TRY_COMPILE([#include <gst/pbutils/install-plugins.h>],[void* pointer = 
&gst_install_plugins_supported],
+  AC_TRY_COMPILE([#include <gst/pbutils/install-plugins.h>],[void* pointer = 
&gst_install_plugins_async],
     GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstpbutils-0.10",
     has_modern_gstpbutils='no')]
     CFLAGS=$save_cflags

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- server/asobj/NetStreamGst.cpp       22 Feb 2008 00:02:24 -0000      1.81
+++ server/asobj/NetStreamGst.cpp       22 Feb 2008 16:19:52 -0000      1.82
@@ -30,6 +30,8 @@
 #include <gst/gstelement.h>
 #include <GstUtil.h>
 
+#include "gnash_gst_version.h"
+
 #ifdef GST_HAS_MODERN_PBUTILS
 #include <gst/pbutils/pbutils.h>
 #include <gst/pbutils/missing-plugins.h>
@@ -614,12 +616,14 @@
   
   gchar* plugin_name = gst_missing_plugin_message_get_description (message);
 
+#if GST_CHECK_VERSION(0,10,15)
   if (!gst_install_plugins_supported()) {
     log_error(_("Missing Gstreamer plugin: %s. Please consider installing 
it."),
       plugin_name);
     g_free(plugin_name);
     return;
   }
+#endif
       
   gchar* detail = gst_missing_plugin_message_get_installer_detail (message);