From 50a52dae28b0a08ec1cefbe790fbca6e11debf6e40b19bbc5452272ce2c00062 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 24 Feb 2014 14:11:01 +0000 Subject: [PATCH] - u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch: arch: Fix image and bitmap byte order for ppc64le (bnc#865069) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=499 --- ...ge-and-bitmap-byte-order-for-ppc64le.patch | 37 +++++++++++++++++++ xorg-x11-server.changes | 6 +++ xorg-x11-server.spec | 3 ++ 3 files changed, 46 insertions(+) create mode 100644 u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch diff --git a/u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch b/u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch new file mode 100644 index 0000000..1b582e0 --- /dev/null +++ b/u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch @@ -0,0 +1,37 @@ +From: Dinar Valeev +Date: Mon Feb 24 10:48:22 2014 +0100 +Subject: [PATCH]arch: Fix image and bitmap byte order for ppc64le +Patch-Mainline: to be upstreamed +Git-commit: 3874826e84151917a443f8efb46ea7414c990243 +Git-repo: git://anongit.freedesktop.org/git/xorg/xserver +References: bnc#865069 +Signed-off-by: Egbert Eich + +So far PPC was big endian for sure. For ppc64le this is no longer +true. + +Signed-off-by: Egbert Eich +--- + include/servermd.h | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/include/servermd.h b/include/servermd.h +index 11f6c10..256d84b 100644 +--- a/include/servermd.h ++++ b/include/servermd.h +@@ -114,8 +114,13 @@ SOFTWARE. + + #if defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) + +-#define IMAGE_BYTE_ORDER MSBFirst +-#define BITMAP_BIT_ORDER MSBFirst ++#if defined(__LITTLE_ENDIAN__) ++#define IMAGE_BYTE_ORDER LSBFirst ++#define BITMAP_BIT_ORDER LSBFirst ++#else ++#define IMAGE_BYTE_ORDER MSBFirst ++#define BITMAP_BIT_ORDER MSBFirst ++#endif + #define GLYPHPADBYTES 4 + + #endif /* PowerPC */ diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 158b6b3..f40ae93 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 24 11:01:00 UTC 2014 - eich@suse.com + +- u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch: + arch: Fix image and bitmap byte order for ppc64le (bnc#865069) + ------------------------------------------------------------------- Fri Feb 7 17:31:29 UTC 2014 - eich@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index f851496..1d61463 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -129,6 +129,8 @@ Patch104: u_xorg-server-xdmcp.patch Patch105: ux_xserver_xvfb-randr.patch # PATCH-FIX-UPSTREAM u_exa-only-draw-valid-trapezoids.patch bnc#853846 msrb@suse.com -- Fixes possible crash of server using invalid trapezoids. 2013-12-12 patch is waiting in mailing list to be upstreamed. Patch106: u_exa-only-draw-valid-trapezoids.patch +# PATCH-FIX-UPSTREAM u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch -- sent to ML 2014-02-24 +Patch107: u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch Patch162: b_cache-xkbcomp-output-for-fast-start-up.patch Patch211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch @@ -201,6 +203,7 @@ cp %{SOURCE90} . %patch104 -p1 %patch105 -p1 %patch106 -p1 +%patch107 -p1 ### disabled for now #%patch162 -p1