1
0

- update to 1.16RC4

* non-PCI device support stuff merged 
- supersedes u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=524
This commit is contained in:
Stefan Dirsch 2014-07-09 13:28:24 +00:00 committed by Git OBS Bridge
parent 7429592527
commit e1373b34c4
5 changed files with 11 additions and 44 deletions

View File

@ -1,37 +0,0 @@
From: Dinar Valeev <dvaleev@suse.com>
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 <eich@suse.com>
So far PPC was big endian for sure. For ppc64le this is no longer
true.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
---
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 */

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:69b5863e1f8ade2db47e3733708972700acc20465a3f57819cace5f783496c14
size 5813761

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3bff7df25363d53d730b353bc19d8fc5fd183b8875e35ac26c6466a542a64b6f
size 5833710

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 9 13:05:56 UTC 2014 - sndirsch@suse.com
- update to 1.16RC4
* non-PCI device support stuff merged
- supersedes u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch
-------------------------------------------------------------------
Thu Jun 5 13:30:12 UTC 2014 - tobias.johannes.klausmann@mni.thm.de

View File

@ -18,7 +18,7 @@
Name: xorg-x11-server
%define dirsuffix 1.15.99.903
%define dirsuffix 1.15.99.904
Summary: X
License: MIT
@ -148,8 +148,6 @@ 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
Patch110: u_connection-avoid-crash-when-CloseWellKnownConnections-gets-called-twice.patch
Patch111: u_CloseConsole-Don-t-report-FatalError-when-shutting-down.patch
Patch112: u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
@ -227,7 +225,6 @@ cp %{SOURCE90} .
%patch104 -p1
%patch105 -p1
%patch106 -p1
%patch107 -p1
%patch110 -p1
%patch111 -p1
%patch112 -p1