From 4eb4d77edba68cb5d7ea1a1d2959249a26f37dff Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 25 Sep 2018 11:03:32 +0300 Subject: [PATCH] srt: Update to 1.3.1 --- ...ubstitute-link-flags-for-package-nam.patch | 12 ++--- .../0003-add-implicit-link-libraries.patch | 2 +- mingw-w64-srt/0004-mingw-ws2_32-linking.patch | 47 +++++++++++++++++++ mingw-w64-srt/0005-mingw-w64-pthread.patch | 19 ++++++++ mingw-w64-srt/PKGBUILD | 19 +++++--- 5 files changed, 86 insertions(+), 13 deletions(-) create mode 100644 mingw-w64-srt/0004-mingw-ws2_32-linking.patch create mode 100644 mingw-w64-srt/0005-mingw-w64-pthread.patch diff --git a/mingw-w64-srt/0001-CMakeLists.txt-substitute-link-flags-for-package-nam.patch b/mingw-w64-srt/0001-CMakeLists.txt-substitute-link-flags-for-package-nam.patch index 0d3cf7038a..1f1433cf5e 100644 --- a/mingw-w64-srt/0001-CMakeLists.txt-substitute-link-flags-for-package-nam.patch +++ b/mingw-w64-srt/0001-CMakeLists.txt-substitute-link-flags-for-package-nam.patch @@ -20,12 +20,12 @@ index 85eb9c5..77fbfb0 100644 add_definitions( -DUSE_GNUTLS=1 -@@ -103,6 +104,7 @@ else() - find_package(OpenSSL REQUIRED) - set (SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR}) - set (SSL_LIBRARIES ${OPENSSL_LIBRARIES}) -+ set (SRT_LIBS_PRIVATE ${SSL_LIBRARIES}) - +@@ -194,6 +194,7 @@ else() + find_package(OpenSSL REQUIRED) + set (SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR}) + set (SSL_LIBRARIES ${OPENSSL_LIBRARIES}) ++ set (SRT_LIBS_PRIVATE ${SSL_LIBRARIES}) + endif() add_definitions( -DHAICRYPT_USE_OPENSSL_EVP=1 -- diff --git a/mingw-w64-srt/0003-add-implicit-link-libraries.patch b/mingw-w64-srt/0003-add-implicit-link-libraries.patch index 85c2259ea8..13bce16053 100644 --- a/mingw-w64-srt/0003-add-implicit-link-libraries.patch +++ b/mingw-w64-srt/0003-add-implicit-link-libraries.patch @@ -8,7 +8,7 @@ -# 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") +- set (IFNEEDED_SRT_LDFLAGS "-lstdc++ -lm") -endif() -endif() + diff --git a/mingw-w64-srt/0004-mingw-ws2_32-linking.patch b/mingw-w64-srt/0004-mingw-ws2_32-linking.patch new file mode 100644 index 0000000000..dbc544f365 --- /dev/null +++ b/mingw-w64-srt/0004-mingw-ws2_32-linking.patch @@ -0,0 +1,47 @@ +--- srt-1.3.1/CMakeLists.txt.orig 2018-09-25 10:49:17.307164900 +0300 ++++ srt-1.3.1/CMakeLists.txt 2018-09-25 10:57:40.362248600 +0300 +@@ -461,8 +461,12 @@ + set_target_properties (${TARGET_srt}_shared PROPERTIES VERSION ${SRT_VERSION} SOVERSION ${SRT_VERSION_MAJOR}) + list (APPEND INSTALL_TARGETS ${TARGET_srt}_shared) + target_link_libraries(${TARGET_srt}_shared PRIVATE ${SSL_LIBRARIES}) +- if (MICROSOFT) +- target_link_libraries(${TARGET_srt}_shared PRIVATE ws2_32.lib) ++ if (WIN32) ++ if (MSVC) ++ target_link_libraries(${TARGET_srt}_shared PRIVATE Ws2_32.lib) ++ else () ++ target_link_libraries(${TARGET_srt}_shared PRIVATE ws2_32) ++ endif() + endif() + endif() + +@@ -506,8 +510,12 @@ + + set (SRT_LIBS_PRIVATE ${SSL_LIBRARIES}) + +-if (MICROSOFT) +- set (SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ws2_32.lib) ++if (WIN32) ++ if (MSVC) ++ set (SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ws2_32.lib) ++ else () ++ set (SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ws2_32) ++ endif() + endif() + + # --- +@@ -541,8 +549,12 @@ + endif() + + if (srt_libspec_shared) +-if (MICROSOFT) +- target_link_libraries(${TARGET_srt}_shared PUBLIC Ws2_32.lib) ++if (WIN32) ++ if (MSVC) ++ target_link_libraries(${TARGET_srt}_shared PUBLIC Ws2_32.lib) ++ else () ++ target_link_libraries(${TARGET_srt}_shared PUBLIC ws2_32) ++ endif() + endif() + endif() + diff --git a/mingw-w64-srt/0005-mingw-w64-pthread.patch b/mingw-w64-srt/0005-mingw-w64-pthread.patch new file mode 100644 index 0000000000..df5728f311 --- /dev/null +++ b/mingw-w64-srt/0005-mingw-w64-pthread.patch @@ -0,0 +1,19 @@ +--- srt-1.3.1/CMakeLists.txt.orig 2018-09-25 10:39:47.874964800 +0300 ++++ srt-1.3.1/CMakeLists.txt 2018-09-25 10:44:06.336218700 +0300 +@@ -340,14 +340,14 @@ + endif() + + if (MINGW) +- set (PTHREAD_LIBRARY -lpthreadGC2) ++ #set (PTHREAD_LIBRARY -lpthreadGC2) + # XXX CONSIDER THIS. It came from a merged previous master version + # and was under an if(NOT MINGW)...elseif(THREADS_FOUND) condition. + # Might be that the current form still suffices; resolve this and remove comment. + #if(THREADS_FOUND) + #set(PTHREAD_LIBRARY ${CMAKE_THREAD_LIBS_INIT}) + #else() +- find_library(PTHREAD_LIBRARY NAMES pthread pthreadGC2 pthreadGC) ++ #find_library(PTHREAD_LIBRARY NAMES pthread pthreadGC2 pthreadGC) + #endif() + elseif (PTHREAD_LIBRARY AND PTHREAD_INCLUDE_DIR) + message(STATUS "Pthread library: ${PTHREAD_LIBRARY}") diff --git a/mingw-w64-srt/PKGBUILD b/mingw-w64-srt/PKGBUILD index acca9b78b2..cc538e8327 100644 --- a/mingw-w64-srt/PKGBUILD +++ b/mingw-w64-srt/PKGBUILD @@ -3,12 +3,12 @@ _realname=srt pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.2.3 +pkgver=1.3.1 pkgrel=1 pkgdesc="Secure Reliable Transport (SRT) (mingw-w64)" arch=('any') license=('MPLv2.0') -url="https://github.com/google/snappy" +url="https://www.srtalliance.org/" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libwinpthread" "${MINGW_PACKAGE_PREFIX}-openssl") @@ -18,10 +18,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "make") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/Haivision/srt/archive/v${pkgver}.tar.gz" 0001-CMakeLists.txt-substitute-link-flags-for-package-nam.patch - 0003-add-implicit-link-libraries.patch) -sha256sums=('81c728c04732b79e350ada51a8d54021906ee3e910e798e2968091a6f6b86eff' - 'a69b787de51287f53485529cad77f10d639e38c78b4f54a2b4e74e20de2718ac' - '536192e8abce3ecd5f1612318f55f3959b72f1e04e8246e1d07501d60ff0debd') + 0003-add-implicit-link-libraries.patch + 0004-mingw-ws2_32-linking.patch + 0005-mingw-w64-pthread.patch) +sha256sums=('f202801d9e53cd8854fccc1ca010272076c32c318396c8f61fb9a61807c3dbea' + 'e127fcc9238e8947be9df3a95ed6c34db09cdb6177bc5087906e3d04fef96c07' + 'ea35b32907f264eab70a88537df76b54409304366050b0f62e3e778fc5fe47cf' + '1dc63f94713c04cef613b37d1f31ccff3c685e431a6a73027045c4d158c3c0d9' + 'fd1436b098844bcebae27dc0584a3b332226648abc3edcc57e503b62e18625bb') noextract=(${_realname}-${pkgver}.tar.gz) prepare() { @@ -31,6 +35,8 @@ prepare() { cd ${_realname}-${pkgver} patch -p1 -i ${srcdir}/0001-CMakeLists.txt-substitute-link-flags-for-package-nam.patch patch -p1 -i ${srcdir}/0003-add-implicit-link-libraries.patch + patch -p1 -i ${srcdir}/0004-mingw-ws2_32-linking.patch + patch -p1 -i ${srcdir}/0005-mingw-w64-pthread.patch } build() { @@ -38,6 +44,7 @@ build() { mkdir -p ${srcdir}/build-${MINGW_CHOST} cd ${srcdir}/build-${MINGW_CHOST} + CXXFLAGS+=" -D_WIN32_WINNT=0x600" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G'MSYS Makefiles' \