[vlc-devel] [PATCH] contrib: live555: keep a version that doesn't require a GPL license

[Steve Lhomme]

---
 contrib/src/live555/rules.mak | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 3093dedec6..d7ed9406c1 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,14 +1,16 @@
 # live555
 
+ifdef GNUV3
 LIVE555_VERSION := 2016.11.28
+else
+LIVE555_VERSION := 2016.10.21
+endif
 LIVE555_FILE := live.$(LIVE555_VERSION).tar.gz
 LIVEDOTCOM_URL := http://live555.com/liveMedia/public/$(LIVE555_FILE)
 
 ifdef BUILD_NETWORK
-ifdef GNUV3
 PKGS += live555
 endif
-endif
 
 ifeq ($(call need_pkg,"live555"),)
 PKGS_FOUND += live555
@@ -76,15 +78,16 @@ endif
 	$(APPLY) $(SRC)/live555/add-pkgconfig-file.patch
 	# Expose Server:
 	$(APPLY) $(SRC)/live555/expose_server_string.patch
+ifdef GNUV3
 	# Fix creating static libs on mingw
 	$(APPLY) $(SRC)/live555/mingw-static-libs.patch
+endif
 
 	mv live.$(LIVE555_VERSION) $@ && touch $@
 
 SUBDIRS=groupsock liveMedia UsageEnvironment BasicUsageEnvironment
 
 .live555: live555
-	$(REQUIRE_GNUV3)
 	cd $< && for subdir in $(SUBDIRS); do \
 		echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
 		echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
-- 
2.16.2