[vlc-commits] contrib: ensure GPL is enabled if needed
Rémi Denis-Courmont
git at videolan.org
Mon Sep 25 20:46:11 CEST 2017
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Sep 25 19:27:48 2017 +0300| [f6b40afddc8582d2ac247a78c03cbfcb954a375d] | committer: Rémi Denis-Courmont
contrib: ensure GPL is enabled if needed
Not including a package in $PKGS only prevents it from being built
as a direct VLC dependency. This patch adds a sanity check that any
GPL package is not pulled either as a dependency or a manual explicit
request.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f6b40afddc8582d2ac247a78c03cbfcb954a375d
---
contrib/src/a52/rules.mak | 1 +
contrib/src/dca/rules.mak | 1 +
contrib/src/dvdnav/rules.mak | 1 +
contrib/src/dvdread/rules.mak | 1 +
contrib/src/faad2/rules.mak | 1 +
contrib/src/libmpeg2/rules.mak | 1 +
contrib/src/mad/rules.mak | 1 +
contrib/src/main.mak | 6 ++++++
contrib/src/postproc/rules.mak | 1 +
contrib/src/samplerate/rules.mak | 1 +
contrib/src/sidplay2/rules.mak | 1 +
contrib/src/x264/rules.mak | 3 +++
contrib/src/x265/rules.mak | 1 +
13 files changed, 20 insertions(+)
diff --git a/contrib/src/a52/rules.mak b/contrib/src/a52/rules.mak
index 00a9d76b59..3ca4d08899 100644
--- a/contrib/src/a52/rules.mak
+++ b/contrib/src/a52/rules.mak
@@ -23,6 +23,7 @@ endif
$(MOVE)
.a52: a52dec
+ $(REQUIRE_GPL)
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $</liba52 && $(MAKE) install
diff --git a/contrib/src/dca/rules.mak b/contrib/src/dca/rules.mak
index 2b977a0c42..e1f2874667 100644
--- a/contrib/src/dca/rules.mak
+++ b/contrib/src/dca/rules.mak
@@ -25,6 +25,7 @@ libdca: libdca-$(DCA_VERSION).tar.bz2 .sum-dca
$(MOVE)
.dca: libdca
+ $(REQUIRE_GPL)
$(RECONF)
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -std=gnu89" ./configure $(HOSTCONF)
cd $< && $(MAKE) -C include install
diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index 9080930270..ef17140e31 100644
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -25,6 +25,7 @@ dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav
DEPS_dvdnav = dvdcss dvdread
.dvdnav: dvdnav .dvdcss .dvdread
+ $(REQUIRE_GPL)
$(RECONF) -I m4
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-examples
cd $< && $(MAKE) install
diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 157c4a9e2b..bcdd85ea71 100644
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -24,6 +24,7 @@ dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
DEPS_dvdread = dvdcss
.dvdread: dvdread .dvdcss
+ $(REQUIRE_GPL)
$(RECONF) -I m4
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-libdvdcss
cd $< && $(MAKE) install
diff --git a/contrib/src/faad2/rules.mak b/contrib/src/faad2/rules.mak
index 4a4467b714..39d4a98514 100644
--- a/contrib/src/faad2/rules.mak
+++ b/contrib/src/faad2/rules.mak
@@ -28,6 +28,7 @@ endif
$(MOVE)
.faad2: faad2
+ $(REQUIRE_GPL)
$(RECONF)
cd $< && $(HOSTVARS) ./configure --without-drm $(HOSTCONF)
cd $< && sed -i.orig "s/shrext_cmds/shrext/g" libtool
diff --git a/contrib/src/libmpeg2/rules.mak b/contrib/src/libmpeg2/rules.mak
index 1ec309834e..c834c2030a 100644
--- a/contrib/src/libmpeg2/rules.mak
+++ b/contrib/src/libmpeg2/rules.mak
@@ -24,6 +24,7 @@ libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz .sum-libmpeg2
$(MOVE)
.libmpeg2: libmpeg2
+ $(REQUIRE_GPL)
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-x --disable-sdl
cd $</libmpeg2 && $(MAKE) && $(MAKE) install
diff --git a/contrib/src/mad/rules.mak b/contrib/src/mad/rules.mak
index e49a733b75..315e523a50 100644
--- a/contrib/src/mad/rules.mak
+++ b/contrib/src/mad/rules.mak
@@ -34,6 +34,7 @@ endif
$(MOVE)
.mad: libmad
+ $(REQUIRE_GPL)
$(RECONF)
ifdef HAVE_IOS
cd $< && $(HOSTVARS) CCAS="$(AS)" CFLAGS="$(CFLAGS) -O3" ./configure $(HOSTCONF) $(MAD_CONF)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 9a874320d4..1d9b6226ea 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -353,6 +353,12 @@ RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
-DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_GENERATOR)
+ifdef GPL
+REQUIRE_GPL =
+else
+REQUIRE_GPL = @echo "Package \"$<\" requires the GPL license." >&2; exit 1
+endif
+
#
# Per-package build rules
#
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index 11a66dc4a0..e8bc00396e 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -121,6 +121,7 @@ postproc: postproc-$(POSTPROC_VERSION).tar.xz .sum-postproc
$(MOVE)
.postproc: postproc
+ $(REQUIRE_GPL)
cd $< && $(HOSTVARS) ./configure \
--extra-cflags="$(EXTRA_CFLAGS)" \
--extra-ldflags="$(LDFLAGS)" $(POSTPROCCONF) \
diff --git a/contrib/src/samplerate/rules.mak b/contrib/src/samplerate/rules.mak
index ab392902af..5714f9cd39 100644
--- a/contrib/src/samplerate/rules.mak
+++ b/contrib/src/samplerate/rules.mak
@@ -20,6 +20,7 @@ samplerate: libsamplerate-$(SAMPLERATE_VERSION).tar.gz .sum-samplerate
$(MOVE)
.samplerate: samplerate
+ $(REQUIRE_GPL)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) -C src install && $(MAKE) install-data
touch $@
diff --git a/contrib/src/sidplay2/rules.mak b/contrib/src/sidplay2/rules.mak
index 69cae3e66d..9c18fef79d 100644
--- a/contrib/src/sidplay2/rules.mak
+++ b/contrib/src/sidplay2/rules.mak
@@ -22,6 +22,7 @@ sidplay-libs: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2
$(MOVE)
.sidplay2: sidplay-libs
+ $(REQUIRE_GPL)
for d in . libsidplay builders resid builders/resid-builder \
builders/hardsid-builder libsidutils ; \
do \
diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 0f8aca3942..26788b5417 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -79,11 +79,13 @@ x262: x262-git.tar.gz .sum-x262
.x264: x264
+ $(REQUIRE_GPL)
cd $< && $(HOSTVARS) ./configure $(X264CONF)
cd $< && $(MAKE) install
touch $@
.x26410b: x26410b
+ $(REQUIRE_GPL)
cd $< && $(HOSTVARS) ./configure $(X264CONF) --bit-depth=10
cd $< && sed -i -e 's/libx264/libx26410b/g' Makefile config.mak
cd $< && sed -i -e 's/x264/x26410b/g' x264.pc
@@ -93,6 +95,7 @@ x262: x262-git.tar.gz .sum-x262
touch $@
.x262: x262
+ $(REQUIRE_GPL)
cd $< && sed -i -e 's/x264/x262/g' configure
cd $< && sed -i -e 's/x264_config/x262_config/g' *.h Makefile *.c
cd $< && $(HOSTVARS) ./configure $(X264CONF)
diff --git a/contrib/src/x265/rules.mak b/contrib/src/x265/rules.mak
index b06699f083..520edb65b1 100644
--- a/contrib/src/x265/rules.mak
+++ b/contrib/src/x265/rules.mak
@@ -34,6 +34,7 @@ endif
$(MOVE)
.x265: x265 toolchain.cmake
+ $(REQUIRE_GPL)
cd $</source && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_SHARED=OFF
cd $</source && $(MAKE) install
sed -e s/'[^ ]*clang_rt[^ ]*'//g -i.orig "$(PREFIX)/lib/pkgconfig/x265.pc"
More information about the vlc-commits
mailing list