From 8df32fb137343f445738977e4563338f8abdd062c49889db0d3229c18fffaee5 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 24 Feb 2014 14:52:01 +0000 Subject: [PATCH] Accepting request 223710 from home:michalsrb:branches:X11:XOrg - 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/request/show/223710 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=17 --- tigervnc.changes | 6 +++ tigervnc.spec | 2 + ...ge-and-bitmap-byte-order-for-ppc64le.patch | 38 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch diff --git a/tigervnc.changes b/tigervnc.changes index b9915f3..3fd5504 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 24 14:42:50 UTC 2014 - msrb@suse.com + +- u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch: + arch: Fix image and bitmap byte order for ppc64le (bnc#865069) + ------------------------------------------------------------------- Thu Feb 13 14:29:47 UTC 2014 - msrb@suse.com diff --git a/tigervnc.spec b/tigervnc.spec index 4fef697..8a4d1d1 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -105,6 +105,7 @@ Patch10: tigervnc-1.2.80-fix-int-to-pointer.patch Patch11: u_aarch64-support.patch Patch12: N_xorg-server-xdmcp.patch Patch13: n_tigervnc-dont-build-gtf.patch +Patch14: u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch %description TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), @@ -142,6 +143,7 @@ patch -p1 < ../xserver113.patch %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 popd %build 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..1c1551f --- /dev/null +++ b/u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch @@ -0,0 +1,38 @@ +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 */ +