[FFmpeg-cvslog] r19129 - in branches/0.5: . COPYING.GPL COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPL COPYING.LGPLv2.1 COPYING.LGPLv3 LICENSE cmdutils.c configure
diego
subversion
Sun Jun 7 14:52:31 CEST 2009
Author: diego
Date: Sun Jun 7 14:52:31 2009
New Revision: 19129
Log:
Merge (L)GPL upgrade code and related changes from trunk.
Added:
branches/0.5/COPYING.GPLv2
- copied unchanged from r19114, trunk/COPYING.GPLv2
branches/0.5/COPYING.GPLv3
- copied unchanged from r19116, trunk/COPYING.GPLv3
branches/0.5/COPYING.LGPLv2.1
- copied unchanged from r19114, trunk/COPYING.LGPLv2.1
branches/0.5/COPYING.LGPLv3
- copied unchanged from r19116, trunk/COPYING.LGPLv3
Deleted:
branches/0.5/COPYING.GPL
branches/0.5/COPYING.LGPL
Modified:
branches/0.5/ (props changed)
branches/0.5/LICENSE
branches/0.5/cmdutils.c
branches/0.5/configure
Modified: branches/0.5/LICENSE
==============================================================================
--- branches/0.5/LICENSE Sat Jun 6 22:16:53 2009 (r19128)
+++ branches/0.5/LICENSE Sun Jun 7 14:52:31 2009 (r19129)
@@ -1,10 +1,13 @@
+FFmpeg:
+-------
+
Most files in FFmpeg are under the GNU Lesser General Public License version 2.1
-or later (LGPL v2.1+). Read the file COPYING.LGPL for details. Some other files
-have a MIT/X11/BSD-style license. In combination the LGPL v2.1+ applies to
+or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other
+files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to
FFmpeg.
Some optional parts of FFmpeg are licensed under the GNU General Public License
-version 2 or later (GPL v2+). See the file COPYING.GPL for details. None of
+version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of
these parts are used by default, you have to explicitly pass --enable-gpl to
configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
@@ -18,6 +21,20 @@ Specifically, the GPL parts of FFmpeg ar
libavcodec/x86/idct_mmx.c
- the X11 grabber in libavdevice/x11grab.c
+There are a handful of files under other licensing terms, namely:
+
+* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c
+ are taken from libjpeg, see the top of the files for licensing details.
+
+Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then
+the configure parameter --enable-version3 will activate this licensing option
+for you. Read the file COPYING.LGPLv3 or, if you have enabled GPL parts,
+COPYING.GPLv3 to learn the exact legal terms that apply in this case.
+
+
+external libraries:
+-------------------
+
Some external libraries, e.g. libx264, are under GPL and can be used in
conjunction with FFmpeg. They require --enable-gpl to be passed to configure
as well.
@@ -26,8 +43,3 @@ The nonfree external libraries libamrnb,
in FFmpeg. You need to pass --enable-nonfree to configure to enable them. Employ
this option with care as FFmpeg then becomes nonfree and unredistributable.
Note that libfaac claims to be LGPL, but is not.
-
-There are a handful of files under other licensing terms, namely:
-
-* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c
- are taken from libjpeg, see the top of the files for licensing details.
Modified: branches/0.5/cmdutils.c
==============================================================================
--- branches/0.5/cmdutils.c Sat Jun 6 22:16:53 2009 (r19128)
+++ branches/0.5/cmdutils.c Sun Jun 7 14:52:31 2009 (r19129)
@@ -309,14 +309,26 @@ void show_version(void) {
void show_license(void)
{
-#if CONFIG_NONFREE
printf(
+#if CONFIG_NONFREE
"This version of %s has nonfree parts compiled in.\n"
"Therefore it is not legally redistributable.\n",
program_name
- );
+#elif CONFIG_GPLV3
+ "%s is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+ "the Free Software Foundation; either version 3 of the License, or\n"
+ "(at your option) any later version.\n"
+ "\n"
+ "%s is distributed in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+ "GNU General Public License for more details.\n"
+ "\n"
+ "You should have received a copy of the GNU General Public License\n"
+ "along with %s. If not, see <http://www.gnu.org/licenses/>.\n",
+ program_name, program_name, program_name
#elif CONFIG_GPL
- printf(
"%s is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
"the Free Software Foundation; either version 2 of the License, or\n"
@@ -331,9 +343,21 @@ void show_license(void)
"along with %s; if not, write to the Free Software\n"
"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n",
program_name, program_name, program_name
- );
+#elif CONFIG_LGPLV3
+ "%s is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU Lesser General Public License as published by\n"
+ "the Free Software Foundation; either version 3 of the License, or\n"
+ "(at your option) any later version.\n"
+ "\n"
+ "%s is distributed in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+ "GNU Lesser General Public License for more details.\n"
+ "\n"
+ "You should have received a copy of the GNU Lesser General Public License\n"
+ "along with %s. If not, see <http://www.gnu.org/licenses/>.\n",
+ program_name, program_name, program_name
#else
- printf(
"%s is free software; you can redistribute it and/or\n"
"modify it under the terms of the GNU Lesser General Public\n"
"License as published by the Free Software Foundation; either\n"
@@ -348,8 +372,8 @@ void show_license(void)
"License along with %s; if not, write to the Free Software\n"
"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n",
program_name, program_name, program_name
- );
#endif
+ );
}
void show_formats(void)
Modified: branches/0.5/configure
==============================================================================
--- branches/0.5/configure Sat Jun 6 22:16:53 2009 (r19128)
+++ branches/0.5/configure Sun Jun 7 14:52:31 2009 (r19129)
@@ -75,6 +75,7 @@ show_help(){
echo " --enable-shared build shared libraries [no]"
echo " --enable-gpl allow use of GPL code, the resulting libs"
echo " and binaries will be under GPL [no]"
+ echo " --enable-version3 upgrade (L)GPL to version 3 [no]"
echo " --enable-nonfree allow use of nonfree code, the resulting libs"
echo " and binaries will be unredistributable [no]"
echo " --disable-ffmpeg disable ffmpeg build"
@@ -801,6 +802,7 @@ CONFIG_LIST="
swscale
vdpau
vhook
+ version3
x11grab
zlib
"
@@ -917,6 +919,8 @@ HAVE_LIST="
# options emitted with CONFIG_ prefix but not available on command line
CONFIG_EXTRA="
+ gplv3
+ lgplv3
oldscaler
"
@@ -1695,6 +1699,7 @@ die_license_disabled nonfree libamr_nb
die_license_disabled nonfree libamr_wb
die_license_disabled nonfree libfaac
+enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
check_deps $ARCH_EXT_LIST
@@ -2336,6 +2341,10 @@ done
license="LGPL version 2.1 or later"
if enabled nonfree; then
license="nonfree and unredistributable"
+elif enabled gplv3; then
+ license="GPL version 3 or later"
+elif enabled lgplv3; then
+ license="LGPL version 3 or later"
elif enabled gpl; then
license="GPL version 2 or later"
fi
More information about the ffmpeg-cvslog
mailing list