Allow building a LGPL only gst-ffmpeg plugin

This removes --enable-gpl and --enable-postproc from the
ffmpeg configure line, and disables building the postproc
gstreamer plugin.

https://bugzilla.gnome.org/show_bug.cgi?id=654037

Conflicts:

	configure.ac
This commit is contained in:
Martin Storsjo 2011-07-05 21:35:46 +03:00 committed by Edward Hervey
parent dc80daec38
commit 2d767fe58f
4 changed files with 34 additions and 7 deletions

View file

@ -204,6 +204,13 @@ if test "x$have_bz2" = "xno"; then
AC_WARN([libbz2 not found, matroska demuxer will not be able to read bz2 tracks]) AC_WARN([libbz2 not found, matroska demuxer will not be able to read bz2 tracks])
fi fi
AC_ARG_ENABLE(lgpl,
[AC_HELP_STRING([--enable-lgpl], [build a LGPL licensed gst-ffmpeg])])
AM_CONDITIONAL(GST_FFMPEG_ENABLE_LGPL, test "x$enable_lgpl" = "xyes")
if test "x$enable_lgpl" = "xyes"; then
AC_DEFINE([GST_FFMPEG_ENABLE_LGPL], [], [Defined if building a LGPL-only version of gst-ffmpeg])
fi
dnl *** configure external libs *** dnl *** configure external libs ***
HAVE_FFMPEG_UNINSTALLED=1 HAVE_FFMPEG_UNINSTALLED=1
@ -213,7 +220,9 @@ AC_ARG_WITH(system-ffmpeg,
if test "x$with_system_ffmpeg" = "xyes"; then if test "x$with_system_ffmpeg" = "xyes"; then
PKG_CHECK_MODULES(FFMPEG, libavformat libavcodec libavutil) PKG_CHECK_MODULES(FFMPEG, libavformat libavcodec libavutil)
if test "x$enable_lgpl" != "xyes"; then
PKG_CHECK_MODULES(POSTPROC, libpostproc libavcodec libavutil) PKG_CHECK_MODULES(POSTPROC, libpostproc libavcodec libavutil)
fi
PKG_CHECK_MODULES(SWSCALE, libswscale libavutil) PKG_CHECK_MODULES(SWSCALE, libswscale libavutil)
saved_CPPFLAGS="$CPPFLAGS" saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS" CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS"
@ -306,11 +315,16 @@ else
# Enable pic and static so that we get .a files, but with PIC code. # Enable pic and static so that we get .a files, but with PIC code.
embffmpeg_configure_args="$embffmpeg_configure_args --disable-ffserver --disable-ffplay\ embffmpeg_configure_args="$embffmpeg_configure_args --disable-ffserver --disable-ffplay\
--disable-ffmpeg --disable-ffprobe --enable-postproc --enable-gpl --enable-static --enable-pic \ --disable-ffmpeg --disable-ffprobe --enable-static --enable-pic \
--disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\ --disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\
--disable-network --disable-hwaccels --disable-filters --disable-doc\ --disable-network --disable-hwaccels --disable-filters --disable-doc\
--enable-optimizations" --enable-optimizations"
if test "x$enable_lgpl" != "xyes"; then
embffmpeg_configure_args="$embffmpeg_configure_args --enable-postproc \
--enable-gpl"
fi
# if we are cross-compiling, tell ffmpeg so # if we are cross-compiling, tell ffmpeg so
target_os=`echo $host_os | sed 's/-gnu//'` target_os=`echo $host_os | sed 's/-gnu//'`
if test "x$cross_compiling" = xyes; then if test "x$cross_compiling" = xyes; then

View file

@ -1 +1,4 @@
SUBDIRS = ffmpeg libpostproc libswscale SUBDIRS = ffmpeg libswscale
if !GST_FFMPEG_ENABLE_LGPL
SUBDIRS += libpostproc
endif

View file

@ -162,4 +162,10 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"ffmpeg", "ffmpeg",
"All FFmpeg codecs and formats (" FFMPEG_SOURCE ")", "All FFmpeg codecs and formats (" FFMPEG_SOURCE ")",
plugin_init, PACKAGE_VERSION, "LGPL", "FFmpeg", "http://ffmpeg.org/") plugin_init, PACKAGE_VERSION,
#ifdef GST_FFMPEG_ENABLE_LGPL
"LGPL",
#else
"GPL",
#endif
"FFmpeg", "http://ffmpeg.org/")

View file

@ -819,6 +819,10 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"ffvideoscale", "ffvideoscale",
"videoscaling element (" FFMPEG_SOURCE ")", "videoscaling element (" FFMPEG_SOURCE ")", plugin_init, PACKAGE_VERSION,
plugin_init, #ifdef GST_FFMPEG_ENABLE_LGPL
PACKAGE_VERSION, "GPL", "FFMpeg", "http://ffmpeg.sourceforge.net/") "LGPL",
#else
"GPL",
#endif
"FFMpeg", "http://ffmpeg.sourceforge.net/")