Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/files/, net-misc/freerdp/
Date: Mon, 02 May 2022 21:26:03
Message-Id: 1651526707.12b6d4df9ddb1e3673afe03bdac7ca8586429f8a.floppym@gentoo
1 commit: 12b6d4df9ddb1e3673afe03bdac7ca8586429f8a
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 2 21:24:37 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon May 2 21:25:07 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b6d4df
7
8 net-misc/freerdp: drop 2.4.1-r1, 2.5.0, 2.5.0_p39
9
10 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
11
12 net-misc/freerdp/Manifest | 3 -
13 .../freerdp/files/freerdp-2.4.1-rdpei-free.patch | 27 -----
14 net-misc/freerdp/freerdp-2.4.1-r1.ebuild | 122 --------------------
15 net-misc/freerdp/freerdp-2.5.0.ebuild | 118 --------------------
16 net-misc/freerdp/freerdp-2.5.0_p39.ebuild | 124 ---------------------
17 5 files changed, 394 deletions(-)
18
19 diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
20 index 0717b684ad13..83df7c62cd22 100644
21 --- a/net-misc/freerdp/Manifest
22 +++ b/net-misc/freerdp/Manifest
23 @@ -1,5 +1,2 @@
24 -DIST freerdp-2.4.1.tar.gz 7300797 BLAKE2B cd14cadfbad9f30ab6ee6ba80c3a3bfb191b68dc0cf576082044a20489f558e222e618ed314a7fefdefcb480f201f384df5d77db8699d2e4530559fd3d5b4398 SHA512 9bacd6a7219690ed62d6a646616a54770293ff45b59211aff73dc8d67300a79ba22e72cbe56803d301b60964e4acccea9b7c6d7e2d698b91eafcf6ba561cd66a
25 -DIST freerdp-2.5.0.tar.gz 7303832 BLAKE2B 93f7428f04e0f5faaf93c08acd75cb4af655b52fc89653d470f28175e8d3fad9b61c9c19bfd7fb7e6edf947c9cca12a1d6a98b410409cd9f96007de1bc52b034 SHA512 d9f70bc12175d4ab1c874a2106d37c7d8c0f5e1f81ef30329518eecc5c58c0131429243a3faa6c7d68b187c8f43f93000a1de0e39e81ab71ad626e33f373f33d
26 -DIST freerdp-2.5.0_p39.tar.gz 37767 BLAKE2B ae520958e2b1418c46d20c4fb50ecf952d0b0cf2c455dca2d6cf08daf85dabcf2dacb5934240a7c3411ff490903bf15a21f621267a47e81e57edaf520b93c274 SHA512 e7455953f11b82290f6689f4ebaa030e73bf5ea3dac768527027bbb09e4d925208d9b324ae175d28642c161eb0e3227f6c98f4c8717e1f83c81d4399586495db
27 DIST freerdp-2.6.1.tar.gz 7270692 BLAKE2B c4da1868be5f1fc40fb14ba54b33c7c79c66cf44b464e4f2e62cfd9cad2da3a6980dc5d33fdd93a11bf8138a75e4427c46977a7110f4cb8669827c0940e3b196 SHA512 4de8718924b63b32fb5068c6538ba31f966e3cc14d17ae42dc90a01787dfff388c486263dcc085777baf4ce25b89f12191e1a5d6afb42f17cbcb38282f4868b7
28 DIST freerdp-2.7.0.tar.gz 7274512 BLAKE2B 82dc1403c8c2cada81585e869315ee2601d1fe87c3cb293f3cfe90278110644a5dab42ec0b516a204a651dc3127e458cd47994269644c41183501b848e399348 SHA512 9e9df14a39412f3ee3cd8a97123377d3da39492f66a0caee37d122f487639483d172cb89824523d57516aa83d22b9da569f2169a0598b475fbe70eab65fa2dc4
29
30 diff --git a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch b/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch
31 deleted file mode 100644
32 index d6e73631c6e2..000000000000
33 --- a/net-misc/freerdp/files/freerdp-2.4.1-rdpei-free.patch
34 +++ /dev/null
35 @@ -1,27 +0,0 @@
36 -From a0ce57541f4f22c4a7201de317e603103d6ffdc6 Mon Sep 17 00:00:00 2001
37 -From: Mike Gilbert <floppym@g.o>
38 -Date: Sun, 24 Oct 2021 10:04:38 -0400
39 -Subject: [PATCH] channels/rdpei: avoid calling free() on contactPoints array
40 -
41 -This was fixed on master as part of
42 -268bc2e8ef7b76887d14d50702bb8446ce15a4c1. Backporting that change seems
43 -like too much for the stable branch.
44 ----
45 - channels/rdpei/client/rdpei_main.c | 1 -
46 - 1 file changed, 1 deletion(-)
47 -
48 -diff --git a/channels/rdpei/client/rdpei_main.c b/channels/rdpei/client/rdpei_main.c
49 -index f20d58a13..1d95054a0 100644
50 ---- a/channels/rdpei/client/rdpei_main.c
51 -+++ b/channels/rdpei/client/rdpei_main.c
52 -@@ -1386,7 +1386,6 @@ UINT DVCPluginEntry(IDRDYNVC_ENTRY_POINTS* pEntryPoints)
53 - return CHANNEL_RC_OK;
54 - error_out:
55 - free(context);
56 -- free(rdpei->contactPoints);
57 - free(rdpei);
58 - return error;
59 - }
60 ---
61 -2.33.1
62 -
63
64 diff --git a/net-misc/freerdp/freerdp-2.4.1-r1.ebuild b/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
65 deleted file mode 100644
66 index 6494b88b6bfb..000000000000
67 --- a/net-misc/freerdp/freerdp-2.4.1-r1.ebuild
68 +++ /dev/null
69 @@ -1,122 +0,0 @@
70 -# Copyright 2011-2021 Gentoo Authors
71 -# Distributed under the terms of the GNU General Public License v2
72 -
73 -EAPI=7
74 -
75 -inherit cmake
76 -
77 -if [[ ${PV} == *9999 ]]; then
78 - inherit git-r3
79 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
80 - case ${PV} in
81 - 2.*) EGIT_BRANCH="stable-2.0";;
82 - esac
83 -else
84 - MY_P=${P/_/-}
85 - S="${WORKDIR}/${MY_P}"
86 - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
87 - KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86"
88 -fi
89 -
90 -DESCRIPTION="Free implementation of the Remote Desktop Protocol"
91 -HOMEPAGE="http://www.freerdp.com/"
92 -
93 -LICENSE="Apache-2.0"
94 -SLOT="0/2"
95 -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
96 -RESTRICT="!test? ( test )"
97 -
98 -RDEPEND="
99 - dev-libs/openssl:0=
100 - sys-libs/zlib:0
101 - alsa? ( media-libs/alsa-lib )
102 - cups? ( net-print/cups )
103 - usb? (
104 - virtual/libudev:0=
105 - sys-apps/util-linux:0=
106 - dev-libs/dbus-glib:0=
107 - virtual/libusb:1=
108 - )
109 - X? (
110 - x11-libs/libXcursor
111 - x11-libs/libXext
112 - x11-libs/libXi
113 - x11-libs/libXrender
114 - xinerama? ( x11-libs/libXinerama )
115 - xv? ( x11-libs/libXv )
116 - )
117 - ffmpeg? ( media-video/ffmpeg:0= )
118 - !ffmpeg? (
119 - x11-libs/cairo:0=
120 - )
121 - gstreamer? (
122 - media-libs/gstreamer:1.0
123 - media-libs/gst-plugins-base:1.0
124 - x11-libs/libXrandr
125 - )
126 - jpeg? ( virtual/jpeg:0 )
127 - openh264? ( media-libs/openh264:0= )
128 - pulseaudio? ( media-sound/pulseaudio )
129 - server? (
130 - X? (
131 - x11-libs/libXcursor
132 - x11-libs/libXdamage
133 - x11-libs/libXext
134 - x11-libs/libXfixes
135 - x11-libs/libXrandr
136 - x11-libs/libXtst
137 - xinerama? ( x11-libs/libXinerama )
138 - )
139 - )
140 - smartcard? ( sys-apps/pcsc-lite )
141 - systemd? ( sys-apps/systemd:0= )
142 - wayland? (
143 - dev-libs/wayland
144 - x11-libs/libxkbcommon
145 - )
146 - X? (
147 - x11-libs/libX11
148 - x11-libs/libxkbfile
149 - )
150 -"
151 -DEPEND="${RDEPEND}"
152 -BDEPEND="
153 - virtual/pkgconfig
154 - X? ( doc? (
155 - app-text/docbook-xml-dtd:4.1.2
156 - app-text/xmlto
157 - ) )
158 -"
159 -
160 -PATCHES=(
161 - "${FILESDIR}/freerdp-2.4.1-rdpei-free.patch"
162 -)
163 -
164 -src_configure() {
165 - local mycmakeargs=(
166 - -DBUILD_TESTING=$(usex test ON OFF)
167 - -DCHANNEL_URBDRC=$(usex usb ON OFF)
168 - -DWITH_ALSA=$(usex alsa ON OFF)
169 - -DWITH_CCACHE=OFF
170 - -DWITH_CUPS=$(usex cups ON OFF)
171 - -DWITH_DEBUG_ALL=$(usex debug ON OFF)
172 - -DWITH_MANPAGES=$(usex doc ON OFF)
173 - -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
174 - -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
175 - -DWITH_CAIRO=$(usex ffmpeg OFF ON)
176 - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
177 - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
178 - -DWITH_JPEG=$(usex jpeg ON OFF)
179 - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
180 - -DWITH_OPENH264=$(usex openh264 ON OFF)
181 - -DWITH_PULSE=$(usex pulseaudio ON OFF)
182 - -DWITH_SERVER=$(usex server ON OFF)
183 - -DWITH_PCSC=$(usex smartcard ON OFF)
184 - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
185 - -DWITH_X11=$(usex X ON OFF)
186 - -DWITH_XINERAMA=$(usex xinerama ON OFF)
187 - -DWITH_XV=$(usex xv ON OFF)
188 - -DWITH_WAYLAND=$(usex wayland ON OFF)
189 - )
190 - cmake_src_configure
191 -}
192
193 diff --git a/net-misc/freerdp/freerdp-2.5.0.ebuild b/net-misc/freerdp/freerdp-2.5.0.ebuild
194 deleted file mode 100644
195 index 670754db442c..000000000000
196 --- a/net-misc/freerdp/freerdp-2.5.0.ebuild
197 +++ /dev/null
198 @@ -1,118 +0,0 @@
199 -# Copyright 2011-2022 Gentoo Authors
200 -# Distributed under the terms of the GNU General Public License v2
201 -
202 -EAPI=7
203 -
204 -inherit cmake
205 -
206 -if [[ ${PV} == *9999 ]]; then
207 - inherit git-r3
208 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
209 - case ${PV} in
210 - 2.*) EGIT_BRANCH="stable-2.0";;
211 - esac
212 -else
213 - MY_P=${P/_/-}
214 - S="${WORKDIR}/${MY_P}"
215 - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
216 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
217 -fi
218 -
219 -DESCRIPTION="Free implementation of the Remote Desktop Protocol"
220 -HOMEPAGE="http://www.freerdp.com/"
221 -
222 -LICENSE="Apache-2.0"
223 -SLOT="0/2"
224 -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
225 -RESTRICT="!test? ( test )"
226 -
227 -RDEPEND="
228 - dev-libs/openssl:0=
229 - sys-libs/zlib:0
230 - alsa? ( media-libs/alsa-lib )
231 - cups? ( net-print/cups )
232 - usb? (
233 - virtual/libudev:0=
234 - sys-apps/util-linux:0=
235 - dev-libs/dbus-glib:0=
236 - virtual/libusb:1=
237 - )
238 - X? (
239 - x11-libs/libXcursor
240 - x11-libs/libXext
241 - x11-libs/libXi
242 - x11-libs/libXrender
243 - xinerama? ( x11-libs/libXinerama )
244 - xv? ( x11-libs/libXv )
245 - )
246 - ffmpeg? ( media-video/ffmpeg:0= )
247 - !ffmpeg? (
248 - x11-libs/cairo:0=
249 - )
250 - gstreamer? (
251 - media-libs/gstreamer:1.0
252 - media-libs/gst-plugins-base:1.0
253 - x11-libs/libXrandr
254 - )
255 - jpeg? ( virtual/jpeg:0 )
256 - openh264? ( media-libs/openh264:0= )
257 - pulseaudio? ( media-sound/pulseaudio )
258 - server? (
259 - X? (
260 - x11-libs/libXcursor
261 - x11-libs/libXdamage
262 - x11-libs/libXext
263 - x11-libs/libXfixes
264 - x11-libs/libXrandr
265 - x11-libs/libXtst
266 - xinerama? ( x11-libs/libXinerama )
267 - )
268 - )
269 - smartcard? ( sys-apps/pcsc-lite )
270 - systemd? ( sys-apps/systemd:0= )
271 - wayland? (
272 - dev-libs/wayland
273 - x11-libs/libxkbcommon
274 - )
275 - X? (
276 - x11-libs/libX11
277 - x11-libs/libxkbfile
278 - )
279 -"
280 -DEPEND="${RDEPEND}"
281 -BDEPEND="
282 - virtual/pkgconfig
283 - X? ( doc? (
284 - app-text/docbook-xml-dtd:4.1.2
285 - app-text/xmlto
286 - ) )
287 -"
288 -
289 -src_configure() {
290 - local mycmakeargs=(
291 - -DBUILD_TESTING=$(usex test ON OFF)
292 - -DCHANNEL_URBDRC=$(usex usb ON OFF)
293 - -DWITH_ALSA=$(usex alsa ON OFF)
294 - -DWITH_CCACHE=OFF
295 - -DWITH_CUPS=$(usex cups ON OFF)
296 - -DWITH_DEBUG_ALL=$(usex debug ON OFF)
297 - -DWITH_MANPAGES=$(usex doc ON OFF)
298 - -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
299 - -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
300 - -DWITH_CAIRO=$(usex ffmpeg OFF ON)
301 - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
302 - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
303 - -DWITH_JPEG=$(usex jpeg ON OFF)
304 - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
305 - -DWITH_OPENH264=$(usex openh264 ON OFF)
306 - -DWITH_PULSE=$(usex pulseaudio ON OFF)
307 - -DWITH_SERVER=$(usex server ON OFF)
308 - -DWITH_PCSC=$(usex smartcard ON OFF)
309 - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
310 - -DWITH_X11=$(usex X ON OFF)
311 - -DWITH_XINERAMA=$(usex xinerama ON OFF)
312 - -DWITH_XV=$(usex xv ON OFF)
313 - -DWITH_WAYLAND=$(usex wayland ON OFF)
314 - )
315 - cmake_src_configure
316 -}
317
318 diff --git a/net-misc/freerdp/freerdp-2.5.0_p39.ebuild b/net-misc/freerdp/freerdp-2.5.0_p39.ebuild
319 deleted file mode 100644
320 index 5755601b61ed..000000000000
321 --- a/net-misc/freerdp/freerdp-2.5.0_p39.ebuild
322 +++ /dev/null
323 @@ -1,124 +0,0 @@
324 -# Copyright 2011-2022 Gentoo Authors
325 -# Distributed under the terms of the GNU General Public License v2
326 -
327 -EAPI=7
328 -
329 -inherit cmake
330 -
331 -if [[ ${PV} == *9999 ]]; then
332 - inherit git-r3
333 - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
334 - case ${PV} in
335 - 2.*) EGIT_BRANCH="stable-2.0";;
336 - esac
337 -else
338 - MY_P=${P%_p*}
339 - MY_P=${MY_P/_/-}
340 - S="${WORKDIR}/${MY_P}"
341 - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
342 - https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
343 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
344 -fi
345 -
346 -DESCRIPTION="Free implementation of the Remote Desktop Protocol"
347 -HOMEPAGE="http://www.freerdp.com/"
348 -
349 -LICENSE="Apache-2.0"
350 -SLOT="0/2"
351 -IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
352 -RESTRICT="!test? ( test )"
353 -
354 -RDEPEND="
355 - dev-libs/openssl:0=
356 - sys-libs/zlib:0
357 - alsa? ( media-libs/alsa-lib )
358 - cups? ( net-print/cups )
359 - usb? (
360 - virtual/libudev:0=
361 - sys-apps/util-linux:0=
362 - dev-libs/dbus-glib:0=
363 - virtual/libusb:1=
364 - )
365 - X? (
366 - x11-libs/libXcursor
367 - x11-libs/libXext
368 - x11-libs/libXi
369 - x11-libs/libXrender
370 - xinerama? ( x11-libs/libXinerama )
371 - xv? ( x11-libs/libXv )
372 - )
373 - ffmpeg? ( media-video/ffmpeg:0= )
374 - !ffmpeg? (
375 - x11-libs/cairo:0=
376 - )
377 - gstreamer? (
378 - media-libs/gstreamer:1.0
379 - media-libs/gst-plugins-base:1.0
380 - x11-libs/libXrandr
381 - )
382 - jpeg? ( virtual/jpeg:0 )
383 - openh264? ( media-libs/openh264:0= )
384 - pulseaudio? ( media-sound/pulseaudio )
385 - server? (
386 - X? (
387 - x11-libs/libXcursor
388 - x11-libs/libXdamage
389 - x11-libs/libXext
390 - x11-libs/libXfixes
391 - x11-libs/libXrandr
392 - x11-libs/libXtst
393 - xinerama? ( x11-libs/libXinerama )
394 - )
395 - )
396 - smartcard? ( sys-apps/pcsc-lite )
397 - systemd? ( sys-apps/systemd:0= )
398 - wayland? (
399 - dev-libs/wayland
400 - x11-libs/libxkbcommon
401 - )
402 - X? (
403 - x11-libs/libX11
404 - x11-libs/libxkbfile
405 - )
406 -"
407 -DEPEND="${RDEPEND}"
408 -BDEPEND="
409 - virtual/pkgconfig
410 - X? ( doc? (
411 - app-text/docbook-xml-dtd:4.1.2
412 - app-text/xmlto
413 - ) )
414 -"
415 -
416 -PATCHES=(
417 - "${WORKDIR}/${P}"
418 -)
419 -
420 -src_configure() {
421 - local mycmakeargs=(
422 - -DBUILD_TESTING=$(usex test ON OFF)
423 - -DCHANNEL_URBDRC=$(usex usb ON OFF)
424 - -DWITH_ALSA=$(usex alsa ON OFF)
425 - -DWITH_CCACHE=OFF
426 - -DWITH_CUPS=$(usex cups ON OFF)
427 - -DWITH_DEBUG_ALL=$(usex debug ON OFF)
428 - -DWITH_MANPAGES=$(usex doc ON OFF)
429 - -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
430 - -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
431 - -DWITH_CAIRO=$(usex ffmpeg OFF ON)
432 - -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
433 - -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
434 - -DWITH_JPEG=$(usex jpeg ON OFF)
435 - -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
436 - -DWITH_OPENH264=$(usex openh264 ON OFF)
437 - -DWITH_PULSE=$(usex pulseaudio ON OFF)
438 - -DWITH_SERVER=$(usex server ON OFF)
439 - -DWITH_PCSC=$(usex smartcard ON OFF)
440 - -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
441 - -DWITH_X11=$(usex X ON OFF)
442 - -DWITH_XINERAMA=$(usex xinerama ON OFF)
443 - -DWITH_XV=$(usex xv ON OFF)
444 - -DWITH_WAYLAND=$(usex wayland ON OFF)
445 - )
446 - cmake_src_configure
447 -}