From 232a872b2d1f6ba60d91f3ee05b58a5f2449191c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Oct 2023 23:55:49 +0100 Subject: gentoo auto-resync : 05:10:2023 - 23:55:49 --- net-libs/srt/Manifest | 7 ++- .../srt/files/1.4.3-always-GNUInstallDirs.patch | 27 ---------- net-libs/srt/srt-1.4.3.ebuild | 51 ------------------- net-libs/srt/srt-1.5.1.ebuild | 2 +- net-libs/srt/srt-1.5.3.ebuild | 58 ++++++++++++++++++++++ 5 files changed, 62 insertions(+), 83 deletions(-) delete mode 100644 net-libs/srt/files/1.4.3-always-GNUInstallDirs.patch delete mode 100644 net-libs/srt/srt-1.4.3.ebuild create mode 100644 net-libs/srt/srt-1.5.3.ebuild (limited to 'net-libs/srt') diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest index 891b5cd2b1c0..f1d67d2d62e1 100644 --- a/net-libs/srt/Manifest +++ b/net-libs/srt/Manifest @@ -1,6 +1,5 @@ -AUX 1.4.3-always-GNUInstallDirs.patch 885 BLAKE2B 84b6a78b6862d4b2302f087c6215b84a4dbf2cfa3b7388b54c63d7d4919a5af43834df32d56d53db04ea87e2aa4bbf1fcdd531ea1274e1135e360470d0ba7d88 SHA512 e4b42a1fbdd60bb34b08e406b950e892e5e1a8bcd32bde3097e2f044596cd31effa049aa12a70a9bf8482943c91fd68e9ba193dd02121849ac723ba21fd7677d -DIST srt-1.4.3.tar.gz 1602671 BLAKE2B ed4ec46cab887461f6dccfc2d695fe78a3782f42f4ef6c3ac5ba6e2ea068a7943eb8079c0a448f35864c575009d556363bcfe7d815d0f47a368001a3df478837 SHA512 5cd15fd0c7b324226ab096c1b6c6f81b4ce5600617e1bd2c38985f18d7d551c9a4a09b1e34c7a705c92ae54bb57c5d736ca7eff6e4992e67666aa167e0da855f DIST srt-1.5.1.tar.gz 1694199 BLAKE2B 4c215ef936100b02b3a5a9aab6e9a715ecdb728517b0648e91f2144bb34a34cb1573c4e6905441a366ea281c9410c2d00d5ebc64144f327f7a115d81038942af SHA512 f3aa1f7773540e2dd31cd19b124eec3c3d830f59c08d953cae01e129a58db7e639bdf94c8a5a678435ae9a1d2402e2c77196fc9c4e75b42aa37d8eafcc16f436 -EBUILD srt-1.4.3.ebuild 1149 BLAKE2B 5aa95e450810b954d4f5dbb36c78abdf974f7a7ed0057dfe300785f4625f7b505415c316034abd5c0052415083ff73a7601b75b598d3b03b9412b433e53de326 SHA512 56708ddf0cd5373620391bffea8069cd7c443e737c3c03dec463fa500706262a51fa105839638a9bf964673263dbc79659e6f40723d7e80068dde6681ff072e7 -EBUILD srt-1.5.1.ebuild 1291 BLAKE2B 759c5f5889abe929a0ba388a284db6a6a79a78c7665881d3121d359b37a7bb91d9f61e0e3fef352877edfe058b1b9746d508edd3b93bb8d922e1bfe1b1363e2b SHA512 c5aa8528b1ffe36da1fbb9014df1b0217af6b1a5f69c0969bc1ca871d8ac723121de102b929dc69c140714c8014aae347321fa0c1378fe7b25962b20debe4cc8 +DIST srt-1.5.3.tar.gz 1706632 BLAKE2B fd053782e58602ccd06690c5785b68ff20531afd890678fbd77660e376887b0886cc020d449e2669672748c3d1a515b56d9fd94670c33d085eadb961220a7431 SHA512 5b576d6fd325515e05074e4568e3b65d1ae265e3e971db6e6242e5138243fc1594df1e3a7d90962385dac38abc34c4c4b0a567439050f8c0ff818b3b3d497efc +EBUILD srt-1.5.1.ebuild 1290 BLAKE2B 95a612435f3b31dc8ce89b14525ed4132a17cfd58bdefd7ec90e65cdd7a8ac597234ef8e40114d15dded247a7780b67450cc438b8bd5570c5dcb6bab1aa10792 SHA512 222743209282bf0b707d18a23df703fa7ead2a84c7b4244ee8b30952aaead1eefa383e57a6958350c00544e28a046e19b3cd09d156c6eff6b026653f7547b4ab +EBUILD srt-1.5.3.ebuild 1504 BLAKE2B a23dc829ead9eb6c078394758b8593dc55a16476ba775817081e6b33edb7195ccf9492968e44939d135cff975d368e2ba10517c4c55a140d90d66c673ee134c3 SHA512 bdb617f900ddee9d2cb4515dbfefb2faca78d80074267f48079d653be997da755162dbe9557958dfedd359f76ba13a3f67a05c9895d668441c13bf54e4fd93e5 MISC metadata.xml 430 BLAKE2B cb25cf1d0a35ec35acab5ca8bb8fa3d074531c584a70b93f02765c8636a2908a10484bd8f9268bcaa64a2a2d23a12f87b5829249c484f8357dba3974553c2c20 SHA512 c2b853dc7bcb2883c24f2ec3d14d3589b57f0ac72bc7a5bba1d8ac46747d051aa02e24e9f86f758f5a1855ba4d1e6cdb9750ab7493be4c996d281aa269c1a390 diff --git a/net-libs/srt/files/1.4.3-always-GNUInstallDirs.patch b/net-libs/srt/files/1.4.3-always-GNUInstallDirs.patch deleted file mode 100644 index f561d789af3f..000000000000 --- a/net-libs/srt/files/1.4.3-always-GNUInstallDirs.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4036afdcd07083159d66c6e12caa20d6ac6d4926 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sat, 10 Jul 2021 15:02:35 +0300 -Subject: [PATCH] [build] Always use GNUInstallDirs - ---- - CMakeLists.txt | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 25f34c8..fe23f90 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,9 +47,7 @@ set_if(SYMLINKABLE LINUX OR DARWIN OR BSD OR CYGWIN OR GNU) - # 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) -- include(GNUInstallDirs) --endif() -+include(GNUInstallDirs) - - # The CMAKE_BUILD_TYPE seems not to be always set, weird. - if (NOT DEFINED ENABLE_DEBUG) --- -2.32.0 - diff --git a/net-libs/srt/srt-1.4.3.ebuild b/net-libs/srt/srt-1.4.3.ebuild deleted file mode 100644 index dfa02328aca0..000000000000 --- a/net-libs/srt/srt-1.4.3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2018-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake-multilib - -DESCRIPTION="Secure Reliable Transport (SRT) library and tools" -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 arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv -sparc x86 ~ppc-macos ~x64-macos" -fi - -LICENSE="MPL-2.0" -SLOT="0/1.4.3" -IUSE="gnutls" - -RDEPEND=" - gnutls? ( - dev-libs/nettle:0=[${MULTILIB_USEDEP}] - net-libs/gnutls:0=[${MULTILIB_USEDEP}] - ) - !gnutls? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PV}-always-GNUInstallDirs.patch" -) - -src_configure() { - local mycmakeargs=( - -DENABLE_STATIC=OFF - -DUSE_GNUTLS=$(usex gnutls) - ) - cmake-multilib_src_configure -} - -multilib_src_install() { - cmake_src_install - # remove old upstream temporary compatibility pc - rm "${ED}/usr/$(get_libdir)/pkgconfig/haisrt.pc" || die -} diff --git a/net-libs/srt/srt-1.5.1.ebuild b/net-libs/srt/srt-1.5.1.ebuild index 443c69eb9a49..9a90f0d612da 100644 --- a/net-libs/srt/srt-1.5.1.ebuild +++ b/net-libs/srt/srt-1.5.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv -sparc x86 ~ppc-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv -sparc x86 ~ppc-macos ~x64-macos" fi LICENSE="MPL-2.0" diff --git a/net-libs/srt/srt-1.5.3.ebuild b/net-libs/srt/srt-1.5.3.ebuild new file mode 100644 index 000000000000..5f4428d36247 --- /dev/null +++ b/net-libs/srt/srt-1.5.3.ebuild @@ -0,0 +1,58 @@ +# Copyright 2018-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="Secure Reliable Transport (SRT) library and tools" +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 ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86 ~ppc-macos ~x64-macos" +fi + +LICENSE="MPL-2.0" +SLOT="0/$(ver_cut 1-2)" +IUSE="gnutls test" +RESTRICT="!test? ( test )" + +RDEPEND=" + gnutls? ( + dev-libs/nettle:0=[${MULTILIB_USEDEP}] + net-libs/gnutls:0=[${MULTILIB_USEDEP}] + ) + !gnutls? ( + dev-libs/openssl:0=[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + test? ( >=dev-cpp/gtest-1.10[${MULTILIB_USEDEP}] )" + +src_configure() { + local mycmakeargs=( + -DUSE_CXX_STD=c++14 # Required for gtest + -DENABLE_STATIC=OFF + # Bonding is experimental in 1.5, but works good and doesn't affect anything when not enabled with API calls + -DENABLE_BONDING=ON + -DENABLE_UNITTESTS=$(usex test) + -DENABLE_TESTING=OFF # Not installed developer/testing tools + -DUSE_GNUTLS=$(usex gnutls) + ) + cmake-multilib_src_configure +} + +multilib_src_test() { + cmake_src_test -j1 +} + +multilib_src_install() { + cmake_src_install + # remove old upstream temporary compatibility pc + rm "${ED}/usr/$(get_libdir)/pkgconfig/haisrt.pc" || die +} -- cgit v1.2.3