[vlc-commits] contrib: srt: Apply a patch to fix link flags

[Justin Kim]

vlc/vlc-3.0 | branch: master | Justin Kim <justin.kim at collabora.com> | Fri Dec  8 20:51:52 2017 +0900| [96151a75eeb33fbea431aa774c9520ec03a389b7] | committer: Konstantin Pavlov

contrib: srt: Apply a patch to fix link flags

SRT 1.2.2 has a bug in their `.pc` that `Libs.private`
field has package names.

Signed-off-by: Justin Kim <justin.kim at collabora.com>
Signed-off-by: Konstantin Pavlov <thresh at videolan.org>
(cherry picked from commit 00cdf85e6a6129aa7057be9746b4e151671d2492)
Signed-off-by: Konstantin Pavlov <thresh at videolan.org>

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

 contrib/src/srt/fix-pc.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 contrib/src/srt/rules.mak    |  1 +
 2 files changed, 42 insertions(+)

diff --git a/contrib/src/srt/fix-pc.patch b/contrib/src/srt/fix-pc.patch
new file mode 100644
index 0000000000..8f666fa6f6
--- /dev/null
+++ b/contrib/src/srt/fix-pc.patch
@@ -0,0 +1,41 @@
+From 2f96045d17b2fc912d8bece54adf1cbe774166dd Mon Sep 17 00:00:00 2001
+From: Justin Kim <justin.kim at collabora.com>
+Date: Fri, 8 Dec 2017 20:43:54 +0900
+Subject: [PATCH] CMakeLists.txt: substitute link flags for package names
+
+Signed-off-by: Justin Kim <justin.kim at collabora.com>
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8e02b58..d9a8a1b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -90,6 +90,7 @@ set_if(LINUX ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ # find OpenSSL
+ if ( USE_GNUTLS )
+ 	pkg_check_modules (SSL REQUIRED gnutls nettle)
++	set (SRT_LIBS_PRIVATE ${SSL_LDFLAGS})
+ 
+ 	add_definitions(
+ 		-DUSE_GNUTLS=1
+@@ -102,6 +103,7 @@ else()
+ 	find_package(OpenSSL REQUIRED)
+ 	set (SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
+ 	set (SSL_LIBRARIES ${OPENSSL_LIBRARIES})
++	set (SRT_LIBS_PRIVATE ${SSL_LIBRARIES})
+ 
+ 	add_definitions(
+ 		-DHAICRYPT_USE_OPENSSL_EVP=1
+@@ -358,7 +360,6 @@ target_include_directories(${TARGET_haicrypt}
+ 
+ set_target_properties (${TARGET_haicrypt} PROPERTIES VERSION ${SRT_VERSION} SOVERSION ${SRT_VERSION_MAJOR})
+ target_link_libraries(${TARGET_haicrypt} PRIVATE ${SSL_LIBRARIES})
+-set (SRT_LIBS_PRIVATE ${SSL_LIBRARIES})
+ if (WIN32)
+ 	target_link_libraries(${TARGET_haicrypt} PRIVATE ws2_32.lib)
+ 	set (SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ws2_32.lib)
+-- 
+2.15.1
+
diff --git a/contrib/src/srt/rules.mak b/contrib/src/srt/rules.mak
index 78d7c9a3e2..b263bff61c 100644
--- a/contrib/src/srt/rules.mak
+++ b/contrib/src/srt/rules.mak
@@ -23,6 +23,7 @@ $(TARBALLS)/srt-$(SRT_VERSION).tar.gz:
 
 srt: srt-$(SRT_VERSION).tar.gz .sum-srt
 	$(UNPACK)
+	$(APPLY) $(SRC)/srt/fix-pc.patch
 	$(call pkg_static,"scripts/haisrt.pc.in")
 	mv srt-$(SRT_VERSION) $@ && touch $@