1 |
commit: 80565dd361ddb4287a8346238b98e2ec3100e821 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 28 21:18:46 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 28 21:20:49 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80565dd3 |
7 |
|
8 |
net-libs/srt: Drop 1.2.2 and 1.3.1-r1 |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
net-libs/srt/Manifest | 2 - |
14 |
net-libs/srt/files/srt-1.3.1-no-rpath.patch | 28 ---------- |
15 |
...-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch | 64 ---------------------- |
16 |
net-libs/srt/srt-1.2.2.ebuild | 41 -------------- |
17 |
net-libs/srt/srt-1.3.1-r1.ebuild | 51 ----------------- |
18 |
5 files changed, 186 deletions(-) |
19 |
|
20 |
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest |
21 |
index 76a817b23a7..187ef5fee05 100644 |
22 |
--- a/net-libs/srt/Manifest |
23 |
+++ b/net-libs/srt/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST srt-1.2.2.tar.gz 634049 BLAKE2B 1f650c5d8ab470829212b9c4a1082eb1de4480c8bad4b787a63a2b9c06cb7c8c0ad3a80a06ec5b13e629ec2d18a025ff36e3dcdaa9de8359805e3ff4c1b4d963 SHA512 cb897c97d5fd93b333c8de0805c78c940650a2daf8d821e09e3fb01c7e4b56bd7513cf28545f7ac422fba9fa8420b745f397359a4b9e81cff496c776820ea90a |
26 |
-DIST srt-1.3.1.tar.gz 783953 BLAKE2B 647a67fbc8806f35b6ebc5c24236664262abbccaf41668f3b3db76055917cff767b6d04b1fdd97b676772fbb561f36f3d2f712e1d1165a26033f728c1bf9efdc SHA512 1f8fdfc0e1d92bc8c477651982c23afeacb65e2293a7225227927e1b6f71a01355a3311600097d77b3df638503e4856acbcb52ed270b650480f20b98c1be5ec2 |
27 |
DIST srt-1.3.2.tar.gz 812053 BLAKE2B 97e9053fb80da967d0ce90b0276f37d23c93b8c9847910559a12f672c1f224b9069955f57b920417b205374e921f7dbdabf96a66f5cad59e14e85506e5d19d89 SHA512 7cd8b64fafe99c47f82ba3b0c34436353161cd829bbe639038e995a0a39557f9c754a3dcadf4cf7ca587779ce185325ba88e391a058818b84b9ed32212a88817 |
28 |
|
29 |
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 |
30 |
deleted file mode 100644 |
31 |
index 6e3650709c6..00000000000 |
32 |
--- a/net-libs/srt/files/srt-1.3.1-no-rpath.patch |
33 |
+++ /dev/null |
34 |
@@ -1,28 +0,0 @@ |
35 |
-From a90e6ab27bc20fa34536c19828db5be44be4ef4d Mon Sep 17 00:00:00 2001 |
36 |
-From: Craig Andrews <candrews@××××××××××××.com> |
37 |
-Date: Mon, 26 Nov 2018 21:51:20 -0500 |
38 |
-Subject: [PATCH] Do not force rpath on Linux |
39 |
- |
40 |
---- |
41 |
- CMakeLists.txt | 8 -------- |
42 |
- 1 file changed, 8 deletions(-) |
43 |
- |
44 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
45 |
-index eb2582c..60c4507 100644 |
46 |
---- a/CMakeLists.txt |
47 |
-+++ b/CMakeLists.txt |
48 |
-@@ -663,14 +663,6 @@ macro(srt_make_application name) |
49 |
- # set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) |
50 |
- # set (FORCE_RPATH BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE) |
51 |
- |
52 |
-- if (LINUX) |
53 |
-- # This is only needed on Linux, on Windows (including Cygwin) the library file will |
54 |
-- # be placed into the binrary directory anyway. |
55 |
-- # XXX not sure about Mac. |
56 |
-- # See this name used already in install(${TARGET_srt} LIBRARY DESTINATION...). |
57 |
-- set(FORCE_RPATH LINK_FLAGS -Wl,-rpath,.,-rpath,../${CMAKE_INSTALL_LIBDIR} BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH_USE_LINK_PATH TRUE) |
58 |
-- endif() |
59 |
-- |
60 |
- # We state that Darwin always uses CLANG compiler, which honors this flag the same way. |
61 |
- set_target_properties(${name} PROPERTIES COMPILE_FLAGS "${CFLAGS_CXX_STANDARD} ${EXTRA_stransmit}" ${FORCE_RPATH}) |
62 |
- |
63 |
|
64 |
diff --git a/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch b/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch |
65 |
deleted file mode 100644 |
66 |
index 2859ed1bac3..00000000000 |
67 |
--- a/net-libs/srt/files/srt-1.3.1-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch |
68 |
+++ /dev/null |
69 |
@@ -1,64 +0,0 @@ |
70 |
-From 09afc227e0880b12a98e18ee8182f89c3a80e3a6 Mon Sep 17 00:00:00 2001 |
71 |
-From: Dennis Schridde <devurandom@×××.net> |
72 |
-Date: Sat, 15 Dec 2018 23:21:17 +0100 |
73 |
-Subject: [PATCH] CMakeLists.txt: Respect DESTDIR when creating stransmit |
74 |
- symlink |
75 |
- |
76 |
-Fixes: #357 |
77 |
---- |
78 |
- CMakeLists.txt | 20 ++++++-------------- |
79 |
- scripts/haiUtil.cmake | 5 ----- |
80 |
- 2 files changed, 6 insertions(+), 19 deletions(-) |
81 |
- |
82 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
83 |
-index eb2582c..fe45919 100644 |
84 |
---- a/CMakeLists.txt |
85 |
-+++ b/CMakeLists.txt |
86 |
-@@ -705,28 +705,20 @@ if ( ENABLE_CXX11 ) |
87 |
- # For backward compatibility with the old name |
88 |
- if (SYMLINKABLE) |
89 |
- set (REPLI_COMMAND create_symlink ) |
90 |
-+ # It appears impossible to get the filename component from the generator |
91 |
-+ # expression $<TARGET_FILE:srt-live-transmit>, hence we predict it as: |
92 |
-+ set (srt_live_transmit_name srt-live-transmit${CMAKE_EXECUTABLE_SUFFIX}) |
93 |
- else() |
94 |
- set (REPLI_COMMAND copy) |
95 |
-+ set (srt_live_transmit_name $<TARGET_FILE:srt-live-transmit>) |
96 |
- endif() |
97 |
- |
98 |
- set (stransmit_path $<TARGET_FILE_DIR:srt-live-transmit>/stransmit${CMAKE_EXECUTABLE_SUFFIX}) |
99 |
- add_custom_command( |
100 |
- TARGET srt-live-transmit |
101 |
- POST_BUILD |
102 |
-- COMMAND ${CMAKE_COMMAND} -E ${REPLI_COMMAND} $<TARGET_FILE:srt-live-transmit> ${stransmit_path}) |
103 |
-- |
104 |
-- if (SYMLINKABLE) |
105 |
-- message(STATUS "BACKWARD COMPATIBLE 'stransmit': will use symbolic link") |
106 |
-- srt_install_symlink(srt-live-transmit ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/stransmit) |
107 |
-- elseif(${CMAKE_MAJOR_VERSION} LESS 3) |
108 |
-- message(FATAL_ERROR "Your system can't install symbolic link to 'stransmit', copy-on-install requires cmake at least 3.0.2") |
109 |
-- else() |
110 |
-- # This installation doesn't work with cmake earlier than 3.0 |
111 |
-- # (looxlike cmake 2.8 somehow doesn't have a problem with resolving the $<TARGET_FILE_DIR:...> |
112 |
-- # inside the generated makefile, but does have problem with its own generated cmake_install.cmake :D) |
113 |
-- message(STATUS "BACKWARD COMPATIBLE 'stransmit': will use copying") |
114 |
-- install(PROGRAMS ${stransmit_path} DESTINATION ${CMAKE_INSTALL_BINDIR}) |
115 |
-- endif() |
116 |
-+ COMMAND ${CMAKE_COMMAND} -E ${REPLI_COMMAND} ${srt_live_transmit_name} ${stransmit_path}) |
117 |
-+ install(FILES ${stransmit_path} DESTINATION ${CMAKE_INSTALL_BINDIR}) |
118 |
- |
119 |
- srt_add_application(srt-file-transmit ${VIRTUAL_srtsupport}) |
120 |
- |
121 |
-diff --git a/scripts/haiUtil.cmake b/scripts/haiUtil.cmake |
122 |
-index 417128d..f60bc11 100644 |
123 |
---- a/scripts/haiUtil.cmake |
124 |
-+++ b/scripts/haiUtil.cmake |
125 |
-@@ -48,5 +48,0 @@ FUNCTION(join_arguments outvar) |
126 |
--macro(srt_install_symlink filepath sympath) |
127 |
-- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${filepath} ${sympath})") |
128 |
-- install(CODE "message(\"-- Created symlink: ${sympath} -> ${filepath}\")") |
129 |
--endmacro(srt_install_symlink) |
130 |
-- |
131 |
--- |
132 |
-2.20.0 |
133 |
- |
134 |
|
135 |
diff --git a/net-libs/srt/srt-1.2.2.ebuild b/net-libs/srt/srt-1.2.2.ebuild |
136 |
deleted file mode 100644 |
137 |
index 66d1b1dadb4..00000000000 |
138 |
--- a/net-libs/srt/srt-1.2.2.ebuild |
139 |
+++ /dev/null |
140 |
@@ -1,41 +0,0 @@ |
141 |
-# Copyright 1999-2018 Gentoo Foundation |
142 |
-# Distributed under the terms of the GNU General Public License v2 |
143 |
- |
144 |
-EAPI=6 |
145 |
- |
146 |
-inherit cmake-multilib |
147 |
- |
148 |
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" |
149 |
-HOMEPAGE="https://github.com/Haivision/srt" |
150 |
-SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
151 |
- |
152 |
-LICENSE="LGPL-2.1" |
153 |
-SLOT="0" |
154 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" |
155 |
-IUSE="doc libressl gnutls" |
156 |
- |
157 |
-RDEPEND=" |
158 |
- gnutls? ( net-libs/gnutls ) |
159 |
- !gnutls? ( |
160 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
161 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
162 |
- ) |
163 |
-" |
164 |
-DEPEND="${RDEPEND}" |
165 |
- |
166 |
-DOCS=( README.md ) |
167 |
- |
168 |
-#PATCHES=( "${FILESDIR}/${P} ) |
169 |
- |
170 |
-src_prepare() { |
171 |
- cmake-utils_src_prepare |
172 |
- sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die |
173 |
- sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die |
174 |
-} |
175 |
- |
176 |
-src_configure() { |
177 |
- local mycmakeargs=( |
178 |
- -DUSE_GNUTLS=$(usex gnutls) |
179 |
- ) |
180 |
- cmake-multilib_src_configure |
181 |
-} |
182 |
|
183 |
diff --git a/net-libs/srt/srt-1.3.1-r1.ebuild b/net-libs/srt/srt-1.3.1-r1.ebuild |
184 |
deleted file mode 100644 |
185 |
index 4233da5f8f4..00000000000 |
186 |
--- a/net-libs/srt/srt-1.3.1-r1.ebuild |
187 |
+++ /dev/null |
188 |
@@ -1,51 +0,0 @@ |
189 |
-# Copyright 1999-2019 Gentoo Authors |
190 |
-# Distributed under the terms of the GNU General Public License v2 |
191 |
- |
192 |
-EAPI=7 |
193 |
- |
194 |
-inherit cmake-multilib |
195 |
- |
196 |
-DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)" |
197 |
-HOMEPAGE="https://github.com/Haivision/srt" |
198 |
- |
199 |
-if [[ ${PV} == *9999 ]] ; then |
200 |
- EGIT_REPO_URI="https://github.com/Haivision/${PN}.git" |
201 |
- inherit git-r3 |
202 |
-else |
203 |
- SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
204 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" |
205 |
-fi |
206 |
- |
207 |
-LICENSE="LGPL-2.1" |
208 |
-SLOT="0" |
209 |
-IUSE="gnutls libressl" |
210 |
- |
211 |
-DEPEND=" |
212 |
- gnutls? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
213 |
- !gnutls? ( |
214 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
215 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
216 |
- ) |
217 |
-" |
218 |
-RDEPEND="${DEPEND}" |
219 |
- |
220 |
-DOCS=( README.md ) |
221 |
- |
222 |
-PATCHES=( |
223 |
- "${FILESDIR}/${PN}-always-GNUInstallDirs.patch" |
224 |
- "${FILESDIR}/${P}-no-rpath.patch" |
225 |
- "${FILESDIR}/${P}-use-destdir-for-symlinks-09afc227e0880b12a98e18ee8182f89c3a80e3a6.patch" |
226 |
-) |
227 |
- |
228 |
-src_prepare() { |
229 |
- cmake-utils_src_prepare |
230 |
- sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die |
231 |
- sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die |
232 |
-} |
233 |
- |
234 |
-src_configure() { |
235 |
- local mycmakeargs=( |
236 |
- -DUSE_GNUTLS=$(usex gnutls) |
237 |
- ) |
238 |
- cmake-multilib_src_configure |
239 |
-} |