summaryrefslogtreecommitdiff
path: root/net-misc/freerdp
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/freerdp')
-rw-r--r--net-misc/freerdp/Manifest7
-rw-r--r--net-misc/freerdp/files/2.1.2-mask-cached_brush.patch23
-rw-r--r--net-misc/freerdp/freerdp-2.1.2-r1.ebuild (renamed from net-misc/freerdp/freerdp-2.1.0.ebuild)6
-rw-r--r--net-misc/freerdp/freerdp-2.1.2.ebuild124
4 files changed, 31 insertions, 129 deletions
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 0dc1f9a4c8b2..416773e30fab 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,10 +1,9 @@
AUX 2.1.1-write_pixel_16-endian.patch 752 BLAKE2B 6a7d28f90819a8f6d578d7c1f305141c5e189937e62bcd704d91041ea71a1121b5c60707b274dd762d524ecc9d198e74333a45f847d93d0139912082cc98196d SHA512 bf5ff1c57867106f19def3ef62da39d74239b8674ea07b8c8f404b9f47f1d9ba28460e04c13c68a19b27f933135688689b8ea4745aa7c82607c5e170da0d6489
-DIST freerdp-2.1.0.tar.gz 6869116 BLAKE2B c9cab4b571b288450efa5c5666f8cb64ca9e37dfd342d5e66c256b0fca151b20b3f9b1027a12f8fe9cbae186d95c8cb4d28c90deeadcacc3c158f50a3e713747 SHA512 86d72419d012c52a3dfa071d50bac96ddb3a1423bf35252fdef72676f8b2830b65c9e0511dea2d7b9a69e7783a3d1eacbd2f868b08836742dec7542c77a39405
+AUX 2.1.2-mask-cached_brush.patch 691 BLAKE2B c7dd4dd9ec92958de6e2979446bc62e60ecd1fc729154deeff6c69614d9793bbc162d13cbb04e245faf2a237ffebcdaf3138ad5354573db903dc33a57fe7598e SHA512 33e75cf31f1922cc3e16c02e2a0f946c5c7c1268586952558a432119ffda4d18700967b223703c55ccb3bbfd01ee01e941d5ea70bd2e1d16be84cc93de91cb7d
DIST freerdp-2.1.1.tar.gz 6871637 BLAKE2B b0c01fb074f28aa569d934797d4fb8451edcb90d7f5eba9e47b7ec844cc95eda143c3d851b86ef72e233e8bde8ebc3e1c4a7d3d549d0de54f774ec1fee62e8cd SHA512 6f0cff79690ca550237c6e31f5ab361246a6d12ac765e85b752d474aceaf1390d8c5f2b21aba028927459892a045e5073e143705e6f2256a2a7c8744dcf3f95b
-DIST freerdp-2.1.2.tar.gz 6838848 BLAKE2B 2ca0e7f22311b574c09b3040a95133ad99ffa0cb91bc6992bf0fa88f8aebfccda3599f3d7f14a0813256c249c1e90fbd6e907fe36f78627fbd4ab6852353ea49 SHA512 09fbd76512661e077c4baab4056c2e636cfb0067678271c6c87dc19fb035e15a463478f697f7caedc0d650089d520f97f6143e85ef1b29f12c41cbd39b8fff92
-EBUILD freerdp-2.1.0.ebuild 2862 BLAKE2B 8b56772f76dd55965acac75cf9abf4d777a008b9473da979f776f63399e4ed662801ca3490d2675d329cf8a0f4330f99c4ad5000d01372f0041aba7fe7bbd6eb SHA512 e16deeb57e4582d7b81f1824332f1449a1204a096f587ddb6253c47606cf988bf09acd546e26e8509b21beb855034908ea035c61ea2a2894c39076a43d84b96d
+DIST freerdp-2.1.2.tar.gz 6877052 BLAKE2B f58e7efa03fb1184aa3ebfe42214668f8372613237571ec2cc21c3d15c30df4ab3b11ac6050eb4ab87af988341f12b0a78e451da967615bc88b3257c253146dc SHA512 6d72b9138b4a4ae6a0a092371624b5a9b73ff914a4c42c73ace63e3f794f6bbca9a84e03d5e92c89bdb945ba2cc8200b4790b685f59d115d67b78a87a6ecab96
EBUILD freerdp-2.1.1-r1.ebuild 2900 BLAKE2B a9e27e7d78bf14a3ccd6a8ddb74d775d7c7e235a8a7a84d3626b765dd8478a69ce65853b9cf41ed759fc0e88c21cb32c91748b18c30e11a33e5af5cbab3a88bb SHA512 821fb34853a3297a7e21aab476812e87ac9156b000ebf49a46ba484c788c94345cfc37bd784d4c540f530ef3d1805f2c5cbdeacb90101c4578844bae3440c04b
-EBUILD freerdp-2.1.2.ebuild 2945 BLAKE2B cd029f4f0137a482c9c89c096eb42253f2da530dff71411e33dfc71870b31c1ffb92720b568657af372d5c7f138a981e13cec715b5fc8cf694c01e73e5d2e235 SHA512 c30e1340aebbff2cc2c0f0db299508a7f15c905cb98378ee73fcdce60d4edb7006e53a4a358b32f8c762190c436c6337ecea3bd840bf38da279ec3cfd58cbf06
+EBUILD freerdp-2.1.2-r1.ebuild 2921 BLAKE2B 93b979f98b6710b2d0a6fc5ac5d190af4f5f267112f0dc18df2204dec58c7bb890bf4e2e38870779e017f9d0ef40e5f1add3af2be57b8502719aaa7054de33bd SHA512 439a1ec3ca08d6eb57fc137a3750ff23e7fecad01d588243607ffd3597c62c15e70dbde9a0e34b4b62218f503ab9473e4765712d2c8b7914b9936b38fa3c610d
EBUILD freerdp-2.9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
EBUILD freerdp-9999.ebuild 2868 BLAKE2B f3e8cab533090b36278612360962292519488aba16b061e52d534a55fc2b9261de5512be9680534db93755b829f33a900435094196fb6ecb2fa0d61931fb44a0 SHA512 1d08bf9875cdb34fee26ea8b668fab1bcaf1473aef5f92d4031ecd3d944447f2d9c3c935e38405283ce8dfa5f6ab65ab6fcbc7c3a1f9914da62d4e6c20fd7f1e
MISC metadata.xml 481 BLAKE2B b7102d2ff331d4c991dbd2d20b3bd33d375fe5f332ab48f2c3401a579e584cdc4c84795a286c18536b82cd88b7b9991b3559774a937ac59ad8ccc21b91241f60 SHA512 47db413f3b78632acc874d8e67ef8231551a6074cb2269760fb780f1a86dc334bf7675550fed7a95e98a92470e3d70cfedb10f98f6ec686e785dd67615e93db7
diff --git a/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch b/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch
new file mode 100644
index 000000000000..bb8fedb19926
--- /dev/null
+++ b/net-misc/freerdp/files/2.1.2-mask-cached_brush.patch
@@ -0,0 +1,23 @@
+From ce1a9d8d1969ecbb4d24b9f4812654638a44abc2 Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Tue, 23 Jun 2020 09:24:35 +0200
+Subject: [PATCH] Fixed #6298: Mask CACHED_BRUSH when checking brush style
+
+---
+ libfreerdp/core/orders.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c
+index dc4e51a873..537e694264 100644
+--- a/libfreerdp/core/orders.c
++++ b/libfreerdp/core/orders.c
+@@ -139,7 +139,8 @@ static BYTE get_bmf_bpp(UINT32 bmf, BOOL* pValid)
+ {
+ if (pValid)
+ *pValid = TRUE;
+- switch (bmf)
++ /* Mask out highest bit */
++ switch (bmf & (~CACHED_BRUSH))
+ {
+ case 1:
+ return 1;
diff --git a/net-misc/freerdp/freerdp-2.1.0.ebuild b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild
index 6f7e867eb817..6bcdecf0961c 100644
--- a/net-misc/freerdp/freerdp-2.1.0.ebuild
+++ b/net-misc/freerdp/freerdp-2.1.2-r1.ebuild
@@ -15,7 +15,7 @@ else
MY_P=${P/_/-}
S="${WORKDIR}/${MY_P}"
SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 x86"
fi
DESCRIPTION="Free implementation of the Remote Desktop Protocol"
@@ -89,6 +89,10 @@ BDEPEND="
) )
"
+PATCHES=(
+ "${FILESDIR}/2.1.2-mask-cached_brush.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test ON OFF)
diff --git a/net-misc/freerdp/freerdp-2.1.2.ebuild b/net-misc/freerdp/freerdp-2.1.2.ebuild
deleted file mode 100644
index 0370121a8a94..000000000000
--- a/net-misc/freerdp/freerdp-2.1.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2011-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
- case ${PV} in
- 2.*) EGIT_BRANCH="stable-2.0";;
- esac
-else
- MY_P=${P/_/-}
- S="${WORKDIR}/${MY_P}"
- SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free implementation of the Remote Desktop Protocol"
-HOMEPAGE="http://www.freerdp.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0/2"
-IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg 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 )
- 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? ( media-video/ffmpeg:0= )
- !ffmpeg? (
- x11-libs/cairo: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}"
-BDEPEND="
- virtual/pkgconfig
- X? ( doc? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/xmlto
- ) )
-"
-
-src_prepare() {
- cmake_src_prepare
- echo "${PV}" > .source_version || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test ON OFF)
- -DCHANNEL_URBDRC=$(usex usb ON OFF)
- -DWITH_ALSA=$(usex alsa ON OFF)
- -DWITH_CCACHE=OFF
- -DWITH_CUPS=$(usex cups ON OFF)
- -DWITH_DEBUG_ALL=$(usex debug ON OFF)
- -DWITH_MANPAGES=$(usex doc ON OFF)
- -DWITH_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_SWSCALE=$(usex ffmpeg ON OFF)
- -DWITH_CAIRO=$(usex ffmpeg OFF ON)
- -DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
- -DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
- -DWITH_JPEG=$(usex jpeg ON OFF)
- -DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
- -DWITH_OPENH264=$(usex openh264 ON OFF)
- -DWITH_PULSE=$(usex pulseaudio ON OFF)
- -DWITH_SERVER=$(usex server ON OFF)
- -DWITH_PCSC=$(usex smartcard ON OFF)
- -DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
- -DWITH_X11=$(usex X ON OFF)
- -DWITH_XINERAMA=$(usex xinerama ON OFF)
- -DWITH_XV=$(usex xv ON OFF)
- -DWITH_WAYLAND=$(usex wayland ON OFF)
- )
- cmake_src_configure
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 09:01:42 +0000