[nvidia-texture-tools] dd patch to fix ftbfs on aarch64

Peter Robinson pbrobinson at fedoraproject.org
Mon Jul 28 13:59:10 UTC 2014


commit 2d6088ad14c47f79b2686c679eb8f6e7098d93b4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Jul 28 14:58:58 2014 +0100

    dd patch to fix ftbfs on aarch64

 nvidia-texture-tools-aarch64.patch |   40 ++++++++++++++++++++++++++++++++++++
 nvidia-texture-tools.spec          |   12 ++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)
---
diff --git a/nvidia-texture-tools-aarch64.patch b/nvidia-texture-tools-aarch64.patch
new file mode 100644
index 0000000..7f9d09e
--- /dev/null
+++ b/nvidia-texture-tools-aarch64.patch
@@ -0,0 +1,40 @@
+--- nvidia-texture-tools/src/nvcore/poshlib/posh.h.orig	2014-07-28 14:39:34.944968317 +0100
++++ nvidia-texture-tools/src/nvcore/poshlib/posh.h	2014-07-28 14:40:24.222814437 +0100
+@@ -475,6 +475,17 @@
+ #  define POSH_CPU_STRING "ARM"
+ #endif
+ 
++/* ------------------------------------------------------------------
++** AArch64
++** ------------------------------------------------------------------
++*/
++#if defined __aarch64__ || defined __arm64__ || defined FORCE_DOXYGEN
++#  define POSH_CPU_AARCH64 /**<if defined, target CPU is AArch64 */
++#  if !defined FORCE_DOXYGEN
++#     define POSH_CPU_STRING "AArch64"
++#  endif
++#endif
++
+ #if defined mips || defined __mips__ || defined __MIPS__ || defined _MIPS
+ #  define POSH_CPU_MIPS 1 
+ #  if defined _R5900
+@@ -648,7 +659,7 @@
+ ** the MIPS series, so we have to be careful about those.
+ ** ----------------------------------------------------------------------------
+ */
+-#if defined POSH_CPU_X86 || defined POSH_CPU_AXP || defined POSH_CPU_STRONGARM || defined POSH_OS_WIN32 || defined POSH_OS_WINCE || defined __MIPSEL__
++#if defined POSH_CPU_X86 || defined POSH_CPU_AXP || defined POSH_CPU_STRONGARM || defined POSH_OS_WIN32 || defined POSH_OS_WINCE || defined __MIPSEL__ || defined POSH_CPU_AARCH64
+ #  define POSH_ENDIAN_STRING "little"
+ #  define POSH_LITTLE_ENDIAN 1
+ #else
+--- nvidia-texture-tools/src/nvcore/nvcore.h.orig	2014-07-28 14:41:03.271484417 +0100
++++ nvidia-texture-tools/src/nvcore/nvcore.h	2014-07-28 14:41:33.280999015 +0100
+@@ -72,6 +72,8 @@
+ #	define NV_CPU_PPC 1
+ #elif defined POSH_CPU_STRONGARM
+ #	define NV_CPU_STRONGARM 1
++#elif defined POSH_CPU_AARCH64
++#	define NV_CPU_AARCH64 1
+ #else
+ #	error "Unsupported CPU"
+ #endif
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 11eff2a..c01bec5 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -2,7 +2,7 @@
 
 Name:		nvidia-texture-tools
 Version:	2.0.8
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Collection of image processing and texture manipulation tools
 Group:		System Environment/Libraries
 License:	MIT
@@ -27,8 +27,10 @@ Patch2:		%{name}-%{version}-png-api.patch
 Patch3:		%{name}-%{version}-soversion.patch
 # install libraries in proper directory
 Patch4:		%{name}-%{version}-libdir.patch
-# add arm support in
-Patch5:         nvidia-texture-tools-arm.patch
+# add arm support
+Patch5:         %{name}-arm.patch
+# add aarch64 support
+Patch6:         %{name}-aarch64.patch
 %description
 The NVIDIA Texture Tools is a collection of image processing and texture
 manipulation tools, designed to be integrated in game tools and asset
@@ -57,6 +59,7 @@ Headers and libraries for development with %{name}.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 mkdir -p build
@@ -98,6 +101,9 @@ make -C build filtertest
 %{_libdir}/lib*.so
 
 %changelog
+* Mon Jul 28 2014 Peter Robinson <pbrobinson at fedoraproject.org> 2.0.8-8
+- add patch to fix ftbfs on aarch64
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.8-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list