[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash macros/ffmpeg.m4 ChangeLog
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash macros/ffmpeg.m4 ChangeLog |
Date: |
Sun, 29 Jul 2007 04:40:35 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/07/29 04:40:34
Modified files:
macros : ffmpeg.m4
. : ChangeLog
Log message:
* macros/ffmpeg.m4: Add test for libswscale, which is needed if
ffmpeg is configured with --enable-gpl --enable-swscale. bug
#20002.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3856&r2=1.3857
Patches:
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- macros/ffmpeg.m4 9 Jul 2007 13:51:08 -0000 1.49
+++ macros/ffmpeg.m4 29 Jul 2007 04:40:34 -0000 1.50
@@ -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.49 2007/07/09 13:51:08 strk Exp $
+dnl $Id: ffmpeg.m4,v 1.50 2007/07/29 04:40:34 rsavoye Exp $
AC_DEFUN([GNASH_PATH_FFMPEG],
[
@@ -411,6 +411,30 @@
AC_MSG_RESULT(${libdc})
ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libdc}"
fi
+
+ dnl Look for the swscale library, which is required on some system if
ffmpeg is
+ dnl configured with --enable-gpl --enable-swscale.
+ AC_MSG_CHECKING([for libswscale library])
+ if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
+ $PKG_CONFIG --exists libswscale && libsws=`$PKG_CONFIG --libs
libswscale`
+ else
+ libsws=""
+ fi
+ if test x"${libsws}" = x; then
+ if test -f ${topdir}/libswscale.a -o -f
${topdir}/libswscale.${shlibext}; then
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lswscale"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ if test x${cross_compiling} = xno; then
+ AC_CHECK_LIB(swscale, sws_scale,
[ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lswscale"])
+ fi
+ fi
+ else
+ AC_MSG_RESULT(${libsws})
+ ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libsws}"
+ fi
+
fi dnl end of all optional library tests
# Set final compilation flags, eliminating the pointless "-I/usr/include"
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3856
retrieving revision 1.3857
diff -u -b -r1.3856 -r1.3857
--- ChangeLog 29 Jul 2007 03:55:52 -0000 1.3856
+++ ChangeLog 29 Jul 2007 04:40:34 -0000 1.3857
@@ -1,3 +1,8 @@
+2007-07-28 Rob Savoye <address@hidden>
+
+ * macros/ffmpeg.m4: Add test for libswscale, which is needed if
+ ffmpeg is configured with --enable-gpl --enable-swscale. bug #20002.
+
2007-07-28 Sandro Santilli <address@hidden>
* configure.ac: re-introduce the $add_gui variable, so that a vanilla