commit: e85481619918ebda09deae2fedf46c5ded6665f8 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Mon Nov 26 17:49:51 2018 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Tue Nov 27 14:34:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8548161
net-libs/srt: 1.3.1 version bump Closes: https://bugs.gentoo.org/671986 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> net-libs/srt/Manifest | 1 + net-libs/srt/files/srt-1.3.1-no-rpath.patch | 28 +++++++++++++ net-libs/srt/files/srt-always-GNUInstallDirs.patch | 25 +++++++++++ net-libs/srt/srt-1.3.1.ebuild | 49 ++++++++++++++++++++++ 4 files changed, 103 insertions(+) diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest index 38bbc15549b..7c2f685cb52 100644 --- a/net-libs/srt/Manifest +++ b/net-libs/srt/Manifest @@ -1 +1,2 @@ DIST srt-1.2.2.tar.gz 634049 BLAKE2B 1f650c5d8ab470829212b9c4a1082eb1de4480c8bad4b787a63a2b9c06cb7c8c0ad3a80a06ec5b13e629ec2d18a025ff36e3dcdaa9de8359805e3ff4c1b4d963 SHA512 cb897c97d5fd93b333c8de0805c78c940650a2daf8d821e09e3fb01c7e4b56bd7513cf28545f7ac422fba9fa8420b745f397359a4b9e81cff496c776820ea90a +DIST srt-1.3.1.tar.gz 783953 BLAKE2B 647a67fbc8806f35b6ebc5c24236664262abbccaf41668f3b3db76055917cff767b6d04b1fdd97b676772fbb561f36f3d2f712e1d1165a26033f728c1bf9efdc SHA512 1f8fdfc0e1d92bc8c477651982c23afeacb65e2293a7225227927e1b6f71a01355a3311600097d77b3df638503e4856acbcb52ed270b650480f20b98c1be5ec2 diff --git a/net-libs/srt/files/srt-1.3.1-no-rpath.patch b/net-libs/srt/files/srt-1.3.1-no-rpath.patch new file mode 100644 index 00000000000..6e3650709c6 --- /dev/null +++ b/net-libs/srt/files/srt-1.3.1-no-rpath.patch @@ -0,0 +1,28 @@ +From a90e6ab27bc20fa34536c19828db5be44be4ef4d Mon Sep 17 00:00:00 2001 +From: Craig Andrews <[email protected]> +Date: Mon, 26 Nov 2018 21:51:20 -0500 +Subject: [PATCH] Do not force rpath on Linux + +--- + CMakeLists.txt | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eb2582c..60c4507 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -663,14 +663,6 @@ macro(srt_make_application name) + # set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + # set (FORCE_RPATH BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE) + +- if (LINUX) +- # This is only needed on Linux, on Windows (including Cygwin) the library file will +- # be placed into the binrary directory anyway. +- # XXX not sure about Mac. +- # See this name used already in install(${TARGET_srt} LIBRARY DESTINATION...). +- set(FORCE_RPATH LINK_FLAGS -Wl,-rpath,.,-rpath,../${CMAKE_INSTALL_LIBDIR} BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE) +- endif() +- + # We state that Darwin always uses CLANG compiler, which honors this flag the same way. + set_target_properties(${name} PROPERTIES COMPILE_FLAGS "${CFLAGS_CXX_STANDARD} ${EXTRA_stransmit}" ${FORCE_RPATH}) + diff --git a/net-libs/srt/files/srt-always-GNUInstallDirs.patch b/net-libs/srt/files/srt-always-GNUInstallDirs.patch new file mode 100644 index 00000000000..94332ad4476 --- /dev/null +++ b/net-libs/srt/files/srt-always-GNUInstallDirs.patch @@ -0,0 +1,25 @@ +From 68190ee0db1bc7577f17c51616966f509f971b0a Mon Sep 17 00:00:00 2001 +From: Craig Andrews <[email protected]> +Date: Mon, 26 Nov 2018 12:45:38 -0500 +Subject: [PATCH] Always use GNUInstallDirs + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eb2582c..59a41d4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,9 +32,9 @@ set_if(SYMLINKABLE LINUX OR DARWIN OR CYGWIN) + # inside "bin" and "lib64" directories. At least this maintains + # the current status. Shall this be not desired, override values + # of CMAKE_INSTALL_BINDIR, CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR. +-if (NOT DEFINED CMAKE_INSTALL_LIBDIR) ++# if (NOT DEFINED CMAKE_INSTALL_LIBDIR) + include(GNUInstallDirs) +-endif() ++# endif() + + set (SRT_VERSION 1.3.1) + set_version_variables(SRT_VERSION ${SRT_VERSION}) diff --git a/net-libs/srt/srt-1.3.1.ebuild b/net-libs/srt/srt-1.3.1.ebuild new file mode 100644 index 00000000000..d326da6dca6 --- /dev/null +++ b/net-libs/srt/srt-1.3.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-multilib + +DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" +HOMEPAGE="https://github.com/Haivision/srt"; + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/Haivision/${PN}.git"; + inherit git-r3 +else + SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" +fi + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="doc libressl gnutls" + +RDEPEND=" + gnutls? ( net-libs/gnutls ) + !gnutls? ( + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${RDEPEND}" +DOCS=( README.md ) + +PATCHES=( + "${FILESDIR}/${PN}-always-GNUInstallDirs.patch" + "${FILESDIR}/${P}-no-rpath.patch" +) + +src_prepare() { + cmake-utils_src_prepare + sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die + sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DUSE_GNUTLS=$(usex gnutls) + ) + cmake-multilib_src_configure +}
