mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 12:10:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

Make the LGPL build the default and require --enable-gpl to build a GPL licensed version

Browse source
This commit is contained in:
Sebastian Dröge 2015-07-01 22:40:02 +02:00
parent b526816cfe
commit 5d2e9b7b80
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -241,11 +241,11 @@ if test "x$HAVE_LZMA" = "xno"; then
AC_WARN([lzma not found, tiff reader will not be able to read lzma files]) AC_WARN([lzma not found, tiff reader will not be able to read lzma files])
fi fi
AC_ARG_ENABLE(lgpl, AC_ARG_ENABLE(gpl,
[AC_HELP_STRING([--enable-lgpl], [build a LGPL licensed gst-libav])]) [AC_HELP_STRING([--enable-gpl], [build a GPL licensed gst-libav])])
AM_CONDITIONAL(GST_LIBAV_ENABLE_LGPL, test "x$enable_lgpl" = "xyes") AM_CONDITIONAL(GST_LIBAV_ENABLE_GPL, test "x$enable_gpl" = "xyes")
if test "x$enable_lgpl" = "xyes"; then if test "x$enable_gpl" = "xyes"; then
AC_DEFINE([GST_LIBAV_ENABLE_LGPL], [], [Defined if building a LGPL-only version of gst-libav]) AC_DEFINE([GST_LIBAV_ENABLE_GPL], [], [Defined if building a GPL-licensed version of gst-libav])
fi fi
dnl *** configure external libs *** dnl *** configure external libs ***
@ -325,7 +325,7 @@ else
--disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau\ --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau\
--disable-filters --disable-doc --enable-optimizations" --disable-filters --disable-doc --enable-optimizations"
if test "x$enable_lgpl" != "xyes"; then if test "x$enable_gpl" == "xyes"; then
emblibav_configure_args="$emblibav_configure_args --enable-gpl" emblibav_configure_args="$emblibav_configure_args --enable-gpl"
fi fi

6
ext/libav/gstav.c
View file

@ -150,9 +150,9 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
libav, libav,
"All libav codecs and formats (" LIBAV_SOURCE ")", "All libav codecs and formats (" LIBAV_SOURCE ")",
plugin_init, PACKAGE_VERSION, plugin_init, PACKAGE_VERSION,
#ifdef GST_LIBAV_ENABLE_LGPL #ifdef GST_LIBAV_ENABLE_GPL
"LGPL",
#else
"GPL", "GPL",
#else
"LGPL",
#endif #endif
"libav", "http://www.libav.org") "libav", "http://www.libav.org")

6
ext/libswscale/gstffmpegscale.c
View file

@ -743,9 +743,9 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
avvideoscale, avvideoscale,
"libav videoscaling element (" LIBAV_SOURCE ")", plugin_init, "libav videoscaling element (" LIBAV_SOURCE ")", plugin_init,
PACKAGE_VERSION, PACKAGE_VERSION,
#ifdef GST_LIBAV_ENABLE_LGPL #ifdef GST_LIBAV_ENABLE_GPL
"LGPL",
#else
"GPL", "GPL",
#else
"LGPL",
#endif #endif
"libav", "http://www.libav.org/") "libav", "http://www.libav.org/")