diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/606_nx-X11_build-on-aarch64.full.patch | 77 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 80 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d2ea904e8..5b53ee146 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ nx-libs (2:3.5.0.25-0x2go1) UNRELEASED; urgency=low - * Continue development... + * Add 606_nx-X11_build-on-aarch64.full.patch. Build on aarch64 + architectures. (Fixes: #490). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 May 2014 09:58:10 +0200 diff --git a/debian/patches/606_nx-X11_build-on-aarch64.full.patch b/debian/patches/606_nx-X11_build-on-aarch64.full.patch new file mode 100644 index 000000000..bda43399a --- /dev/null +++ b/debian/patches/606_nx-X11_build-on-aarch64.full.patch @@ -0,0 +1,77 @@ +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 diff --git a/debian/patches/series b/debian/patches/series index 511e45125..e0fdb323e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -55,6 +55,7 @@ 603_nx-X11_compilation_warnings.full.patch 604_nx-X11_recent-freetype-API.full.patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch +606_nx-X11_build-on-aarch64.full.patch 999_nxagent_unbrand-nxagent-brand-x2goagent.full.patch 016_nx-X11_install-location.debian.patch 102_xserver-xext_set-securitypolicy-path.debian.patch |