[Gnash-commit] [SCM] Gnash branch, master, updated. 50dd02faacaf322be2fbe5fdc9de9e84813c0aa1

[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  50dd02faacaf322be2fbe5fdc9de9e84813c0aa1 (commit)
       via  7ea2970490eb3d818769648836403b73472fc5b8 (commit)
       via  ed01ef8b5a6331b10f91c15e30085fca519f00a3 (commit)
      from  ef59dcbd5a482fde3e4eaee4a053fa654f651e9e (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=50dd02faacaf322be2fbe5fdc9de9e84813c0aa1


commit 50dd02faacaf322be2fbe5fdc9de9e84813c0aa1
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 8 13:09:24 2010 -0700

    add /usr/include/ffmpeg to the front of the incllist, so swscale gets found 
too

diff --git a/macros/ffmpeg.m4 b/macros/ffmpeg.m4
index 132cec8..917307c 100644
--- a/macros/ffmpeg.m4
+++ b/macros/ffmpeg.m4
@@ -76,7 +76,8 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
   dnl in several common places ourselves. Note that the variable 
ffmpeg_top_incl
   dnl contains the value of the top level path that has been found.
   if test x"${ac_cv_path_ffmpeg_incl}" = x ; then
-    for ffmpeg_top_incl in $incllist; do
+    newlist="/usr/include/ffmpeg $incllist"
+    for ffmpeg_top_incl in $newlist; do
       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)`"

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


commit 7ea2970490eb3d818769648836403b73472fc5b8
Merge: ed01ef8 ef59dcb
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 8 12:43:40 2010 -0700

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


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


commit ed01ef8b5a6331b10f91c15e30085fca519f00a3
Author: Rob Savoye <address@hidden>
Date:   Wed Dec 8 12:42:36 2010 -0700

    add LIBVA_X11_LIBS to LDADD

diff --git a/gui/kde/kde4.am b/gui/kde/kde4.am
index 488d1cf..355c401 100644
--- a/gui/kde/kde4.am
+++ b/gui/kde/kde4.am
@@ -51,7 +51,12 @@ kde4_gnash_SOURCES = $(GUI_SRCS) \
 
 kde4_gnash_CPPFLAGS = -DGUI_KDE4 -DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS) 
$(KDE4_CFLAGS) $(QT4_CFLAGS)
 kde4_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
-kde4_gnash_LDADD = $(MYSQL_LIBS) $(GNASH_LIBS) $(AM_LDFLAGS) $(KDE4_LIBS)
+kde4_gnash_LDADD = \
+       $(MYSQL_LIBS) \
+       $(GNASH_LIBS) \
+       $(AM_LDFLAGS) \
+       $(KDE4_LIBS) \
+       $(LIBVA_X11_LIBS)
 
 if BUILD_OGL_RENDERER
 kde4_gnash_CPPFLAGS += $(OPENGL_CFLAGS)

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

Summary of changes:
 gui/kde/kde4.am  |    7 ++++++-
 macros/ffmpeg.m4 |    3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash