[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1609-gfa892e9

[Rob Savoye]

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  fa892e9ea0efe69a1ce36cb9a1f8a362741f45ef (commit)
       via  a9ec6093b57f7e2efe42e7cdf9363782efd4023e (commit)
       via  31169fe05ad59640ca8cc30392cbc50c1aa195ae (commit)
      from  80989fcd47d33e30336785422ded17f4c607a113 (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=fa892e9ea0efe69a1ce36cb9a1f8a362741f45ef


commit fa892e9ea0efe69a1ce36cb9a1f8a362741f45ef
Author: Rob Savoye <address@hidden>
Date:   Fri Feb 15 21:27:23 2013 -0700

    this test case has been moved. Was breaking distcheck.

diff --git a/libdevice/Makefile.am b/libdevice/Makefile.am
index 5230a0c..6cd0c9e 100644
--- a/libdevice/Makefile.am
+++ b/libdevice/Makefile.am
@@ -124,19 +124,6 @@ if BUILD_DIRECTFB_DEVICE
 include directfb/directfb.am
 endif
 
-if ENABLE_DEVELOPER_TESTS
-if BUILD_X11_DEVICE
-
-check_PROGRAMS += test_x11
-test_x11_SOURCES = x11/test_x11.cpp
-test_x11_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS)
-test_x11_LDADD = \
-       libgnashdevice.la \
-       $(X11_LIBS) \
-       $(GNASH_LIBS)
-endif
-endif
-
 if BUILD_VAAPI_DEVICE
 include vaapi/vaapi.am
 endif

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


commit a9ec6093b57f7e2efe42e7cdf9363782efd4023e
Author: Rob Savoye <address@hidden>
Date:   Fri Feb 15 21:26:50 2013 -0700

    redirect stderr so grep stops spewing all the matching lines when 
configuring.

diff --git a/macros/ffmpeg.m4 b/macros/ffmpeg.m4
index 2134435..7e042d9 100644
--- a/macros/ffmpeg.m4
+++ b/macros/ffmpeg.m4
@@ -43,7 +43,7 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
       ffmpeg_top_incl=`dirname ${with_ffmpeg_incl}`
       if test -f ${with_ffmpeg_incl}/avcodec.h; then
         ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`"
-        if test -f ${with_ffmpeg_incl}/version.h && $EGREP LIBAVCODEC_VERSION 
${with_ffmpeg_incl}/version.h >/dev/null; then
+        if test -f ${with_ffmpeg_incl}/version.h && $EGREP LIBAVCODEC_VERSION 
${with_ffmpeg_incl}/version.h 2>&1 >/dev/null; then
           avcodec_h=${with_ffmpeg_incl}/version.h
         else
           avcodec_h=${with_ffmpeg_incl}/avcodec.h
@@ -73,7 +73,7 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
         for i in "" ffmpeg libavcodec ffmpeg/libavcodec; do
           if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
             ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`"
-            if test -f ${ffmpeg_top_incl}/${i}/version.h && $EGREP 
LIBAVCODEC_VERSION ${ffmpeg_top_incl}/${i}/version.h >/dev/null; then
+            if test -f ${ffmpeg_top_incl}/${i}/version.h && $EGREP 
LIBAVCODEC_VERSION ${ffmpeg_top_incl}/${i}/version.h  2>&1 >/dev/null; then
               avcodec_h="${ffmpeg_top_incl}/${i}/version.h"
             else
               avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h"
@@ -97,7 +97,7 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
       for i in ffmpeg libavcodec ffmpeg/libavcodec; do
         if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
           ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`"
-          if test -f ${ffmpeg_top_incl}/${i}/version.h && $EGREP 
LIBAVCODEC_VERSION ${ffmpeg_top_incl}/${i}/version.h >/dev/null; then
+          if test -f ${ffmpeg_top_incl}/${i}/version.h && $EGREP 
LIBAVCODEC_VERSION ${ffmpeg_top_incl}/${i}/version.h  2>&1 >/dev/null; then
             avcodec_h=${ffmpeg_top_incl}/${i}/version.h
           else
             avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h
@@ -219,9 +219,9 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
 
     AC_MSG_CHECKING([ffmpeg version])
 
-    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " 
${versionfile} | sed -e "s%[[^0-9]]%%g"`
-    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " 
${versionfile} | sed -e "s%[[^0-9]]%%g"`
-    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " 
${versionfile} | sed -e "s%[[^0-9]]%%g"`
+    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " 
${versionfile} 2>&1 | sed -e "s%[[^0-9]]%%g"`
+    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " 
${versionfile} 2>&1 | sed -e "s%[[^0-9]]%%g"`
+    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " 
${versionfile} 2>&1 | sed -e "s%[[^0-9]]%%g"`
 
     if test x"${ffmpeg_major_version}" != x ; then
 
@@ -230,15 +230,15 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
     else
 
       dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1
-      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " 
${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"`
+      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " 
${versionfile}  2>&1 | awk '{print $'3'}' | sed -e "s%,%.%g"`
 
       if test x"${ffmpeg_version}" = x ; then
 
         dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix
-        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | 
awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
+        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | 
awk '{print $'3'}' 2>&1 | sed -e "s%^[[0-9]]d\.%%"` 
 
         if test x"${ffmpeg_version}" = x ; then
-          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | 
awk '{print $'3'}'`
+          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} 
2>&1  | awk '{print $'3'}'`
         fi
       fi
 

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


commit 31169fe05ad59640ca8cc30392cbc50c1aa195ae
Author: Rob Savoye <address@hidden>
Date:   Fri Feb 15 21:25:52 2013 -0700

    the testcases have been moved. This was breaking distcheck.

diff --git a/libdevice/directfb/directfb.am b/libdevice/directfb/directfb.am
index d04827a..7022a16 100644
--- a/libdevice/directfb/directfb.am
+++ b/libdevice/directfb/directfb.am
@@ -1,5 +1,6 @@
 # 
-#   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 
Inc.
+#   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2012,
+#      2013 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -21,12 +22,3 @@ libgnashdevice_la_SOURCES += \
        directfb/DirectFBDevice.cpp \
        directfb/DirectFBDevice.h
 libgnashdevice_la_LIBADD += $(DIRECTFB_LIBS)
-
-check_PROGRAMS += test_dfb
-test_dfb_SOURCES = directfb/test_dfb.cpp
-test_dfb_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTFB_CFLAGS)
-test_dfb_LDADD = \
-       libgnashdevice.la \
-       $(TS_LIBS) \
-       $(DIRECTFB_LIBS) \
-       $(GNASH_LIBS)
diff --git a/libdevice/vaapi/vaapi.am b/libdevice/vaapi/vaapi.am
index 4e9e602..2611c2b 100644
--- a/libdevice/vaapi/vaapi.am
+++ b/libdevice/vaapi/vaapi.am
@@ -91,13 +91,3 @@ libgnashdevice_la_CPPFLAGS += $(VAAPI_CFLAGS)
 #      vaapi/VaapiDevice.cpp \
 #      vaapi/VaapiDevice.h
 libgnashdevice_la_LIBADD += $(VAAPI_LIBS)
-
-if ENABLE_DEVELOPER_TESTS
-check_PROGRAMS += test_vaapi
-test_vaapi_SOURCES = vaapi/test_vaapi.cpp
-test_vaapi_CPPFLAGS = $(AM_CPPFLAGS) $(VAAPI_CFLAGS)
-test_vaapi_LDADD = \
-       libgnashdevice.la \
-       $(VAAPI_LIBS) \
-       $(GNASH_LIBS)
-endif
\ No newline at end of file

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

Summary of changes:
 libdevice/Makefile.am          |   13 -------------
 libdevice/directfb/directfb.am |   12 ++----------
 libdevice/vaapi/vaapi.am       |   10 ----------
 macros/ffmpeg.m4               |   18 +++++++++---------
 4 files changed, 11 insertions(+), 42 deletions(-)


hooks/post-receive
-- 
Gnash