slurp in ffmpeg a) please test b) please help me figure out how to portably...

slurp in ffmpeg a) please test b) please help me figure out how to portably link in a .a file in our .so plugin

Original commit message from CVS:
slurp in ffmpeg

a) please test
b) please help me figure out how to portably link in a .a file in our
.so plugin
parent 8d964703
...@@ -13,6 +13,9 @@ then ...@@ -13,6 +13,9 @@ then
cvs co common cvs co common
fi fi
# ensure that we have the dirs we put ext libs in to appease automake
mkdir -p gst-libs/ext/ffmpeg
# source helper functions # source helper functions
if test ! -e common/gst-autogen.sh; if test ! -e common/gst-autogen.sh;
then then
......
common @ 4a7bc52a
Subproject commit 79e6940e7ff1a6cbf959a1f7a0a3d1ed3f90d3ee Subproject commit 4a7bc52a893bdd9fefa9fabe460c827822a9e0f2
...@@ -207,6 +207,7 @@ GTK_LIBS=$GTK2_LIBS ...@@ -207,6 +207,7 @@ GTK_LIBS=$GTK2_LIBS
AC_SUBST(GTK_LIBS) AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_CFLAGS)
dnl Check for X11 extensions dnl Check for X11 extensions
AC_PATH_XTRA AC_PATH_XTRA
if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
...@@ -522,7 +523,10 @@ GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [ ...@@ -522,7 +523,10 @@ GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [
dnl *** FFMPEG *** dnl *** FFMPEG ***
translit(dnm, m, l) AM_CONDITIONAL(USE_FFMPEG, true) translit(dnm, m, l) AM_CONDITIONAL(USE_FFMPEG, true)
GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
AM_PATH_FFMPEG(0.4.6, HAVE_FFMPEG=yes, HAVE_FFMPEG=no) AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, "2002-12-14 12:00 GMT",
HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
[defined if we use uninstalled ffmpeg])
]) ])
dnl *** Gnome VFS *** dnl *** Gnome VFS ***
...@@ -1089,6 +1093,8 @@ gst-libs/gst/play/Makefile ...@@ -1089,6 +1093,8 @@ gst-libs/gst/play/Makefile
gst-libs/gst/resample/Makefile gst-libs/gst/resample/Makefile
gst-libs/gst/riff/Makefile gst-libs/gst/riff/Makefile
gst-libs/gst/video/Makefile gst-libs/gst/video/Makefile
gst-libs/ext/Makefile
gst-libs/ext/ffmpeg/Makefile
examples/dynparams/Makefile examples/dynparams/Makefile
examples/capsfilter/Makefile examples/capsfilter/Makefile
examples/seeking/Makefile examples/seeking/Makefile
...@@ -1100,7 +1106,6 @@ testsuite/Makefile ...@@ -1100,7 +1106,6 @@ testsuite/Makefile
tools/Makefile tools/Makefile
gconf/Makefile gconf/Makefile
) )
AC_OUTPUT AC_OUTPUT
echo -e "configure: *** Plug-ins that will be built : $GST_PLUGINS_YES" echo -e "configure: *** Plug-ins that will be built : $GST_PLUGINS_YES"
......
...@@ -18,7 +18,7 @@ AC_DEFUN(AM_PATH_FFMPEG, ...@@ -18,7 +18,7 @@ AC_DEFUN(AM_PATH_FFMPEG,
AC_ARG_WITH(ffmpeg-source, AC_ARG_WITH(ffmpeg-source,
AC_HELP_STRING([--with-ffmpeg-source=DIR], AC_HELP_STRING([--with-ffmpeg-source=DIR],
[Directory where FFmpeg source is (optional)]), [Directory where FFmpeg source is (optional)]),
ffmpeg_source="$withval", ffmpeg_source="") ffmpeg_source="$withval")
dnl save CFLAGS and LIBS here dnl save CFLAGS and LIBS here
CFLAGS_save=$CFLAGS CFLAGS_save=$CFLAGS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment