Skip to content

Commit 6bc610b

Browse files
committed
configure: remove libzvbi GPL dependency
The COPYING.LIB file in the zvbi source tree as well as libzvbi.h references the GNU Library General Public License version 2 since version 0.2.28. Signed-off-by: Marton Balint <[email protected]>
1 parent 995c7a6 commit 6bc610b

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

configure

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4886,7 +4886,6 @@ die_license_disabled gpl libx264
48864886
die_license_disabled gpl libx265
48874887
die_license_disabled gpl libxavs
48884888
die_license_disabled gpl libxvid
4889-
die_license_disabled gpl libzvbi
48904889
die_license_disabled gpl x11grab
48914890

48924891
die_license_disabled nonfree libaacplus
@@ -5573,7 +5572,9 @@ enabled libxavs && require libxavs xavs.h xavs_encoder_encode -lxavs
55735572
enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
55745573
enabled libzimg && require_pkg_config zimg zimg.h zimg_get_api_version
55755574
enabled libzmq && require_pkg_config libzmq zmq.h zmq_ctx_new
5576-
enabled libzvbi && require libzvbi libzvbi.h vbi_decoder_new -lzvbi
5575+
enabled libzvbi && require libzvbi libzvbi.h vbi_decoder_new -lzvbi &&
5576+
{ check_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" ||
5577+
enabled gpl || die "ERROR: libzvbi requires version 0.2.28 or --enable-gpl."; }
55775578
enabled mmal && { check_lib interface/mmal/mmal.h mmal_port_connect -lmmal_core -lmmal_util -lmmal_vc_client -lbcm_host ||
55785579
{ ! enabled cross_compile && {
55795580
add_cflags -isystem/opt/vc/include/ -isystem/opt/vc/include/interface/vmcs_host/linux -isystem/opt/vc/include/interface/vcos/pthreads -fgnu89-inline ;

doc/general.texi

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,6 @@ Go to @url{http://sourceforge.net/projects/zapping/} and follow the instructions
173173
installing the library. Then pass @code{--enable-libzvbi} to configure to
174174
enable it.
175175

176-
@float NOTE
177-
libzvbi is licensed under the GNU General Public License Version 2 or later
178-
(see @url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html} for details),
179-
you must upgrade FFmpeg's license to GPL in order to use it.
180-
@end float
181-
182176
@section AviSynth
183177

184178
FFmpeg can read AviSynth scripts as input. To enable support, pass

0 commit comments

Comments
 (0)