gnash-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-

From: Bastiaan Jacques
Subject: [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-495-gbf4a739
Date: Sat, 02 Apr 2011 17:56:28 +0000 
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  bf4a7390d3854696624651dbaa6af91be66eddb3 (commit)
       via  e69186a36c786c117151d4855de514a059522d06 (commit)
       via  180013c18f0790387efe1e26b5d56d7c710e0c2f (commit)
      from  d90badbc98718332fb163bdad6f2d50c3f61f6be (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=bf4a7390d3854696624651dbaa6af91be66eddb3


commit bf4a7390d3854696624651dbaa6af91be66eddb3
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Apr 2 19:10:31 2011 +0200

    Don't link zlib where it's not used directly.

diff --git a/gui/Makefile.am b/gui/Makefile.am
index cd8f084..de87299 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -99,8 +99,7 @@ GTK_LIBS =  \
        $(PANGO_LIBS) \
        $(ATK_LIBS) \
        $(EXPAT_LIBS) \
-       $(X11_LIBS) \
-       $(Z_LIBS)
+       $(X11_LIBS)
 
 # The following will be filled up later
 GUI_CPPFLAGS = 

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


commit e69186a36c786c117151d4855de514a059522d06
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Apr 2 19:05:45 2011 +0200

    Don't link gstreamer or ffmpeg libraries to targets that don't use it 
directly.

diff --git a/gui/Makefile.am b/gui/Makefile.am
index a7ab3be..cd8f084 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -123,17 +123,6 @@ if WIN32
 LIB_FLAGS += --enable-auto-import
 endif
 
-if USE_FFMPEG_ENGINE
-AM_LDFLAGS += $(FFMPEG_LIBS) $(LIBVA_LIBS) $(LIBVA_X11_LIBS) 
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) 
-endif
-
-if USE_GST_ENGINE
-GST_STUFF = $(GSTREAMER_PBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) 
$(GSTREAMER_LIBS)
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
-AM_LDFLAGS += $(GST_STUFF)
-endif
-
 AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
 AM_CPPFLAGS += -DRENDERER_CONFIG="\"$(RENDERER_CONFIG)\""
 AM_CPPFLAGS += -DHWACCEL_CONFIG="\"$(HWACCEL_CONFIG)\""
diff --git a/gui/dump/Makefile.am b/gui/dump/Makefile.am
index dc23651..2af04af 100644
--- a/gui/dump/Makefile.am
+++ b/gui/dump/Makefile.am
@@ -73,17 +73,6 @@ AM_LDFLAGS =  \
        $(BOOST_LIBS) \
        $(NULL)
 
-if USE_FFMPEG_ENGINE
-AM_LDFLAGS += $(FFMPEG_LIBS) $(LIBVA_LIBS) $(LIBVA_X11_LIBS) 
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) 
-endif
-
-if USE_GST_ENGINE
-GST_STUFF = $(GSTREAMER_PBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) 
$(GSTREAMER_LIBS)
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
-AM_LDFLAGS += $(GST_STUFF)
-endif
-
 GNASH_LIBS = \
        $(top_builddir)/libcore/libgnashcore.la \
        $(top_builddir)/librender/libgnashrender.la \
diff --git a/gui/fb/Makefile.am b/gui/fb/Makefile.am
index 487f09e..c1c9d92 100644
--- a/gui/fb/Makefile.am
+++ b/gui/fb/Makefile.am
@@ -70,17 +70,6 @@ AM_LDFLAGS =  \
        $(BOOST_LIBS) \
        $(NULL)
 
-if USE_FFMPEG_ENGINE
-AM_LDFLAGS += $(FFMPEG_LIBS) $(LIBVA_LIBS) $(LIBVA_X11_LIBS) 
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) 
-endif
-
-if USE_GST_ENGINE
-GST_STUFF = $(GSTREAMER_PBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) 
$(GSTREAMER_LIBS)
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
-AM_LDFLAGS += $(GST_STUFF)
-endif
-
 GNASH_LIBS = \
        $(top_builddir)/libcore/libgnashcore.la \
        $(top_builddir)/librender/libgnashrender.la \
diff --git a/libcore/Makefile.am b/libcore/Makefile.am
index 5ec61fa..add8fa2 100644
--- a/libcore/Makefile.am
+++ b/libcore/Makefile.am
@@ -284,17 +284,6 @@ libgnashcore_la_LIBADD = \
        $(FONTCONFIG_LIBS) \
        $(NULL)
 
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
-               -I$(top_srcdir)/libmedia/gst
-libgnashcore_la_LIBADD += $(GSTREAMER_LIBS)
-endif
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
-               -I$(top_srcdir)/libmedia/ffmpeg
-endif
-
 libgnashcore_la_LDFLAGS = -release $(VERSION) -export-dynamic
 
 if HAIKU
diff --git a/libcore/parser/Makefile.am b/libcore/parser/Makefile.am
index d334fab..66a9af4 100644
--- a/libcore/parser/Makefile.am
+++ b/libcore/parser/Makefile.am
@@ -78,16 +78,6 @@ if WIN32
   libgnashparser_la_LDFLAGS += -no-undefined 
 endif
 
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
-               -I$(top_srcdir)/libmedia/gst
-endif
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
-               -I$(top_srcdir)/libmedia/ffmpeg
-endif
-
 if ENABLE_PCH
 AM_CXXFLAGS = $(PCH_FLAGS)
 endif
diff --git a/libcore/vm/Makefile.am b/libcore/vm/Makefile.am
index b940fce..a0553b5 100644
--- a/libcore/vm/Makefile.am
+++ b/libcore/vm/Makefile.am
@@ -73,10 +73,6 @@ inst_HEADERS += $(EXTENSIONS_API)
 libgnashvm_la_LIBADD = \
        $(top_builddir)/libbase/libgnashbase.la 
 
-if USE_FFMPEG_ENGINE
-       libgnashvm_la_CPPFLAGS += $(FFMPEG_CFLAGS)
-endif
-
 libgnashvm_la_LDFLAGS = -export-dynamic # -release $(VERSION)
 
 if WIN32
diff --git a/plugin/aos4/Makefile.am b/plugin/aos4/Makefile.am
index 62a9bc3..767ceae 100644
--- a/plugin/aos4/Makefile.am
+++ b/plugin/aos4/Makefile.am
@@ -37,7 +37,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/plugin/npapi \
        $(AGG_CFLAGS) \
        $(BOOST_CFLAGS) \
-       $(FFMPEG_CFLAGS) \
        $(SDL_CFLAGS) \
        $(NULL)
 
@@ -54,7 +53,6 @@ AM_LDFLAGS = \
        $(BOOST_LIBS) \
        $(CURL_LIBS) \
        $(EXPAT_LIBS) \
-       $(FFMPEG_LIBS) \
        $(JPEG_LIBS) \
        $(PNG_LIBS) \
        $(SDL_LIBS) \
diff --git a/plugin/win32/Makefile.am b/plugin/win32/Makefile.am
index 43c4fcf..ade498f 100644
--- a/plugin/win32/Makefile.am
+++ b/plugin/win32/Makefile.am
@@ -35,7 +35,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/plugin/mozilla-sdk/include \
        $(AGG_CFLAGS) \
        $(BOOST_CFLAGS) \
-       $(FFMPEG_CFLAGS) \
        $(SDL_CFLAGS) \
        $(NULL)
 
@@ -52,7 +51,6 @@ AM_LDFLAGS = \
        $(BOOST_LIBS) \
        $(CURL_LIBS) \
        $(EXPAT_LIBS) \
-       $(FFMPEG_LIBS) \
        $(JPEG_LIBS) \
        $(PNG_LIBS) \
        $(SDL_LIBS) \
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 2753692..3a279aa 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -69,21 +69,6 @@ if WIN32
   GNASH_LIBS += -lintl -lz -lws2_32
 endif
 
-if USE_FFMPEG_ENGINE
- AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
-               -I$(top_srcdir)/libmedia/ffmpeg 
- GNASH_LIBS += $(FFMPEG_LIBS)
-endif
-
-if USE_GST_ENGINE
- AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
-               -I$(top_srcdir)/libmedia/gst
- GNASH_LIBS += $(GLIB_LIBS) $(GSTREAMER_LIBS)
-if CROSS_COMPILING
-  GNASH_LIBS +=        $(GLIB_LIBS)
-endif
-endif
-
 bin_PROGRAMS = gprocessor rtmpget
 
 if CYGNAL

http://git.savannah.gnu.org/cgit//commit/?id=180013c18f0790387efe1e26b5d56d7c710e0c2f


commit 180013c18f0790387efe1e26b5d56d7c710e0c2f
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Apr 2 15:45:32 2011 +0200

    Remove unused test.

diff --git a/configure.ac b/configure.ac
index 6e9a532..16dbec3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1871,13 +1871,6 @@ AM_CONDITIONAL(HAVE_X11, [test x$x11 = xyes])
 AC_CHECK_LIB(rt, shm_unlink)
 AC_CHECK_FUNCS(shm_open shm_unlink)
 
-AC_TRY_COMPILE([#include <strings.h>], [
-  char *p1 = (char *)"Hello";
-  char *p2 = (char *)"World";
-  strcasecmp(p1, p2); ],
-  AC_DEFINE(HAVE_STRINGCASECMP, [1], [Has strcasecmp])
-)
-
 dnl if test x$cross_compiling = xno; then
 AC_LANG_PUSH(C++)
 AC_MSG_CHECKING([to see if float formatting is broken])

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

Summary of changes:
 configure.ac               |    7 -------
 gui/Makefile.am            |   14 +-------------
 gui/dump/Makefile.am       |   11 -----------
 gui/fb/Makefile.am         |   11 -----------
 libcore/Makefile.am        |   11 -----------
 libcore/parser/Makefile.am |   10 ----------
 libcore/vm/Makefile.am     |    4 ----
 plugin/aos4/Makefile.am    |    2 --
 plugin/win32/Makefile.am   |    2 --
 utilities/Makefile.am      |   15 ---------------
 10 files changed, 1 insertions(+), 86 deletions(-)


hooks/post-receive
-- 
Gnash
reply via email to
[Prev in Thread] Current Thread [Next in Thread]