commit: e800eb711b7372087af804f91c5cb14b8e7d35bf Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Oct 7 17:17:51 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Oct 7 17:17:51 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e800eb71
net-misc/freerdp: backport another ppc fix Closes: https://bugs.gentoo.org/672744 Package-Manager: Portage-2.3.76_p10, Repoman-2.3.17_p62 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../freerdp/files/2.0.0-rc4-bitmap-endian.patch | 30 ++++++++++++++++++++++ net-misc/freerdp/freerdp-2.0.0_rc4.ebuild | 1 + 2 files changed, 31 insertions(+) diff --git a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch new file mode 100644 index 00000000000..cd78ba983b7 --- /dev/null +++ b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch @@ -0,0 +1,30 @@ +From 18b193a1cf083b92279c3952f4f907a07cd92834 Mon Sep 17 00:00:00 2001 +From: Armin Novak <armin.no...@thincast.com> +Date: Wed, 13 Feb 2019 09:30:34 +0100 +Subject: [PATCH] Fixed endianess issue with GETPIXEL16 and GETPIXEL32 + +--- + libfreerdp/codec/bitmap.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c +index 7524bb99ce..479c965e52 100644 +--- a/libfreerdp/codec/bitmap.c ++++ b/libfreerdp/codec/bitmap.c +@@ -26,12 +26,14 @@ + + static INLINE UINT16 GETPIXEL16(const void* d, UINT32 x, UINT32 y, UINT32 w) + { +- return (*(((const unsigned short*)d) + ((y) * (w) + (x)))); ++ const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT16)); ++ return (UINT16)(((UINT16)src[1] << 8) | (UINT16)src[0]); + } + + static INLINE UINT32 GETPIXEL32(const void* d, UINT32 x, UINT32 y, UINT32 w) + { +- return (*(((const unsigned int*)d) + ((y) * (w) + (x)))); ++ const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT32)); ++ return (((UINT32)src[3]) << 24) | (((UINT32)src[2]) << 16) | (((UINT32)src[1]) << 8) | (src[0] & 0xFF); + } + + /*****************************************************************************/ diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild index f727736d924..26e3c838fd0 100644 --- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild +++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild @@ -90,6 +90,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/2.0.0-rc4-libressl.patch + "${FILESDIR}"/2.0.0-rc4-bitmap-endian.patch "${DISTDIR}"/freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch )
