[Gnash-commit] gnash ChangeLog configure.ac macros/ffmpeg.m4

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/06/01 17:50:07

Modified files:
        .              : ChangeLog configure.ac 
        macros         : ffmpeg.m4 

Log message:
        Avoid using swscale in certain ffmpeg versions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3436&r2=1.3437
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.329&r2=1.330
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.42&r2=1.43

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3436
retrieving revision 1.3437
diff -u -b -r1.3436 -r1.3437
--- ChangeLog   1 Jun 2007 15:23:34 -0000       1.3436
+++ ChangeLog   1 Jun 2007 17:50:06 -0000       1.3437
@@ -1,3 +1,8 @@
+2007-06-01 Bastiaan Jacques <address@hidden>
+
+       * macros/ffmpeg.m4: Avoid using libswscale with broken ffmpeg
+       versions.
+
 2007-06-01 Sandro Santilli <address@hidden>
 
        * server/asobj/NetStreamGst.cpp: protect all log_debug calls
@@ -48,7 +53,9 @@
 
        * macros/ffmpeg.m4: Define HAVE_SWSCALE_H if swscale.h is present.
        * libbase/embedVideoDecoderFfmpeg.cpp: If swscale.h is available,
-       use swscale and friends. Otherwise, default to img_convert.
+       use swscale and friends. Otherwise, default to img_convert. Also,
+       conditionally include swscale.h itself.
+       * server/asobj/NetStreamFfmpeg.cpp: Remove unused include.
 
 2007-05-31 Sandro Santilli <address@hidden>
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -b -r1.329 -r1.330
--- configure.ac        31 May 2007 16:44:56 -0000      1.329
+++ configure.ac        1 Jun 2007 17:50:06 -0000       1.330
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.329 2007/05/31 16:44:56 martinwguy Exp $
+dnl $Id: configure.ac,v 1.330 2007/06/01 17:50:06 bjacques Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -212,9 +212,12 @@
  [gui=gtk]
 )
 
-dnl if test x"$klash" = xyes -a x"$gui" != xkde; then
-dnl   AC_MSG_ERROR([You must use the kde GUI ( --enable-gui=KDE ) if you 
enable klash.])
-dnl fi
+if test x"$klash" = xyes ; then
+  if test x"$gui" != xkde -a x"$gui" != xfltk; then
+    AC_MSG_ERROR([You must use either the kde GUI ( --enable-gui=KDE )
+      or the fltk GUI ( --enable-gui=FLTK ) if you enable klash.])
+  fi
+fi
 
 AC_ARG_ENABLE(renderer,
   AC_HELP_STRING([--enable-renderer=engine], [Specify rendering engine: 
OpenGL, Agg or Cairo (experimental) [[OpenGL]] ]),
@@ -462,9 +465,6 @@
 if $LD --help 2>/dev/null | grep as-needed > /dev/null; then
        gcc_cv_ld_as_needed=yes
 fi
-if test x"$gcc_cv_ld_as_needed" = xyes; then
-       LDFLAGS="${LDFLAGS} -Wl,--as-needed"
-fi
 AC_MSG_RESULT($gcc_cv_ld_as_needed)
 
 dnl GNASH_PKG_FIND(dmalloc, [dmalloc.h], [dmalloc], mallinfo)

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- macros/ffmpeg.m4    31 May 2007 21:18:20 -0000      1.42
+++ macros/ffmpeg.m4    1 Jun 2007 17:50:07 -0000       1.43
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: ffmpeg.m4,v 1.42 2007/05/31 21:18:20 bjacques Exp $
+dnl $Id: ffmpeg.m4,v 1.43 2007/06/01 17:50:07 bjacques Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -134,7 +134,7 @@
 
   if test x"$avcodec_h" != x; then
     swscale_h="`dirname $avcodec_h`/swscale.h"
-    if test -f "$swscale_h"; then
+    if test -f "$swscale_h" -a $ffmpeg_num_version -gt 51403; then
       AC_DEFINE(HAVE_SWSCALE_H, 1, [Define if swscale.h is found])
     fi
   fi