0010-contrib-use-live555-version-that-is-compatible-with-.patch 1.71 KB
Newer Older
1
From e9bf297b30a286c26681dd733530b4d6a02d39d5 Mon Sep 17 00:00:00 2001
2 3
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 29 Sep 2017 14:49:02 +0200
4
Subject: [PATCH 10/26] contrib: use live555 version that is compatible with
Felix Paul Kühne's avatar
Felix Paul Kühne committed
5
 LGPL2
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20

---
 contrib/src/live555/SHA512SUMS | 2 +-
 contrib/src/live555/rules.mak  | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/contrib/src/live555/SHA512SUMS b/contrib/src/live555/SHA512SUMS
index f459fb9d16..02b2a69734 100644
--- a/contrib/src/live555/SHA512SUMS
+++ b/contrib/src/live555/SHA512SUMS
@@ -1 +1 @@
-319639acef6474b2eec0bdfa3416ca3c88a60f57d9d22911eee018fc494978fde93a241556bc0ea309f0b6a35e0242bd44a8f4de83a845f80d9ca5f94254ade6  live.2016.11.28.tar.gz
+10846fd6d5482bbea131ae805137077997e9dec242665e3c01d699d5584154c65049e8c520ea855599e554154a148e61fea77b592d97c814a4a98c773658d8f5  live.2016.10.21.tar.gz
\ No newline at end of file
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
21
index bb1d5655c7..41fc1c6179 100644
22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -1,14 +1,12 @@
 # live555
 
-LIVE555_VERSION := 2016.11.28
+LIVE555_VERSION := 2016.10.21
 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
 
Thomas Guillem's avatar
Thomas Guillem committed
38 39
 ifeq ($(call need_pkg,"live555"),)
 PKGS_FOUND += live555
Soomin Lee's avatar
Soomin Lee committed
40
@@ -92,7 +90,6 @@ endif
41 42 43 44 45 46 47 48
 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
-- 
49
2.20.1
50