diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-01-05 22:24:21 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-01-05 22:24:21 +0000 |
| commit | fa3a2c46c023ca438e062efa8dc115de341b627e (patch) | |
| tree | 3b8ec4a606949ddce733585f30085748e89f9618 /vlc | |
| parent | 3b6d3f34323e4b89fa9e622ea0aece7e9567e9ac (diff) | |
| download | asb-fa3a2c46c023ca438e062efa8dc115de341b627e.tar.gz asb-fa3a2c46c023ca438e062efa8dc115de341b627e.tar.xz | |
Initial revision
Diffstat (limited to 'vlc')
| -rw-r--r-- | vlc/build/patches/srt_add_implicit_link_libraries.patch | 27 | ||||
| -rw-r--r-- | vlc/build/patches/srt_fix_pc.patch | 41 |
2 files changed, 68 insertions, 0 deletions
diff --git a/vlc/build/patches/srt_add_implicit_link_libraries.patch b/vlc/build/patches/srt_add_implicit_link_libraries.patch new file mode 100644 index 00000000..808a9b0d --- /dev/null +++ b/vlc/build/patches/srt_add_implicit_link_libraries.patch @@ -0,0 +1,27 @@ +Source: http://git.videolan.org/?p=vlc/vlc-3.0.git;a=blob;f=contrib/src/srt/add-implicit-link-libraries.patch +srt: add implicit link libraries + ++++ srt/CMakeLists.txt 2017-12-09 09:18:38.000000000 +0100 +@@ -425,13 +425,15 @@ + # This may cause trouble when you want to compile your app with static libstdc++; + # if your build requires it, you'd probably remove -lstdc++ from the list + # obtained by `pkg-config --libs`. +-# +-# Some sensible solution for that is desired. Currently turned on only on demand. +-if (ENABLE_C_DEPS) +-if ( LINUX ) +- set (IFNEEDED_SRT_LDFLAGS "${IFNEEDED_SRT_LDFLAGS} -lstdc++ -lm") +-endif() +-endif() ++ ++message("Adding the following implicit link libraries: ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}") ++foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}) ++ if(IS_ABSOLUTE ${LIB} AND EXISTS ${LIB}) ++ set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ${LIB}) ++ else() ++ set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} "-l${LIB}") ++ endif() ++endforeach() + + join_arguments(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE}) + diff --git a/vlc/build/patches/srt_fix_pc.patch b/vlc/build/patches/srt_fix_pc.patch new file mode 100644 index 00000000..8f666fa6 --- /dev/null +++ b/vlc/build/patches/srt_fix_pc.patch @@ -0,0 +1,41 @@ +From 2f96045d17b2fc912d8bece54adf1cbe774166dd Mon Sep 17 00:00:00 2001 +From: Justin Kim <justin.kim@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@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 + |