+++ /dev/null
-From 9460f4292b130fcca58519a1c52b9aaef3265042 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@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)
+++ /dev/null
-# 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
-}