[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac macros/ffmpeg.m4
From: |
Russ Nelson |
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac macros/ffmpeg.m4 |
Date: |
Fri, 06 Jun 2008 19:30:42 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Russ Nelson <nelsonrn> 08/06/06 19:30:42
Modified files:
. : ChangeLog configure.ac
macros : ffmpeg.m4
Log message:
* macros/ffmpeg.m4: Previous method for location of ffmpeg
libraries didn't work on Mandriva. Current method should be
more supportable.
* ..: throw up our hands and give up if we can't autolocate
avcodec.h; suggest that they use --with-ffmpeg-incl.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6838&r2=1.6839
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.539&r2=1.540
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.55&r2=1.56
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6838
retrieving revision 1.6839
diff -u -b -r1.6838 -r1.6839
--- ChangeLog 6 Jun 2008 19:08:37 -0000 1.6838
+++ ChangeLog 6 Jun 2008 19:30:40 -0000 1.6839
@@ -1,3 +1,11 @@
+2008-06-06 Russ Nelson <address@hidden>
+
+ * macros/ffmpeg.m4: Previous method for location of ffmpeg
+ libraries didn't work on Mandriva. Current method should be
+ more supportable.
+ * ..: throw up our hands and give up if we can't autolocate
+ avcodec.h; suggest that they use --with-ffmpeg-incl.
+
2008-06-06 Benjamin Wolsey <address@hidden>
* libmedia/MediaHandler.h, libmedia/MediaParser.h,
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -b -r1.539 -r1.540
--- configure.ac 6 Jun 2008 11:04:06 -0000 1.539
+++ configure.ac 6 Jun 2008 19:30:41 -0000 1.540
@@ -2556,6 +2556,8 @@
echo " ERROR: FFMPEG's libavcodec header is installed but not
libavformat." >&3
echo " You can install FFMPEG from
http://ffmpeg.mplayerhq.hu" >&3
echo " or .deb users: apt-get install libavformat-dev"
>&3
+ echo " or YaST users: yast -i libavformat-api (but
currently installs into /usr/lib64)" >&3
+
echo " or explicitly set the path using
--with-ffmpeg-incl=" >&5
echo " or reconfigure with --enable-media=gst" >&3
else
Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- macros/ffmpeg.m4 23 May 2008 05:58:09 -0000 1.55
+++ macros/ffmpeg.m4 6 Jun 2008 19:30:41 -0000 1.56
@@ -22,7 +22,7 @@
backupLIBS="$LIBS"
backupCFLAGS="$CFLAGS"
- dnl Look for the header
+ dnl Did they tell us where the header is?
AC_ARG_WITH(ffmpeg_incl, AC_HELP_STRING([--with-ffmpeg-incl], [directory
where ffmpeg headers are]), with_ffmpeg_incl=${withval})
AC_CACHE_VAL(ac_cv_path_ffmpeg_incl,[
if test x"${with_ffmpeg_incl}" != x ; then
@@ -43,6 +43,7 @@
else
AC_MSG_ERROR([${with_ffmpeg_incl} directory contains neither the
ffmpeg/avcodec.h nor libavcodec/avcodec.h header])
fi
+ topdir=${with_ffmpeg_incl}
fi
])
@@ -114,9 +115,7 @@
fi
if test x"${ac_cv_path_ffmpeg_incl}" = x; then
- if test x${cross_compiling} = xno; then
- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [ac_cv_path_ffmpeg_incl=""])
- fi
+ AC_MSG_ERROR([Cannot find ffmpeg/avcodec.h. Use --with-ffmpeg-incl= to
specify the location of the *directory* holding avcodec.h])
else
if echo $avcodec_h | grep -q ffmpeg; then
AC_DEFINE(HAVE_FFMPEG_AVCODEC_H, 1, [Define if you have avcodec.h
installed.])
@@ -247,14 +246,13 @@
fi
AC_MSG_CHECKING([for avformat.h])
- avformat_h=`echo ${ac_cv_path_ffmpeg_incl} | sed 's/-I//'`
- if test -f "${avformat_h}/ffmpeg/avformat.h"; then
+ if test -f "${topdir}/ffmpeg/avformat.h"; then
AC_DEFINE(HAVE_FFMPEG_AVFORMAT_H, 1, [Define if avformat.h is found])
- avformat_h="${avformat_h}/ffmpeg/avformat.h"
+ avformat_h="${topdir}/ffmpeg/avformat.h"
else
- if test -f "${avformat_h}/libavformat/avformat.h"; then
+ if test -f "${topdir}/libavformat/avformat.h"; then
AC_DEFINE(HAVE_LIBAVFORMAT_AVFORMAT_H, 1, [Define if avformat.h is
found])
- avformat_h="${avformat_h}/libavformat/avformat.h"
+ avformat_h="${topdir}/libavformat/avformat.h"
else
avformat_h=""
fi
@@ -263,11 +261,10 @@
dnl look for swscale.h, but ignore versions older than 51.40.3
if test $ffmpeg_num_version -gt 51403; then
- swscale_h=`echo ${ac_cv_path_ffmpeg_incl} | sed 's/-I//'`
- if test -f "${swscale_h}/ffmpeg/swscale.h"; then
+ if test -f "${topdir}/ffmpeg/swscale.h"; then
AC_DEFINE(HAVE_FFMPEG_SWSCALE_H, 1, [Define if swscale.h is found])
fi
- if test -f "${swscale_h}/libswscale/swscale.h"; then
+ if test -f "${topdir}/libswscale/swscale.h"; then
AC_DEFINE(HAVE_LIBSWSCALE_SWSCALE_H, 1, [Define if swscale.h is found])
fi
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog configure.ac macros/ffmpeg.m4,
Russ Nelson <=