diff --git a/.gitignore b/.gitignore index 939a8db..7460bbb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /nx-libs-3.5.0.22-full.tar.gz /nx-libs-3.5.0.23-full.tar.gz /nx-libs-3.5.0.24-full.tar.gz +/nx-libs-3.5.0.27-full.tar.gz diff --git a/nx-libs-aarch64.patch b/nx-libs-aarch64.patch deleted file mode 100644 index 48baf32..0000000 --- a/nx-libs-aarch64.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -up nx-libs-3.5.0.24/nx-X11/config/cf/Imake.cf.aarch64 nx-libs-3.5.0.24/nx-X11/config/cf/Imake.cf ---- nx-libs-3.5.0.24/nx-X11/config/cf/Imake.cf.aarch64 2014-05-07 01:56:12.000000000 -0600 -+++ nx-libs-3.5.0.24/nx-X11/config/cf/Imake.cf 2014-05-07 19:27:07.748795509 -0600 -@@ -908,6 +908,9 @@ XCOMM Keep cpp from replacing path eleme - # endif - # undef __ARMEB__ - # endif -+# ifdef __aarch64__ -+# define Arm64Architecture -+# endif - # ifdef mc68000 - # define Mc68020Architecture - # undef mc68000 -diff -up nx-libs-3.5.0.24/nx-X11/config/cf/linux.cf.aarch64 nx-libs-3.5.0.24/nx-X11/config/cf/linux.cf ---- nx-libs-3.5.0.24/nx-X11/config/cf/linux.cf.aarch64 2014-05-07 02:00:04.000000000 -0600 -+++ nx-libs-3.5.0.24/nx-X11/config/cf/linux.cf 2014-05-07 19:28:17.823777953 -0600 -@@ -844,6 +844,16 @@ InstallNamedTargetNoClobber(install,file - # 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__ -diff -up nx-libs-3.5.0.24/nx-X11/config/cf/Imake.tmpl.aarch64 nx-libs-3.5.0.24/nx-X11/config/cf/Imake.tmpl ---- nx-libs-3.5.0.24/nx-X11/config/cf/Imake.tmpl.aarch64 2014-05-07 02:00:04.000000000 -0600 -+++ nx-libs-3.5.0.24/nx-X11/config/cf/Imake.tmpl 2014-05-07 19:59:05.266769630 -0600 -@@ -526,6 +526,10 @@ XCOMM the platform-specific parameters - - #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) -diff -up nx-libs-3.5.0.24/nx-X11/programs/Xserver/include/servermd.h.aarch64 nx-libs-3.5.0.24/nx-X11/programs/Xserver/include/servermd.h ---- nx-libs-3.5.0.24/nx-X11/programs/Xserver/include/servermd.h.aarch64 2014-05-07 01:56:12.000000000 -0600 -+++ nx-libs-3.5.0.24/nx-X11/programs/Xserver/include/servermd.h 2014-05-07 19:55:11.760395141 -0600 -@@ -154,6 +154,28 @@ SOFTWARE. - - #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/nx-libs.spec b/nx-libs.spec index ede2d34..fbb133f 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -3,8 +3,8 @@ %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro -Wl,-z,now} Name: nx-libs -Version: 3.5.0.24 -Release: 3%{?dist} +Version: 3.5.0.27 +Release: 1%{?dist} Summary: NX X11 protocol compression libraries Group: System Environment/Libraries @@ -16,9 +16,6 @@ Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}- # debian/roll-tarballs.sh HEAD server # mv _releases_/source/nx-libs/nx-libs-HEAD-full.tar.gz . #Source0: ns-libs-HEAD-full.tar.gz -# Attempt at aarch64 support -# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=490 -Patch0: nx-libs-aarch64.patch BuildRequires: autoconf BuildRequires: expat-devel @@ -489,7 +486,6 @@ information on NX. %prep %setup -q -%patch0 -p1 -b .aarch64 # Install into /usr sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def # Use rpm optflags @@ -894,6 +890,10 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans %changelog +* Mon Jul 7 2014 Orion Poplawski - 3.5.0.27-1 +- Update to 3.5.0.27 +- Drop aarch64 patch applied upstream + * Sat Jun 07 2014 Fedora Release Engineering - 3.5.0.24-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index e3788a3..fc22c2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ebf329a8e7ef7fe022bd985f789f2d6 nx-libs-3.5.0.24-full.tar.gz +068104be9e233e52167e0df519d2d665 nx-libs-3.5.0.27-full.tar.gz