Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
0777a37fbd | ||
|
6522b45336 | ||
|
ce57a49469 | ||
|
e4f5d7df69 | ||
|
7dee1ee4db | ||
|
b83b5bbc31 | ||
|
1093c5adf3 |
38
nvidia-texture-tools-mips.patch
Normal file
38
nvidia-texture-tools-mips.patch
Normal file
@ -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
|
||||
|
39
nvidia-texture-tools-ppcle.patch
Normal file
39
nvidia-texture-tools-ppcle.patch
Normal file
@ -0,0 +1,39 @@
|
||||
diff -up nvidia-texture-tools/src/nvtt/squish/simd_ve.h.orig nvidia-texture-tools/src/nvtt/squish/simd_ve.h
|
||||
--- nvidia-texture-tools/src/nvtt/squish/simd_ve.h.orig 2017-11-15 06:05:46.803953979 -0500
|
||||
+++ nvidia-texture-tools/src/nvtt/squish/simd_ve.h 2017-11-15 06:06:42.533956113 -0500
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
namespace squish {
|
||||
|
||||
-#define VEC4_CONST( X ) Vec4( ( vector float )( X ) )
|
||||
+#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
|
||||
|
||||
class Vec4
|
||||
{
|
||||
@@ -96,7 +96,7 @@ public:
|
||||
|
||||
Vec4& operator*=( Arg v )
|
||||
{
|
||||
- m_v = vec_madd( m_v, v.m_v, ( vector float )( -0.0f ) );
|
||||
+ m_v = vec_madd( m_v, v.m_v, ( vector float ){ -0.0f } );
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@ public:
|
||||
|
||||
friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
|
||||
{
|
||||
- return Vec4( vec_madd( left.m_v, right.m_v, ( vector float )( -0.0f ) ) );
|
||||
+ return Vec4( vec_madd( left.m_v, right.m_v, ( vector float ){ -0.0f } ) );
|
||||
}
|
||||
|
||||
//! Returns a*b + c
|
||||
@@ -133,7 +133,7 @@ public:
|
||||
vector float estimate = vec_re( v.m_v );
|
||||
|
||||
// one round of Newton-Rhaphson refinement
|
||||
- vector float diff = vec_nmsub( estimate, v.m_v, ( vector float )( 1.0f ) );
|
||||
+ vector float diff = vec_nmsub( estimate, v.m_v, ( vector float ){ 1.0f } );
|
||||
return Vec4( vec_madd( diff, estimate, estimate ) );
|
||||
}
|
||||
|
27
nvidia-texture-tools-s390.patch
Normal file
27
nvidia-texture-tools-s390.patch
Normal file
@ -0,0 +1,27 @@
|
||||
diff -up nvidia-texture-tools/src/nvcore/nvcore.h.orig nvidia-texture-tools/src/nvcore/nvcore.h
|
||||
--- nvidia-texture-tools/src/nvcore/nvcore.h.orig 2017-11-15 05:24:04.826858170 -0500
|
||||
+++ nvidia-texture-tools/src/nvcore/nvcore.h 2017-11-15 05:24:18.980858712 -0500
|
||||
@@ -78,6 +78,8 @@
|
||||
# define NV_CPU_MIPS 1
|
||||
#elif defined POSH_CPU_MIPS64
|
||||
# define NV_CPU_MIPS64 1
|
||||
+#elif defined POSH_CPU_S390
|
||||
+# define NV_CPU_S390 1
|
||||
#else
|
||||
# error "Unsupported CPU"
|
||||
#endif
|
||||
diff -up nvidia-texture-tools/src/nvcore/poshlib/posh.h.orig nvidia-texture-tools/src/nvcore/poshlib/posh.h
|
||||
--- nvidia-texture-tools/src/nvcore/poshlib/posh.h.orig 2017-11-15 05:22:08.066853699 -0500
|
||||
+++ nvidia-texture-tools/src/nvcore/poshlib/posh.h 2017-11-15 05:23:05.949855915 -0500
|
||||
@@ -527,6 +527,11 @@ Metrowerks:
|
||||
# define POSH_CPU_STRING "PA-RISC"
|
||||
#endif
|
||||
|
||||
+#if defined __s390__ || defined __s390x__
|
||||
+# define POSH_CPU_S390 1
|
||||
+# define POSH_CPU_STRING "S390"
|
||||
+#endif
|
||||
+
|
||||
#if !defined POSH_CPU_STRING
|
||||
# error POSH cannot determine target CPU
|
||||
# define POSH_CPU_STRING "Unknown" /* this is here for Doxygen's benefit */
|
@ -2,7 +2,7 @@
|
||||
|
||||
Name: nvidia-texture-tools
|
||||
Version: 2.0.8
|
||||
Release: 13%{?dist}
|
||||
Release: 18%{?dist}
|
||||
Summary: Collection of image processing and texture manipulation tools
|
||||
Group: System Environment/Libraries
|
||||
License: MIT
|
||||
@ -16,9 +16,6 @@ BuildRequires: libtiff-devel
|
||||
BuildRequires: openjpeg-devel
|
||||
BuildRequires: libGL-devel
|
||||
BuildRequires: libGLU-devel
|
||||
|
||||
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
|
||||
|
||||
# g++ 4.7 does not include unistd.h by default to avoid namespace polution
|
||||
Patch0: %{name}-%{version}-gcc4.7.patch
|
||||
# use a saner type for int64 and uint64 generic typedefs that are unlikely
|
||||
@ -36,6 +33,12 @@ 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
|
||||
# add S390 support
|
||||
Patch9: %{name}-s390.patch
|
||||
# add PPCLE support
|
||||
Patch10: %{name}-ppcle.patch
|
||||
|
||||
%description
|
||||
The NVIDIA Texture Tools is a collection of image processing and texture
|
||||
@ -67,6 +70,9 @@ Headers and libraries for development with %{name}.
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
|
||||
%build
|
||||
mkdir -p build
|
||||
@ -108,6 +114,22 @@ make -C build filtertest
|
||||
%{_libdir}/lib*.so
|
||||
|
||||
%changelog
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Nov 15 2017 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 2.0.8-17
|
||||
- Correct FTBFS in rawhide (#1424003)
|
||||
- Add support for MIPS (#1366716)
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Mar 17 2016 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 2.0.8-13
|
||||
- Correct FTBFS in rawhide (#1307810)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user