aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/606_nx-X11_build-on-aarch64.full.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:23:43 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-14 16:23:43 +0100
commit09d2732b4e299eaa06c64b7a683529e337691c59 (patch)
tree3a07c4a95980c0f34b1d3ce2f55388dd7677c685 /debian/patches/606_nx-X11_build-on-aarch64.full.patch
parent8c98a401b49506f969dc9263d9bd566e5b31a572 (diff)
downloadnx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.gz
nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.tar.bz2
nx-libs-09d2732b4e299eaa06c64b7a683529e337691c59.zip
Patch system: Prepend a "0" to every patch file name in debian/patches/. Adapt only this changelog stanza to this modification.
Diffstat (limited to 'debian/patches/606_nx-X11_build-on-aarch64.full.patch')
-rw-r--r--debian/patches/606_nx-X11_build-on-aarch64.full.patch77
1 files changed, 0 insertions, 77 deletions
diff --git a/debian/patches/606_nx-X11_build-on-aarch64.full.patch b/debian/patches/606_nx-X11_build-on-aarch64.full.patch
deleted file mode 100644
index bda43399a..000000000
--- a/debian/patches/606_nx-X11_build-on-aarch64.full.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Description: Provide build support for aarch64 architecture
-Author: Orion Poplawski <orion@cora.nwra.com>
---- a/nx-X11/config/cf/Imake.cf
-+++ b/nx-X11/config/cf/Imake.cf
-@@ -908,6 +908,9 @@
- # endif
- # undef __ARMEB__
- # endif
-+# ifdef __aarch64__
-+# define Arm64Architecture
-+# endif
- # ifdef mc68000
- # define Mc68020Architecture
- # undef mc68000
---- a/nx-X11/config/cf/linux.cf
-+++ b/nx-X11/config/cf/linux.cf
-@@ -844,6 +844,16 @@
- # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
- #endif /* Arm32Achitecture */
-
-+#ifdef Arm64Architecture
-+# define DefaultCCOptions
-+# ifndef OptimizedCDebugFlags
-+# define OptimizedCDebugFlags -O3
-+# endif
-+# define LinuxMachineDefines -D__aarch64__ -U__arm -Uarm
-+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-+#endif /* Arm64Achitecture */
-+
- #ifdef HPArchitecture
- # define OptimizedCDebugFlags -O2 GccAliasingArgs
- # define LinuxMachineDefines -D__hppa__
---- a/nx-X11/config/cf/Imake.tmpl
-+++ b/nx-X11/config/cf/Imake.tmpl
-@@ -526,6 +526,10 @@
- #define ByteOrder X_BIG_ENDIAN
- #elif defined(Arm32Architecture)
- #define ByteOrder X_LITTLE_ENDIAN
-+#elif defined(Arm64ebArchitecture)
-+#define ByteOrder X_BIG_ENDIAN
-+#elif defined(Arm64Architecture)
-+#define ByteOrder X_LITTLE_ENDIAN
- #elif defined(RsArchitecture)
- #define ByteOrder X_BIG_ENDIAN
- #elif defined(PpcArchitecture) || defined(Ppc64Architecture)
---- a/nx-X11/programs/Xserver/include/servermd.h
-+++ b/nx-X11/programs/Xserver/include/servermd.h
-@@ -154,6 +154,28 @@
-
- #endif /* __arm32__ */
-
-+#ifdef __aarch64__
-+
-+#ifdef __AARCH64EL__
-+#define IMAGE_BYTE_ORDER LSBFirst
-+#define BITMAP_BIT_ORDER LSBFirst
-+#endif
-+#ifdef __AARCH64EB__
-+#define IMAGE_BYTE_ORDER MSBFirst
-+#define BITMAP_BIT_ORDER MSBFirst
-+#endif
-+
-+# if defined(XF86MONOVGA) || defined(XF86VGA16)
-+# define BITMAP_SCANLINE_UNIT 8
-+# endif
-+
-+#define GLYPHPADBYTES 4
-+#define GETLEFTBITS_ALIGNMENT 1
-+#define LARGE_INSTRUCTION_CACHE
-+#define AVOID_MEMORY_READ
-+
-+#endif /* __aarch64__ */
-+
- #if defined (hpux) || defined __hppa__
-
- #define IMAGE_BYTE_ORDER MSBFirst