From e4f5d7df69571268b0cee2ed059fce91d7616706 Mon Sep 17 00:00:00 2001 From: pcpa Date: Wed, 15 Nov 2017 05:14:00 -0500 Subject: [PATCH] Correct rhbz #1424003 and #1366716 Correct FTBFS in rawhide (#1424003) Add support for MIPS (#1366716) --- nvidia-texture-tools-mips.patch | 38 +++++++++++++++++++++++++++++++++ nvidia-texture-tools.spec | 9 +++++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 nvidia-texture-tools-mips.patch diff --git a/nvidia-texture-tools-mips.patch b/nvidia-texture-tools-mips.patch new file mode 100644 index 0000000..4773641 --- /dev/null +++ b/nvidia-texture-tools-mips.patch @@ -0,0 +1,38 @@ +diff -urp nvidia-texture-tools/src/nvcore/nvcore.h n/src/nvcore/nvcore.h +--- nvidia-texture-tools/src/nvcore/nvcore.h 2016-08-11 16:03:03.828716573 +0200 ++++ n/src/nvcore/nvcore.h 2016-08-11 16:04:57.149510851 +0200 +@@ -74,6 +74,10 @@ + # define NV_CPU_STRONGARM 1 + #elif defined POSH_CPU_AARCH64 + # define NV_CPU_AARCH64 1 ++#elif defined POSH_CPU_MIPS ++# define NV_CPU_MIPS 1 ++#elif defined POSH_CPU_MIPS64 ++# define NV_CPU_MIPS64 1 + #else + # error "Unsupported CPU" + #endif +diff -urp nvidia-texture-tools/src/nvcore/poshlib/posh.h n/src/nvcore/poshlib/posh.h +--- nvidia-texture-tools/src/nvcore/poshlib/posh.h 2016-08-11 16:03:03.828716573 +0200 ++++ n/src/nvcore/poshlib/posh.h 2016-08-11 16:09:51.757575793 +0200 +@@ -487,11 +487,16 @@ Metrowerks: + #endif + + #if defined mips || defined __mips__ || defined __MIPS__ || defined _MIPS +-# define POSH_CPU_MIPS 1 +-# if defined _R5900 +-# define POSH_CPU_STRING "MIPS R5900 (PS2)" ++# if defined __mips64 ++# define POSH_CPU_MIPS64 1 ++# define POSH_CPU_STRING "MIPS64" + # else +-# define POSH_CPU_STRING "MIPS" ++# define POSH_CPU_MIPS 1 ++# if defined _R5900 ++# define POSH_CPU_STRING "MIPS R5900 (PS2)" ++# else ++# define POSH_CPU_STRING "MIPS" ++# endif + # endif + #endif + diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec index 5666bc1..2c35135 100644 --- a/nvidia-texture-tools.spec +++ b/nvidia-texture-tools.spec @@ -2,7 +2,7 @@ Name: nvidia-texture-tools Version: 2.0.8 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Collection of image processing and texture manipulation tools Group: System Environment/Libraries License: MIT @@ -33,6 +33,8 @@ Patch5: %{name}-arm.patch Patch6: %{name}-aarch64.patch # Return NULL not false on pointer returning functions Patch7: %{name}-bool-null.patch +# add MIPS support +Patch8: %{name}-mips.patch %description The NVIDIA Texture Tools is a collection of image processing and texture @@ -64,6 +66,7 @@ Headers and libraries for development with %{name}. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build mkdir -p build @@ -105,6 +108,10 @@ make -C build filtertest %{_libdir}/lib*.so %changelog +* Wed Nov 15 2017 pcpa - 2.0.8-17 +- Correct FTBFS in rawhide (#1424003) +- Add support for MIPS (#1366716) + * Thu Aug 03 2017 Fedora Release Engineering - 2.0.8-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild