From acc428a2c1c99b33dd553c662d19c54540c63833 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 9 Apr 2015 10:24:17 -0400 Subject: [PATCH] Fix endian detection code (#1206060) --- 0001-include-Fix-endianness-setup.patch | 39 +++++++++++++++++++++++++ xorg-x11-server.spec | 6 +++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0001-include-Fix-endianness-setup.patch diff --git a/0001-include-Fix-endianness-setup.patch b/0001-include-Fix-endianness-setup.patch new file mode 100644 index 0000000..1d9a542 --- /dev/null +++ b/0001-include-Fix-endianness-setup.patch @@ -0,0 +1,39 @@ +From 1f679da30a33f3ddad14bc6b2be0795160ae12b8 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 9 Apr 2015 10:19:13 -0400 +Subject: [PATCH] include: Fix endianness setup + +Need to make sure X_{BIG,LITTLE}_ENDIAN actually get defined + +Signed-off-by: Adam Jackson +--- + include/dix-config.h.in | 1 + + include/xorg-server.h.in | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/include/dix-config.h.in b/include/dix-config.h.in +index 1aa77a5..5e53c00 100644 +--- a/include/dix-config.h.in ++++ b/include/dix-config.h.in +@@ -499,6 +499,7 @@ + + /* byte order */ + #undef X_BYTE_ORDER ++#include + + /* Listen on TCP socket */ + #undef LISTEN_TCP +diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in +index 4cb9487..de6462a 100644 +--- a/include/xorg-server.h.in ++++ b/include/xorg-server.h.in +@@ -233,5 +233,6 @@ + + /* byte order */ + #undef X_BYTE_ORDER ++#include + + #endif /* _XORG_SERVER_H_ */ +-- +2.1.0 + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index adca228..988e680 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -45,7 +45,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.17.1 -Release: 7%{?gitdate:.%{gitdate}}%{dist} +Release: 8%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -106,6 +106,7 @@ Patch10000: 0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch Patch10001: 0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch Patch10002: 0001-int10-Fix-mapping-the-interrupt-vector.patch +Patch10003: 0001-include-Fix-endianness-setup.patch %global moduledir %{_libdir}/xorg/modules %global drimoduledir %{_libdir}/dri @@ -640,6 +641,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Thu Apr 09 2015 Adam Jackson 1.17.1-8 +- Fix endian detection code (#1206060) + * Wed Mar 18 2015 Hans de Goede - 1.17.1-7 - Modify the server wrapper to not always start the server as root. Callers of the server which start it in a way which is compatible with the