[Gnash-commit] [SCM] Gnash branch, master, updated. 85305aaac01c7dd97ad79720d8f78e1a475fd815

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  85305aaac01c7dd97ad79720d8f78e1a475fd815 (commit)
       via  11ed87c2cc4882466bb882371208de4836d32fee (commit)
      from  d84e3cadb5018b25f802cb5dda9f5a7875b485ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=85305aaac01c7dd97ad79720d8f78e1a475fd815


commit 85305aaac01c7dd97ad79720d8f78e1a475fd815
Author: Sandro Santilli <address@hidden>
Date:   Tue Nov 23 19:41:22 2010 +0100

    Update references to pbutils package

diff --git a/Makefile.am b/Makefile.am
index c3d9c71..37f30af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -237,8 +237,8 @@ dumpconfig:
 if USE_GST_ENGINE
        @echo " GSTREAMER_CFLAGS is $(GSTREAMER_CFLAGS)"
        @echo " GSTREAMER_LIBS is $(GSTREAMER_LIBS)"
-       @echo " GSTPBUTILS_CFLAGS is $(GSTPBUTILS_CFLAGS)"
-       @echo " GSTPBUTILS_LIBS is $(GSTPBUTILS_LIBS)"
+       @echo " GSTREAMER_PBUTILS_CFLAGS is $(GSTREAMER_PBUTILS_CFLAGS)"
+       @echo " GSTREAMER_PBUTILS_LIBS is $(GSTREAMER_PBUTILS_LIBS)"
 endif
 if USE_FFMPEG_ENGINE
        @echo " FFMPEG_CFLAGS is $(FFMPEG_CFLAGS)"
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 208cca0..2fbd7bd 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -160,7 +160,7 @@ AM_CPPFLAGS += $(FFMPEG_CFLAGS)
 endif
 
 if USE_GST_ENGINE
-GST_STUFF = $(GSTPBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) $(GSTREAMER_LIBS)
+GST_STUFF = $(GSTREAMER_PBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) 
$(GSTREAMER_LIBS)
 AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
 AM_LDFLAGS += $(GST_STUFF)
 endif
diff --git a/gui/fb/Makefile.am b/gui/fb/Makefile.am
index 7fc2dc9..f3c9c1a 100644
--- a/gui/fb/Makefile.am
+++ b/gui/fb/Makefile.am
@@ -80,7 +80,7 @@ AM_CPPFLAGS += $(FFMPEG_CFLAGS)
 endif
 
 if USE_GST_ENGINE
-GST_STUFF = $(GSTPBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) $(GSTREAMER_LIBS)
+GST_STUFF = $(GSTREAMER_PBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) 
$(GSTREAMER_LIBS)
 AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
 AM_LDFLAGS += $(GST_STUFF)
 endif
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index fdcde93..09639d0 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -117,13 +117,13 @@ if USE_GST_ENGINE
        -I$(top_srcdir)/libmedia/gst \
        $(GSTREAMER_CFLAGS) \
        $(GSTAPP_CFLAGS) \
-       $(GSTPBUTILS_CFLAGS) \
+       $(GSTREAMER_PBUTILS_CFLAGS) \
        $(NULL)
 
    libgnashmedia_la_LIBADD += \
        -lgstbase-0.10 \
        $(GSTREAMER_APP_LIBS) \
-       $(GSTPBUTILS_LIBS) \
+       $(GSTREAMER_PBUTILS_LIBS) \
        $(GSTREAMER_PLUGINS_BASE_LIBS) \
        $(GSTREAMER_LIBS) \
        $(NULL)
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 2d57cc9..616c061 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -146,7 +146,7 @@ rtmpget_LDADD =  $(GNASH_LIBS) $(AM_LDFLAGS)
 
 if USE_GST_ENGINE
  GST_STUFF = \
-       $(GSTPBUTILS_LIBS) \
+       $(GSTREAMER_PBUTILS_LIBS) \
        $(GSTREAMER_PLUGINS_BASE_LIBS) \
        $(GSTREAMER_LIBS) \
        $(GSTAPP_CFLAGS) \

http://git.savannah.gnu.org/cgit//commit/?id=11ed87c2cc4882466bb882371208de4836d32fee


commit 11ed87c2cc4882466bb882371208de4836d32fee
Author: Sandro Santilli <address@hidden>
Date:   Tue Nov 23 19:30:52 2010 +0100

    For pbutils, use a name pkgconfig knows about

diff --git a/configure.ac b/configure.ac
index ad18f6a..7a6e6f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2465,11 +2465,7 @@ if test x"$build_media_gst" = "xyes"; then
   dnl the codec installer to download the package to install, so disable
   dnl it if cross compiling with gstreamer support.
   if test x$cross_compiling = xno; then
-    GNASH_PKG_FIND(gstpbutils, [gst/pbutils/install-plugins.h], [gstreamer PB 
Utils library], gst_install_plugins_supported, [0.10])
-    dnl We need the header for doing anything interesting
-    if test x"${GSTPBUTILS_CFLAGS}" = "x"; then
-        has_gstpbutils=no
-    fi
+    GNASH_PKG_FIND(gstreamer_pbutils, [gst/pbutils/install-plugins.h], 
[gstreamer PB Utils library], gst_install_plugins_supported, [0.10])
   fi
   dnl when cross compiling Gstreamer, not all supplied SDKs include all the
   dnl development libraries since most devices don't need to support plugin
@@ -3238,7 +3234,7 @@ if test x"$build_media_gst" = x"yes"; then
       echo "        Gstreamer flags are: default include path"
     fi
     echo "        Gstreamer libs are: $GSTREAMER_LIBS"
-    if test x"$has_gstpbutils" = "xno"; then
+    if test x"$has_gstreamer_pbutils" != "xyes"; then
       echo "        RECOMMENDED: If the user has not installed the necessary 
Gstreamer plugins," >&5
       echo "                     Gstreamer can pop up a message prompting them 
to." >&5
       echo "                     Install gstpbutils (>= 0.10.15) from 
http://www.gstreamer.net for that to be enabled" >&5

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am           |    4 ++--
 configure.ac          |    8 ++------
 gui/Makefile.am       |    2 +-
 gui/fb/Makefile.am    |    2 +-
 libmedia/Makefile.am  |    4 ++--
 utilities/Makefile.am |    2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Gnash