[vlc-commits] Revert "contribs: srt: use HAVE_GNUV3 to enable"

Alexandre Janniaux git at videolan.org
Wed May 20 15:32:52 CEST 2020


vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Thu May  7 12:05:24 2020 +0200| [dde18de77e0f4520f98854ebfd5aa4b1acee3307] | committer: Alexandre Janniaux

Revert "contribs: srt: use HAVE_GNUV3 to enable"

This reverts commit 8570ea869abb5ff95467336b843f164aa74ee527.

Nettle is actually multilicensed as GPLv2 too, and the define was even
wrong.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dde18de77e0f4520f98854ebfd5aa4b1acee3307
---

 contrib/src/srt/rules.mak | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak
index 88c34e4ccd..c9dbb59db8 100644
--- a/contrib/src/srt/rules.mak
+++ b/contrib/src/srt/rules.mak
@@ -4,12 +4,8 @@ SRT_VERSION := 1.3.1
 SRT_URL := $(GITHUB)/Haivision/srt/archive/v$(SRT_VERSION).tar.gz
 
 ifdef BUILD_NETWORK
-# Nettle is GPLv3 and is required by GnuTLS, which is a
-# dependency of srt
-ifdef HAVE_GNUV3
 PKGS += srt
 endif
-endif
 
 ifeq ($(call need_pkg,"srt >= 1.3.1"),)
 PKGS_FOUND += srt



More information about the vlc-commits mailing list