[vlc-devel] [PATCH] contrib: add --disable-gpl option to bootstrap
Rafaël Carré
funman at videolan.org
Wed Dec 19 06:09:48 CET 2012
This will skip auto-select of libraries under the GPL
---
contrib/bootstrap | 6 ++++++
contrib/src/a52/rules.mak | 2 ++
contrib/src/dca/rules.mak | 2 ++
contrib/src/dvdnav/rules.mak | 2 ++
contrib/src/dvdread/rules.mak | 2 ++
contrib/src/faad2/rules.mak | 2 ++
contrib/src/gnutls/rules.mak | 2 ++
contrib/src/libmpeg2/rules.mak | 2 ++
contrib/src/mad/rules.mak | 2 ++
contrib/src/postproc/rules.mak | 2 ++
contrib/src/samplerate/rules.mak | 2 ++
contrib/src/sidplay2/rules.mak | 2 ++
contrib/src/x264/rules.mak | 2 ++
13 files changed, 30 insertions(+)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index b8d88c9..37cdda8 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -29,6 +29,7 @@ usage()
echo " --disable-disc configure to not build optical discs packages"
echo " --disable-sout configure to not build stream output packages"
echo " --enable-small optimize libraries for size with slight speed decrease [DANGEROUS]"
+ echo " --disable-gpl configure to not build viral GPL code"
}
BUILD=
@@ -38,6 +39,7 @@ PKGS_ENABLE=
PKGS_DISABLE=
BUILD_ENCODERS="1"
BUILD_DISCS="1"
+GPL="1"
if test ! -f "../../contrib/src/main.mak"
then
@@ -70,6 +72,9 @@ do
--enable-small)
ENABLE_SMALL=1
;;
+ --disable-gpl)
+ GPL=
+ ;;
--disable-*)
PKGS_DISABLE="${PKGS_DISABLE} ${1#--disable-}"
;;
@@ -199,6 +204,7 @@ test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
+test -z "$GPL" || add_make_enabled "GPL"
#
# Checks
diff --git a/contrib/src/a52/rules.mak b/contrib/src/a52/rules.mak
index 36546ae..1db72df 100644
--- a/contrib/src/a52/rules.mak
+++ b/contrib/src/a52/rules.mak
@@ -3,7 +3,9 @@
A52DEC_VERSION := 0.7.4
A52DEC_URL := $(CONTRIB_VIDEOLAN)/a52dec-$(A52DEC_VERSION).tar.gz
+ifdef GPL
PKGS += a52
+endif
$(TARBALLS)/a52dec-$(A52DEC_VERSION).tar.gz:
$(call download,$(A52DEC_URL))
diff --git a/contrib/src/dca/rules.mak b/contrib/src/dca/rules.mak
index c4de8b0..6582845 100644
--- a/contrib/src/dca/rules.mak
+++ b/contrib/src/dca/rules.mak
@@ -4,8 +4,10 @@ DCA_VERSION := 0.0.5
DCA_URL := $(VIDEOLAN)/libdca/$(DCA_VERSION)/libdca-$(DCA_VERSION).tar.bz2
ifdef HAVE_FPU
+ifdef GPL
PKGS += dca
endif
+endif
ifeq ($(call need_pkg,"libdca"),)
PKGS_FOUND += dca
endif
diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index a579724..2d24893 100644
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -6,8 +6,10 @@ DVDNAV_GITURL := git://github.com/microe/libdvdnav
LIBDVDNAV_VERSION := git
ifdef BUILD_DISCS
+ifdef GPL
PKGS += dvdnav
endif
+endif
ifeq ($(call need_pkg,"dvdnav"),)
PKGS_FOUND += dvdnav
endif
diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 9c6d57d..84f1ae7 100644
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -4,8 +4,10 @@ LIBDVDREAD_VERSION := 4.2.0
LIBDVDREAD_URL := http://dvdnav.mplayerhq.hu/releases/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
ifdef BUILD_DISCS
+ifdef GPL
PKGS += dvdread
endif
+endif
ifeq ($(call need_pkg,"dvdread"),)
PKGS_FOUND += dvdread
endif
diff --git a/contrib/src/faad2/rules.mak b/contrib/src/faad2/rules.mak
index 080af72..5bc68cb 100644
--- a/contrib/src/faad2/rules.mak
+++ b/contrib/src/faad2/rules.mak
@@ -5,8 +5,10 @@ FAAD2_URL := $(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
ifeq ($(findstring $(ARCH),arm),)
# FAAD is a lot slower than lavc on ARM. Skip it.
+ifdef GPL
PKGS += faad2
endif
+endif
$(TARBALLS)/faad2-$(FAAD2_VERSION).tar.gz:
$(call download,$(FAAD2_URL))
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index cdeef98..972f2b1 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -3,7 +3,9 @@
GNUTLS_VERSION := 2.12.20
GNUTLS_URL := http://ftp.gnu.org/pub/gnu/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
+ifdef GPL
PKGS += gnutls
+endif
ifeq ($(call need_pkg,"gnutls >= 2.0.0"),)
PKGS_FOUND += gnutls
endif
diff --git a/contrib/src/libmpeg2/rules.mak b/contrib/src/libmpeg2/rules.mak
index 505a5b9..650814a 100644
--- a/contrib/src/libmpeg2/rules.mak
+++ b/contrib/src/libmpeg2/rules.mak
@@ -3,7 +3,9 @@
LIBMPEG2_VERSION = 0.5.1
LIBMPEG2_URL := http://libmpeg2.sourceforge.net/files/libmpeg2-$(LIBMPEG2_VERSION).tar.gz
+ifdef GPL
PKGS += libmpeg2
+endif
ifeq ($(call need_pkg,"libmpeg2"),)
PKGS_FOUND += libmpeg2
endif
diff --git a/contrib/src/mad/rules.mak b/contrib/src/mad/rules.mak
index 7f34e4b..ff2c428 100644
--- a/contrib/src/mad/rules.mak
+++ b/contrib/src/mad/rules.mak
@@ -3,7 +3,9 @@
MAD_VERSION := 0.15.1b
MAD_URL := $(CONTRIB_VIDEOLAN)/libmad-$(MAD_VERSION).tar.gz
+ifdef GPL
PKGS += mad
+endif
ifeq ($(call need_pkg,"mad"),)
PKGS_FOUND += mad
endif
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index 111e47d..307ffa0 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -84,7 +84,9 @@ POSTPROC_CFLAGS += --std=gnu99
# Build
+ifdef GPL
PKGS += postproc
+endif
ifeq ($(call need_pkg,"libpostproc"),)
PKGS_FOUND += postproc
endif
diff --git a/contrib/src/samplerate/rules.mak b/contrib/src/samplerate/rules.mak
index 7bdc858..c3548ba 100644
--- a/contrib/src/samplerate/rules.mak
+++ b/contrib/src/samplerate/rules.mak
@@ -2,7 +2,9 @@
SAMPLERATE_VERSION := 0.1.8
SAMPLERATE_URL := http://www.mega-nerd.com/SRC/libsamplerate-$(SAMPLERATE_VERSION).tar.gz
+ifdef GPL
PKGS += samplerate
+endif
ifeq ($(call need_pkg,"samplerate"),)
PKGS_FOUND += samplerate
endif
diff --git a/contrib/src/sidplay2/rules.mak b/contrib/src/sidplay2/rules.mak
index 6184629..5ab0376 100644
--- a/contrib/src/sidplay2/rules.mak
+++ b/contrib/src/sidplay2/rules.mak
@@ -3,7 +3,9 @@
SID_VERSION := 2.1.1
SID_URL := $(SF)/sidplay2/sidplay2/sidplay-libs-$(SID_VERSION)/sidplay-libs-$(SID_VERSION).tar.gz
+ifdef GPL
PKGS += sidplay2
+endif
$(TARBALLS)/sidplay-libs-$(SID_VERSION).tar.gz:
$(call download,$(SID_URL))
diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index a0bd03e..2bf920a 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -4,8 +4,10 @@ X264_GITURL := git://git.videolan.org/x264.git
X264_SNAPURL := http://git.videolan.org/?p=x264.git;a=snapshot;h=HEAD;sf=tgz
ifdef BUILD_ENCODERS
+ifdef GPL
PKGS += x264
endif
+endif
ifeq ($(call need_pkg,"x264 >= 0.86"),)
PKGS_FOUND += x264
--
1.7.10.4
More information about the vlc-devel
mailing list