commit: 08f2438131f86e39251efb3620668c776f9f4243 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Dec 12 20:14:23 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Dec 12 20:15:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f24381
net-misc/freerdp: remove old Bug: https://bugs.gentoo.org/672010 Bug: https://bugs.gentoo.org/679416 Package-Manager: Portage-2.3.80_p5, Repoman-2.3.19_p4 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-misc/freerdp/Manifest | 1 - net-misc/freerdp/files/2.0.0-rc2-primitives.patch | 41 -------- net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild | 120 ---------------------- 3 files changed, 162 deletions(-) diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index ad3f3a0ba7b..fd0ee55a133 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,3 +1,2 @@ -DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589 DIST freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch 20553 BLAKE2B 17ba83ba2dc05f2179df3aa8805877e15b353d4c6bbe88fa0553f7412baf85849a834032143ebd22ff3d27dd12ffdfddfc802868e10ca2718145a58378940ec4 SHA512 b3b548e98422362f63aedfefca399e4008a4b571e6cd786603418c5a3d1c4d832d5148ddee2f62d6bc1259c66020ee01ced6357d72333f49fc34a1059f4f804e DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20 diff --git a/net-misc/freerdp/files/2.0.0-rc2-primitives.patch b/net-misc/freerdp/files/2.0.0-rc2-primitives.patch deleted file mode 100644 index a82dec1ad0f..00000000000 --- a/net-misc/freerdp/files/2.0.0-rc2-primitives.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9460f4292b130fcca58519a1c52b9aaef3265042 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Wed, 16 May 2018 16:15:50 -0400 -Subject: [PATCH] primitives: ensure primitives_get() returns a populated - struct - -Fixes: https://github.com/FreeRDP/FreeRDP/issues/4658 ---- - libfreerdp/primitives/primitives.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/libfreerdp/primitives/primitives.c b/libfreerdp/primitives/primitives.c -index fd236df6e7..d25c5b41dc 100644 ---- a/libfreerdp/primitives/primitives.c -+++ b/libfreerdp/primitives/primitives.c -@@ -28,10 +28,12 @@ - #include "prim_internal.h" - - /* Singleton pointer used throughout the program when requested. */ --static primitives_t pPrimitives = { 0 }; - static primitives_t pPrimitivesGeneric = { 0 }; - static INIT_ONCE generic_primitives_InitOnce = INIT_ONCE_STATIC_INIT; -+#if defined(HAVE_OPTIMIZED_PRIMITIVES) -+static primitives_t pPrimitives = { 0 }; - static INIT_ONCE primitives_InitOnce = INIT_ONCE_STATIC_INIT; -+#endif - - - /* ------------------------------------------------------------------------- */ -@@ -74,8 +76,10 @@ primitives_t* primitives_get(void) - InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic, NULL, NULL); - #if defined(HAVE_OPTIMIZED_PRIMITIVES) - InitOnceExecuteOnce(&primitives_InitOnce, primitives_init, NULL, NULL); --#endif - return &pPrimitives; -+#else -+ return &pPrimitivesGeneric; -+#endif - } - - primitives_t* primitives_get_generic(void) diff --git a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild deleted file mode 100644 index fdbeb49fd21..00000000000 --- a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 2011-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -if [[ ${PV} != 9999 ]]; then - MY_P=${P/_/-} - S="${WORKDIR}/${MY_P}" - SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"; - KEYWORDS="alpha amd64 arm ppc ppc64 x86" -else - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"; -fi - -DESCRIPTION="Free implementation of the Remote Desktop Protocol" -HOMEPAGE="http://www.freerdp.com/"; - -LICENSE="Apache-2.0" -SLOT="0/2" -IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" -RESTRICT="!test? ( test )" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/zlib:0 - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - client? ( - usb? ( - virtual/libudev:0= - sys-apps/util-linux:0= - dev-libs/dbus-glib:0= - virtual/libusb:1= - ) - X? ( - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - xinerama? ( x11-libs/libXinerama ) - xv? ( x11-libs/libXv ) - ) - ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - x11-libs/libXrandr - ) - jpeg? ( virtual/jpeg:0 ) - openh264? ( media-libs/openh264 ) - pulseaudio? ( media-sound/pulseaudio ) - server? ( - X? ( - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - xinerama? ( x11-libs/libXinerama ) - ) - ) - smartcard? ( sys-apps/pcsc-lite ) - systemd? ( sys-apps/systemd:0= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - X? ( - x11-libs/libX11 - x11-libs/libxkbfile - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - client? ( X? ( doc? ( - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - ) ) ) -" - -PATCHES=( - "${FILESDIR}"/2.0.0-rc2-primitives.patch -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DCHANNEL_URBDRC=$(usex usb) - -DWITH_ALSA=$(usex alsa) - -DWITH_CCACHE=OFF - -DWITH_CLIENT=$(usex client) - -DWITH_CUPS=$(usex cups) - -DWITH_DEBUG_ALL=$(usex debug) - -DWITH_MANPAGES=$(usex doc) - -DWITH_FFMPEG=$(usex ffmpeg) - -DWITH_GSTREAMER_1_0=$(usex gstreamer) - -DWITH_JPEG=$(usex jpeg) - -DWITH_NEON=$(usex cpu_flags_arm_neon) - -DWITH_OPENH264=$(usex openh264) - -DWITH_PULSE=$(usex pulseaudio) - -DWITH_SERVER=$(usex server) - -DWITH_PCSC=$(usex smartcard) - -DWITH_LIBSYSTEMD=$(usex systemd) - -DWITH_X11=$(usex X) - -DWITH_XINERAMA=$(usex xinerama) - -DWITH_XV=$(usex xv) - -DWITH_WAYLAND=$(usex wayland) - ) - cmake-utils_src_configure -}
