Architecture specific change in rpms/nvidia-texture-tools.git
by githook-noreply＠fedoraproject.org 26 Feb '21
by githook-noreply＠fedoraproject.org 26 Feb '21
26 Feb '21
The package rpms/nvidia-texture-tools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nvidia-texture-tools.git/commit/?id…
https://src.fedoraproject.org/cgit/rpms/nvidia-texture-tools.git/commit/?id….
Change:
+%ifnarch %{ix86} x86_64
+%ifarch ppc64 ppc64le
Thanks.
Full change:
============
commit 9f338bb34655deab4027c5d93e6fd1655d97a602
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 15:01:43 2021 -0300
Disable more altivec code
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index a69660c..d82faa8 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,6 +1,15 @@
diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
---- src/nvtt/icbc.h.orig 2021-02-25 14:37:32.913095824 -0300
-+++ src/nvtt/icbc.h 2021-02-25 14:39:48.633666276 -0300
+--- src/nvtt/icbc.h.orig 2021-02-25 14:58:15.331333196 -0300
++++ src/nvtt/icbc.h 2021-02-25 14:59:57.648990370 -0300
+@@ -91,7 +91,7 @@ namespace icbc {
+ #endif
+ #endif
+
+- #if ICBC_PPC
++ #if ICBC_PPC && BUILD_SQUISH_WITH_ALTIVEC
+ #define ICBC_SIMD ICBC_VMX
+ #endif
+ #endif
@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
constexpr int VEC_SIZE = 4;
commit ae0433329f7820830d8f56bf8d70a166285d1264
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:49:26 2021 -0300
Disable altivec for ppc64le
Code appears to not have been tested by upstream. After several
trial&error scratch builds, give up when it comes down to:
error: invalid parameter combination for AltiVec intrinsic ...
error messages.
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 19a8f95..eda6e4b 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -75,9 +75,11 @@ Headers and libraries for development with %{name}.
%ifnarch %{ix86} x86_64
-DBUILD_SQUISH_WITH_SSE2=OFF \
%endif
+%if 0
%ifarch ppc64 ppc64le
-DBUILD_SQUISH_WITH_ALTIVEC=ON \
%endif
+%endif
%cmake_build
commit 77009a511ccb043d5b28ce6b09a9ecc2a736deee
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:40:53 2021 -0300
Implement missing/incorrect altivec function
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 79c9c53..a69660c 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,6 +1,72 @@
+diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
+--- src/nvtt/icbc.h.orig 2021-02-25 14:37:32.913095824 -0300
++++ src/nvtt/icbc.h 2021-02-25 14:39:48.633666276 -0300
+@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
+ constexpr int VEC_SIZE = 4;
+
+ union VFloat {
+- vectro float v;
++ __vector float v;
+ float e[4];
+ VFloat() {}
+- VFloat(vector float v) : v(v) {}
+- operator vector float & () { return v; }
++ VFloat(__vector float v) : v(v) {}
++ operator __vector float & () { return v; }
+ };
+ struct VMask {
+- vector unsigned int v;
++ __vector unsigned int v;
+ VMask() {}
+- VMask(vector unsigned int v) : v(v) {}
+- operator vector unsigned int & () { return v; }
++ VMask(__vector unsigned int v) : v(v) {}
++ operator __vector unsigned int & () { return v; }
+ };
+
+ ICBC_FORCEINLINE float & lane(VFloat & v, int i) {
+@@ -1213,15 +1213,15 @@ ICBC_FORCEINLINE float & lane(VFloat & v
+ }
+
+ ICBC_FORCEINLINE VFloat vzero() {
+- return vec_splats(0.0f);
++ return ( __vector float ){ 0.0f };
+ }
+
+ ICBC_FORCEINLINE VFloat vbroadcast(float a) {
+- return vec_splats(a);
++ return ( __vector float ){ a };
+ }
+
+ ICBC_FORCEINLINE VFloat vload(const float * ptr) {
+- return vec_ld(ptr)
++ return ( __vector float ){ ptr[0], ptr[1], ptr[2], ptr[3] };
+ }
+
+ ICBC_FORCEINLINE VFloat operator+(VFloat a, VFloat b) {
+@@ -1233,16 +1233,16 @@ ICBC_FORCEINLINE VFloat operator-(VFloat
+ }
+
+ ICBC_FORCEINLINE VFloat operator*(VFloat a, VFloat b) {
+- return vec_madd(a, b, vec_splats(-0.0f));
++ return vec_madd(a, b, ( __vector float ){ -0.0f });
+ }
+
+ ICBC_FORCEINLINE VFloat vrcp(VFloat a) {
+ #if ICBC_USE_RCP
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.vec );
++ __vector float estimate = vec_re( v.vec );
+
+ // one round of Newton-Rhaphson refinement
+- vector float diff = vec_nmsub( estimate, v.vec, vec_splats( 1.0f ) );
++ __vector float diff = vec_nmsub( estimate, v.vec, ( __vector float ){ 1.0f } );
+ return vec_madd(diff, estimate, estimate );
+ #else
+ return vec_div(vec_splats(1),a);
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:50:09.980146060 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-25 13:53:36.871679483 -0300
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 14:37:32.907095799 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 14:37:35.891108297 -0300
@@ -27,14 +27,12 @@
#ifndef SQUISH_SIMD_VE_H
#define SQUISH_SIMD_VE_H
@@ -119,8 +185,8 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
} // namespace squish
diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
---- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:50:20.447323496 -0300
-+++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:54:29.543307998 -0300
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 14:37:32.910095811 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-25 14:37:35.892108302 -0300
@@ -31,7 +31,7 @@
namespace squish {
@@ -206,64 +272,3 @@ diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
};
} // namespace squish
-diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
---- src/nvtt/icbc.h.orig 2021-02-25 14:19:04.692618121 -0300
-+++ src/nvtt/icbc.h 2021-02-25 14:23:52.364456026 -0300
-@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
- constexpr int VEC_SIZE = 4;
-
- union VFloat {
-- vectro float v;
-+ __vector float v;
- float e[4];
- VFloat() {}
-- VFloat(vector float v) : v(v) {}
-- operator vector float & () { return v; }
-+ VFloat(__vector float v) : v(v) {}
-+ operator __vector float & () { return v; }
- };
- struct VMask {
-- vector unsigned int v;
-+ __vector unsigned int v;
- VMask() {}
-- VMask(vector unsigned int v) : v(v) {}
-- operator vector unsigned int & () { return v; }
-+ VMask(__vector unsigned int v) : v(v) {}
-+ operator __vector unsigned int & () { return v; }
- };
-
- ICBC_FORCEINLINE float & lane(VFloat & v, int i) {
-@@ -1213,11 +1213,11 @@ ICBC_FORCEINLINE float & lane(VFloat & v
- }
-
- ICBC_FORCEINLINE VFloat vzero() {
-- return vec_splats(0.0f);
-+ return ( __vector float ){ 0.0f };
- }
-
- ICBC_FORCEINLINE VFloat vbroadcast(float a) {
-- return vec_splats(a);
-+ return ( __vector float ){ a };
- }
-
- ICBC_FORCEINLINE VFloat vload(const float * ptr) {
-@@ -1233,16 +1233,16 @@ ICBC_FORCEINLINE VFloat operator-(VFloat
- }
-
- ICBC_FORCEINLINE VFloat operator*(VFloat a, VFloat b) {
-- return vec_madd(a, b, vec_splats(-0.0f));
-+ return vec_madd(a, b, ( __vector float ){ -0.0f });
- }
-
- ICBC_FORCEINLINE VFloat vrcp(VFloat a) {
- #if ICBC_USE_RCP
- // get the reciprocal estimate
-- vector float estimate = vec_re( v.vec );
-+ __vector float estimate = vec_re( v.vec );
-
- // one round of Newton-Rhaphson refinement
-- vector float diff = vec_nmsub( estimate, v.vec, vec_splats( 1.0f ) );
-+ __vector float diff = vec_nmsub( estimate, v.vec, ( __vector float ){ 1.0f } );
- return vec_madd(diff, estimate, estimate );
- #else
- return vec_div(vec_splats(1),a);
commit 8583d501e6eb71fcf5fb9dadcb15b03d9fd20e93
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:24:54 2021 -0300
More altivec code that needs adaptation and correction of typos
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index b4c7ce3..79c9c53 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -206,3 +206,64 @@ diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
};
} // namespace squish
+diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
+--- src/nvtt/icbc.h.orig 2021-02-25 14:19:04.692618121 -0300
++++ src/nvtt/icbc.h 2021-02-25 14:23:52.364456026 -0300
+@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
+ constexpr int VEC_SIZE = 4;
+
+ union VFloat {
+- vectro float v;
++ __vector float v;
+ float e[4];
+ VFloat() {}
+- VFloat(vector float v) : v(v) {}
+- operator vector float & () { return v; }
++ VFloat(__vector float v) : v(v) {}
++ operator __vector float & () { return v; }
+ };
+ struct VMask {
+- vector unsigned int v;
++ __vector unsigned int v;
+ VMask() {}
+- VMask(vector unsigned int v) : v(v) {}
+- operator vector unsigned int & () { return v; }
++ VMask(__vector unsigned int v) : v(v) {}
++ operator __vector unsigned int & () { return v; }
+ };
+
+ ICBC_FORCEINLINE float & lane(VFloat & v, int i) {
+@@ -1213,11 +1213,11 @@ ICBC_FORCEINLINE float & lane(VFloat & v
+ }
+
+ ICBC_FORCEINLINE VFloat vzero() {
+- return vec_splats(0.0f);
++ return ( __vector float ){ 0.0f };
+ }
+
+ ICBC_FORCEINLINE VFloat vbroadcast(float a) {
+- return vec_splats(a);
++ return ( __vector float ){ a };
+ }
+
+ ICBC_FORCEINLINE VFloat vload(const float * ptr) {
+@@ -1233,16 +1233,16 @@ ICBC_FORCEINLINE VFloat operator-(VFloat
+ }
+
+ ICBC_FORCEINLINE VFloat operator*(VFloat a, VFloat b) {
+- return vec_madd(a, b, vec_splats(-0.0f));
++ return vec_madd(a, b, ( __vector float ){ -0.0f });
+ }
+
+ ICBC_FORCEINLINE VFloat vrcp(VFloat a) {
+ #if ICBC_USE_RCP
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.vec );
++ __vector float estimate = vec_re( v.vec );
+
+ // one round of Newton-Rhaphson refinement
+- vector float diff = vec_nmsub( estimate, v.vec, vec_splats( 1.0f ) );
++ __vector float diff = vec_nmsub( estimate, v.vec, ( __vector float ){ 1.0f } );
+ return vec_madd(diff, estimate, estimate );
+ #else
+ return vec_div(vec_splats(1),a);
commit d4c836a29ab426649eeba9c80590899b1201feaa
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:05:35 2021 -0300
Correct wrong text cut and tabulation on ppc64le patch
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 80358d2..b4c7ce3 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -77,7 +77,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
{
- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
-+ 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
@@ -90,7 +90,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
// one round of Newton-Rhaphson refinement
- vector float diff = vec_nmsub( estimate, v.m_v, vec_splats( 1.0f ) );
-+ __vector float diff = vec_nmsub( estimate, v.m_( __vector float ){ 1.0f } );
++ __vector float diff = vec_nmsub( estimate, v.m_v, ( __vector float ){ 1.0f } );
return Vec4( vec_madd( diff, estimate, estimate ) );
}
commit ecbbd6cbff6f948b1db6c830161a9dc42166ba53
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 13:55:32 2021 -0300
Another attempt to get altivec working
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index c19a010..80358d2 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,25 +1,34 @@
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:26:09.519676632 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-25 13:37:25.107712987 -0300
-@@ -32,7 +32,7 @@
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:50:09.980146060 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 13:53:36.871679483 -0300
+@@ -27,14 +27,12 @@
+ #ifndef SQUISH_SIMD_VE_H
+ #define SQUISH_SIMD_VE_H
+
+-#if !defined(__APPLE_ALTIVEC__) || defined(__PPC64__)
+ #include <altivec.h>
+ #undef bool
+-#endif
namespace nvsquish {
--#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
+-#define VEC4_CONST( X ) Vec4( vec_splats( (float)X ) )
+#define VEC4_CONST( X ) Vec4( ( __vector float ) { X } )
class Vec4
{
-@@ -41,7 +41,7 @@ public:
+@@ -42,8 +40,8 @@ public:
+ typedef Vec4 Arg;
Vec4() {}
-
+-
- explicit Vec4( vector float v ) : m_v( v ) {}
++
+ explicit Vec4( __vector float v ) : m_v( v ) {}
Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
-@@ -53,7 +53,7 @@ public:
+@@ -55,7 +53,7 @@ public:
Vec4( const float * v )
{
@@ -28,7 +37,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
u.c[0] = v[0];
u.c[1] = v[1];
u.c[2] = v[2];
-@@ -63,7 +63,7 @@ public:
+@@ -65,7 +63,7 @@ public:
Vec4( float x, float y, float z, float w )
{
@@ -37,7 +46,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
u.c[0] = x;
u.c[1] = y;
u.c[2] = z;
-@@ -73,14 +73,14 @@ public:
+@@ -75,14 +73,14 @@ public:
Vec3 GetVec3() const
{
@@ -54,25 +63,25 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
u.v = m_v;
return u.c[0];
}
-@@ -104,7 +104,7 @@ public:
+@@ -106,7 +104,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, vec_splats( -0.0f ) );
+ m_v = vec_madd( m_v, v.m_v, ( __vector float ){ -0.0f } );
return *this;
}
-@@ -120,7 +120,7 @@ public:
+@@ -122,7 +120,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 } ) );
+- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
++ return Vec4( vec_madd( left.m_v, right.m_v, ( __vector float ){ -0.0f } ) );
}
//! Returns a*b + c
-@@ -138,10 +138,10 @@ public:
+@@ -140,10 +138,10 @@ public:
friend Vec4 Reciprocal( Vec4::Arg v )
{
// get the reciprocal estimate
@@ -80,12 +89,12 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
+ __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 } );
+- vector float diff = vec_nmsub( estimate, v.m_v, vec_splats( 1.0f ) );
++ __vector float diff = vec_nmsub( estimate, v.m_( __vector float ){ 1.0f } );
return Vec4( vec_madd( diff, estimate, estimate ) );
}
-@@ -162,12 +162,12 @@ public:
+@@ -164,12 +162,12 @@ public:
friend Vec4 CompareEqual( Vec4::Arg left, Vec4::Arg right )
{
@@ -100,7 +109,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
}
friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
-@@ -176,7 +176,7 @@ public:
+@@ -178,7 +176,7 @@ public:
}
private:
@@ -110,8 +119,8 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
} // namespace squish
diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
---- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:26:42.862873033 -0300
-+++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:29:13.365759490 -0300
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:50:20.447323496 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:54:29.543307998 -0300
@@ -31,7 +31,7 @@
namespace squish {
commit 38d3eb10d728d43d7200454ab880d04f7544c88d
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 13:40:58 2021 -0300
Tenative ppc64le fix patch
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 2cc7132..c19a010 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,46 +1,199 @@
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-25 12:39:52.342544144 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-25 12:41:51.141231967 -0300
-@@ -27,14 +27,12 @@
- #ifndef SQUISH_SIMD_VE_H
- #define SQUISH_SIMD_VE_H
-
--#if !defined(__APPLE_ALTIVEC__) || defined(__PPC64__)
- #include <altivec.h>
- #undef bool
--#endif
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:26:09.519676632 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 13:37:25.107712987 -0300
+@@ -32,7 +32,7 @@
namespace nvsquish {
--#define VEC4_CONST( X ) Vec4( vec_splats( (float)X ) )
-+#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
+-#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
++#define VEC4_CONST( X ) Vec4( ( __vector float ) { X } )
class Vec4
{
-@@ -106,7 +104,7 @@ public:
+@@ -41,7 +41,7 @@ public:
+
+ Vec4() {}
+
+- explicit Vec4( vector float v ) : m_v( v ) {}
++ explicit Vec4( __vector float v ) : m_v( v ) {}
+
+ Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
+
+@@ -53,7 +53,7 @@ public:
+
+ Vec4( const float * v )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = v[0];
+ u.c[1] = v[1];
+ u.c[2] = v[2];
+@@ -63,7 +63,7 @@ public:
+
+ Vec4( float x, float y, float z, float w )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = x;
+ u.c[1] = y;
+ u.c[2] = z;
+@@ -73,14 +73,14 @@ public:
+
+ Vec3 GetVec3() const
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.v = m_v;
+ return Vec3( u.c[0], u.c[1], u.c[2] );
+ }
+
+ float GetX() const
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.v = m_v;
+ return u.c[0];
+ }
+@@ -104,7 +104,7 @@ public:
Vec4& operator*=( Arg v )
{
-- m_v = vec_madd( m_v, v.m_v, vec_splats( -0.0f ) );
-+ 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 } );
++ m_v = vec_madd( m_v, v.m_v, ( __vector float ){ -0.0f } );
return *this;
}
-@@ -122,7 +120,7 @@ public:
+@@ -120,7 +120,7 @@ public:
friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
{
-- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
-+ 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 } ) );
++ return Vec4( vec_madd( left.m_v, right.m_v, ( __vector float ){ -0.0f } ) );
}
//! Returns a*b + c
-@@ -143,7 +141,7 @@ public:
- vector float estimate = vec_re( v.m_v );
+@@ -138,10 +138,10 @@ public:
+ friend Vec4 Reciprocal( Vec4::Arg v )
+ {
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.m_v );
++ __vector float estimate = vec_re( v.m_v );
// one round of Newton-Rhaphson refinement
-- vector float diff = vec_nmsub( estimate, v.m_v, vec_splats( 1.0f ) );
-+ 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 } );
++ __vector float diff = vec_nmsub( estimate, v.m_v, ( __vector float ){ 1.0f } );
return Vec4( vec_madd( diff, estimate, estimate ) );
}
+@@ -162,12 +162,12 @@ public:
+
+ friend Vec4 CompareEqual( Vec4::Arg left, Vec4::Arg right )
+ {
+- return Vec4( ( vector float )vec_cmpeq( left.m_v, right.m_v ) );
++ return Vec4( ( __vector float )vec_cmpeq( left.m_v, right.m_v ) );
+ }
+
+ friend Vec4 Select( Vec4::Arg off, Vec4::Arg on, Vec4::Arg bits )
+ {
+- return Vec4( vec_sel( off.m_v, on.m_v, ( vector unsigned int )bits.m_v ) );
++ return Vec4( vec_sel( off.m_v, on.m_v, ( __vector unsigned int )bits.m_v ) );
+ }
+
+ friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
+@@ -176,7 +176,7 @@ public:
+ }
+
+ private:
+- vector float m_v;
++ __vector float m_v;
+ };
+
+ } // namespace squish
+diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:26:42.862873033 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:29:13.365759490 -0300
+@@ -31,7 +31,7 @@
+
+ namespace squish {
+
+-#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
++#define VEC4_CONST( X ) Vec4( ( __vector float ){ X } )
+
+ class Vec4
+ {
+@@ -40,7 +40,7 @@ public:
+
+ Vec4() {}
+
+- explicit Vec4( vector float v ) : m_v( v ) {}
++ explicit Vec4( __vector float v ) : m_v( v ) {}
+
+ Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
+
+@@ -52,7 +52,7 @@ public:
+
+ explicit Vec4( float s )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = s;
+ u.c[1] = s;
+ u.c[2] = s;
+@@ -62,7 +62,7 @@ public:
+
+ Vec4( float x, float y, float z, float w )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = x;
+ u.c[1] = y;
+ u.c[2] = z;
+@@ -72,7 +72,7 @@ public:
+
+ Vec3 GetVec3() const
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.v = m_v;
+ return Vec3( u.c[0], u.c[1], u.c[2] );
+ }
+@@ -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
+@@ -130,10 +130,10 @@ public:
+ friend Vec4 Reciprocal( Vec4::Arg v )
+ {
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.m_v );
++ __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 ) );
+ }
+
+@@ -158,7 +158,7 @@ public:
+ }
+
+ private:
+- vector float m_v;
++ __vector float m_v;
+ };
+
+ } // namespace squish
commit 457de10155f7d19e381f689e6725f491394a9558
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 13:12:52 2021 -0300
Correct non x86 build issues
diff --git a/nvidia-texture-tools-aarch64.patch b/nvidia-texture-tools-aarch64.patch
new file mode 100644
index 0000000..c9c956f
--- /dev/null
+++ b/nvidia-texture-tools-aarch64.patch
@@ -0,0 +1,24 @@
+diff -up src/nvcore/nvcore.h.orig src/nvcore/nvcore.h
+--- src/nvcore/nvcore.h.orig 2021-02-25 10:27:37.067879391 -0300
++++ src/nvcore/nvcore.h 2021-02-25 10:28:11.034088040 -0300
+@@ -112,7 +112,7 @@
+ #elif defined POSH_CPU_STRONGARM
+ # define NV_CPU_ARM 1
+ #elif defined POSH_CPU_AARCH64
+-# define NV_CPU_ARM_64 1
++# define NV_CPU_AARCH64 1
+ #elif defined POSH_CPU_E2K
+ # define NV_CPU_E2K 1
+ #elif defined POSH_CPU_MIPS
+diff -up extern/poshlib/posh.h.orig extern/poshlib/posh.h
+--- extern/poshlib/posh.h.orig 2021-02-25 10:27:44.795926865 -0300
++++ extern/poshlib/posh.h 2021-02-25 10:28:34.666233220 -0300
+@@ -514,7 +514,7 @@ LCC predefines the following:
+ # define POSH_CPU_STRING "ARM"
+ #endif
+
+-#if defined __aarch64__
++#if defined __aarch64__ || defined __arm64__
+ # define POSH_CPU_AARCH64 1
+ # define POSH_CPU_STRING "ARM64"
+ #endif
diff --git a/nvidia-texture-tools-debug.patch b/nvidia-texture-tools-debug.patch
index 673edc4..929c77f 100644
--- a/nvidia-texture-tools-debug.patch
+++ b/nvidia-texture-tools-debug.patch
@@ -1,16 +1,3 @@
-diff -up CMakeLists.txt.orig CMakeLists.txt
---- CMakeLists.txt.orig 2021-02-24 15:38:17.881472659 -0300
-+++ CMakeLists.txt 2021-02-24 15:38:20.230485965 -0300
-@@ -24,6 +24,9 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
- ADD_DEFINITIONS(-D_DEBUG=1)
- ENDIF()
-
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNV_NO_ASSERT=1")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNV_NO_ASSERT=1")
-+
- IF(NVTT_SHARED)
- SET(NVCORE_SHARED TRUE)
- SET(NVMATH_SHARED TRUE)
diff -up src/nvcore/CMakeLists.txt.orig src/nvcore/CMakeLists.txt
--- src/nvcore/CMakeLists.txt.orig 2021-02-24 15:38:17.873472614 -0300
+++ src/nvcore/CMakeLists.txt 2021-02-24 15:38:20.228485954 -0300
@@ -64,3 +51,61 @@ diff -up src/bc7/avpcl_mode5.cpp.orig src/bc7/avpcl_mode5.cpp
toterr[region] += besterr;
// do A index
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-25 09:37:08.120845257 -0300
++++ CMakeLists.txt 2021-02-25 09:37:14.926885247 -0300
+@@ -28,6 +28,9 @@ IF(BUILD_SQUISH_WITH_ALTIVEC)
+ ADD_DEFINITIONS(-maltivec)
+ ENDIF(BUILD_SQUISH_WITH_ALTIVEC)
+
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNV_NO_ASSERT=1 -DNV_DEBUG_PRINT=0")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNV_NO_ASSERT=1 -DNV_DEBUG_PRINT=0")
++
+ IF(NVTT_SHARED)
+ SET(NVCORE_SHARED TRUE)
+ SET(NVMATH_SHARED TRUE)
+diff -up src/nvtt/tools/cmdline.h.orig src/nvtt/tools/cmdline.h
+--- src/nvtt/tools/cmdline.h.orig 2021-02-25 11:03:12.258338108 -0300
++++ src/nvtt/tools/cmdline.h 2021-02-25 11:04:02.152643276 -0300
+@@ -33,10 +33,14 @@
+
+ struct MyMessageHandler : public nv::MessageHandler {
+ MyMessageHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::setMessageHandler( this );
++#endif
+ }
+ ~MyMessageHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::resetMessageHandler();
++#endif
+ }
+
+ virtual void log( const char * str, va_list arg ) {
+@@ -50,20 +54,26 @@ struct MyMessageHandler : public nv::Mes
+
+ struct MyAssertHandler : public nv::AssertHandler {
+ MyAssertHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::setAssertHandler( this );
+ nv::debug::enableSigHandler(/*interactive=*/true);
++#endif
+ }
+ ~MyAssertHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::resetAssertHandler();
++#endif
+ }
+
+ // Handler method, note that func might be NULL!
+ virtual int assertion( const char *exp, const char *file, int line, const char *func, const char *msg, va_list arg ) {
+ fprintf(stderr, "Assertion failed: %s\nIn %s:%d\n", exp, file, line);
++#if !NV_NO_ASSERT
+ nv::debug::dumpInfo();
+ if (nv::debug::isDebuggerPresent()) {
+ return NV_ABORT_DEBUG;
+ }
++#endif
+ exit(1);
+ }
+ };
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 9b32672..2cc7132 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,62 +1,7 @@
-diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
---- extern/libsquish-1.15/simd_ve.h.orig 2021-02-24 16:12:12.187577193 -0300
-+++ extern/libsquish-1.15/simd_ve.h 2021-02-24 16:24:04.568285598 -0300
-@@ -23,15 +23,15 @@
-
- -------------------------------------------------------------------------- */
-
--#ifndef SQUISH_SIMD_VE_H
--#define SQUISH_SIMD_VE_H
-+#ifndef NV_SQUISH_SIMD_VE_H
-+#define NV_SQUISH_SIMD_VE_H
-
- #include <altivec.h>
- #undef bool
-
- namespace squish {
-
--#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
-+#define VEC4_CONST( X ) Vec4( ( vec_splats( (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, vec_splats( -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, vec_splats( -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, vec_splats( 1.0f ) );
- return Vec4( vec_madd( diff, estimate, estimate ) );
- }
-
-@@ -163,4 +163,4 @@ private:
-
- } // namespace squish
-
--#endif // ndef SQUISH_SIMD_VE_H
-+#endif // ndef NV_SQUISH_SIMD_VE_H
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-24 16:12:00.057516674 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-24 16:12:52.778779698 -0300
-@@ -27,10 +27,8 @@
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 12:39:52.342544144 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 12:41:51.141231967 -0300
+@@ -27,14 +27,12 @@
#ifndef SQUISH_SIMD_VE_H
#define SQUISH_SIMD_VE_H
@@ -67,3 +12,35 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
namespace nvsquish {
+-#define VEC4_CONST( X ) Vec4( vec_splats( (float)X ) )
++#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
+
+ class Vec4
+ {
+@@ -106,7 +104,7 @@ public:
+
+ Vec4& operator*=( Arg v )
+ {
+- m_v = vec_madd( m_v, v.m_v, vec_splats( -0.0f ) );
++ m_v = vec_madd( m_v, v.m_v, ( vector float ){ -0.0f } );
+ return *this;
+ }
+
+@@ -122,7 +120,7 @@ public:
+
+ friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
+ {
+- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
++ return Vec4( vec_madd( left.m_v, right.m_v, ( vector float ){ -0.0f } ) );
+ }
+
+ //! Returns a*b + c
+@@ -143,7 +141,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, vec_splats( 1.0f ) );
++ vector float diff = vec_nmsub( estimate, v.m_v, ( vector float ){ 1.0f } );
+ return Vec4( vec_madd( diff, estimate, estimate ) );
+ }
+
diff --git a/nvidia-texture-tools-s390.patch b/nvidia-texture-tools-s390.patch
index 8ab2ade..88fb051 100644
--- a/nvidia-texture-tools-s390.patch
+++ b/nvidia-texture-tools-s390.patch
@@ -25,3 +25,48 @@ diff -up extern/poshlib/posh.h.orig extern/poshlib/posh.h
#if !defined POSH_CPU_STRING
# error POSH cannot determine target CPU
# define POSH_CPU_STRING "Unknown" /* this is here for Doxygen's benefit */
+diff -up src/nvcore/Debug.h.orig src/nvcore/Debug.h
+--- src/nvcore/Debug.h.orig 2021-02-25 10:17:35.200199481 -0300
++++ src/nvcore/Debug.h 2021-02-25 10:17:56.318328346 -0300
+@@ -166,7 +166,7 @@ NVCORE_API void NV_CDECL nvDebugPrint( c
+ namespace nv
+ {
+ inline bool isValidPtr(const void * ptr) {
+- #if NV_CPU_X86_64 || POSH_CPU_PPC64 || NV_CPU_AARCH64
++ #if NV_CPU_X86_64 || POSH_CPU_PPC64 || NV_CPU_AARCH64 || NV_CPU_S390
+ if (ptr == NULL) return true;
+ if (reinterpret_cast<uint64>(ptr) < 0x10000ULL) return false;
+ if (reinterpret_cast<uint64>(ptr) >= 0x000007FFFFFEFFFFULL) return false;
+diff -up src/nvcore/Debug.h.orig src/nvcore/Debug.h
+diff -up src/nvthread/Atomic.h.orig src/nvthread/Atomic.h
+--- src/nvthread/Atomic.h.orig 2021-02-25 11:42:21.289380524 -0300
++++ src/nvthread/Atomic.h 2021-02-25 11:43:17.214706223 -0300
+@@ -78,6 +78,16 @@ namespace nv {
+ uint32 ret = *ptr; // replace with ldrex?
+ nvCompilerReadWriteBarrier();
+ return ret;
++#elif POSH_CPU_S390
++ // need more specific cpu type for ppc64?
++ // also utilizes a full barrier
++ // currently treating load like x86 - this could be wrong
++
++ // this is the easiest but slowest way to do this
++ nvCompilerReadWriteBarrier();
++ uint32 ret = *ptr; // replace with ldrex?
++ nvCompilerReadWriteBarrier();
++ return ret;
+ #elif POSH_CPU_E2K
+ // need more specific cpu type for e2k?
+ // also utilizes a full barrier
+@@ -112,6 +122,11 @@ namespace nv {
+ nvCompilerReadWriteBarrier();
+ *ptr = value; //strex?
+ nvCompilerReadWriteBarrier();
++#elif POSH_CPU_S390
++ // this is the easiest but slowest way to do this
++ nvCompilerReadWriteBarrier();
++ *ptr = value; //strex?
++ nvCompilerReadWriteBarrier();
+ #elif POSH_CPU_E2K
+ // this is the easiest but slowest way to do this
+ nvCompilerReadWriteBarrier();
diff --git a/nvidia-texture-tools-simd.patch b/nvidia-texture-tools-simd.patch
index c1e2056..d13baae 100644
--- a/nvidia-texture-tools-simd.patch
+++ b/nvidia-texture-tools-simd.patch
@@ -40,3 +40,17 @@ diff -up extern/CMP_Core/source/cmp_math_vec4.h.orig extern/CMP_Core/source/cmp_
typedef Vec4<float> CMP_Vec4f;
typedef Vec4<double> CMP_Vec4d;
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-25 09:01:12.611528660 -0300
++++ CMakeLists.txt 2021-02-25 09:05:38.954201319 -0300
+@@ -24,6 +24,10 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ ADD_DEFINITIONS(-D_DEBUG=1)
+ ENDIF()
+
++IF(BUILD_SQUISH_WITH_ALTIVEC)
++ ADD_DEFINITIONS(-maltivec)
++ENDIF(BUILD_SQUISH_WITH_ALTIVEC)
++
+ IF(NVTT_SHARED)
+ SET(NVCORE_SHARED TRUE)
+ SET(NVMATH_SHARED TRUE)
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 90aee35..19a8f95 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -27,12 +27,14 @@ Patch3: %{name}-mips.patch
Patch4: %{name}-s390.patch
# add PPCLE support
Patch5: %{name}-ppcle.patch
+# add aarch64 support
+Patch6: %{name}-aarch64.patch
# Do not presume SSE is available
-Patch6: %{name}-simd.patch
+Patch7: %{name}-simd.patch
# Do not force compiler flags
-Patch7: %{name}-flags.patch
+Patch8: %{name}-flags.patch
# Only implemented for x86
-Patch8: %{name}-debug.patch
+Patch9: %{name}-debug.patch
%description
The NVIDIA Texture Tools is a collection of image processing and texture
@@ -63,8 +65,9 @@ Headers and libraries for development with %{name}.
%patch5 -p0
%patch6 -p0
%patch7 -p0
-%ifnarch %{ix86} x86_64
%patch8 -p0
+%ifnarch %{ix86} x86_64
+%patch9 -p0
%endif
%build
commit d162c8ed97d5cf9801c0b458818657a79989233f
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 08:24:53 2021 -0300
Correct typo
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 09c1262..90aee35 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -64,7 +64,7 @@ Headers and libraries for development with %{name}.
%patch6 -p0
%patch7 -p0
%ifnarch %{ix86} x86_64
-%patch78 -p0
+%patch8 -p0
%endif
%build
commit 7e1a82c1f5d76277475b8a9342abd577325de7d4
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 08:03:22 2021 -0300
Update to version 2.1.2
diff --git a/.gitignore b/.gitignore
index 25998c4..246b0a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/nvidia-texture-tools-2.0.8-1.tar.gz
+/2.1.2.tar.gz
diff --git a/nvidia-texture-tools-2.0.8-gcc4.7.patch b/nvidia-texture-tools-2.0.8-gcc4.7.patch
deleted file mode 100644
index 773af16..0000000
--- a/nvidia-texture-tools-2.0.8-gcc4.7.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up nvidia-texture-tools/src/nvcore/Debug.cpp.orig nvidia-texture-tools/src/nvcore/Debug.cpp
---- nvidia-texture-tools/src/nvcore/Debug.cpp.orig 2012-05-18 22:10:11.359805471 -0300
-+++ nvidia-texture-tools/src/nvcore/Debug.cpp 2012-05-18 22:11:15.588807912 -0300
-@@ -34,6 +34,10 @@
- # endif
- #endif
-
-+#if NV_OS_LINUX
-+# include <unistd.h> // getpid
-+#endif
-+
- #if NV_OS_DARWIN
- # include <unistd.h> // getpid
- # include <sys/types.h>
diff --git a/nvidia-texture-tools-2.0.8-libdir.patch b/nvidia-texture-tools-2.0.8-libdir.patch
deleted file mode 100644
index b0cbcaa..0000000
--- a/nvidia-texture-tools-2.0.8-libdir.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig nvidia-texture-tools/src/nvcore/CMakeLists.txt
---- nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig 2012-05-18 23:32:42.120995054 -0300
-+++ nvidia-texture-tools/src/nvcore/CMakeLists.txt 2012-05-18 23:33:18.078996428 -0300
-@@ -47,5 +47,5 @@ TARGET_LINK_LIBRARIES(nvcore ${LIBS})
-
- INSTALL(TARGETS nvcore
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-diff -up nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig nvidia-texture-tools/src/nvimage/CMakeLists.txt
---- nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig 2012-05-18 23:32:37.775994885 -0300
-+++ nvidia-texture-tools/src/nvimage/CMakeLists.txt 2012-05-18 23:33:08.398996062 -0300
-@@ -67,6 +67,6 @@ TARGET_LINK_LIBRARIES(nvimage ${LIBS} nv
-
- INSTALL(TARGETS nvimage
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-
-diff -up nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig nvidia-texture-tools/src/nvmath/CMakeLists.txt
---- nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig 2012-05-18 23:32:31.192994634 -0300
-+++ nvidia-texture-tools/src/nvmath/CMakeLists.txt 2012-05-18 23:33:12.854996216 -0300
-@@ -33,5 +33,5 @@ TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvc
-
- INSTALL(TARGETS nvmath
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-diff -up nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig nvidia-texture-tools/src/nvtt/CMakeLists.txt
---- nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig 2012-05-18 23:32:18.184994143 -0300
-+++ nvidia-texture-tools/src/nvtt/CMakeLists.txt 2012-05-18 23:32:57.542995724 -0300
-@@ -58,7 +58,7 @@ TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcor
-
- INSTALL(TARGETS nvtt
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-
- INSTALL(FILES nvtt.h DESTINATION include/nvtt)
diff --git a/nvidia-texture-tools-2.0.8-png-api.patch b/nvidia-texture-tools-2.0.8-png-api.patch
deleted file mode 100644
index 0b22916..0000000
--- a/nvidia-texture-tools-2.0.8-png-api.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/src/nvimage/ImageIO.cpp
-===================================================================
---- src/src/nvimage/ImageIO.cpp (revision 9895)
-+++ src/src/nvimage/ImageIO.cpp (working copy)
-@@ -603,7 +603,7 @@
- {
- nvDebugCheck(png_ptr != NULL);
-
-- Stream * s = (Stream *)png_ptr->io_ptr;
-+ Stream * s = (Stream *)png_get_io_ptr(png_ptr);
- s->serialize(data, (int)length);
-
- if (s->isError()) {
diff --git a/nvidia-texture-tools-2.0.8-soversion.patch b/nvidia-texture-tools-2.0.8-soversion.patch
deleted file mode 100644
index cb418f2..0000000
--- a/nvidia-texture-tools-2.0.8-soversion.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -up nvidia-texture-tools/CMakeLists.txt.orig nvidia-texture-tools/CMakeLists.txt
---- nvidia-texture-tools/CMakeLists.txt.orig 2012-05-18 22:58:53.135917349 -0300
-+++ nvidia-texture-tools/CMakeLists.txt 2012-05-18 22:59:45.293919346 -0300
-@@ -2,6 +2,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
- PROJECT(NV)
- ENABLE_TESTING()
-
-+set(PACKAGE_VERSION 2.0.8)
-+set(LIBRARY_SOVERSION 2.0)
-+
- SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
-
-diff -up nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig nvidia-texture-tools/src/nvcore/CMakeLists.txt
---- nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig 2012-05-18 22:58:59.455917596 -0300
-+++ nvidia-texture-tools/src/nvcore/CMakeLists.txt 2012-05-18 23:00:45.677921655 -0300
-@@ -35,6 +35,10 @@ ENDIF(UNIX)
- IF(NVCORE_SHARED)
- ADD_DEFINITIONS(-DNVCORE_SHARED=1)
- ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
-+ SET_TARGET_PROPERTIES(nvcore
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVCORE_SHARED)
- ADD_LIBRARY(nvcore ${CORE_SRCS})
- ENDIF(NVCORE_SHARED)
-diff -up nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig nvidia-texture-tools/src/nvimage/CMakeLists.txt
---- nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig 2012-05-18 22:59:07.007917887 -0300
-+++ nvidia-texture-tools/src/nvimage/CMakeLists.txt 2012-05-18 23:00:58.557922157 -0300
-@@ -55,6 +55,10 @@ ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
- IF(NVIMAGE_SHARED)
- ADD_DEFINITIONS(-DNVIMAGE_SHARED=1)
- ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS})
-+ SET_TARGET_PROPERTIES(nvimage
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVIMAGE_SHARED)
- ADD_LIBRARY(nvimage ${IMAGE_SRCS})
- ENDIF(NVIMAGE_SHARED)
-diff -up nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig nvidia-texture-tools/src/nvmath/CMakeLists.txt
---- nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig 2012-05-18 22:59:13.119918119 -0300
-+++ nvidia-texture-tools/src/nvmath/CMakeLists.txt 2012-05-18 23:01:05.373922375 -0300
-@@ -21,6 +21,10 @@ ADD_DEFINITIONS(-DNVMATH_EXPORTS)
- IF(NVMATH_SHARED)
- ADD_DEFINITIONS(-DNVMATH_SHARED=1)
- ADD_LIBRARY(nvmath SHARED ${MATH_SRCS})
-+ SET_TARGET_PROPERTIES(nvmath
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVMATH_SHARED)
- ADD_LIBRARY(nvmath ${MATH_SRCS})
- ENDIF(NVMATH_SHARED)
-diff -up nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig nvidia-texture-tools/src/nvtt/CMakeLists.txt
---- nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig 2012-05-18 22:59:21.607918449 -0300
-+++ nvidia-texture-tools/src/nvtt/CMakeLists.txt 2012-05-18 23:01:12.133922682 -0300
-@@ -46,6 +46,10 @@ ADD_DEFINITIONS(-DNVTT_EXPORTS)
- IF(NVTT_SHARED)
- ADD_DEFINITIONS(-DNVTT_SHARED=1)
- ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS})
-+ SET_TARGET_PROPERTIES(nvtt
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVTT_SHARED)
- ADD_LIBRARY(nvtt ${NVTT_SRCS})
- ENDIF(NVTT_SHARED)
diff --git a/nvidia-texture-tools-2.0.8-wordsize.patch b/nvidia-texture-tools-2.0.8-wordsize.patch
deleted file mode 100644
index e93eaac..0000000
--- a/nvidia-texture-tools-2.0.8-wordsize.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up nvidia-texture-tools/src/nvcore/DefsGnucLinux.h.orig nvidia-texture-tools/src/nvcore/DefsGnucLinux.h
---- nvidia-texture-tools/src/nvcore/DefsGnucLinux.h.orig 2012-05-18 22:17:43.367822764 -0300
-+++ nvidia-texture-tools/src/nvcore/DefsGnucLinux.h 2012-05-18 22:19:50.709827759 -0300
-@@ -2,6 +2,8 @@
- #error "Do not include this file directly."
- #endif
-
-+#include <bits/wordsize.h>
-+
- // Function linkage
- #define DLL_IMPORT
- #if __GNUC__ >= 4
-@@ -58,8 +60,13 @@ typedef signed short int16;
- typedef unsigned int uint32;
- typedef signed int int32;
-
-+#if __WORDSIZE == 32
- typedef unsigned long long uint64;
- typedef signed long long int64;
-+#else
-+typedef unsigned long uint64;
-+typedef signed long int64;
-+#endif
-
- // Aliases
- typedef uint32 uint;
diff --git a/nvidia-texture-tools-aarch64.patch b/nvidia-texture-tools-aarch64.patch
deleted file mode 100644
index 7f9d09e..0000000
--- a/nvidia-texture-tools-aarch64.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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-arm.patch b/nvidia-texture-tools-arm.patch
deleted file mode 100644
index 3e6a8c6..0000000
--- a/nvidia-texture-tools-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nvidia-texture-tools/src/nvcore/nvcore.h.orig 2013-07-30 09:48:05.111350472 -0500
-+++ nvidia-texture-tools/src/nvcore/nvcore.h 2013-07-30 09:50:19.667643065 -0500
-@@ -70,6 +70,8 @@
- # define NV_CPU_X86 1
- #elif defined POSH_CPU_PPC
- # define NV_CPU_PPC 1
-+#elif defined POSH_CPU_STRONGARM
-+# define NV_CPU_STRONGARM 1
- #else
- # error "Unsupported CPU"
- #endif
diff --git a/nvidia-texture-tools-bool-null.patch b/nvidia-texture-tools-bool-null.patch
deleted file mode 100644
index bb5453f..0000000
--- a/nvidia-texture-tools-bool-null.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -up nvidia-texture-tools/src/nvimage/ImageIO.cpp.orig nvidia-texture-tools/src/nvimage/ImageIO.cpp
---- nvidia-texture-tools/src/nvimage/ImageIO.cpp.orig 2016-03-17 16:05:57.432384322 -0300
-+++ nvidia-texture-tools/src/nvimage/ImageIO.cpp 2016-03-17 16:07:43.769388394 -0300
-@@ -135,7 +135,7 @@ FloatImage * nv::ImageIO::loadFloat(cons
- StdInputStream stream(fileName);
-
- if (stream.isError()) {
-- return false;
-+ return NULL;
- }
-
- return loadFloat(fileName, stream);
-@@ -233,7 +233,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
- case TGA_TYPE_INDEXED:
- if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
- nvDebug( "*** ImageIO::loadTGA: Error, only 24bit paletted images are supported.\n" );
-- return false;
-+ return NULL;
- }
- pal = true;
- break;
-@@ -254,7 +254,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
-
- default:
- nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
-- return false;
-+ return NULL;
- }
-
- const uint pixel_size = (tga.pixel_size/8);
-@@ -621,7 +621,7 @@ Image * nv::ImageIO::loadPNG(Stream & s)
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if (png_ptr == NULL) {
- // nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name );
-- return false;
-+ return NULL;
- }
-
- // Allocate/initialize a memory block for the image information
-@@ -629,14 +629,14 @@ Image * nv::ImageIO::loadPNG(Stream & s)
- if (info_ptr == NULL) {
- png_destroy_read_struct(&png_ptr, NULL, NULL);
- // nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name );
-- return false;
-+ return NULL;
- }
-
- // Set up the error handling
- if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- // nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name );
-- return false;
-+ return NULL;
- }
-
- // Set up the I/O functions.
diff --git a/nvidia-texture-tools-check.patch b/nvidia-texture-tools-check.patch
new file mode 100644
index 0000000..976cc84
--- /dev/null
+++ b/nvidia-texture-tools-check.patch
@@ -0,0 +1,31 @@
+diff -up src/nvtt/tests/CMakeLists.txt.orig src/nvtt/tests/CMakeLists.txt
+--- src/nvtt/tests/CMakeLists.txt.orig 2021-02-23 06:12:25.272491130 -0300
++++ src/nvtt/tests/CMakeLists.txt 2021-02-23 06:12:47.525609378 -0300
+@@ -4,12 +4,12 @@ TARGET_LINK_LIBRARIES(filtertest nvcore
+
+ ADD_EXECUTABLE(nvtestsuite testsuite.cpp)
+ TARGET_LINK_LIBRARIES(nvtestsuite nvcore nvmath nvimage nvtt)
+-ADD_TEST(NVTT.TestSuite.Kodak.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 0 -out output-cuda-kodak)
+-ADD_TEST(NVTT.TestSuite.Waterloo.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 1 -out output-cuda-waterloo)
+-ADD_TEST(NVTT.TestSuite.Epic.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 2 -out output-cuda-epic)
+-ADD_TEST(NVTT.TestSuite.Kodak.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 0 -nocuda -out output-nocuda-kodak)
+-ADD_TEST(NVTT.TestSuite.Waterloo.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 1 -nocuda -out output-nocuda-waterloo)
+-ADD_TEST(NVTT.TestSuite.Epic.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 2 -nocuda -out output-nocuda-epic)
++ADD_TEST(NVTT.TestSuite.Kodak.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 0 -out output-cuda-kodak)
++ADD_TEST(NVTT.TestSuite.Waterloo.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 1 -out output-cuda-waterloo)
++ADD_TEST(NVTT.TestSuite.Epic.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 2 -out output-cuda-epic)
++ADD_TEST(NVTT.TestSuite.Kodak.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 0 -nocuda -out output-nocuda-kodak)
++ADD_TEST(NVTT.TestSuite.Waterloo.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 1 -nocuda -out output-nocuda-waterloo)
++ADD_TEST(NVTT.TestSuite.Epic.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 2 -nocuda -out output-nocuda-epic)
+
+ IF (CUDA_FOUND)
+ ADD_EXECUTABLE(driverapitest driverapi.cpp)
+@@ -31,7 +31,7 @@ TARGET_LINK_LIBRARIES(nvhdrtest nvcore n
+ #ADD_EXECUTABLE(bc1enc bc1enc.cpp)
+ #TARGET_LINK_LIBRARIES(bc1enc nvcore nvimage nvmath squish CMP_Core)
+
+-INSTALL(TARGETS nvtestsuite nvhdrtest DESTINATION bin)
++#INSTALL(TARGETS nvtestsuite nvhdrtest DESTINATION bin)
+
+ #include_directories("/usr/include/ffmpeg/")
+ #ADD_EXECUTABLE(nvmpegenc tools/mpegenc.cpp tools/cmdline.h)
diff --git a/nvidia-texture-tools-debug.patch b/nvidia-texture-tools-debug.patch
new file mode 100644
index 0000000..673edc4
--- /dev/null
+++ b/nvidia-texture-tools-debug.patch
@@ -0,0 +1,66 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-24 15:38:17.881472659 -0300
++++ CMakeLists.txt 2021-02-24 15:38:20.230485965 -0300
+@@ -24,6 +24,9 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ ADD_DEFINITIONS(-D_DEBUG=1)
+ ENDIF()
+
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNV_NO_ASSERT=1")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNV_NO_ASSERT=1")
++
+ IF(NVTT_SHARED)
+ SET(NVCORE_SHARED TRUE)
+ SET(NVMATH_SHARED TRUE)
+diff -up src/nvcore/CMakeLists.txt.orig src/nvcore/CMakeLists.txt
+--- src/nvcore/CMakeLists.txt.orig 2021-02-24 15:38:17.873472614 -0300
++++ src/nvcore/CMakeLists.txt 2021-02-24 15:38:20.228485954 -0300
+@@ -3,7 +3,6 @@ PROJECT(nvcore)
+ SET(CORE_SRCS
+ nvcore.h
+ Array.h
+- Debug.h Debug.cpp
+ DefsGnucDarwin.h
+ DefsGnucLinux.h
+ DefsGnucWin32.h
+diff -up src/bc7/avpcl_mode4.cpp.orig src/bc7/avpcl_mode4.cpp
+--- src/bc7/avpcl_mode4.cpp.orig 2021-02-24 15:51:20.362903501 -0300
++++ src/bc7/avpcl_mode4.cpp 2021-02-24 15:51:52.829087279 -0300
+@@ -519,7 +519,7 @@ static float map_colors(const Vector4 co
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : 0;
+ toterr += besterr;
+
+ // do A index
+@@ -647,7 +647,7 @@ static void assign_indices(const Tile &t
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[region][bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[region][bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : 0;
+ toterr[region] += besterr;
+
+ // do A index
+diff -up src/bc7/avpcl_mode5.cpp.orig src/bc7/avpcl_mode5.cpp
+--- src/bc7/avpcl_mode5.cpp.orig 2021-02-24 15:51:27.342943012 -0300
++++ src/bc7/avpcl_mode5.cpp 2021-02-24 15:51:46.341050553 -0300
+@@ -520,7 +520,7 @@ static float map_colors(const Vector4 co
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : 0;
+ toterr += besterr;
+
+ // do A index
+@@ -648,7 +648,7 @@ static void assign_indices(const Tile &t
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[region][bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[region][bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : 0;
+ toterr[region] += besterr;
+
+ // do A index
diff --git a/nvidia-texture-tools-docs.patch b/nvidia-texture-tools-docs.patch
new file mode 100644
index 0000000..e8316ca
--- /dev/null
+++ b/nvidia-texture-tools-docs.patch
@@ -0,0 +1,18 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-23 07:27:10.611067241 -0300
++++ CMakeLists.txt 2021-02-23 07:27:35.953203458 -0300
+@@ -38,10 +38,10 @@ ADD_SUBDIRECTORY(extern)
+ ADD_SUBDIRECTORY(src)
+
+ # These files should only be installed when creating packages.
+-INSTALL(FILES
+- LICENSE
+- README.md
+- DESTINATION share/doc/nvtt)
++# INSTALL(FILES
++# LICENSE
++# README.md
++# DESTINATION share/doc/nvtt)
+
+ # Add packaging support
+ INCLUDE(InstallRequiredSystemLibraries)
diff --git a/nvidia-texture-tools-flags.patch b/nvidia-texture-tools-flags.patch
new file mode 100644
index 0000000..98a8c33
--- /dev/null
+++ b/nvidia-texture-tools-flags.patch
@@ -0,0 +1,12 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-24 11:32:41.101973054 -0300
++++ CMakeLists.txt 2021-02-24 11:32:46.452001665 -0300
+@@ -19,8 +19,6 @@ else()
+ message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+ endif()
+
+-INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
+-
+ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ SET(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Postfix for debug build libraries.")
+ ADD_DEFINITIONS(-D_DEBUG=1)
diff --git a/nvidia-texture-tools-libs.patch b/nvidia-texture-tools-libs.patch
new file mode 100644
index 0000000..b97c9e4
--- /dev/null
+++ b/nvidia-texture-tools-libs.patch
@@ -0,0 +1,153 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-23 05:07:03.217873178 -0300
++++ CMakeLists.txt 2021-02-23 05:07:30.217012734 -0300
+@@ -2,6 +2,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
+ PROJECT(NV)
+ ENABLE_TESTING()
+
++set(PACKAGE_VERSION 2.1.2)
++set(LIBRARY_SOVERSION 2.1)
++
+ SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
+
+@@ -23,6 +26,12 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ ADD_DEFINITIONS(-D_DEBUG=1)
+ ENDIF()
+
++IF(NVTT_SHARED)
++ SET(NVCORE_SHARED TRUE)
++ SET(NVMATH_SHARED TRUE)
++ SET(NVIMAGE_SHARED TRUE)
++ SET(NVTHREAD_SHARED TRUE)
++ENDIF(NVTT_SHARED)
+
+ ADD_SUBDIRECTORY(extern)
+
+diff -up src/nvcore/CMakeLists.txt.orig src/nvcore/CMakeLists.txt
+--- src/nvcore/CMakeLists.txt.orig 2021-02-22 18:18:43.500403584 -0300
++++ src/nvcore/CMakeLists.txt 2021-02-22 18:19:32.913676238 -0300
+@@ -33,6 +33,10 @@ ENDIF(UNIX)
+ IF(NVCORE_SHARED)
+ ADD_DEFINITIONS(-DNVCORE_SHARED=1)
+ ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
++ SET_TARGET_PROPERTIES(nvcore
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVCORE_SHARED)
+ ADD_LIBRARY(nvcore ${CORE_SRCS})
+ ENDIF(NVCORE_SHARED)
+@@ -46,5 +50,5 @@ endif()
+
+ INSTALL(TARGETS nvcore
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+diff -up src/nvimage/CMakeLists.txt.orig src/nvimage/CMakeLists.txt
+--- src/nvimage/CMakeLists.txt.orig 2021-02-22 18:19:56.299805277 -0300
++++ src/nvimage/CMakeLists.txt 2021-02-22 18:20:51.082107555 -0300
+@@ -50,6 +50,10 @@ ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
+ IF(NVIMAGE_SHARED)
+ ADD_DEFINITIONS(-DNVIMAGE_SHARED=1)
+ ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS})
++ SET_TARGET_PROPERTIES(nvimage
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVIMAGE_SHARED)
+ ADD_LIBRARY(nvimage ${IMAGE_SRCS})
+ ENDIF(NVIMAGE_SHARED)
+@@ -58,6 +62,6 @@ TARGET_LINK_LIBRARIES(nvimage ${LIBS} nv
+
+ INSTALL(TARGETS nvimage
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+
+diff -up src/nvmath/CMakeLists.txt.orig src/nvmath/CMakeLists.txt
+--- src/nvmath/CMakeLists.txt.orig 2021-02-22 18:21:03.021173431 -0300
++++ src/nvmath/CMakeLists.txt 2021-02-22 18:21:57.570474430 -0300
+@@ -14,11 +14,20 @@ SET(MATH_SRCS
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+-ADD_LIBRARY(nvmath ${MATH_SRCS})
++IF(NVMATH_SHARED)
++ ADD_DEFINITIONS(-DNMATH_SHARED=1)
++ ADD_LIBRARY(nvmath SHARED ${MATH_SRCS})
++ SET_TARGET_PROPERTIES(nvmath
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
++ELSE(NVMATH_SHARED)
++ ADD_LIBRARY(nvmath ${MATH_SRCS})
++ENDIF(NVMATH_SHARED)
+
+ TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
+
+ INSTALL(TARGETS nvmath
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+diff -up src/nvthread/CMakeLists.txt.orig src/nvthread/CMakeLists.txt
+--- src/nvthread/CMakeLists.txt.orig 2021-02-23 04:45:54.643331358 -0300
++++ src/nvthread/CMakeLists.txt 2021-02-23 04:46:55.665643283 -0300
+@@ -16,6 +16,10 @@ ADD_DEFINITIONS(-DNVTHREAD_EXPORTS)
+
+ IF(NVTHREAD_SHARED)
+ ADD_LIBRARY(nvthread SHARED ${THREAD_SRCS})
++ SET_TARGET_PROPERTIES(nvthread
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVTHREAD_SHARED)
+ ADD_LIBRARY(nvthread ${THREAD_SRCS})
+ ENDIF(NVTHREAD_SHARED)
+@@ -24,5 +28,5 @@ TARGET_LINK_LIBRARIES(nvthread ${LIBS} n
+
+ INSTALL(TARGETS nvthread
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+diff -up src/nvtt/CMakeLists.txt.orig src/nvtt/CMakeLists.txt
+--- src/nvtt/CMakeLists.txt.orig 2021-02-22 18:22:16.155576979 -0300
++++ src/nvtt/CMakeLists.txt 2021-02-22 18:22:48.018752789 -0300
+@@ -49,6 +49,10 @@ ADD_DEFINITIONS(-DNVTT_EXPORTS)
+
+ IF(NVTT_SHARED)
+ ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS})
++ SET_TARGET_PROPERTIES(nvtt
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVTT_SHARED)
+ ADD_LIBRARY(nvtt ${NVTT_SRCS})
+ ENDIF(NVTT_SHARED)
+@@ -57,7 +61,7 @@ TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcor
+
+ INSTALL(TARGETS nvtt
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+
+ INSTALL(FILES nvtt.h nvtt_wrapper.h DESTINATION include/nvtt)
+diff -up extern/libsquish-1.15/CMakeLists.txt.orig extern/libsquish-1.15/CMakeLists.txt
+--- extern/libsquish-1.15/CMakeLists.txt.orig 2021-02-23 04:56:58.942749647 -0300
++++ extern/libsquish-1.15/CMakeLists.txt 2021-02-23 04:57:07.724795042 -0300
+@@ -108,10 +108,3 @@ IF (BUILD_SQUISH_EXTRA)
+ TARGET_LINK_LIBRARIES(squishpng squish ${PNG_LIBRARIES})
+ ENDIF (PNG_FOUND)
+ ENDIF (BUILD_SQUISH_EXTRA)
+-
+-INSTALL(
+- TARGETS squish
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
+- PUBLIC_HEADER DESTINATION include
+- )
diff --git a/nvidia-texture-tools-mips.patch b/nvidia-texture-tools-mips.patch
index 4773641..532ebc3 100644
--- a/nvidia-texture-tools-mips.patch
+++ b/nvidia-texture-tools-mips.patch
@@ -1,38 +1,14 @@
-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 -up src/nvcore/nvcore.h.orig src/nvcore/nvcore.h
+--- src/nvcore/nvcore.h.orig 2020-08-24 03:27:21.000000000 -0300
++++ src/nvcore/nvcore.h 2021-02-22 17:41:56.397423994 -0300
+@@ -115,6 +115,10 @@
+ # define NV_CPU_ARM_64 1
+ #elif defined POSH_CPU_E2K
+ # define NV_CPU_E2K 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 --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 0b25fd3..9b32672 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,39 +1,69 @@
-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 @@
+diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-24 16:12:12.187577193 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-24 16:24:04.568285598 -0300
+@@ -23,15 +23,15 @@
+
+ -------------------------------------------------------------------------- */
+
+-#ifndef SQUISH_SIMD_VE_H
+-#define SQUISH_SIMD_VE_H
++#ifndef NV_SQUISH_SIMD_VE_H
++#define NV_SQUISH_SIMD_VE_H
+
+ #include <altivec.h>
+ #undef bool
namespace squish {
--#define VEC4_CONST( X ) Vec4( ( vector float )( X ) )
-+#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
+-#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
++#define VEC4_CONST( X ) Vec4( ( vec_splats( (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;
- }
-
+
+ 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, vec_splats( -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
+
+ 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, vec_splats( -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 ) );
- }
-
+ 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, vec_splats( 1.0f ) );
+ return Vec4( vec_madd( diff, estimate, estimate ) );
+ }
+
+@@ -163,4 +163,4 @@ private:
+
+ } // namespace squish
+
+-#endif // ndef SQUISH_SIMD_VE_H
++#endif // ndef NV_SQUISH_SIMD_VE_H
+diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-24 16:12:00.057516674 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-24 16:12:52.778779698 -0300
+@@ -27,10 +27,8 @@
+ #ifndef SQUISH_SIMD_VE_H
+ #define SQUISH_SIMD_VE_H
+
+-#if !defined(__APPLE_ALTIVEC__) || defined(__PPC64__)
+ #include <altivec.h>
+ #undef bool
+-#endif
+
+ namespace nvsquish {
+
diff --git a/nvidia-texture-tools-s390.patch b/nvidia-texture-tools-s390.patch
index 93d2463..8ab2ade 100644
--- a/nvidia-texture-tools-s390.patch
+++ b/nvidia-texture-tools-s390.patch
@@ -1,23 +1,23 @@
-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"
+diff -up src/nvcore/nvcore.h.orig src/nvcore/nvcore.h
+--- src/nvcore/nvcore.h.orig 2021-02-22 17:43:36.159964579 -0300
++++ src/nvcore/nvcore.h 2021-02-22 17:43:56.917077055 -0300
+@@ -119,6 +119,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 extern/poshlib/posh.h.orig extern/poshlib/posh.h
+--- extern/poshlib/posh.h.orig 2021-02-24 14:04:24.455712030 -0300
++++ extern/poshlib/posh.h 2021-02-24 14:06:16.557482153 -0300
+@@ -560,6 +560,11 @@ LCC predefines the following:
+ # define POSH_CPU_STRING "MCST Elbrus 2000"
#endif
-+#if defined __s390__ || defined __s390x__
++#if defined __s390x__
+# define POSH_CPU_S390 1
+# define POSH_CPU_STRING "S390"
+#endif
diff --git a/nvidia-texture-tools-simd.patch b/nvidia-texture-tools-simd.patch
new file mode 100644
index 0000000..c1e2056
--- /dev/null
+++ b/nvidia-texture-tools-simd.patch
@@ -0,0 +1,42 @@
+diff -up extern/libsquish-1.15/CMakeLists.txt.orig extern/libsquish-1.15/CMakeLists.txt
+--- extern/libsquish-1.15/CMakeLists.txt.orig 2021-02-24 10:47:15.629070541 -0300
++++ extern/libsquish-1.15/CMakeLists.txt 2021-02-24 10:48:37.453467988 -0300
+@@ -36,9 +36,13 @@ IF (CMAKE_GENERATOR STREQUAL "Xcode")
+ ELSE (CMAKE_GENERATOR STREQUAL "Xcode")
+ IF (BUILD_SQUISH_WITH_SSE2 AND NOT WIN32)
+ ADD_DEFINITIONS(-DSQUISH_USE_SSE=2 -msse2)
++ ELSE (BUILD_SQUISH_WITH_SSE2 AND NOT WIN32)
++ ADD_DEFINITIONS(-DSQUISH_USE_SSE=0)
+ ENDIF (BUILD_SQUISH_WITH_SSE2 AND NOT WIN32)
+ IF (BUILD_SQUISH_WITH_ALTIVEC AND NOT WIN32)
+ ADD_DEFINITIONS(-DSQUISH_USE_ALTIVEC=1 -maltivec)
++ ELSE (BUILD_SQUISH_WITH_ALTIVEC AND NOT WIN32)
++ ADD_DEFINITIONS(-DSQUISH_USE_ALTIVEC=0)
+ ENDIF (BUILD_SQUISH_WITH_ALTIVEC AND NOT WIN32)
+ ENDIF (CMAKE_GENERATOR STREQUAL "Xcode")
+
+diff -up extern/CMP_Core/source/cmp_math_vec4.h.orig extern/CMP_Core/source/cmp_math_vec4.h
+--- extern/CMP_Core/source/cmp_math_vec4.h.orig 2021-02-24 13:17:51.629327597 -0300
++++ extern/CMP_Core/source/cmp_math_vec4.h 2021-02-24 13:45:22.725513798 -0300
+@@ -322,10 +322,13 @@ public:
+ };
+
+ #include <stdio.h>
++#if SQUISH_USE_SSE
+ #include "xmmintrin.h"
++#endif
+ #include <math.h>
+ #include <float.h>
+
++#if SQUISH_USE_SSE
+ // SSE Vec4
+ #ifdef _LINUX
+ class CMP_SSEVec4f
+@@ -419,6 +422,7 @@ public:
+ };
+
+ };
++#endif // SQUISH_USE_SSE
+
+ typedef Vec4<float> CMP_Vec4f;
+ typedef Vec4<double> CMP_Vec4d;
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index e6e6653..09c1262 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -1,12 +1,12 @@
-%global soversion 2.0
+%global soversion 2.1
Name: nvidia-texture-tools
-Version: 2.0.8
-Release: 26%{?dist}
+Version: 2.1.2
+Release: 1%{?dist}
Summary: Collection of image processing and texture manipulation tools
-License: MIT
-URL: http://code.google.com/p/nvidia-texture-tools/
-Source0: http://nvidia-texture-tools.googlecode.com/files/%{name}-%{version}-1.tar.gz
+License: MIT and ASL 2.0 and BSD
+URL: https://github.com/castano/nvidia-texture-tools/wiki
+Source0: https://github.com/castano/%{name}/archive/%{version}.tar.gz
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -17,29 +17,22 @@ BuildRequires: libtiff-devel
BuildRequires: openjpeg-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
-# 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
-# to conflict with other headers that do not use long long on 64 bit
-Patch1: %{name}-%{version}-wordsize.patch
-# from 0ad sources
-Patch2: %{name}-%{version}-png-api.patch
-# add soversion to libraries
-Patch3: %{name}-%{version}-soversion.patch
-# install libraries in proper directory
-Patch4: %{name}-%{version}-libdir.patch
-# add arm support
-Patch5: %{name}-arm.patch
-# add aarch64 support
-Patch6: %{name}-aarch64.patch
-# Return NULL not false on pointer returning functions
-Patch7: %{name}-bool-null.patch
+
+Patch0: %{name}-libs.patch
+Patch1: %{name}-check.patch
+Patch2: %{name}-docs.patch
# add MIPS support
-Patch8: %{name}-mips.patch
+Patch3: %{name}-mips.patch
# add S390 support
-Patch9: %{name}-s390.patch
+Patch4: %{name}-s390.patch
# add PPCLE support
-Patch10: %{name}-ppcle.patch
+Patch5: %{name}-ppcle.patch
+# Do not presume SSE is available
+Patch6: %{name}-simd.patch
+# Do not force compiler flags
+Patch7: %{name}-flags.patch
+# Only implemented for x86
+Patch8: %{name}-debug.patch
%description
The NVIDIA Texture Tools is a collection of image processing and texture
@@ -61,24 +54,31 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Headers and libraries for development with %{name}.
%prep
-%setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%setup -q
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%ifnarch %{ix86} x86_64
+%patch78 -p0
+%endif
%build
-%cmake -DNVTT_SHARED=1 -DCMAKE_SKIP_RPATH=1
+%cmake -DNVTT_SHARED=1 -DCMAKE_SKIP_RPATH=1 \
+%ifnarch %{ix86} x86_64
+ -DBUILD_SQUISH_WITH_SSE2=OFF \
+%endif
+%ifarch ppc64 ppc64le
+ -DBUILD_SQUISH_WITH_ALTIVEC=ON \
+%endif
+
%cmake_build
-sed -e 's/\r//' -i NVIDIA_*.txt
+sed -e 's/\r//' -i LICENSE
%install
%cmake_install
@@ -91,13 +91,14 @@ pushd $RPM_BUILD_ROOT/%{_bindir}
popd
%check
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:
%ctest
%ldconfig_scriptlets
%files
-%doc NVIDIA_Texture_Tools_LICENSE.txt
-%doc NVIDIA_Texture_Tools_README.txt
+%license LICENSE
+%doc README.md
%{_bindir}/*
%{_libdir}/lib*.%{version}
%{_libdir}/lib*.%{soversion}
@@ -109,6 +110,9 @@ popd
%{_libdir}/lib*.so
%changelog
+* Mon Feb 22 2021 pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com> - 2.1.2-1
+- Update to version 2.1.2
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 9e78729..1797125 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7449c95ca1583b512561c83c5a5f401c nvidia-texture-tools-2.0.8-1.tar.gz
+SHA512 (2.1.2.tar.gz) = 4285e1a348c6ab9abbc34a499879fe1c8ff6976da01d0397eb95e19ae7fb566f3efb57613d2cee31e6c694b497a28b050e377267e137a4d114d093d681824adb
1
0
Architecture specific change in rpms/nvidia-texture-tools.git
by githook-noreply＠fedoraproject.org 26 Feb '21
by githook-noreply＠fedoraproject.org 26 Feb '21
26 Feb '21
The package rpms/nvidia-texture-tools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nvidia-texture-tools.git/commit/?id…
https://src.fedoraproject.org/cgit/rpms/nvidia-texture-tools.git/commit/?id….
Change:
+%ifnarch %{ix86} x86_64
+%ifarch ppc64 ppc64le
Thanks.
Full change:
============
commit 9f338bb34655deab4027c5d93e6fd1655d97a602
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 15:01:43 2021 -0300
Disable more altivec code
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index a69660c..d82faa8 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,6 +1,15 @@
diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
---- src/nvtt/icbc.h.orig 2021-02-25 14:37:32.913095824 -0300
-+++ src/nvtt/icbc.h 2021-02-25 14:39:48.633666276 -0300
+--- src/nvtt/icbc.h.orig 2021-02-25 14:58:15.331333196 -0300
++++ src/nvtt/icbc.h 2021-02-25 14:59:57.648990370 -0300
+@@ -91,7 +91,7 @@ namespace icbc {
+ #endif
+ #endif
+
+- #if ICBC_PPC
++ #if ICBC_PPC && BUILD_SQUISH_WITH_ALTIVEC
+ #define ICBC_SIMD ICBC_VMX
+ #endif
+ #endif
@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
constexpr int VEC_SIZE = 4;
commit ae0433329f7820830d8f56bf8d70a166285d1264
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:49:26 2021 -0300
Disable altivec for ppc64le
Code appears to not have been tested by upstream. After several
trial&error scratch builds, give up when it comes down to:
error: invalid parameter combination for AltiVec intrinsic ...
error messages.
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 19a8f95..eda6e4b 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -75,9 +75,11 @@ Headers and libraries for development with %{name}.
%ifnarch %{ix86} x86_64
-DBUILD_SQUISH_WITH_SSE2=OFF \
%endif
+%if 0
%ifarch ppc64 ppc64le
-DBUILD_SQUISH_WITH_ALTIVEC=ON \
%endif
+%endif
%cmake_build
commit 77009a511ccb043d5b28ce6b09a9ecc2a736deee
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:40:53 2021 -0300
Implement missing/incorrect altivec function
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 79c9c53..a69660c 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,6 +1,72 @@
+diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
+--- src/nvtt/icbc.h.orig 2021-02-25 14:37:32.913095824 -0300
++++ src/nvtt/icbc.h 2021-02-25 14:39:48.633666276 -0300
+@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
+ constexpr int VEC_SIZE = 4;
+
+ union VFloat {
+- vectro float v;
++ __vector float v;
+ float e[4];
+ VFloat() {}
+- VFloat(vector float v) : v(v) {}
+- operator vector float & () { return v; }
++ VFloat(__vector float v) : v(v) {}
++ operator __vector float & () { return v; }
+ };
+ struct VMask {
+- vector unsigned int v;
++ __vector unsigned int v;
+ VMask() {}
+- VMask(vector unsigned int v) : v(v) {}
+- operator vector unsigned int & () { return v; }
++ VMask(__vector unsigned int v) : v(v) {}
++ operator __vector unsigned int & () { return v; }
+ };
+
+ ICBC_FORCEINLINE float & lane(VFloat & v, int i) {
+@@ -1213,15 +1213,15 @@ ICBC_FORCEINLINE float & lane(VFloat & v
+ }
+
+ ICBC_FORCEINLINE VFloat vzero() {
+- return vec_splats(0.0f);
++ return ( __vector float ){ 0.0f };
+ }
+
+ ICBC_FORCEINLINE VFloat vbroadcast(float a) {
+- return vec_splats(a);
++ return ( __vector float ){ a };
+ }
+
+ ICBC_FORCEINLINE VFloat vload(const float * ptr) {
+- return vec_ld(ptr)
++ return ( __vector float ){ ptr[0], ptr[1], ptr[2], ptr[3] };
+ }
+
+ ICBC_FORCEINLINE VFloat operator+(VFloat a, VFloat b) {
+@@ -1233,16 +1233,16 @@ ICBC_FORCEINLINE VFloat operator-(VFloat
+ }
+
+ ICBC_FORCEINLINE VFloat operator*(VFloat a, VFloat b) {
+- return vec_madd(a, b, vec_splats(-0.0f));
++ return vec_madd(a, b, ( __vector float ){ -0.0f });
+ }
+
+ ICBC_FORCEINLINE VFloat vrcp(VFloat a) {
+ #if ICBC_USE_RCP
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.vec );
++ __vector float estimate = vec_re( v.vec );
+
+ // one round of Newton-Rhaphson refinement
+- vector float diff = vec_nmsub( estimate, v.vec, vec_splats( 1.0f ) );
++ __vector float diff = vec_nmsub( estimate, v.vec, ( __vector float ){ 1.0f } );
+ return vec_madd(diff, estimate, estimate );
+ #else
+ return vec_div(vec_splats(1),a);
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:50:09.980146060 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-25 13:53:36.871679483 -0300
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 14:37:32.907095799 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 14:37:35.891108297 -0300
@@ -27,14 +27,12 @@
#ifndef SQUISH_SIMD_VE_H
#define SQUISH_SIMD_VE_H
@@ -119,8 +185,8 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
} // namespace squish
diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
---- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:50:20.447323496 -0300
-+++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:54:29.543307998 -0300
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 14:37:32.910095811 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-25 14:37:35.892108302 -0300
@@ -31,7 +31,7 @@
namespace squish {
@@ -206,64 +272,3 @@ diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
};
} // namespace squish
-diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
---- src/nvtt/icbc.h.orig 2021-02-25 14:19:04.692618121 -0300
-+++ src/nvtt/icbc.h 2021-02-25 14:23:52.364456026 -0300
-@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
- constexpr int VEC_SIZE = 4;
-
- union VFloat {
-- vectro float v;
-+ __vector float v;
- float e[4];
- VFloat() {}
-- VFloat(vector float v) : v(v) {}
-- operator vector float & () { return v; }
-+ VFloat(__vector float v) : v(v) {}
-+ operator __vector float & () { return v; }
- };
- struct VMask {
-- vector unsigned int v;
-+ __vector unsigned int v;
- VMask() {}
-- VMask(vector unsigned int v) : v(v) {}
-- operator vector unsigned int & () { return v; }
-+ VMask(__vector unsigned int v) : v(v) {}
-+ operator __vector unsigned int & () { return v; }
- };
-
- ICBC_FORCEINLINE float & lane(VFloat & v, int i) {
-@@ -1213,11 +1213,11 @@ ICBC_FORCEINLINE float & lane(VFloat & v
- }
-
- ICBC_FORCEINLINE VFloat vzero() {
-- return vec_splats(0.0f);
-+ return ( __vector float ){ 0.0f };
- }
-
- ICBC_FORCEINLINE VFloat vbroadcast(float a) {
-- return vec_splats(a);
-+ return ( __vector float ){ a };
- }
-
- ICBC_FORCEINLINE VFloat vload(const float * ptr) {
-@@ -1233,16 +1233,16 @@ ICBC_FORCEINLINE VFloat operator-(VFloat
- }
-
- ICBC_FORCEINLINE VFloat operator*(VFloat a, VFloat b) {
-- return vec_madd(a, b, vec_splats(-0.0f));
-+ return vec_madd(a, b, ( __vector float ){ -0.0f });
- }
-
- ICBC_FORCEINLINE VFloat vrcp(VFloat a) {
- #if ICBC_USE_RCP
- // get the reciprocal estimate
-- vector float estimate = vec_re( v.vec );
-+ __vector float estimate = vec_re( v.vec );
-
- // one round of Newton-Rhaphson refinement
-- vector float diff = vec_nmsub( estimate, v.vec, vec_splats( 1.0f ) );
-+ __vector float diff = vec_nmsub( estimate, v.vec, ( __vector float ){ 1.0f } );
- return vec_madd(diff, estimate, estimate );
- #else
- return vec_div(vec_splats(1),a);
commit 8583d501e6eb71fcf5fb9dadcb15b03d9fd20e93
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:24:54 2021 -0300
More altivec code that needs adaptation and correction of typos
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index b4c7ce3..79c9c53 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -206,3 +206,64 @@ diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
};
} // namespace squish
+diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
+--- src/nvtt/icbc.h.orig 2021-02-25 14:19:04.692618121 -0300
++++ src/nvtt/icbc.h 2021-02-25 14:23:52.364456026 -0300
+@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
+ constexpr int VEC_SIZE = 4;
+
+ union VFloat {
+- vectro float v;
++ __vector float v;
+ float e[4];
+ VFloat() {}
+- VFloat(vector float v) : v(v) {}
+- operator vector float & () { return v; }
++ VFloat(__vector float v) : v(v) {}
++ operator __vector float & () { return v; }
+ };
+ struct VMask {
+- vector unsigned int v;
++ __vector unsigned int v;
+ VMask() {}
+- VMask(vector unsigned int v) : v(v) {}
+- operator vector unsigned int & () { return v; }
++ VMask(__vector unsigned int v) : v(v) {}
++ operator __vector unsigned int & () { return v; }
+ };
+
+ ICBC_FORCEINLINE float & lane(VFloat & v, int i) {
+@@ -1213,11 +1213,11 @@ ICBC_FORCEINLINE float & lane(VFloat & v
+ }
+
+ ICBC_FORCEINLINE VFloat vzero() {
+- return vec_splats(0.0f);
++ return ( __vector float ){ 0.0f };
+ }
+
+ ICBC_FORCEINLINE VFloat vbroadcast(float a) {
+- return vec_splats(a);
++ return ( __vector float ){ a };
+ }
+
+ ICBC_FORCEINLINE VFloat vload(const float * ptr) {
+@@ -1233,16 +1233,16 @@ ICBC_FORCEINLINE VFloat operator-(VFloat
+ }
+
+ ICBC_FORCEINLINE VFloat operator*(VFloat a, VFloat b) {
+- return vec_madd(a, b, vec_splats(-0.0f));
++ return vec_madd(a, b, ( __vector float ){ -0.0f });
+ }
+
+ ICBC_FORCEINLINE VFloat vrcp(VFloat a) {
+ #if ICBC_USE_RCP
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.vec );
++ __vector float estimate = vec_re( v.vec );
+
+ // one round of Newton-Rhaphson refinement
+- vector float diff = vec_nmsub( estimate, v.vec, vec_splats( 1.0f ) );
++ __vector float diff = vec_nmsub( estimate, v.vec, ( __vector float ){ 1.0f } );
+ return vec_madd(diff, estimate, estimate );
+ #else
+ return vec_div(vec_splats(1),a);
commit d4c836a29ab426649eeba9c80590899b1201feaa
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:05:35 2021 -0300
Correct wrong text cut and tabulation on ppc64le patch
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 80358d2..b4c7ce3 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -77,7 +77,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
{
- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
-+ 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
@@ -90,7 +90,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
// one round of Newton-Rhaphson refinement
- vector float diff = vec_nmsub( estimate, v.m_v, vec_splats( 1.0f ) );
-+ __vector float diff = vec_nmsub( estimate, v.m_( __vector float ){ 1.0f } );
++ __vector float diff = vec_nmsub( estimate, v.m_v, ( __vector float ){ 1.0f } );
return Vec4( vec_madd( diff, estimate, estimate ) );
}
commit ecbbd6cbff6f948b1db6c830161a9dc42166ba53
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 13:55:32 2021 -0300
Another attempt to get altivec working
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index c19a010..80358d2 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,25 +1,34 @@
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:26:09.519676632 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-25 13:37:25.107712987 -0300
-@@ -32,7 +32,7 @@
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:50:09.980146060 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 13:53:36.871679483 -0300
+@@ -27,14 +27,12 @@
+ #ifndef SQUISH_SIMD_VE_H
+ #define SQUISH_SIMD_VE_H
+
+-#if !defined(__APPLE_ALTIVEC__) || defined(__PPC64__)
+ #include <altivec.h>
+ #undef bool
+-#endif
namespace nvsquish {
--#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
+-#define VEC4_CONST( X ) Vec4( vec_splats( (float)X ) )
+#define VEC4_CONST( X ) Vec4( ( __vector float ) { X } )
class Vec4
{
-@@ -41,7 +41,7 @@ public:
+@@ -42,8 +40,8 @@ public:
+ typedef Vec4 Arg;
Vec4() {}
-
+-
- explicit Vec4( vector float v ) : m_v( v ) {}
++
+ explicit Vec4( __vector float v ) : m_v( v ) {}
Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
-@@ -53,7 +53,7 @@ public:
+@@ -55,7 +53,7 @@ public:
Vec4( const float * v )
{
@@ -28,7 +37,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
u.c[0] = v[0];
u.c[1] = v[1];
u.c[2] = v[2];
-@@ -63,7 +63,7 @@ public:
+@@ -65,7 +63,7 @@ public:
Vec4( float x, float y, float z, float w )
{
@@ -37,7 +46,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
u.c[0] = x;
u.c[1] = y;
u.c[2] = z;
-@@ -73,14 +73,14 @@ public:
+@@ -75,14 +73,14 @@ public:
Vec3 GetVec3() const
{
@@ -54,25 +63,25 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
u.v = m_v;
return u.c[0];
}
-@@ -104,7 +104,7 @@ public:
+@@ -106,7 +104,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, vec_splats( -0.0f ) );
+ m_v = vec_madd( m_v, v.m_v, ( __vector float ){ -0.0f } );
return *this;
}
-@@ -120,7 +120,7 @@ public:
+@@ -122,7 +120,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 } ) );
+- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
++ return Vec4( vec_madd( left.m_v, right.m_v, ( __vector float ){ -0.0f } ) );
}
//! Returns a*b + c
-@@ -138,10 +138,10 @@ public:
+@@ -140,10 +138,10 @@ public:
friend Vec4 Reciprocal( Vec4::Arg v )
{
// get the reciprocal estimate
@@ -80,12 +89,12 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
+ __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 } );
+- vector float diff = vec_nmsub( estimate, v.m_v, vec_splats( 1.0f ) );
++ __vector float diff = vec_nmsub( estimate, v.m_( __vector float ){ 1.0f } );
return Vec4( vec_madd( diff, estimate, estimate ) );
}
-@@ -162,12 +162,12 @@ public:
+@@ -164,12 +162,12 @@ public:
friend Vec4 CompareEqual( Vec4::Arg left, Vec4::Arg right )
{
@@ -100,7 +109,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
}
friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
-@@ -176,7 +176,7 @@ public:
+@@ -178,7 +176,7 @@ public:
}
private:
@@ -110,8 +119,8 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
} // namespace squish
diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
---- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:26:42.862873033 -0300
-+++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:29:13.365759490 -0300
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:50:20.447323496 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:54:29.543307998 -0300
@@ -31,7 +31,7 @@
namespace squish {
commit 38d3eb10d728d43d7200454ab880d04f7544c88d
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 13:40:58 2021 -0300
Tenative ppc64le fix patch
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 2cc7132..c19a010 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,46 +1,199 @@
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-25 12:39:52.342544144 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-25 12:41:51.141231967 -0300
-@@ -27,14 +27,12 @@
- #ifndef SQUISH_SIMD_VE_H
- #define SQUISH_SIMD_VE_H
-
--#if !defined(__APPLE_ALTIVEC__) || defined(__PPC64__)
- #include <altivec.h>
- #undef bool
--#endif
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:26:09.519676632 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 13:37:25.107712987 -0300
+@@ -32,7 +32,7 @@
namespace nvsquish {
--#define VEC4_CONST( X ) Vec4( vec_splats( (float)X ) )
-+#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
+-#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
++#define VEC4_CONST( X ) Vec4( ( __vector float ) { X } )
class Vec4
{
-@@ -106,7 +104,7 @@ public:
+@@ -41,7 +41,7 @@ public:
+
+ Vec4() {}
+
+- explicit Vec4( vector float v ) : m_v( v ) {}
++ explicit Vec4( __vector float v ) : m_v( v ) {}
+
+ Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
+
+@@ -53,7 +53,7 @@ public:
+
+ Vec4( const float * v )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = v[0];
+ u.c[1] = v[1];
+ u.c[2] = v[2];
+@@ -63,7 +63,7 @@ public:
+
+ Vec4( float x, float y, float z, float w )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = x;
+ u.c[1] = y;
+ u.c[2] = z;
+@@ -73,14 +73,14 @@ public:
+
+ Vec3 GetVec3() const
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.v = m_v;
+ return Vec3( u.c[0], u.c[1], u.c[2] );
+ }
+
+ float GetX() const
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.v = m_v;
+ return u.c[0];
+ }
+@@ -104,7 +104,7 @@ public:
Vec4& operator*=( Arg v )
{
-- m_v = vec_madd( m_v, v.m_v, vec_splats( -0.0f ) );
-+ 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 } );
++ m_v = vec_madd( m_v, v.m_v, ( __vector float ){ -0.0f } );
return *this;
}
-@@ -122,7 +120,7 @@ public:
+@@ -120,7 +120,7 @@ public:
friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
{
-- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
-+ 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 } ) );
++ return Vec4( vec_madd( left.m_v, right.m_v, ( __vector float ){ -0.0f } ) );
}
//! Returns a*b + c
-@@ -143,7 +141,7 @@ public:
- vector float estimate = vec_re( v.m_v );
+@@ -138,10 +138,10 @@ public:
+ friend Vec4 Reciprocal( Vec4::Arg v )
+ {
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.m_v );
++ __vector float estimate = vec_re( v.m_v );
// one round of Newton-Rhaphson refinement
-- vector float diff = vec_nmsub( estimate, v.m_v, vec_splats( 1.0f ) );
-+ 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 } );
++ __vector float diff = vec_nmsub( estimate, v.m_v, ( __vector float ){ 1.0f } );
return Vec4( vec_madd( diff, estimate, estimate ) );
}
+@@ -162,12 +162,12 @@ public:
+
+ friend Vec4 CompareEqual( Vec4::Arg left, Vec4::Arg right )
+ {
+- return Vec4( ( vector float )vec_cmpeq( left.m_v, right.m_v ) );
++ return Vec4( ( __vector float )vec_cmpeq( left.m_v, right.m_v ) );
+ }
+
+ friend Vec4 Select( Vec4::Arg off, Vec4::Arg on, Vec4::Arg bits )
+ {
+- return Vec4( vec_sel( off.m_v, on.m_v, ( vector unsigned int )bits.m_v ) );
++ return Vec4( vec_sel( off.m_v, on.m_v, ( __vector unsigned int )bits.m_v ) );
+ }
+
+ friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
+@@ -176,7 +176,7 @@ public:
+ }
+
+ private:
+- vector float m_v;
++ __vector float m_v;
+ };
+
+ } // namespace squish
+diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:26:42.862873033 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:29:13.365759490 -0300
+@@ -31,7 +31,7 @@
+
+ namespace squish {
+
+-#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
++#define VEC4_CONST( X ) Vec4( ( __vector float ){ X } )
+
+ class Vec4
+ {
+@@ -40,7 +40,7 @@ public:
+
+ Vec4() {}
+
+- explicit Vec4( vector float v ) : m_v( v ) {}
++ explicit Vec4( __vector float v ) : m_v( v ) {}
+
+ Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
+
+@@ -52,7 +52,7 @@ public:
+
+ explicit Vec4( float s )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = s;
+ u.c[1] = s;
+ u.c[2] = s;
+@@ -62,7 +62,7 @@ public:
+
+ Vec4( float x, float y, float z, float w )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = x;
+ u.c[1] = y;
+ u.c[2] = z;
+@@ -72,7 +72,7 @@ public:
+
+ Vec3 GetVec3() const
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.v = m_v;
+ return Vec3( u.c[0], u.c[1], u.c[2] );
+ }
+@@ -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
+@@ -130,10 +130,10 @@ public:
+ friend Vec4 Reciprocal( Vec4::Arg v )
+ {
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.m_v );
++ __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 ) );
+ }
+
+@@ -158,7 +158,7 @@ public:
+ }
+
+ private:
+- vector float m_v;
++ __vector float m_v;
+ };
+
+ } // namespace squish
commit 457de10155f7d19e381f689e6725f491394a9558
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 13:12:52 2021 -0300
Correct non x86 build issues
diff --git a/nvidia-texture-tools-aarch64.patch b/nvidia-texture-tools-aarch64.patch
new file mode 100644
index 0000000..c9c956f
--- /dev/null
+++ b/nvidia-texture-tools-aarch64.patch
@@ -0,0 +1,24 @@
+diff -up src/nvcore/nvcore.h.orig src/nvcore/nvcore.h
+--- src/nvcore/nvcore.h.orig 2021-02-25 10:27:37.067879391 -0300
++++ src/nvcore/nvcore.h 2021-02-25 10:28:11.034088040 -0300
+@@ -112,7 +112,7 @@
+ #elif defined POSH_CPU_STRONGARM
+ # define NV_CPU_ARM 1
+ #elif defined POSH_CPU_AARCH64
+-# define NV_CPU_ARM_64 1
++# define NV_CPU_AARCH64 1
+ #elif defined POSH_CPU_E2K
+ # define NV_CPU_E2K 1
+ #elif defined POSH_CPU_MIPS
+diff -up extern/poshlib/posh.h.orig extern/poshlib/posh.h
+--- extern/poshlib/posh.h.orig 2021-02-25 10:27:44.795926865 -0300
++++ extern/poshlib/posh.h 2021-02-25 10:28:34.666233220 -0300
+@@ -514,7 +514,7 @@ LCC predefines the following:
+ # define POSH_CPU_STRING "ARM"
+ #endif
+
+-#if defined __aarch64__
++#if defined __aarch64__ || defined __arm64__
+ # define POSH_CPU_AARCH64 1
+ # define POSH_CPU_STRING "ARM64"
+ #endif
diff --git a/nvidia-texture-tools-debug.patch b/nvidia-texture-tools-debug.patch
index 673edc4..929c77f 100644
--- a/nvidia-texture-tools-debug.patch
+++ b/nvidia-texture-tools-debug.patch
@@ -1,16 +1,3 @@
-diff -up CMakeLists.txt.orig CMakeLists.txt
---- CMakeLists.txt.orig 2021-02-24 15:38:17.881472659 -0300
-+++ CMakeLists.txt 2021-02-24 15:38:20.230485965 -0300
-@@ -24,6 +24,9 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
- ADD_DEFINITIONS(-D_DEBUG=1)
- ENDIF()
-
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNV_NO_ASSERT=1")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNV_NO_ASSERT=1")
-+
- IF(NVTT_SHARED)
- SET(NVCORE_SHARED TRUE)
- SET(NVMATH_SHARED TRUE)
diff -up src/nvcore/CMakeLists.txt.orig src/nvcore/CMakeLists.txt
--- src/nvcore/CMakeLists.txt.orig 2021-02-24 15:38:17.873472614 -0300
+++ src/nvcore/CMakeLists.txt 2021-02-24 15:38:20.228485954 -0300
@@ -64,3 +51,61 @@ diff -up src/bc7/avpcl_mode5.cpp.orig src/bc7/avpcl_mode5.cpp
toterr[region] += besterr;
// do A index
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-25 09:37:08.120845257 -0300
++++ CMakeLists.txt 2021-02-25 09:37:14.926885247 -0300
+@@ -28,6 +28,9 @@ IF(BUILD_SQUISH_WITH_ALTIVEC)
+ ADD_DEFINITIONS(-maltivec)
+ ENDIF(BUILD_SQUISH_WITH_ALTIVEC)
+
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNV_NO_ASSERT=1 -DNV_DEBUG_PRINT=0")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNV_NO_ASSERT=1 -DNV_DEBUG_PRINT=0")
++
+ IF(NVTT_SHARED)
+ SET(NVCORE_SHARED TRUE)
+ SET(NVMATH_SHARED TRUE)
+diff -up src/nvtt/tools/cmdline.h.orig src/nvtt/tools/cmdline.h
+--- src/nvtt/tools/cmdline.h.orig 2021-02-25 11:03:12.258338108 -0300
++++ src/nvtt/tools/cmdline.h 2021-02-25 11:04:02.152643276 -0300
+@@ -33,10 +33,14 @@
+
+ struct MyMessageHandler : public nv::MessageHandler {
+ MyMessageHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::setMessageHandler( this );
++#endif
+ }
+ ~MyMessageHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::resetMessageHandler();
++#endif
+ }
+
+ virtual void log( const char * str, va_list arg ) {
+@@ -50,20 +54,26 @@ struct MyMessageHandler : public nv::Mes
+
+ struct MyAssertHandler : public nv::AssertHandler {
+ MyAssertHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::setAssertHandler( this );
+ nv::debug::enableSigHandler(/*interactive=*/true);
++#endif
+ }
+ ~MyAssertHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::resetAssertHandler();
++#endif
+ }
+
+ // Handler method, note that func might be NULL!
+ virtual int assertion( const char *exp, const char *file, int line, const char *func, const char *msg, va_list arg ) {
+ fprintf(stderr, "Assertion failed: %s\nIn %s:%d\n", exp, file, line);
++#if !NV_NO_ASSERT
+ nv::debug::dumpInfo();
+ if (nv::debug::isDebuggerPresent()) {
+ return NV_ABORT_DEBUG;
+ }
++#endif
+ exit(1);
+ }
+ };
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 9b32672..2cc7132 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,62 +1,7 @@
-diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
---- extern/libsquish-1.15/simd_ve.h.orig 2021-02-24 16:12:12.187577193 -0300
-+++ extern/libsquish-1.15/simd_ve.h 2021-02-24 16:24:04.568285598 -0300
-@@ -23,15 +23,15 @@
-
- -------------------------------------------------------------------------- */
-
--#ifndef SQUISH_SIMD_VE_H
--#define SQUISH_SIMD_VE_H
-+#ifndef NV_SQUISH_SIMD_VE_H
-+#define NV_SQUISH_SIMD_VE_H
-
- #include <altivec.h>
- #undef bool
-
- namespace squish {
-
--#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
-+#define VEC4_CONST( X ) Vec4( ( vec_splats( (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, vec_splats( -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, vec_splats( -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, vec_splats( 1.0f ) );
- return Vec4( vec_madd( diff, estimate, estimate ) );
- }
-
-@@ -163,4 +163,4 @@ private:
-
- } // namespace squish
-
--#endif // ndef SQUISH_SIMD_VE_H
-+#endif // ndef NV_SQUISH_SIMD_VE_H
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-24 16:12:00.057516674 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-24 16:12:52.778779698 -0300
-@@ -27,10 +27,8 @@
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 12:39:52.342544144 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 12:41:51.141231967 -0300
+@@ -27,14 +27,12 @@
#ifndef SQUISH_SIMD_VE_H
#define SQUISH_SIMD_VE_H
@@ -67,3 +12,35 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
namespace nvsquish {
+-#define VEC4_CONST( X ) Vec4( vec_splats( (float)X ) )
++#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
+
+ class Vec4
+ {
+@@ -106,7 +104,7 @@ public:
+
+ Vec4& operator*=( Arg v )
+ {
+- m_v = vec_madd( m_v, v.m_v, vec_splats( -0.0f ) );
++ m_v = vec_madd( m_v, v.m_v, ( vector float ){ -0.0f } );
+ return *this;
+ }
+
+@@ -122,7 +120,7 @@ public:
+
+ friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
+ {
+- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
++ return Vec4( vec_madd( left.m_v, right.m_v, ( vector float ){ -0.0f } ) );
+ }
+
+ //! Returns a*b + c
+@@ -143,7 +141,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, vec_splats( 1.0f ) );
++ vector float diff = vec_nmsub( estimate, v.m_v, ( vector float ){ 1.0f } );
+ return Vec4( vec_madd( diff, estimate, estimate ) );
+ }
+
diff --git a/nvidia-texture-tools-s390.patch b/nvidia-texture-tools-s390.patch
index 8ab2ade..88fb051 100644
--- a/nvidia-texture-tools-s390.patch
+++ b/nvidia-texture-tools-s390.patch
@@ -25,3 +25,48 @@ diff -up extern/poshlib/posh.h.orig extern/poshlib/posh.h
#if !defined POSH_CPU_STRING
# error POSH cannot determine target CPU
# define POSH_CPU_STRING "Unknown" /* this is here for Doxygen's benefit */
+diff -up src/nvcore/Debug.h.orig src/nvcore/Debug.h
+--- src/nvcore/Debug.h.orig 2021-02-25 10:17:35.200199481 -0300
++++ src/nvcore/Debug.h 2021-02-25 10:17:56.318328346 -0300
+@@ -166,7 +166,7 @@ NVCORE_API void NV_CDECL nvDebugPrint( c
+ namespace nv
+ {
+ inline bool isValidPtr(const void * ptr) {
+- #if NV_CPU_X86_64 || POSH_CPU_PPC64 || NV_CPU_AARCH64
++ #if NV_CPU_X86_64 || POSH_CPU_PPC64 || NV_CPU_AARCH64 || NV_CPU_S390
+ if (ptr == NULL) return true;
+ if (reinterpret_cast<uint64>(ptr) < 0x10000ULL) return false;
+ if (reinterpret_cast<uint64>(ptr) >= 0x000007FFFFFEFFFFULL) return false;
+diff -up src/nvcore/Debug.h.orig src/nvcore/Debug.h
+diff -up src/nvthread/Atomic.h.orig src/nvthread/Atomic.h
+--- src/nvthread/Atomic.h.orig 2021-02-25 11:42:21.289380524 -0300
++++ src/nvthread/Atomic.h 2021-02-25 11:43:17.214706223 -0300
+@@ -78,6 +78,16 @@ namespace nv {
+ uint32 ret = *ptr; // replace with ldrex?
+ nvCompilerReadWriteBarrier();
+ return ret;
++#elif POSH_CPU_S390
++ // need more specific cpu type for ppc64?
++ // also utilizes a full barrier
++ // currently treating load like x86 - this could be wrong
++
++ // this is the easiest but slowest way to do this
++ nvCompilerReadWriteBarrier();
++ uint32 ret = *ptr; // replace with ldrex?
++ nvCompilerReadWriteBarrier();
++ return ret;
+ #elif POSH_CPU_E2K
+ // need more specific cpu type for e2k?
+ // also utilizes a full barrier
+@@ -112,6 +122,11 @@ namespace nv {
+ nvCompilerReadWriteBarrier();
+ *ptr = value; //strex?
+ nvCompilerReadWriteBarrier();
++#elif POSH_CPU_S390
++ // this is the easiest but slowest way to do this
++ nvCompilerReadWriteBarrier();
++ *ptr = value; //strex?
++ nvCompilerReadWriteBarrier();
+ #elif POSH_CPU_E2K
+ // this is the easiest but slowest way to do this
+ nvCompilerReadWriteBarrier();
diff --git a/nvidia-texture-tools-simd.patch b/nvidia-texture-tools-simd.patch
index c1e2056..d13baae 100644
--- a/nvidia-texture-tools-simd.patch
+++ b/nvidia-texture-tools-simd.patch
@@ -40,3 +40,17 @@ diff -up extern/CMP_Core/source/cmp_math_vec4.h.orig extern/CMP_Core/source/cmp_
typedef Vec4<float> CMP_Vec4f;
typedef Vec4<double> CMP_Vec4d;
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-25 09:01:12.611528660 -0300
++++ CMakeLists.txt 2021-02-25 09:05:38.954201319 -0300
+@@ -24,6 +24,10 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ ADD_DEFINITIONS(-D_DEBUG=1)
+ ENDIF()
+
++IF(BUILD_SQUISH_WITH_ALTIVEC)
++ ADD_DEFINITIONS(-maltivec)
++ENDIF(BUILD_SQUISH_WITH_ALTIVEC)
++
+ IF(NVTT_SHARED)
+ SET(NVCORE_SHARED TRUE)
+ SET(NVMATH_SHARED TRUE)
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 90aee35..19a8f95 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -27,12 +27,14 @@ Patch3: %{name}-mips.patch
Patch4: %{name}-s390.patch
# add PPCLE support
Patch5: %{name}-ppcle.patch
+# add aarch64 support
+Patch6: %{name}-aarch64.patch
# Do not presume SSE is available
-Patch6: %{name}-simd.patch
+Patch7: %{name}-simd.patch
# Do not force compiler flags
-Patch7: %{name}-flags.patch
+Patch8: %{name}-flags.patch
# Only implemented for x86
-Patch8: %{name}-debug.patch
+Patch9: %{name}-debug.patch
%description
The NVIDIA Texture Tools is a collection of image processing and texture
@@ -63,8 +65,9 @@ Headers and libraries for development with %{name}.
%patch5 -p0
%patch6 -p0
%patch7 -p0
-%ifnarch %{ix86} x86_64
%patch8 -p0
+%ifnarch %{ix86} x86_64
+%patch9 -p0
%endif
%build
commit d162c8ed97d5cf9801c0b458818657a79989233f
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 08:24:53 2021 -0300
Correct typo
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 09c1262..90aee35 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -64,7 +64,7 @@ Headers and libraries for development with %{name}.
%patch6 -p0
%patch7 -p0
%ifnarch %{ix86} x86_64
-%patch78 -p0
+%patch8 -p0
%endif
%build
commit 7e1a82c1f5d76277475b8a9342abd577325de7d4
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 08:03:22 2021 -0300
Update to version 2.1.2
diff --git a/.gitignore b/.gitignore
index 25998c4..246b0a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/nvidia-texture-tools-2.0.8-1.tar.gz
+/2.1.2.tar.gz
diff --git a/nvidia-texture-tools-2.0.8-gcc4.7.patch b/nvidia-texture-tools-2.0.8-gcc4.7.patch
deleted file mode 100644
index 773af16..0000000
--- a/nvidia-texture-tools-2.0.8-gcc4.7.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up nvidia-texture-tools/src/nvcore/Debug.cpp.orig nvidia-texture-tools/src/nvcore/Debug.cpp
---- nvidia-texture-tools/src/nvcore/Debug.cpp.orig 2012-05-18 22:10:11.359805471 -0300
-+++ nvidia-texture-tools/src/nvcore/Debug.cpp 2012-05-18 22:11:15.588807912 -0300
-@@ -34,6 +34,10 @@
- # endif
- #endif
-
-+#if NV_OS_LINUX
-+# include <unistd.h> // getpid
-+#endif
-+
- #if NV_OS_DARWIN
- # include <unistd.h> // getpid
- # include <sys/types.h>
diff --git a/nvidia-texture-tools-2.0.8-libdir.patch b/nvidia-texture-tools-2.0.8-libdir.patch
deleted file mode 100644
index b0cbcaa..0000000
--- a/nvidia-texture-tools-2.0.8-libdir.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig nvidia-texture-tools/src/nvcore/CMakeLists.txt
---- nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig 2012-05-18 23:32:42.120995054 -0300
-+++ nvidia-texture-tools/src/nvcore/CMakeLists.txt 2012-05-18 23:33:18.078996428 -0300
-@@ -47,5 +47,5 @@ TARGET_LINK_LIBRARIES(nvcore ${LIBS})
-
- INSTALL(TARGETS nvcore
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-diff -up nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig nvidia-texture-tools/src/nvimage/CMakeLists.txt
---- nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig 2012-05-18 23:32:37.775994885 -0300
-+++ nvidia-texture-tools/src/nvimage/CMakeLists.txt 2012-05-18 23:33:08.398996062 -0300
-@@ -67,6 +67,6 @@ TARGET_LINK_LIBRARIES(nvimage ${LIBS} nv
-
- INSTALL(TARGETS nvimage
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-
-diff -up nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig nvidia-texture-tools/src/nvmath/CMakeLists.txt
---- nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig 2012-05-18 23:32:31.192994634 -0300
-+++ nvidia-texture-tools/src/nvmath/CMakeLists.txt 2012-05-18 23:33:12.854996216 -0300
-@@ -33,5 +33,5 @@ TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvc
-
- INSTALL(TARGETS nvmath
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-diff -up nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig nvidia-texture-tools/src/nvtt/CMakeLists.txt
---- nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig 2012-05-18 23:32:18.184994143 -0300
-+++ nvidia-texture-tools/src/nvtt/CMakeLists.txt 2012-05-18 23:32:57.542995724 -0300
-@@ -58,7 +58,7 @@ TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcor
-
- INSTALL(TARGETS nvtt
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-
- INSTALL(FILES nvtt.h DESTINATION include/nvtt)
diff --git a/nvidia-texture-tools-2.0.8-png-api.patch b/nvidia-texture-tools-2.0.8-png-api.patch
deleted file mode 100644
index 0b22916..0000000
--- a/nvidia-texture-tools-2.0.8-png-api.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/src/nvimage/ImageIO.cpp
-===================================================================
---- src/src/nvimage/ImageIO.cpp (revision 9895)
-+++ src/src/nvimage/ImageIO.cpp (working copy)
-@@ -603,7 +603,7 @@
- {
- nvDebugCheck(png_ptr != NULL);
-
-- Stream * s = (Stream *)png_ptr->io_ptr;
-+ Stream * s = (Stream *)png_get_io_ptr(png_ptr);
- s->serialize(data, (int)length);
-
- if (s->isError()) {
diff --git a/nvidia-texture-tools-2.0.8-soversion.patch b/nvidia-texture-tools-2.0.8-soversion.patch
deleted file mode 100644
index cb418f2..0000000
--- a/nvidia-texture-tools-2.0.8-soversion.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -up nvidia-texture-tools/CMakeLists.txt.orig nvidia-texture-tools/CMakeLists.txt
---- nvidia-texture-tools/CMakeLists.txt.orig 2012-05-18 22:58:53.135917349 -0300
-+++ nvidia-texture-tools/CMakeLists.txt 2012-05-18 22:59:45.293919346 -0300
-@@ -2,6 +2,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
- PROJECT(NV)
- ENABLE_TESTING()
-
-+set(PACKAGE_VERSION 2.0.8)
-+set(LIBRARY_SOVERSION 2.0)
-+
- SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
-
-diff -up nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig nvidia-texture-tools/src/nvcore/CMakeLists.txt
---- nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig 2012-05-18 22:58:59.455917596 -0300
-+++ nvidia-texture-tools/src/nvcore/CMakeLists.txt 2012-05-18 23:00:45.677921655 -0300
-@@ -35,6 +35,10 @@ ENDIF(UNIX)
- IF(NVCORE_SHARED)
- ADD_DEFINITIONS(-DNVCORE_SHARED=1)
- ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
-+ SET_TARGET_PROPERTIES(nvcore
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVCORE_SHARED)
- ADD_LIBRARY(nvcore ${CORE_SRCS})
- ENDIF(NVCORE_SHARED)
-diff -up nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig nvidia-texture-tools/src/nvimage/CMakeLists.txt
---- nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig 2012-05-18 22:59:07.007917887 -0300
-+++ nvidia-texture-tools/src/nvimage/CMakeLists.txt 2012-05-18 23:00:58.557922157 -0300
-@@ -55,6 +55,10 @@ ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
- IF(NVIMAGE_SHARED)
- ADD_DEFINITIONS(-DNVIMAGE_SHARED=1)
- ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS})
-+ SET_TARGET_PROPERTIES(nvimage
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVIMAGE_SHARED)
- ADD_LIBRARY(nvimage ${IMAGE_SRCS})
- ENDIF(NVIMAGE_SHARED)
-diff -up nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig nvidia-texture-tools/src/nvmath/CMakeLists.txt
---- nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig 2012-05-18 22:59:13.119918119 -0300
-+++ nvidia-texture-tools/src/nvmath/CMakeLists.txt 2012-05-18 23:01:05.373922375 -0300
-@@ -21,6 +21,10 @@ ADD_DEFINITIONS(-DNVMATH_EXPORTS)
- IF(NVMATH_SHARED)
- ADD_DEFINITIONS(-DNVMATH_SHARED=1)
- ADD_LIBRARY(nvmath SHARED ${MATH_SRCS})
-+ SET_TARGET_PROPERTIES(nvmath
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVMATH_SHARED)
- ADD_LIBRARY(nvmath ${MATH_SRCS})
- ENDIF(NVMATH_SHARED)
-diff -up nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig nvidia-texture-tools/src/nvtt/CMakeLists.txt
---- nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig 2012-05-18 22:59:21.607918449 -0300
-+++ nvidia-texture-tools/src/nvtt/CMakeLists.txt 2012-05-18 23:01:12.133922682 -0300
-@@ -46,6 +46,10 @@ ADD_DEFINITIONS(-DNVTT_EXPORTS)
- IF(NVTT_SHARED)
- ADD_DEFINITIONS(-DNVTT_SHARED=1)
- ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS})
-+ SET_TARGET_PROPERTIES(nvtt
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVTT_SHARED)
- ADD_LIBRARY(nvtt ${NVTT_SRCS})
- ENDIF(NVTT_SHARED)
diff --git a/nvidia-texture-tools-2.0.8-wordsize.patch b/nvidia-texture-tools-2.0.8-wordsize.patch
deleted file mode 100644
index e93eaac..0000000
--- a/nvidia-texture-tools-2.0.8-wordsize.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up nvidia-texture-tools/src/nvcore/DefsGnucLinux.h.orig nvidia-texture-tools/src/nvcore/DefsGnucLinux.h
---- nvidia-texture-tools/src/nvcore/DefsGnucLinux.h.orig 2012-05-18 22:17:43.367822764 -0300
-+++ nvidia-texture-tools/src/nvcore/DefsGnucLinux.h 2012-05-18 22:19:50.709827759 -0300
-@@ -2,6 +2,8 @@
- #error "Do not include this file directly."
- #endif
-
-+#include <bits/wordsize.h>
-+
- // Function linkage
- #define DLL_IMPORT
- #if __GNUC__ >= 4
-@@ -58,8 +60,13 @@ typedef signed short int16;
- typedef unsigned int uint32;
- typedef signed int int32;
-
-+#if __WORDSIZE == 32
- typedef unsigned long long uint64;
- typedef signed long long int64;
-+#else
-+typedef unsigned long uint64;
-+typedef signed long int64;
-+#endif
-
- // Aliases
- typedef uint32 uint;
diff --git a/nvidia-texture-tools-aarch64.patch b/nvidia-texture-tools-aarch64.patch
deleted file mode 100644
index 7f9d09e..0000000
--- a/nvidia-texture-tools-aarch64.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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-arm.patch b/nvidia-texture-tools-arm.patch
deleted file mode 100644
index 3e6a8c6..0000000
--- a/nvidia-texture-tools-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nvidia-texture-tools/src/nvcore/nvcore.h.orig 2013-07-30 09:48:05.111350472 -0500
-+++ nvidia-texture-tools/src/nvcore/nvcore.h 2013-07-30 09:50:19.667643065 -0500
-@@ -70,6 +70,8 @@
- # define NV_CPU_X86 1
- #elif defined POSH_CPU_PPC
- # define NV_CPU_PPC 1
-+#elif defined POSH_CPU_STRONGARM
-+# define NV_CPU_STRONGARM 1
- #else
- # error "Unsupported CPU"
- #endif
diff --git a/nvidia-texture-tools-bool-null.patch b/nvidia-texture-tools-bool-null.patch
deleted file mode 100644
index bb5453f..0000000
--- a/nvidia-texture-tools-bool-null.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -up nvidia-texture-tools/src/nvimage/ImageIO.cpp.orig nvidia-texture-tools/src/nvimage/ImageIO.cpp
---- nvidia-texture-tools/src/nvimage/ImageIO.cpp.orig 2016-03-17 16:05:57.432384322 -0300
-+++ nvidia-texture-tools/src/nvimage/ImageIO.cpp 2016-03-17 16:07:43.769388394 -0300
-@@ -135,7 +135,7 @@ FloatImage * nv::ImageIO::loadFloat(cons
- StdInputStream stream(fileName);
-
- if (stream.isError()) {
-- return false;
-+ return NULL;
- }
-
- return loadFloat(fileName, stream);
-@@ -233,7 +233,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
- case TGA_TYPE_INDEXED:
- if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
- nvDebug( "*** ImageIO::loadTGA: Error, only 24bit paletted images are supported.\n" );
-- return false;
-+ return NULL;
- }
- pal = true;
- break;
-@@ -254,7 +254,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
-
- default:
- nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
-- return false;
-+ return NULL;
- }
-
- const uint pixel_size = (tga.pixel_size/8);
-@@ -621,7 +621,7 @@ Image * nv::ImageIO::loadPNG(Stream & s)
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if (png_ptr == NULL) {
- // nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name );
-- return false;
-+ return NULL;
- }
-
- // Allocate/initialize a memory block for the image information
-@@ -629,14 +629,14 @@ Image * nv::ImageIO::loadPNG(Stream & s)
- if (info_ptr == NULL) {
- png_destroy_read_struct(&png_ptr, NULL, NULL);
- // nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name );
-- return false;
-+ return NULL;
- }
-
- // Set up the error handling
- if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- // nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name );
-- return false;
-+ return NULL;
- }
-
- // Set up the I/O functions.
diff --git a/nvidia-texture-tools-check.patch b/nvidia-texture-tools-check.patch
new file mode 100644
index 0000000..976cc84
--- /dev/null
+++ b/nvidia-texture-tools-check.patch
@@ -0,0 +1,31 @@
+diff -up src/nvtt/tests/CMakeLists.txt.orig src/nvtt/tests/CMakeLists.txt
+--- src/nvtt/tests/CMakeLists.txt.orig 2021-02-23 06:12:25.272491130 -0300
++++ src/nvtt/tests/CMakeLists.txt 2021-02-23 06:12:47.525609378 -0300
+@@ -4,12 +4,12 @@ TARGET_LINK_LIBRARIES(filtertest nvcore
+
+ ADD_EXECUTABLE(nvtestsuite testsuite.cpp)
+ TARGET_LINK_LIBRARIES(nvtestsuite nvcore nvmath nvimage nvtt)
+-ADD_TEST(NVTT.TestSuite.Kodak.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 0 -out output-cuda-kodak)
+-ADD_TEST(NVTT.TestSuite.Waterloo.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 1 -out output-cuda-waterloo)
+-ADD_TEST(NVTT.TestSuite.Epic.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 2 -out output-cuda-epic)
+-ADD_TEST(NVTT.TestSuite.Kodak.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 0 -nocuda -out output-nocuda-kodak)
+-ADD_TEST(NVTT.TestSuite.Waterloo.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 1 -nocuda -out output-nocuda-waterloo)
+-ADD_TEST(NVTT.TestSuite.Epic.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 2 -nocuda -out output-nocuda-epic)
++ADD_TEST(NVTT.TestSuite.Kodak.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 0 -out output-cuda-kodak)
++ADD_TEST(NVTT.TestSuite.Waterloo.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 1 -out output-cuda-waterloo)
++ADD_TEST(NVTT.TestSuite.Epic.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 2 -out output-cuda-epic)
++ADD_TEST(NVTT.TestSuite.Kodak.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 0 -nocuda -out output-nocuda-kodak)
++ADD_TEST(NVTT.TestSuite.Waterloo.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 1 -nocuda -out output-nocuda-waterloo)
++ADD_TEST(NVTT.TestSuite.Epic.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 2 -nocuda -out output-nocuda-epic)
+
+ IF (CUDA_FOUND)
+ ADD_EXECUTABLE(driverapitest driverapi.cpp)
+@@ -31,7 +31,7 @@ TARGET_LINK_LIBRARIES(nvhdrtest nvcore n
+ #ADD_EXECUTABLE(bc1enc bc1enc.cpp)
+ #TARGET_LINK_LIBRARIES(bc1enc nvcore nvimage nvmath squish CMP_Core)
+
+-INSTALL(TARGETS nvtestsuite nvhdrtest DESTINATION bin)
++#INSTALL(TARGETS nvtestsuite nvhdrtest DESTINATION bin)
+
+ #include_directories("/usr/include/ffmpeg/")
+ #ADD_EXECUTABLE(nvmpegenc tools/mpegenc.cpp tools/cmdline.h)
diff --git a/nvidia-texture-tools-debug.patch b/nvidia-texture-tools-debug.patch
new file mode 100644
index 0000000..673edc4
--- /dev/null
+++ b/nvidia-texture-tools-debug.patch
@@ -0,0 +1,66 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-24 15:38:17.881472659 -0300
++++ CMakeLists.txt 2021-02-24 15:38:20.230485965 -0300
+@@ -24,6 +24,9 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ ADD_DEFINITIONS(-D_DEBUG=1)
+ ENDIF()
+
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNV_NO_ASSERT=1")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNV_NO_ASSERT=1")
++
+ IF(NVTT_SHARED)
+ SET(NVCORE_SHARED TRUE)
+ SET(NVMATH_SHARED TRUE)
+diff -up src/nvcore/CMakeLists.txt.orig src/nvcore/CMakeLists.txt
+--- src/nvcore/CMakeLists.txt.orig 2021-02-24 15:38:17.873472614 -0300
++++ src/nvcore/CMakeLists.txt 2021-02-24 15:38:20.228485954 -0300
+@@ -3,7 +3,6 @@ PROJECT(nvcore)
+ SET(CORE_SRCS
+ nvcore.h
+ Array.h
+- Debug.h Debug.cpp
+ DefsGnucDarwin.h
+ DefsGnucLinux.h
+ DefsGnucWin32.h
+diff -up src/bc7/avpcl_mode4.cpp.orig src/bc7/avpcl_mode4.cpp
+--- src/bc7/avpcl_mode4.cpp.orig 2021-02-24 15:51:20.362903501 -0300
++++ src/bc7/avpcl_mode4.cpp 2021-02-24 15:51:52.829087279 -0300
+@@ -519,7 +519,7 @@ static float map_colors(const Vector4 co
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : 0;
+ toterr += besterr;
+
+ // do A index
+@@ -647,7 +647,7 @@ static void assign_indices(const Tile &t
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[region][bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[region][bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : 0;
+ toterr[region] += besterr;
+
+ // do A index
+diff -up src/bc7/avpcl_mode5.cpp.orig src/bc7/avpcl_mode5.cpp
+--- src/bc7/avpcl_mode5.cpp.orig 2021-02-24 15:51:27.342943012 -0300
++++ src/bc7/avpcl_mode5.cpp 2021-02-24 15:51:46.341050553 -0300
+@@ -520,7 +520,7 @@ static float map_colors(const Vector4 co
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : 0;
+ toterr += besterr;
+
+ // do A index
+@@ -648,7 +648,7 @@ static void assign_indices(const Tile &t
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[region][bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[region][bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : 0;
+ toterr[region] += besterr;
+
+ // do A index
diff --git a/nvidia-texture-tools-docs.patch b/nvidia-texture-tools-docs.patch
new file mode 100644
index 0000000..e8316ca
--- /dev/null
+++ b/nvidia-texture-tools-docs.patch
@@ -0,0 +1,18 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-23 07:27:10.611067241 -0300
++++ CMakeLists.txt 2021-02-23 07:27:35.953203458 -0300
+@@ -38,10 +38,10 @@ ADD_SUBDIRECTORY(extern)
+ ADD_SUBDIRECTORY(src)
+
+ # These files should only be installed when creating packages.
+-INSTALL(FILES
+- LICENSE
+- README.md
+- DESTINATION share/doc/nvtt)
++# INSTALL(FILES
++# LICENSE
++# README.md
++# DESTINATION share/doc/nvtt)
+
+ # Add packaging support
+ INCLUDE(InstallRequiredSystemLibraries)
diff --git a/nvidia-texture-tools-flags.patch b/nvidia-texture-tools-flags.patch
new file mode 100644
index 0000000..98a8c33
--- /dev/null
+++ b/nvidia-texture-tools-flags.patch
@@ -0,0 +1,12 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-24 11:32:41.101973054 -0300
++++ CMakeLists.txt 2021-02-24 11:32:46.452001665 -0300
+@@ -19,8 +19,6 @@ else()
+ message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+ endif()
+
+-INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
+-
+ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ SET(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Postfix for debug build libraries.")
+ ADD_DEFINITIONS(-D_DEBUG=1)
diff --git a/nvidia-texture-tools-libs.patch b/nvidia-texture-tools-libs.patch
new file mode 100644
index 0000000..b97c9e4
--- /dev/null
+++ b/nvidia-texture-tools-libs.patch
@@ -0,0 +1,153 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-23 05:07:03.217873178 -0300
++++ CMakeLists.txt 2021-02-23 05:07:30.217012734 -0300
+@@ -2,6 +2,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
+ PROJECT(NV)
+ ENABLE_TESTING()
+
++set(PACKAGE_VERSION 2.1.2)
++set(LIBRARY_SOVERSION 2.1)
++
+ SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
+
+@@ -23,6 +26,12 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ ADD_DEFINITIONS(-D_DEBUG=1)
+ ENDIF()
+
++IF(NVTT_SHARED)
++ SET(NVCORE_SHARED TRUE)
++ SET(NVMATH_SHARED TRUE)
++ SET(NVIMAGE_SHARED TRUE)
++ SET(NVTHREAD_SHARED TRUE)
++ENDIF(NVTT_SHARED)
+
+ ADD_SUBDIRECTORY(extern)
+
+diff -up src/nvcore/CMakeLists.txt.orig src/nvcore/CMakeLists.txt
+--- src/nvcore/CMakeLists.txt.orig 2021-02-22 18:18:43.500403584 -0300
++++ src/nvcore/CMakeLists.txt 2021-02-22 18:19:32.913676238 -0300
+@@ -33,6 +33,10 @@ ENDIF(UNIX)
+ IF(NVCORE_SHARED)
+ ADD_DEFINITIONS(-DNVCORE_SHARED=1)
+ ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
++ SET_TARGET_PROPERTIES(nvcore
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVCORE_SHARED)
+ ADD_LIBRARY(nvcore ${CORE_SRCS})
+ ENDIF(NVCORE_SHARED)
+@@ -46,5 +50,5 @@ endif()
+
+ INSTALL(TARGETS nvcore
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+diff -up src/nvimage/CMakeLists.txt.orig src/nvimage/CMakeLists.txt
+--- src/nvimage/CMakeLists.txt.orig 2021-02-22 18:19:56.299805277 -0300
++++ src/nvimage/CMakeLists.txt 2021-02-22 18:20:51.082107555 -0300
+@@ -50,6 +50,10 @@ ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
+ IF(NVIMAGE_SHARED)
+ ADD_DEFINITIONS(-DNVIMAGE_SHARED=1)
+ ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS})
++ SET_TARGET_PROPERTIES(nvimage
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVIMAGE_SHARED)
+ ADD_LIBRARY(nvimage ${IMAGE_SRCS})
+ ENDIF(NVIMAGE_SHARED)
+@@ -58,6 +62,6 @@ TARGET_LINK_LIBRARIES(nvimage ${LIBS} nv
+
+ INSTALL(TARGETS nvimage
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+
+diff -up src/nvmath/CMakeLists.txt.orig src/nvmath/CMakeLists.txt
+--- src/nvmath/CMakeLists.txt.orig 2021-02-22 18:21:03.021173431 -0300
++++ src/nvmath/CMakeLists.txt 2021-02-22 18:21:57.570474430 -0300
+@@ -14,11 +14,20 @@ SET(MATH_SRCS
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+-ADD_LIBRARY(nvmath ${MATH_SRCS})
++IF(NVMATH_SHARED)
++ ADD_DEFINITIONS(-DNMATH_SHARED=1)
++ ADD_LIBRARY(nvmath SHARED ${MATH_SRCS})
++ SET_TARGET_PROPERTIES(nvmath
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
++ELSE(NVMATH_SHARED)
++ ADD_LIBRARY(nvmath ${MATH_SRCS})
++ENDIF(NVMATH_SHARED)
+
+ TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
+
+ INSTALL(TARGETS nvmath
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+diff -up src/nvthread/CMakeLists.txt.orig src/nvthread/CMakeLists.txt
+--- src/nvthread/CMakeLists.txt.orig 2021-02-23 04:45:54.643331358 -0300
++++ src/nvthread/CMakeLists.txt 2021-02-23 04:46:55.665643283 -0300
+@@ -16,6 +16,10 @@ ADD_DEFINITIONS(-DNVTHREAD_EXPORTS)
+
+ IF(NVTHREAD_SHARED)
+ ADD_LIBRARY(nvthread SHARED ${THREAD_SRCS})
++ SET_TARGET_PROPERTIES(nvthread
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVTHREAD_SHARED)
+ ADD_LIBRARY(nvthread ${THREAD_SRCS})
+ ENDIF(NVTHREAD_SHARED)
+@@ -24,5 +28,5 @@ TARGET_LINK_LIBRARIES(nvthread ${LIBS} n
+
+ INSTALL(TARGETS nvthread
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+diff -up src/nvtt/CMakeLists.txt.orig src/nvtt/CMakeLists.txt
+--- src/nvtt/CMakeLists.txt.orig 2021-02-22 18:22:16.155576979 -0300
++++ src/nvtt/CMakeLists.txt 2021-02-22 18:22:48.018752789 -0300
+@@ -49,6 +49,10 @@ ADD_DEFINITIONS(-DNVTT_EXPORTS)
+
+ IF(NVTT_SHARED)
+ ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS})
++ SET_TARGET_PROPERTIES(nvtt
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVTT_SHARED)
+ ADD_LIBRARY(nvtt ${NVTT_SRCS})
+ ENDIF(NVTT_SHARED)
+@@ -57,7 +61,7 @@ TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcor
+
+ INSTALL(TARGETS nvtt
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+
+ INSTALL(FILES nvtt.h nvtt_wrapper.h DESTINATION include/nvtt)
+diff -up extern/libsquish-1.15/CMakeLists.txt.orig extern/libsquish-1.15/CMakeLists.txt
+--- extern/libsquish-1.15/CMakeLists.txt.orig 2021-02-23 04:56:58.942749647 -0300
++++ extern/libsquish-1.15/CMakeLists.txt 2021-02-23 04:57:07.724795042 -0300
+@@ -108,10 +108,3 @@ IF (BUILD_SQUISH_EXTRA)
+ TARGET_LINK_LIBRARIES(squishpng squish ${PNG_LIBRARIES})
+ ENDIF (PNG_FOUND)
+ ENDIF (BUILD_SQUISH_EXTRA)
+-
+-INSTALL(
+- TARGETS squish
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
+- PUBLIC_HEADER DESTINATION include
+- )
diff --git a/nvidia-texture-tools-mips.patch b/nvidia-texture-tools-mips.patch
index 4773641..532ebc3 100644
--- a/nvidia-texture-tools-mips.patch
+++ b/nvidia-texture-tools-mips.patch
@@ -1,38 +1,14 @@
-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 -up src/nvcore/nvcore.h.orig src/nvcore/nvcore.h
+--- src/nvcore/nvcore.h.orig 2020-08-24 03:27:21.000000000 -0300
++++ src/nvcore/nvcore.h 2021-02-22 17:41:56.397423994 -0300
+@@ -115,6 +115,10 @@
+ # define NV_CPU_ARM_64 1
+ #elif defined POSH_CPU_E2K
+ # define NV_CPU_E2K 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 --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 0b25fd3..9b32672 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,39 +1,69 @@
-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 @@
+diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-24 16:12:12.187577193 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-24 16:24:04.568285598 -0300
+@@ -23,15 +23,15 @@
+
+ -------------------------------------------------------------------------- */
+
+-#ifndef SQUISH_SIMD_VE_H
+-#define SQUISH_SIMD_VE_H
++#ifndef NV_SQUISH_SIMD_VE_H
++#define NV_SQUISH_SIMD_VE_H
+
+ #include <altivec.h>
+ #undef bool
namespace squish {
--#define VEC4_CONST( X ) Vec4( ( vector float )( X ) )
-+#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
+-#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
++#define VEC4_CONST( X ) Vec4( ( vec_splats( (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;
- }
-
+
+ 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, vec_splats( -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
+
+ 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, vec_splats( -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 ) );
- }
-
+ 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, vec_splats( 1.0f ) );
+ return Vec4( vec_madd( diff, estimate, estimate ) );
+ }
+
+@@ -163,4 +163,4 @@ private:
+
+ } // namespace squish
+
+-#endif // ndef SQUISH_SIMD_VE_H
++#endif // ndef NV_SQUISH_SIMD_VE_H
+diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-24 16:12:00.057516674 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-24 16:12:52.778779698 -0300
+@@ -27,10 +27,8 @@
+ #ifndef SQUISH_SIMD_VE_H
+ #define SQUISH_SIMD_VE_H
+
+-#if !defined(__APPLE_ALTIVEC__) || defined(__PPC64__)
+ #include <altivec.h>
+ #undef bool
+-#endif
+
+ namespace nvsquish {
+
diff --git a/nvidia-texture-tools-s390.patch b/nvidia-texture-tools-s390.patch
index 93d2463..8ab2ade 100644
--- a/nvidia-texture-tools-s390.patch
+++ b/nvidia-texture-tools-s390.patch
@@ -1,23 +1,23 @@
-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"
+diff -up src/nvcore/nvcore.h.orig src/nvcore/nvcore.h
+--- src/nvcore/nvcore.h.orig 2021-02-22 17:43:36.159964579 -0300
++++ src/nvcore/nvcore.h 2021-02-22 17:43:56.917077055 -0300
+@@ -119,6 +119,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 extern/poshlib/posh.h.orig extern/poshlib/posh.h
+--- extern/poshlib/posh.h.orig 2021-02-24 14:04:24.455712030 -0300
++++ extern/poshlib/posh.h 2021-02-24 14:06:16.557482153 -0300
+@@ -560,6 +560,11 @@ LCC predefines the following:
+ # define POSH_CPU_STRING "MCST Elbrus 2000"
#endif
-+#if defined __s390__ || defined __s390x__
++#if defined __s390x__
+# define POSH_CPU_S390 1
+# define POSH_CPU_STRING "S390"
+#endif
diff --git a/nvidia-texture-tools-simd.patch b/nvidia-texture-tools-simd.patch
new file mode 100644
index 0000000..c1e2056
--- /dev/null
+++ b/nvidia-texture-tools-simd.patch
@@ -0,0 +1,42 @@
+diff -up extern/libsquish-1.15/CMakeLists.txt.orig extern/libsquish-1.15/CMakeLists.txt
+--- extern/libsquish-1.15/CMakeLists.txt.orig 2021-02-24 10:47:15.629070541 -0300
++++ extern/libsquish-1.15/CMakeLists.txt 2021-02-24 10:48:37.453467988 -0300
+@@ -36,9 +36,13 @@ IF (CMAKE_GENERATOR STREQUAL "Xcode")
+ ELSE (CMAKE_GENERATOR STREQUAL "Xcode")
+ IF (BUILD_SQUISH_WITH_SSE2 AND NOT WIN32)
+ ADD_DEFINITIONS(-DSQUISH_USE_SSE=2 -msse2)
++ ELSE (BUILD_SQUISH_WITH_SSE2 AND NOT WIN32)
++ ADD_DEFINITIONS(-DSQUISH_USE_SSE=0)
+ ENDIF (BUILD_SQUISH_WITH_SSE2 AND NOT WIN32)
+ IF (BUILD_SQUISH_WITH_ALTIVEC AND NOT WIN32)
+ ADD_DEFINITIONS(-DSQUISH_USE_ALTIVEC=1 -maltivec)
++ ELSE (BUILD_SQUISH_WITH_ALTIVEC AND NOT WIN32)
++ ADD_DEFINITIONS(-DSQUISH_USE_ALTIVEC=0)
+ ENDIF (BUILD_SQUISH_WITH_ALTIVEC AND NOT WIN32)
+ ENDIF (CMAKE_GENERATOR STREQUAL "Xcode")
+
+diff -up extern/CMP_Core/source/cmp_math_vec4.h.orig extern/CMP_Core/source/cmp_math_vec4.h
+--- extern/CMP_Core/source/cmp_math_vec4.h.orig 2021-02-24 13:17:51.629327597 -0300
++++ extern/CMP_Core/source/cmp_math_vec4.h 2021-02-24 13:45:22.725513798 -0300
+@@ -322,10 +322,13 @@ public:
+ };
+
+ #include <stdio.h>
++#if SQUISH_USE_SSE
+ #include "xmmintrin.h"
++#endif
+ #include <math.h>
+ #include <float.h>
+
++#if SQUISH_USE_SSE
+ // SSE Vec4
+ #ifdef _LINUX
+ class CMP_SSEVec4f
+@@ -419,6 +422,7 @@ public:
+ };
+
+ };
++#endif // SQUISH_USE_SSE
+
+ typedef Vec4<float> CMP_Vec4f;
+ typedef Vec4<double> CMP_Vec4d;
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index e6e6653..09c1262 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -1,12 +1,12 @@
-%global soversion 2.0
+%global soversion 2.1
Name: nvidia-texture-tools
-Version: 2.0.8
-Release: 26%{?dist}
+Version: 2.1.2
+Release: 1%{?dist}
Summary: Collection of image processing and texture manipulation tools
-License: MIT
-URL: http://code.google.com/p/nvidia-texture-tools/
-Source0: http://nvidia-texture-tools.googlecode.com/files/%{name}-%{version}-1.tar.gz
+License: MIT and ASL 2.0 and BSD
+URL: https://github.com/castano/nvidia-texture-tools/wiki
+Source0: https://github.com/castano/%{name}/archive/%{version}.tar.gz
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -17,29 +17,22 @@ BuildRequires: libtiff-devel
BuildRequires: openjpeg-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
-# 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
-# to conflict with other headers that do not use long long on 64 bit
-Patch1: %{name}-%{version}-wordsize.patch
-# from 0ad sources
-Patch2: %{name}-%{version}-png-api.patch
-# add soversion to libraries
-Patch3: %{name}-%{version}-soversion.patch
-# install libraries in proper directory
-Patch4: %{name}-%{version}-libdir.patch
-# add arm support
-Patch5: %{name}-arm.patch
-# add aarch64 support
-Patch6: %{name}-aarch64.patch
-# Return NULL not false on pointer returning functions
-Patch7: %{name}-bool-null.patch
+
+Patch0: %{name}-libs.patch
+Patch1: %{name}-check.patch
+Patch2: %{name}-docs.patch
# add MIPS support
-Patch8: %{name}-mips.patch
+Patch3: %{name}-mips.patch
# add S390 support
-Patch9: %{name}-s390.patch
+Patch4: %{name}-s390.patch
# add PPCLE support
-Patch10: %{name}-ppcle.patch
+Patch5: %{name}-ppcle.patch
+# Do not presume SSE is available
+Patch6: %{name}-simd.patch
+# Do not force compiler flags
+Patch7: %{name}-flags.patch
+# Only implemented for x86
+Patch8: %{name}-debug.patch
%description
The NVIDIA Texture Tools is a collection of image processing and texture
@@ -61,24 +54,31 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Headers and libraries for development with %{name}.
%prep
-%setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%setup -q
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%ifnarch %{ix86} x86_64
+%patch78 -p0
+%endif
%build
-%cmake -DNVTT_SHARED=1 -DCMAKE_SKIP_RPATH=1
+%cmake -DNVTT_SHARED=1 -DCMAKE_SKIP_RPATH=1 \
+%ifnarch %{ix86} x86_64
+ -DBUILD_SQUISH_WITH_SSE2=OFF \
+%endif
+%ifarch ppc64 ppc64le
+ -DBUILD_SQUISH_WITH_ALTIVEC=ON \
+%endif
+
%cmake_build
-sed -e 's/\r//' -i NVIDIA_*.txt
+sed -e 's/\r//' -i LICENSE
%install
%cmake_install
@@ -91,13 +91,14 @@ pushd $RPM_BUILD_ROOT/%{_bindir}
popd
%check
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:
%ctest
%ldconfig_scriptlets
%files
-%doc NVIDIA_Texture_Tools_LICENSE.txt
-%doc NVIDIA_Texture_Tools_README.txt
+%license LICENSE
+%doc README.md
%{_bindir}/*
%{_libdir}/lib*.%{version}
%{_libdir}/lib*.%{soversion}
@@ -109,6 +110,9 @@ popd
%{_libdir}/lib*.so
%changelog
+* Mon Feb 22 2021 pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com> - 2.1.2-1
+- Update to version 2.1.2
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 9e78729..1797125 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7449c95ca1583b512561c83c5a5f401c nvidia-texture-tools-2.0.8-1.tar.gz
+SHA512 (2.1.2.tar.gz) = 4285e1a348c6ab9abbc34a499879fe1c8ff6976da01d0397eb95e19ae7fb566f3efb57613d2cee31e6c694b497a28b050e377267e137a4d114d093d681824adb
commit f0dfaf0cd5c142540716db1c1e07f19de6fb1100
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 21:48:21 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index e96ed16..e6e6653 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -2,7 +2,7 @@
Name: nvidia-texture-tools
Version: 2.0.8
-Release: 25%{?dist}
+Release: 26%{?dist}
Summary: Collection of image processing and texture manipulation tools
License: MIT
URL: http://code.google.com/p/nvidia-texture-tools/
@@ -109,6 +109,9 @@ popd
%{_libdir}/lib*.so
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Oct 19 2020 Kalev Lember <klember(a)redhat.com> - 2.0.8-25
- Fix FTBFS with new cmake macros (#1865080)
commit 9b49b083415e5581cc1b19ad89d0e4a50da66b41
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Oct 19 12:57:21 2020 +0200
Fix FTBFS with new cmake macros (#1865080)
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 87a19f1..e96ed16 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -2,7 +2,7 @@
Name: nvidia-texture-tools
Version: 2.0.8
-Release: 24%{?dist}
+Release: 25%{?dist}
Summary: Collection of image processing and texture manipulation tools
License: MIT
URL: http://code.google.com/p/nvidia-texture-tools/
@@ -75,16 +75,13 @@ Headers and libraries for development with %{name}.
%patch10 -p1
%build
-mkdir -p build
-pushd build
- %cmake -DNVTT_SHARED=1 -DCMAKE_SKIP_RPATH=1 ..
- make %{?_smp_mflags}
-popd
+%cmake -DNVTT_SHARED=1 -DCMAKE_SKIP_RPATH=1
+%cmake_build
sed -e 's/\r//' -i NVIDIA_*.txt
%install
-make -C build install DESTDIR=$RPM_BUILD_ROOT
+%cmake_install
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
pushd $RPM_BUILD_ROOT/%{_bindir}
export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:
@@ -94,7 +91,7 @@ pushd $RPM_BUILD_ROOT/%{_bindir}
popd
%check
-make -C build filtertest
+%ctest
%ldconfig_scriptlets
@@ -112,6 +109,9 @@ make -C build filtertest
%{_libdir}/lib*.so
%changelog
+* Mon Oct 19 2020 Kalev Lember <klember(a)redhat.com> - 2.0.8-25
+- Fix FTBFS with new cmake macros (#1865080)
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-24
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit d585118e66aff16c45d557655b5fa01fd10c7df4
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Aug 1 06:34:58 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 96a4cf9..87a19f1 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -2,7 +2,7 @@
Name: nvidia-texture-tools
Version: 2.0.8
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: Collection of image processing and texture manipulation tools
License: MIT
URL: http://code.google.com/p/nvidia-texture-tools/
@@ -112,6 +112,10 @@ make -C build filtertest
%{_libdir}/lib*.so
%changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-24
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 95a2497600a5a43c1d322b301db6fd7238a9bdc0
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 28 12:00:31 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 45c4521..96a4cf9 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -2,7 +2,7 @@
Name: nvidia-texture-tools
Version: 2.0.8
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: Collection of image processing and texture manipulation tools
License: MIT
URL: http://code.google.com/p/nvidia-texture-tools/
@@ -112,6 +112,9 @@ make -C build filtertest
%{_libdir}/lib*.so
%changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
1
0
Architecture specific change in rpms/nvidia-texture-tools.git
by githook-noreply＠fedoraproject.org 26 Feb '21
by githook-noreply＠fedoraproject.org 26 Feb '21
26 Feb '21
The package rpms/nvidia-texture-tools.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nvidia-texture-tools.git/commit/?id…
https://src.fedoraproject.org/cgit/rpms/nvidia-texture-tools.git/commit/?id….
Change:
+%ifnarch %{ix86} x86_64
+%ifarch ppc64 ppc64le
Thanks.
Full change:
============
commit 9f338bb34655deab4027c5d93e6fd1655d97a602
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 15:01:43 2021 -0300
Disable more altivec code
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index a69660c..d82faa8 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,6 +1,15 @@
diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
---- src/nvtt/icbc.h.orig 2021-02-25 14:37:32.913095824 -0300
-+++ src/nvtt/icbc.h 2021-02-25 14:39:48.633666276 -0300
+--- src/nvtt/icbc.h.orig 2021-02-25 14:58:15.331333196 -0300
++++ src/nvtt/icbc.h 2021-02-25 14:59:57.648990370 -0300
+@@ -91,7 +91,7 @@ namespace icbc {
+ #endif
+ #endif
+
+- #if ICBC_PPC
++ #if ICBC_PPC && BUILD_SQUISH_WITH_ALTIVEC
+ #define ICBC_SIMD ICBC_VMX
+ #endif
+ #endif
@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
constexpr int VEC_SIZE = 4;
commit ae0433329f7820830d8f56bf8d70a166285d1264
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:49:26 2021 -0300
Disable altivec for ppc64le
Code appears to not have been tested by upstream. After several
trial&error scratch builds, give up when it comes down to:
error: invalid parameter combination for AltiVec intrinsic ...
error messages.
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 19a8f95..eda6e4b 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -75,9 +75,11 @@ Headers and libraries for development with %{name}.
%ifnarch %{ix86} x86_64
-DBUILD_SQUISH_WITH_SSE2=OFF \
%endif
+%if 0
%ifarch ppc64 ppc64le
-DBUILD_SQUISH_WITH_ALTIVEC=ON \
%endif
+%endif
%cmake_build
commit 77009a511ccb043d5b28ce6b09a9ecc2a736deee
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:40:53 2021 -0300
Implement missing/incorrect altivec function
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 79c9c53..a69660c 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,6 +1,72 @@
+diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
+--- src/nvtt/icbc.h.orig 2021-02-25 14:37:32.913095824 -0300
++++ src/nvtt/icbc.h 2021-02-25 14:39:48.633666276 -0300
+@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
+ constexpr int VEC_SIZE = 4;
+
+ union VFloat {
+- vectro float v;
++ __vector float v;
+ float e[4];
+ VFloat() {}
+- VFloat(vector float v) : v(v) {}
+- operator vector float & () { return v; }
++ VFloat(__vector float v) : v(v) {}
++ operator __vector float & () { return v; }
+ };
+ struct VMask {
+- vector unsigned int v;
++ __vector unsigned int v;
+ VMask() {}
+- VMask(vector unsigned int v) : v(v) {}
+- operator vector unsigned int & () { return v; }
++ VMask(__vector unsigned int v) : v(v) {}
++ operator __vector unsigned int & () { return v; }
+ };
+
+ ICBC_FORCEINLINE float & lane(VFloat & v, int i) {
+@@ -1213,15 +1213,15 @@ ICBC_FORCEINLINE float & lane(VFloat & v
+ }
+
+ ICBC_FORCEINLINE VFloat vzero() {
+- return vec_splats(0.0f);
++ return ( __vector float ){ 0.0f };
+ }
+
+ ICBC_FORCEINLINE VFloat vbroadcast(float a) {
+- return vec_splats(a);
++ return ( __vector float ){ a };
+ }
+
+ ICBC_FORCEINLINE VFloat vload(const float * ptr) {
+- return vec_ld(ptr)
++ return ( __vector float ){ ptr[0], ptr[1], ptr[2], ptr[3] };
+ }
+
+ ICBC_FORCEINLINE VFloat operator+(VFloat a, VFloat b) {
+@@ -1233,16 +1233,16 @@ ICBC_FORCEINLINE VFloat operator-(VFloat
+ }
+
+ ICBC_FORCEINLINE VFloat operator*(VFloat a, VFloat b) {
+- return vec_madd(a, b, vec_splats(-0.0f));
++ return vec_madd(a, b, ( __vector float ){ -0.0f });
+ }
+
+ ICBC_FORCEINLINE VFloat vrcp(VFloat a) {
+ #if ICBC_USE_RCP
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.vec );
++ __vector float estimate = vec_re( v.vec );
+
+ // one round of Newton-Rhaphson refinement
+- vector float diff = vec_nmsub( estimate, v.vec, vec_splats( 1.0f ) );
++ __vector float diff = vec_nmsub( estimate, v.vec, ( __vector float ){ 1.0f } );
+ return vec_madd(diff, estimate, estimate );
+ #else
+ return vec_div(vec_splats(1),a);
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:50:09.980146060 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-25 13:53:36.871679483 -0300
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 14:37:32.907095799 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 14:37:35.891108297 -0300
@@ -27,14 +27,12 @@
#ifndef SQUISH_SIMD_VE_H
#define SQUISH_SIMD_VE_H
@@ -119,8 +185,8 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
} // namespace squish
diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
---- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:50:20.447323496 -0300
-+++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:54:29.543307998 -0300
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 14:37:32.910095811 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-25 14:37:35.892108302 -0300
@@ -31,7 +31,7 @@
namespace squish {
@@ -206,64 +272,3 @@ diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
};
} // namespace squish
-diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
---- src/nvtt/icbc.h.orig 2021-02-25 14:19:04.692618121 -0300
-+++ src/nvtt/icbc.h 2021-02-25 14:23:52.364456026 -0300
-@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
- constexpr int VEC_SIZE = 4;
-
- union VFloat {
-- vectro float v;
-+ __vector float v;
- float e[4];
- VFloat() {}
-- VFloat(vector float v) : v(v) {}
-- operator vector float & () { return v; }
-+ VFloat(__vector float v) : v(v) {}
-+ operator __vector float & () { return v; }
- };
- struct VMask {
-- vector unsigned int v;
-+ __vector unsigned int v;
- VMask() {}
-- VMask(vector unsigned int v) : v(v) {}
-- operator vector unsigned int & () { return v; }
-+ VMask(__vector unsigned int v) : v(v) {}
-+ operator __vector unsigned int & () { return v; }
- };
-
- ICBC_FORCEINLINE float & lane(VFloat & v, int i) {
-@@ -1213,11 +1213,11 @@ ICBC_FORCEINLINE float & lane(VFloat & v
- }
-
- ICBC_FORCEINLINE VFloat vzero() {
-- return vec_splats(0.0f);
-+ return ( __vector float ){ 0.0f };
- }
-
- ICBC_FORCEINLINE VFloat vbroadcast(float a) {
-- return vec_splats(a);
-+ return ( __vector float ){ a };
- }
-
- ICBC_FORCEINLINE VFloat vload(const float * ptr) {
-@@ -1233,16 +1233,16 @@ ICBC_FORCEINLINE VFloat operator-(VFloat
- }
-
- ICBC_FORCEINLINE VFloat operator*(VFloat a, VFloat b) {
-- return vec_madd(a, b, vec_splats(-0.0f));
-+ return vec_madd(a, b, ( __vector float ){ -0.0f });
- }
-
- ICBC_FORCEINLINE VFloat vrcp(VFloat a) {
- #if ICBC_USE_RCP
- // get the reciprocal estimate
-- vector float estimate = vec_re( v.vec );
-+ __vector float estimate = vec_re( v.vec );
-
- // one round of Newton-Rhaphson refinement
-- vector float diff = vec_nmsub( estimate, v.vec, vec_splats( 1.0f ) );
-+ __vector float diff = vec_nmsub( estimate, v.vec, ( __vector float ){ 1.0f } );
- return vec_madd(diff, estimate, estimate );
- #else
- return vec_div(vec_splats(1),a);
commit 8583d501e6eb71fcf5fb9dadcb15b03d9fd20e93
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:24:54 2021 -0300
More altivec code that needs adaptation and correction of typos
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index b4c7ce3..79c9c53 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -206,3 +206,64 @@ diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
};
} // namespace squish
+diff -up src/nvtt/icbc.h.orig src/nvtt/icbc.h
+--- src/nvtt/icbc.h.orig 2021-02-25 14:19:04.692618121 -0300
++++ src/nvtt/icbc.h 2021-02-25 14:23:52.364456026 -0300
+@@ -1195,17 +1195,17 @@ ICBC_FORCEINLINE void vtranspose4(VFloat
+ constexpr int VEC_SIZE = 4;
+
+ union VFloat {
+- vectro float v;
++ __vector float v;
+ float e[4];
+ VFloat() {}
+- VFloat(vector float v) : v(v) {}
+- operator vector float & () { return v; }
++ VFloat(__vector float v) : v(v) {}
++ operator __vector float & () { return v; }
+ };
+ struct VMask {
+- vector unsigned int v;
++ __vector unsigned int v;
+ VMask() {}
+- VMask(vector unsigned int v) : v(v) {}
+- operator vector unsigned int & () { return v; }
++ VMask(__vector unsigned int v) : v(v) {}
++ operator __vector unsigned int & () { return v; }
+ };
+
+ ICBC_FORCEINLINE float & lane(VFloat & v, int i) {
+@@ -1213,11 +1213,11 @@ ICBC_FORCEINLINE float & lane(VFloat & v
+ }
+
+ ICBC_FORCEINLINE VFloat vzero() {
+- return vec_splats(0.0f);
++ return ( __vector float ){ 0.0f };
+ }
+
+ ICBC_FORCEINLINE VFloat vbroadcast(float a) {
+- return vec_splats(a);
++ return ( __vector float ){ a };
+ }
+
+ ICBC_FORCEINLINE VFloat vload(const float * ptr) {
+@@ -1233,16 +1233,16 @@ ICBC_FORCEINLINE VFloat operator-(VFloat
+ }
+
+ ICBC_FORCEINLINE VFloat operator*(VFloat a, VFloat b) {
+- return vec_madd(a, b, vec_splats(-0.0f));
++ return vec_madd(a, b, ( __vector float ){ -0.0f });
+ }
+
+ ICBC_FORCEINLINE VFloat vrcp(VFloat a) {
+ #if ICBC_USE_RCP
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.vec );
++ __vector float estimate = vec_re( v.vec );
+
+ // one round of Newton-Rhaphson refinement
+- vector float diff = vec_nmsub( estimate, v.vec, vec_splats( 1.0f ) );
++ __vector float diff = vec_nmsub( estimate, v.vec, ( __vector float ){ 1.0f } );
+ return vec_madd(diff, estimate, estimate );
+ #else
+ return vec_div(vec_splats(1),a);
commit d4c836a29ab426649eeba9c80590899b1201feaa
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 14:05:35 2021 -0300
Correct wrong text cut and tabulation on ppc64le patch
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 80358d2..b4c7ce3 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -77,7 +77,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
{
- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
-+ 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
@@ -90,7 +90,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
// one round of Newton-Rhaphson refinement
- vector float diff = vec_nmsub( estimate, v.m_v, vec_splats( 1.0f ) );
-+ __vector float diff = vec_nmsub( estimate, v.m_( __vector float ){ 1.0f } );
++ __vector float diff = vec_nmsub( estimate, v.m_v, ( __vector float ){ 1.0f } );
return Vec4( vec_madd( diff, estimate, estimate ) );
}
commit ecbbd6cbff6f948b1db6c830161a9dc42166ba53
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 13:55:32 2021 -0300
Another attempt to get altivec working
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index c19a010..80358d2 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,25 +1,34 @@
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:26:09.519676632 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-25 13:37:25.107712987 -0300
-@@ -32,7 +32,7 @@
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:50:09.980146060 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 13:53:36.871679483 -0300
+@@ -27,14 +27,12 @@
+ #ifndef SQUISH_SIMD_VE_H
+ #define SQUISH_SIMD_VE_H
+
+-#if !defined(__APPLE_ALTIVEC__) || defined(__PPC64__)
+ #include <altivec.h>
+ #undef bool
+-#endif
namespace nvsquish {
--#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
+-#define VEC4_CONST( X ) Vec4( vec_splats( (float)X ) )
+#define VEC4_CONST( X ) Vec4( ( __vector float ) { X } )
class Vec4
{
-@@ -41,7 +41,7 @@ public:
+@@ -42,8 +40,8 @@ public:
+ typedef Vec4 Arg;
Vec4() {}
-
+-
- explicit Vec4( vector float v ) : m_v( v ) {}
++
+ explicit Vec4( __vector float v ) : m_v( v ) {}
Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
-@@ -53,7 +53,7 @@ public:
+@@ -55,7 +53,7 @@ public:
Vec4( const float * v )
{
@@ -28,7 +37,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
u.c[0] = v[0];
u.c[1] = v[1];
u.c[2] = v[2];
-@@ -63,7 +63,7 @@ public:
+@@ -65,7 +63,7 @@ public:
Vec4( float x, float y, float z, float w )
{
@@ -37,7 +46,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
u.c[0] = x;
u.c[1] = y;
u.c[2] = z;
-@@ -73,14 +73,14 @@ public:
+@@ -75,14 +73,14 @@ public:
Vec3 GetVec3() const
{
@@ -54,25 +63,25 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
u.v = m_v;
return u.c[0];
}
-@@ -104,7 +104,7 @@ public:
+@@ -106,7 +104,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, vec_splats( -0.0f ) );
+ m_v = vec_madd( m_v, v.m_v, ( __vector float ){ -0.0f } );
return *this;
}
-@@ -120,7 +120,7 @@ public:
+@@ -122,7 +120,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 } ) );
+- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
++ return Vec4( vec_madd( left.m_v, right.m_v, ( __vector float ){ -0.0f } ) );
}
//! Returns a*b + c
-@@ -138,10 +138,10 @@ public:
+@@ -140,10 +138,10 @@ public:
friend Vec4 Reciprocal( Vec4::Arg v )
{
// get the reciprocal estimate
@@ -80,12 +89,12 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
+ __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 } );
+- vector float diff = vec_nmsub( estimate, v.m_v, vec_splats( 1.0f ) );
++ __vector float diff = vec_nmsub( estimate, v.m_( __vector float ){ 1.0f } );
return Vec4( vec_madd( diff, estimate, estimate ) );
}
-@@ -162,12 +162,12 @@ public:
+@@ -164,12 +162,12 @@ public:
friend Vec4 CompareEqual( Vec4::Arg left, Vec4::Arg right )
{
@@ -100,7 +109,7 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
}
friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
-@@ -176,7 +176,7 @@ public:
+@@ -178,7 +176,7 @@ public:
}
private:
@@ -110,8 +119,8 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
} // namespace squish
diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
---- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:26:42.862873033 -0300
-+++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:29:13.365759490 -0300
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:50:20.447323496 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:54:29.543307998 -0300
@@ -31,7 +31,7 @@
namespace squish {
commit 38d3eb10d728d43d7200454ab880d04f7544c88d
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 13:40:58 2021 -0300
Tenative ppc64le fix patch
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 2cc7132..c19a010 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,46 +1,199 @@
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-25 12:39:52.342544144 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-25 12:41:51.141231967 -0300
-@@ -27,14 +27,12 @@
- #ifndef SQUISH_SIMD_VE_H
- #define SQUISH_SIMD_VE_H
-
--#if !defined(__APPLE_ALTIVEC__) || defined(__PPC64__)
- #include <altivec.h>
- #undef bool
--#endif
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 13:26:09.519676632 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 13:37:25.107712987 -0300
+@@ -32,7 +32,7 @@
namespace nvsquish {
--#define VEC4_CONST( X ) Vec4( vec_splats( (float)X ) )
-+#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
+-#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
++#define VEC4_CONST( X ) Vec4( ( __vector float ) { X } )
class Vec4
{
-@@ -106,7 +104,7 @@ public:
+@@ -41,7 +41,7 @@ public:
+
+ Vec4() {}
+
+- explicit Vec4( vector float v ) : m_v( v ) {}
++ explicit Vec4( __vector float v ) : m_v( v ) {}
+
+ Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
+
+@@ -53,7 +53,7 @@ public:
+
+ Vec4( const float * v )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = v[0];
+ u.c[1] = v[1];
+ u.c[2] = v[2];
+@@ -63,7 +63,7 @@ public:
+
+ Vec4( float x, float y, float z, float w )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = x;
+ u.c[1] = y;
+ u.c[2] = z;
+@@ -73,14 +73,14 @@ public:
+
+ Vec3 GetVec3() const
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.v = m_v;
+ return Vec3( u.c[0], u.c[1], u.c[2] );
+ }
+
+ float GetX() const
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.v = m_v;
+ return u.c[0];
+ }
+@@ -104,7 +104,7 @@ public:
Vec4& operator*=( Arg v )
{
-- m_v = vec_madd( m_v, v.m_v, vec_splats( -0.0f ) );
-+ 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 } );
++ m_v = vec_madd( m_v, v.m_v, ( __vector float ){ -0.0f } );
return *this;
}
-@@ -122,7 +120,7 @@ public:
+@@ -120,7 +120,7 @@ public:
friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
{
-- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
-+ 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 } ) );
++ return Vec4( vec_madd( left.m_v, right.m_v, ( __vector float ){ -0.0f } ) );
}
//! Returns a*b + c
-@@ -143,7 +141,7 @@ public:
- vector float estimate = vec_re( v.m_v );
+@@ -138,10 +138,10 @@ public:
+ friend Vec4 Reciprocal( Vec4::Arg v )
+ {
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.m_v );
++ __vector float estimate = vec_re( v.m_v );
// one round of Newton-Rhaphson refinement
-- vector float diff = vec_nmsub( estimate, v.m_v, vec_splats( 1.0f ) );
-+ 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 } );
++ __vector float diff = vec_nmsub( estimate, v.m_v, ( __vector float ){ 1.0f } );
return Vec4( vec_madd( diff, estimate, estimate ) );
}
+@@ -162,12 +162,12 @@ public:
+
+ friend Vec4 CompareEqual( Vec4::Arg left, Vec4::Arg right )
+ {
+- return Vec4( ( vector float )vec_cmpeq( left.m_v, right.m_v ) );
++ return Vec4( ( __vector float )vec_cmpeq( left.m_v, right.m_v ) );
+ }
+
+ friend Vec4 Select( Vec4::Arg off, Vec4::Arg on, Vec4::Arg bits )
+ {
+- return Vec4( vec_sel( off.m_v, on.m_v, ( vector unsigned int )bits.m_v ) );
++ return Vec4( vec_sel( off.m_v, on.m_v, ( __vector unsigned int )bits.m_v ) );
+ }
+
+ friend bool CompareAnyLessThan( Vec4::Arg left, Vec4::Arg right )
+@@ -176,7 +176,7 @@ public:
+ }
+
+ private:
+- vector float m_v;
++ __vector float m_v;
+ };
+
+ } // namespace squish
+diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-25 13:26:42.862873033 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-25 13:29:13.365759490 -0300
+@@ -31,7 +31,7 @@
+
+ namespace squish {
+
+-#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
++#define VEC4_CONST( X ) Vec4( ( __vector float ){ X } )
+
+ class Vec4
+ {
+@@ -40,7 +40,7 @@ public:
+
+ Vec4() {}
+
+- explicit Vec4( vector float v ) : m_v( v ) {}
++ explicit Vec4( __vector float v ) : m_v( v ) {}
+
+ Vec4( Vec4 const& arg ) : m_v( arg.m_v ) {}
+
+@@ -52,7 +52,7 @@ public:
+
+ explicit Vec4( float s )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = s;
+ u.c[1] = s;
+ u.c[2] = s;
+@@ -62,7 +62,7 @@ public:
+
+ Vec4( float x, float y, float z, float w )
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.c[0] = x;
+ u.c[1] = y;
+ u.c[2] = z;
+@@ -72,7 +72,7 @@ public:
+
+ Vec3 GetVec3() const
+ {
+- union { vector float v; float c[4]; } u;
++ union { __vector float v; float c[4]; } u;
+ u.v = m_v;
+ return Vec3( u.c[0], u.c[1], u.c[2] );
+ }
+@@ -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
+@@ -130,10 +130,10 @@ public:
+ friend Vec4 Reciprocal( Vec4::Arg v )
+ {
+ // get the reciprocal estimate
+- vector float estimate = vec_re( v.m_v );
++ __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 ) );
+ }
+
+@@ -158,7 +158,7 @@ public:
+ }
+
+ private:
+- vector float m_v;
++ __vector float m_v;
+ };
+
+ } // namespace squish
commit 457de10155f7d19e381f689e6725f491394a9558
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 13:12:52 2021 -0300
Correct non x86 build issues
diff --git a/nvidia-texture-tools-aarch64.patch b/nvidia-texture-tools-aarch64.patch
new file mode 100644
index 0000000..c9c956f
--- /dev/null
+++ b/nvidia-texture-tools-aarch64.patch
@@ -0,0 +1,24 @@
+diff -up src/nvcore/nvcore.h.orig src/nvcore/nvcore.h
+--- src/nvcore/nvcore.h.orig 2021-02-25 10:27:37.067879391 -0300
++++ src/nvcore/nvcore.h 2021-02-25 10:28:11.034088040 -0300
+@@ -112,7 +112,7 @@
+ #elif defined POSH_CPU_STRONGARM
+ # define NV_CPU_ARM 1
+ #elif defined POSH_CPU_AARCH64
+-# define NV_CPU_ARM_64 1
++# define NV_CPU_AARCH64 1
+ #elif defined POSH_CPU_E2K
+ # define NV_CPU_E2K 1
+ #elif defined POSH_CPU_MIPS
+diff -up extern/poshlib/posh.h.orig extern/poshlib/posh.h
+--- extern/poshlib/posh.h.orig 2021-02-25 10:27:44.795926865 -0300
++++ extern/poshlib/posh.h 2021-02-25 10:28:34.666233220 -0300
+@@ -514,7 +514,7 @@ LCC predefines the following:
+ # define POSH_CPU_STRING "ARM"
+ #endif
+
+-#if defined __aarch64__
++#if defined __aarch64__ || defined __arm64__
+ # define POSH_CPU_AARCH64 1
+ # define POSH_CPU_STRING "ARM64"
+ #endif
diff --git a/nvidia-texture-tools-debug.patch b/nvidia-texture-tools-debug.patch
index 673edc4..929c77f 100644
--- a/nvidia-texture-tools-debug.patch
+++ b/nvidia-texture-tools-debug.patch
@@ -1,16 +1,3 @@
-diff -up CMakeLists.txt.orig CMakeLists.txt
---- CMakeLists.txt.orig 2021-02-24 15:38:17.881472659 -0300
-+++ CMakeLists.txt 2021-02-24 15:38:20.230485965 -0300
-@@ -24,6 +24,9 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
- ADD_DEFINITIONS(-D_DEBUG=1)
- ENDIF()
-
-+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNV_NO_ASSERT=1")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNV_NO_ASSERT=1")
-+
- IF(NVTT_SHARED)
- SET(NVCORE_SHARED TRUE)
- SET(NVMATH_SHARED TRUE)
diff -up src/nvcore/CMakeLists.txt.orig src/nvcore/CMakeLists.txt
--- src/nvcore/CMakeLists.txt.orig 2021-02-24 15:38:17.873472614 -0300
+++ src/nvcore/CMakeLists.txt 2021-02-24 15:38:20.228485954 -0300
@@ -64,3 +51,61 @@ diff -up src/bc7/avpcl_mode5.cpp.orig src/bc7/avpcl_mode5.cpp
toterr[region] += besterr;
// do A index
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-25 09:37:08.120845257 -0300
++++ CMakeLists.txt 2021-02-25 09:37:14.926885247 -0300
+@@ -28,6 +28,9 @@ IF(BUILD_SQUISH_WITH_ALTIVEC)
+ ADD_DEFINITIONS(-maltivec)
+ ENDIF(BUILD_SQUISH_WITH_ALTIVEC)
+
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNV_NO_ASSERT=1 -DNV_DEBUG_PRINT=0")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNV_NO_ASSERT=1 -DNV_DEBUG_PRINT=0")
++
+ IF(NVTT_SHARED)
+ SET(NVCORE_SHARED TRUE)
+ SET(NVMATH_SHARED TRUE)
+diff -up src/nvtt/tools/cmdline.h.orig src/nvtt/tools/cmdline.h
+--- src/nvtt/tools/cmdline.h.orig 2021-02-25 11:03:12.258338108 -0300
++++ src/nvtt/tools/cmdline.h 2021-02-25 11:04:02.152643276 -0300
+@@ -33,10 +33,14 @@
+
+ struct MyMessageHandler : public nv::MessageHandler {
+ MyMessageHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::setMessageHandler( this );
++#endif
+ }
+ ~MyMessageHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::resetMessageHandler();
++#endif
+ }
+
+ virtual void log( const char * str, va_list arg ) {
+@@ -50,20 +54,26 @@ struct MyMessageHandler : public nv::Mes
+
+ struct MyAssertHandler : public nv::AssertHandler {
+ MyAssertHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::setAssertHandler( this );
+ nv::debug::enableSigHandler(/*interactive=*/true);
++#endif
+ }
+ ~MyAssertHandler() {
++#if !NV_NO_ASSERT
+ nv::debug::resetAssertHandler();
++#endif
+ }
+
+ // Handler method, note that func might be NULL!
+ virtual int assertion( const char *exp, const char *file, int line, const char *func, const char *msg, va_list arg ) {
+ fprintf(stderr, "Assertion failed: %s\nIn %s:%d\n", exp, file, line);
++#if !NV_NO_ASSERT
+ nv::debug::dumpInfo();
+ if (nv::debug::isDebuggerPresent()) {
+ return NV_ABORT_DEBUG;
+ }
++#endif
+ exit(1);
+ }
+ };
diff --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 9b32672..2cc7132 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,62 +1,7 @@
-diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
---- extern/libsquish-1.15/simd_ve.h.orig 2021-02-24 16:12:12.187577193 -0300
-+++ extern/libsquish-1.15/simd_ve.h 2021-02-24 16:24:04.568285598 -0300
-@@ -23,15 +23,15 @@
-
- -------------------------------------------------------------------------- */
-
--#ifndef SQUISH_SIMD_VE_H
--#define SQUISH_SIMD_VE_H
-+#ifndef NV_SQUISH_SIMD_VE_H
-+#define NV_SQUISH_SIMD_VE_H
-
- #include <altivec.h>
- #undef bool
-
- namespace squish {
-
--#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
-+#define VEC4_CONST( X ) Vec4( ( vec_splats( (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, vec_splats( -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, vec_splats( -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, vec_splats( 1.0f ) );
- return Vec4( vec_madd( diff, estimate, estimate ) );
- }
-
-@@ -163,4 +163,4 @@ private:
-
- } // namespace squish
-
--#endif // ndef SQUISH_SIMD_VE_H
-+#endif // ndef NV_SQUISH_SIMD_VE_H
diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
---- src/nvtt/squish/simd_ve.h.orig 2021-02-24 16:12:00.057516674 -0300
-+++ src/nvtt/squish/simd_ve.h 2021-02-24 16:12:52.778779698 -0300
-@@ -27,10 +27,8 @@
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-25 12:39:52.342544144 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-25 12:41:51.141231967 -0300
+@@ -27,14 +27,12 @@
#ifndef SQUISH_SIMD_VE_H
#define SQUISH_SIMD_VE_H
@@ -67,3 +12,35 @@ diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
namespace nvsquish {
+-#define VEC4_CONST( X ) Vec4( vec_splats( (float)X ) )
++#define VEC4_CONST( X ) Vec4( ( vector float ) { X } )
+
+ class Vec4
+ {
+@@ -106,7 +104,7 @@ public:
+
+ Vec4& operator*=( Arg v )
+ {
+- m_v = vec_madd( m_v, v.m_v, vec_splats( -0.0f ) );
++ m_v = vec_madd( m_v, v.m_v, ( vector float ){ -0.0f } );
+ return *this;
+ }
+
+@@ -122,7 +120,7 @@ public:
+
+ friend Vec4 operator*( Vec4::Arg left, Vec4::Arg right )
+ {
+- return Vec4( vec_madd( left.m_v, right.m_v, vec_splats( -0.0f ) ) );
++ return Vec4( vec_madd( left.m_v, right.m_v, ( vector float ){ -0.0f } ) );
+ }
+
+ //! Returns a*b + c
+@@ -143,7 +141,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, vec_splats( 1.0f ) );
++ vector float diff = vec_nmsub( estimate, v.m_v, ( vector float ){ 1.0f } );
+ return Vec4( vec_madd( diff, estimate, estimate ) );
+ }
+
diff --git a/nvidia-texture-tools-s390.patch b/nvidia-texture-tools-s390.patch
index 8ab2ade..88fb051 100644
--- a/nvidia-texture-tools-s390.patch
+++ b/nvidia-texture-tools-s390.patch
@@ -25,3 +25,48 @@ diff -up extern/poshlib/posh.h.orig extern/poshlib/posh.h
#if !defined POSH_CPU_STRING
# error POSH cannot determine target CPU
# define POSH_CPU_STRING "Unknown" /* this is here for Doxygen's benefit */
+diff -up src/nvcore/Debug.h.orig src/nvcore/Debug.h
+--- src/nvcore/Debug.h.orig 2021-02-25 10:17:35.200199481 -0300
++++ src/nvcore/Debug.h 2021-02-25 10:17:56.318328346 -0300
+@@ -166,7 +166,7 @@ NVCORE_API void NV_CDECL nvDebugPrint( c
+ namespace nv
+ {
+ inline bool isValidPtr(const void * ptr) {
+- #if NV_CPU_X86_64 || POSH_CPU_PPC64 || NV_CPU_AARCH64
++ #if NV_CPU_X86_64 || POSH_CPU_PPC64 || NV_CPU_AARCH64 || NV_CPU_S390
+ if (ptr == NULL) return true;
+ if (reinterpret_cast<uint64>(ptr) < 0x10000ULL) return false;
+ if (reinterpret_cast<uint64>(ptr) >= 0x000007FFFFFEFFFFULL) return false;
+diff -up src/nvcore/Debug.h.orig src/nvcore/Debug.h
+diff -up src/nvthread/Atomic.h.orig src/nvthread/Atomic.h
+--- src/nvthread/Atomic.h.orig 2021-02-25 11:42:21.289380524 -0300
++++ src/nvthread/Atomic.h 2021-02-25 11:43:17.214706223 -0300
+@@ -78,6 +78,16 @@ namespace nv {
+ uint32 ret = *ptr; // replace with ldrex?
+ nvCompilerReadWriteBarrier();
+ return ret;
++#elif POSH_CPU_S390
++ // need more specific cpu type for ppc64?
++ // also utilizes a full barrier
++ // currently treating load like x86 - this could be wrong
++
++ // this is the easiest but slowest way to do this
++ nvCompilerReadWriteBarrier();
++ uint32 ret = *ptr; // replace with ldrex?
++ nvCompilerReadWriteBarrier();
++ return ret;
+ #elif POSH_CPU_E2K
+ // need more specific cpu type for e2k?
+ // also utilizes a full barrier
+@@ -112,6 +122,11 @@ namespace nv {
+ nvCompilerReadWriteBarrier();
+ *ptr = value; //strex?
+ nvCompilerReadWriteBarrier();
++#elif POSH_CPU_S390
++ // this is the easiest but slowest way to do this
++ nvCompilerReadWriteBarrier();
++ *ptr = value; //strex?
++ nvCompilerReadWriteBarrier();
+ #elif POSH_CPU_E2K
+ // this is the easiest but slowest way to do this
+ nvCompilerReadWriteBarrier();
diff --git a/nvidia-texture-tools-simd.patch b/nvidia-texture-tools-simd.patch
index c1e2056..d13baae 100644
--- a/nvidia-texture-tools-simd.patch
+++ b/nvidia-texture-tools-simd.patch
@@ -40,3 +40,17 @@ diff -up extern/CMP_Core/source/cmp_math_vec4.h.orig extern/CMP_Core/source/cmp_
typedef Vec4<float> CMP_Vec4f;
typedef Vec4<double> CMP_Vec4d;
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-25 09:01:12.611528660 -0300
++++ CMakeLists.txt 2021-02-25 09:05:38.954201319 -0300
+@@ -24,6 +24,10 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ ADD_DEFINITIONS(-D_DEBUG=1)
+ ENDIF()
+
++IF(BUILD_SQUISH_WITH_ALTIVEC)
++ ADD_DEFINITIONS(-maltivec)
++ENDIF(BUILD_SQUISH_WITH_ALTIVEC)
++
+ IF(NVTT_SHARED)
+ SET(NVCORE_SHARED TRUE)
+ SET(NVMATH_SHARED TRUE)
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 90aee35..19a8f95 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -27,12 +27,14 @@ Patch3: %{name}-mips.patch
Patch4: %{name}-s390.patch
# add PPCLE support
Patch5: %{name}-ppcle.patch
+# add aarch64 support
+Patch6: %{name}-aarch64.patch
# Do not presume SSE is available
-Patch6: %{name}-simd.patch
+Patch7: %{name}-simd.patch
# Do not force compiler flags
-Patch7: %{name}-flags.patch
+Patch8: %{name}-flags.patch
# Only implemented for x86
-Patch8: %{name}-debug.patch
+Patch9: %{name}-debug.patch
%description
The NVIDIA Texture Tools is a collection of image processing and texture
@@ -63,8 +65,9 @@ Headers and libraries for development with %{name}.
%patch5 -p0
%patch6 -p0
%patch7 -p0
-%ifnarch %{ix86} x86_64
%patch8 -p0
+%ifnarch %{ix86} x86_64
+%patch9 -p0
%endif
%build
commit d162c8ed97d5cf9801c0b458818657a79989233f
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 08:24:53 2021 -0300
Correct typo
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index 09c1262..90aee35 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -64,7 +64,7 @@ Headers and libraries for development with %{name}.
%patch6 -p0
%patch7 -p0
%ifnarch %{ix86} x86_64
-%patch78 -p0
+%patch8 -p0
%endif
%build
commit 7e1a82c1f5d76277475b8a9342abd577325de7d4
Author: pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com>
Date: Thu Feb 25 08:03:22 2021 -0300
Update to version 2.1.2
diff --git a/.gitignore b/.gitignore
index 25998c4..246b0a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/nvidia-texture-tools-2.0.8-1.tar.gz
+/2.1.2.tar.gz
diff --git a/nvidia-texture-tools-2.0.8-gcc4.7.patch b/nvidia-texture-tools-2.0.8-gcc4.7.patch
deleted file mode 100644
index 773af16..0000000
--- a/nvidia-texture-tools-2.0.8-gcc4.7.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up nvidia-texture-tools/src/nvcore/Debug.cpp.orig nvidia-texture-tools/src/nvcore/Debug.cpp
---- nvidia-texture-tools/src/nvcore/Debug.cpp.orig 2012-05-18 22:10:11.359805471 -0300
-+++ nvidia-texture-tools/src/nvcore/Debug.cpp 2012-05-18 22:11:15.588807912 -0300
-@@ -34,6 +34,10 @@
- # endif
- #endif
-
-+#if NV_OS_LINUX
-+# include <unistd.h> // getpid
-+#endif
-+
- #if NV_OS_DARWIN
- # include <unistd.h> // getpid
- # include <sys/types.h>
diff --git a/nvidia-texture-tools-2.0.8-libdir.patch b/nvidia-texture-tools-2.0.8-libdir.patch
deleted file mode 100644
index b0cbcaa..0000000
--- a/nvidia-texture-tools-2.0.8-libdir.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig nvidia-texture-tools/src/nvcore/CMakeLists.txt
---- nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig 2012-05-18 23:32:42.120995054 -0300
-+++ nvidia-texture-tools/src/nvcore/CMakeLists.txt 2012-05-18 23:33:18.078996428 -0300
-@@ -47,5 +47,5 @@ TARGET_LINK_LIBRARIES(nvcore ${LIBS})
-
- INSTALL(TARGETS nvcore
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-diff -up nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig nvidia-texture-tools/src/nvimage/CMakeLists.txt
---- nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig 2012-05-18 23:32:37.775994885 -0300
-+++ nvidia-texture-tools/src/nvimage/CMakeLists.txt 2012-05-18 23:33:08.398996062 -0300
-@@ -67,6 +67,6 @@ TARGET_LINK_LIBRARIES(nvimage ${LIBS} nv
-
- INSTALL(TARGETS nvimage
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-
-diff -up nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig nvidia-texture-tools/src/nvmath/CMakeLists.txt
---- nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig 2012-05-18 23:32:31.192994634 -0300
-+++ nvidia-texture-tools/src/nvmath/CMakeLists.txt 2012-05-18 23:33:12.854996216 -0300
-@@ -33,5 +33,5 @@ TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvc
-
- INSTALL(TARGETS nvmath
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-diff -up nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig nvidia-texture-tools/src/nvtt/CMakeLists.txt
---- nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig 2012-05-18 23:32:18.184994143 -0300
-+++ nvidia-texture-tools/src/nvtt/CMakeLists.txt 2012-05-18 23:32:57.542995724 -0300
-@@ -58,7 +58,7 @@ TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcor
-
- INSTALL(TARGETS nvtt
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION lib/static)
-
- INSTALL(FILES nvtt.h DESTINATION include/nvtt)
diff --git a/nvidia-texture-tools-2.0.8-png-api.patch b/nvidia-texture-tools-2.0.8-png-api.patch
deleted file mode 100644
index 0b22916..0000000
--- a/nvidia-texture-tools-2.0.8-png-api.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/src/nvimage/ImageIO.cpp
-===================================================================
---- src/src/nvimage/ImageIO.cpp (revision 9895)
-+++ src/src/nvimage/ImageIO.cpp (working copy)
-@@ -603,7 +603,7 @@
- {
- nvDebugCheck(png_ptr != NULL);
-
-- Stream * s = (Stream *)png_ptr->io_ptr;
-+ Stream * s = (Stream *)png_get_io_ptr(png_ptr);
- s->serialize(data, (int)length);
-
- if (s->isError()) {
diff --git a/nvidia-texture-tools-2.0.8-soversion.patch b/nvidia-texture-tools-2.0.8-soversion.patch
deleted file mode 100644
index cb418f2..0000000
--- a/nvidia-texture-tools-2.0.8-soversion.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -up nvidia-texture-tools/CMakeLists.txt.orig nvidia-texture-tools/CMakeLists.txt
---- nvidia-texture-tools/CMakeLists.txt.orig 2012-05-18 22:58:53.135917349 -0300
-+++ nvidia-texture-tools/CMakeLists.txt 2012-05-18 22:59:45.293919346 -0300
-@@ -2,6 +2,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
- PROJECT(NV)
- ENABLE_TESTING()
-
-+set(PACKAGE_VERSION 2.0.8)
-+set(LIBRARY_SOVERSION 2.0)
-+
- SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
-
-diff -up nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig nvidia-texture-tools/src/nvcore/CMakeLists.txt
---- nvidia-texture-tools/src/nvcore/CMakeLists.txt.orig 2012-05-18 22:58:59.455917596 -0300
-+++ nvidia-texture-tools/src/nvcore/CMakeLists.txt 2012-05-18 23:00:45.677921655 -0300
-@@ -35,6 +35,10 @@ ENDIF(UNIX)
- IF(NVCORE_SHARED)
- ADD_DEFINITIONS(-DNVCORE_SHARED=1)
- ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
-+ SET_TARGET_PROPERTIES(nvcore
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVCORE_SHARED)
- ADD_LIBRARY(nvcore ${CORE_SRCS})
- ENDIF(NVCORE_SHARED)
-diff -up nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig nvidia-texture-tools/src/nvimage/CMakeLists.txt
---- nvidia-texture-tools/src/nvimage/CMakeLists.txt.orig 2012-05-18 22:59:07.007917887 -0300
-+++ nvidia-texture-tools/src/nvimage/CMakeLists.txt 2012-05-18 23:00:58.557922157 -0300
-@@ -55,6 +55,10 @@ ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
- IF(NVIMAGE_SHARED)
- ADD_DEFINITIONS(-DNVIMAGE_SHARED=1)
- ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS})
-+ SET_TARGET_PROPERTIES(nvimage
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVIMAGE_SHARED)
- ADD_LIBRARY(nvimage ${IMAGE_SRCS})
- ENDIF(NVIMAGE_SHARED)
-diff -up nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig nvidia-texture-tools/src/nvmath/CMakeLists.txt
---- nvidia-texture-tools/src/nvmath/CMakeLists.txt.orig 2012-05-18 22:59:13.119918119 -0300
-+++ nvidia-texture-tools/src/nvmath/CMakeLists.txt 2012-05-18 23:01:05.373922375 -0300
-@@ -21,6 +21,10 @@ ADD_DEFINITIONS(-DNVMATH_EXPORTS)
- IF(NVMATH_SHARED)
- ADD_DEFINITIONS(-DNVMATH_SHARED=1)
- ADD_LIBRARY(nvmath SHARED ${MATH_SRCS})
-+ SET_TARGET_PROPERTIES(nvmath
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVMATH_SHARED)
- ADD_LIBRARY(nvmath ${MATH_SRCS})
- ENDIF(NVMATH_SHARED)
-diff -up nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig nvidia-texture-tools/src/nvtt/CMakeLists.txt
---- nvidia-texture-tools/src/nvtt/CMakeLists.txt.orig 2012-05-18 22:59:21.607918449 -0300
-+++ nvidia-texture-tools/src/nvtt/CMakeLists.txt 2012-05-18 23:01:12.133922682 -0300
-@@ -46,6 +46,10 @@ ADD_DEFINITIONS(-DNVTT_EXPORTS)
- IF(NVTT_SHARED)
- ADD_DEFINITIONS(-DNVTT_SHARED=1)
- ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS})
-+ SET_TARGET_PROPERTIES(nvtt
-+ PROPERTIES
-+ VERSION ${PACKAGE_VERSION}
-+ SOVERSION ${LIBRARY_SOVERSION})
- ELSE(NVTT_SHARED)
- ADD_LIBRARY(nvtt ${NVTT_SRCS})
- ENDIF(NVTT_SHARED)
diff --git a/nvidia-texture-tools-2.0.8-wordsize.patch b/nvidia-texture-tools-2.0.8-wordsize.patch
deleted file mode 100644
index e93eaac..0000000
--- a/nvidia-texture-tools-2.0.8-wordsize.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up nvidia-texture-tools/src/nvcore/DefsGnucLinux.h.orig nvidia-texture-tools/src/nvcore/DefsGnucLinux.h
---- nvidia-texture-tools/src/nvcore/DefsGnucLinux.h.orig 2012-05-18 22:17:43.367822764 -0300
-+++ nvidia-texture-tools/src/nvcore/DefsGnucLinux.h 2012-05-18 22:19:50.709827759 -0300
-@@ -2,6 +2,8 @@
- #error "Do not include this file directly."
- #endif
-
-+#include <bits/wordsize.h>
-+
- // Function linkage
- #define DLL_IMPORT
- #if __GNUC__ >= 4
-@@ -58,8 +60,13 @@ typedef signed short int16;
- typedef unsigned int uint32;
- typedef signed int int32;
-
-+#if __WORDSIZE == 32
- typedef unsigned long long uint64;
- typedef signed long long int64;
-+#else
-+typedef unsigned long uint64;
-+typedef signed long int64;
-+#endif
-
- // Aliases
- typedef uint32 uint;
diff --git a/nvidia-texture-tools-aarch64.patch b/nvidia-texture-tools-aarch64.patch
deleted file mode 100644
index 7f9d09e..0000000
--- a/nvidia-texture-tools-aarch64.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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-arm.patch b/nvidia-texture-tools-arm.patch
deleted file mode 100644
index 3e6a8c6..0000000
--- a/nvidia-texture-tools-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nvidia-texture-tools/src/nvcore/nvcore.h.orig 2013-07-30 09:48:05.111350472 -0500
-+++ nvidia-texture-tools/src/nvcore/nvcore.h 2013-07-30 09:50:19.667643065 -0500
-@@ -70,6 +70,8 @@
- # define NV_CPU_X86 1
- #elif defined POSH_CPU_PPC
- # define NV_CPU_PPC 1
-+#elif defined POSH_CPU_STRONGARM
-+# define NV_CPU_STRONGARM 1
- #else
- # error "Unsupported CPU"
- #endif
diff --git a/nvidia-texture-tools-bool-null.patch b/nvidia-texture-tools-bool-null.patch
deleted file mode 100644
index bb5453f..0000000
--- a/nvidia-texture-tools-bool-null.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -up nvidia-texture-tools/src/nvimage/ImageIO.cpp.orig nvidia-texture-tools/src/nvimage/ImageIO.cpp
---- nvidia-texture-tools/src/nvimage/ImageIO.cpp.orig 2016-03-17 16:05:57.432384322 -0300
-+++ nvidia-texture-tools/src/nvimage/ImageIO.cpp 2016-03-17 16:07:43.769388394 -0300
-@@ -135,7 +135,7 @@ FloatImage * nv::ImageIO::loadFloat(cons
- StdInputStream stream(fileName);
-
- if (stream.isError()) {
-- return false;
-+ return NULL;
- }
-
- return loadFloat(fileName, stream);
-@@ -233,7 +233,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
- case TGA_TYPE_INDEXED:
- if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
- nvDebug( "*** ImageIO::loadTGA: Error, only 24bit paletted images are supported.\n" );
-- return false;
-+ return NULL;
- }
- pal = true;
- break;
-@@ -254,7 +254,7 @@ Image * nv::ImageIO::loadTGA(Stream & s)
-
- default:
- nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
-- return false;
-+ return NULL;
- }
-
- const uint pixel_size = (tga.pixel_size/8);
-@@ -621,7 +621,7 @@ Image * nv::ImageIO::loadPNG(Stream & s)
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if (png_ptr == NULL) {
- // nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name );
-- return false;
-+ return NULL;
- }
-
- // Allocate/initialize a memory block for the image information
-@@ -629,14 +629,14 @@ Image * nv::ImageIO::loadPNG(Stream & s)
- if (info_ptr == NULL) {
- png_destroy_read_struct(&png_ptr, NULL, NULL);
- // nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name );
-- return false;
-+ return NULL;
- }
-
- // Set up the error handling
- if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- // nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name );
-- return false;
-+ return NULL;
- }
-
- // Set up the I/O functions.
diff --git a/nvidia-texture-tools-check.patch b/nvidia-texture-tools-check.patch
new file mode 100644
index 0000000..976cc84
--- /dev/null
+++ b/nvidia-texture-tools-check.patch
@@ -0,0 +1,31 @@
+diff -up src/nvtt/tests/CMakeLists.txt.orig src/nvtt/tests/CMakeLists.txt
+--- src/nvtt/tests/CMakeLists.txt.orig 2021-02-23 06:12:25.272491130 -0300
++++ src/nvtt/tests/CMakeLists.txt 2021-02-23 06:12:47.525609378 -0300
+@@ -4,12 +4,12 @@ TARGET_LINK_LIBRARIES(filtertest nvcore
+
+ ADD_EXECUTABLE(nvtestsuite testsuite.cpp)
+ TARGET_LINK_LIBRARIES(nvtestsuite nvcore nvmath nvimage nvtt)
+-ADD_TEST(NVTT.TestSuite.Kodak.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 0 -out output-cuda-kodak)
+-ADD_TEST(NVTT.TestSuite.Waterloo.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 1 -out output-cuda-waterloo)
+-ADD_TEST(NVTT.TestSuite.Epic.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 2 -out output-cuda-epic)
+-ADD_TEST(NVTT.TestSuite.Kodak.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 0 -nocuda -out output-nocuda-kodak)
+-ADD_TEST(NVTT.TestSuite.Waterloo.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 1 -nocuda -out output-nocuda-waterloo)
+-ADD_TEST(NVTT.TestSuite.Epic.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite -set 2 -nocuda -out output-nocuda-epic)
++ADD_TEST(NVTT.TestSuite.Kodak.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 0 -out output-cuda-kodak)
++ADD_TEST(NVTT.TestSuite.Waterloo.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 1 -out output-cuda-waterloo)
++ADD_TEST(NVTT.TestSuite.Epic.cuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 2 -out output-cuda-epic)
++ADD_TEST(NVTT.TestSuite.Kodak.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 0 -nocuda -out output-nocuda-kodak)
++ADD_TEST(NVTT.TestSuite.Waterloo.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 1 -nocuda -out output-nocuda-waterloo)
++ADD_TEST(NVTT.TestSuite.Epic.nocuda nvtestsuite -path ${NV_SOURCE_DIR}/data/testsuite/ -set 2 -nocuda -out output-nocuda-epic)
+
+ IF (CUDA_FOUND)
+ ADD_EXECUTABLE(driverapitest driverapi.cpp)
+@@ -31,7 +31,7 @@ TARGET_LINK_LIBRARIES(nvhdrtest nvcore n
+ #ADD_EXECUTABLE(bc1enc bc1enc.cpp)
+ #TARGET_LINK_LIBRARIES(bc1enc nvcore nvimage nvmath squish CMP_Core)
+
+-INSTALL(TARGETS nvtestsuite nvhdrtest DESTINATION bin)
++#INSTALL(TARGETS nvtestsuite nvhdrtest DESTINATION bin)
+
+ #include_directories("/usr/include/ffmpeg/")
+ #ADD_EXECUTABLE(nvmpegenc tools/mpegenc.cpp tools/cmdline.h)
diff --git a/nvidia-texture-tools-debug.patch b/nvidia-texture-tools-debug.patch
new file mode 100644
index 0000000..673edc4
--- /dev/null
+++ b/nvidia-texture-tools-debug.patch
@@ -0,0 +1,66 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-24 15:38:17.881472659 -0300
++++ CMakeLists.txt 2021-02-24 15:38:20.230485965 -0300
+@@ -24,6 +24,9 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ ADD_DEFINITIONS(-D_DEBUG=1)
+ ENDIF()
+
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNV_NO_ASSERT=1")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNV_NO_ASSERT=1")
++
+ IF(NVTT_SHARED)
+ SET(NVCORE_SHARED TRUE)
+ SET(NVMATH_SHARED TRUE)
+diff -up src/nvcore/CMakeLists.txt.orig src/nvcore/CMakeLists.txt
+--- src/nvcore/CMakeLists.txt.orig 2021-02-24 15:38:17.873472614 -0300
++++ src/nvcore/CMakeLists.txt 2021-02-24 15:38:20.228485954 -0300
+@@ -3,7 +3,6 @@ PROJECT(nvcore)
+ SET(CORE_SRCS
+ nvcore.h
+ Array.h
+- Debug.h Debug.cpp
+ DefsGnucDarwin.h
+ DefsGnucLinux.h
+ DefsGnucWin32.h
+diff -up src/bc7/avpcl_mode4.cpp.orig src/bc7/avpcl_mode4.cpp
+--- src/bc7/avpcl_mode4.cpp.orig 2021-02-24 15:51:20.362903501 -0300
++++ src/bc7/avpcl_mode4.cpp 2021-02-24 15:51:52.829087279 -0300
+@@ -519,7 +519,7 @@ static float map_colors(const Vector4 co
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : 0;
+ toterr += besterr;
+
+ // do A index
+@@ -647,7 +647,7 @@ static void assign_indices(const Tile &t
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[region][bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[region][bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : 0;
+ toterr[region] += besterr;
+
+ // do A index
+diff -up src/bc7/avpcl_mode5.cpp.orig src/bc7/avpcl_mode5.cpp
+--- src/bc7/avpcl_mode5.cpp.orig 2021-02-24 15:51:27.342943012 -0300
++++ src/bc7/avpcl_mode5.cpp 2021-02-24 15:51:46.341050553 -0300
+@@ -520,7 +520,7 @@ static float map_colors(const Vector4 co
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : 0;
+ toterr += besterr;
+
+ // do A index
+@@ -648,7 +648,7 @@ static void assign_indices(const Tile &t
+ }
+ palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[region][bestindex]).x :
+ (rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[region][bestindex]).y :
+- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : nvCheckMacro(0);
++ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : 0;
+ toterr[region] += besterr;
+
+ // do A index
diff --git a/nvidia-texture-tools-docs.patch b/nvidia-texture-tools-docs.patch
new file mode 100644
index 0000000..e8316ca
--- /dev/null
+++ b/nvidia-texture-tools-docs.patch
@@ -0,0 +1,18 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-23 07:27:10.611067241 -0300
++++ CMakeLists.txt 2021-02-23 07:27:35.953203458 -0300
+@@ -38,10 +38,10 @@ ADD_SUBDIRECTORY(extern)
+ ADD_SUBDIRECTORY(src)
+
+ # These files should only be installed when creating packages.
+-INSTALL(FILES
+- LICENSE
+- README.md
+- DESTINATION share/doc/nvtt)
++# INSTALL(FILES
++# LICENSE
++# README.md
++# DESTINATION share/doc/nvtt)
+
+ # Add packaging support
+ INCLUDE(InstallRequiredSystemLibraries)
diff --git a/nvidia-texture-tools-flags.patch b/nvidia-texture-tools-flags.patch
new file mode 100644
index 0000000..98a8c33
--- /dev/null
+++ b/nvidia-texture-tools-flags.patch
@@ -0,0 +1,12 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-24 11:32:41.101973054 -0300
++++ CMakeLists.txt 2021-02-24 11:32:46.452001665 -0300
+@@ -19,8 +19,6 @@ else()
+ message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+ endif()
+
+-INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
+-
+ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ SET(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Postfix for debug build libraries.")
+ ADD_DEFINITIONS(-D_DEBUG=1)
diff --git a/nvidia-texture-tools-libs.patch b/nvidia-texture-tools-libs.patch
new file mode 100644
index 0000000..b97c9e4
--- /dev/null
+++ b/nvidia-texture-tools-libs.patch
@@ -0,0 +1,153 @@
+diff -up CMakeLists.txt.orig CMakeLists.txt
+--- CMakeLists.txt.orig 2021-02-23 05:07:03.217873178 -0300
++++ CMakeLists.txt 2021-02-23 05:07:30.217012734 -0300
+@@ -2,6 +2,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
+ PROJECT(NV)
+ ENABLE_TESTING()
+
++set(PACKAGE_VERSION 2.1.2)
++set(LIBRARY_SOVERSION 2.1)
++
+ SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
+
+@@ -23,6 +26,12 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug")
+ ADD_DEFINITIONS(-D_DEBUG=1)
+ ENDIF()
+
++IF(NVTT_SHARED)
++ SET(NVCORE_SHARED TRUE)
++ SET(NVMATH_SHARED TRUE)
++ SET(NVIMAGE_SHARED TRUE)
++ SET(NVTHREAD_SHARED TRUE)
++ENDIF(NVTT_SHARED)
+
+ ADD_SUBDIRECTORY(extern)
+
+diff -up src/nvcore/CMakeLists.txt.orig src/nvcore/CMakeLists.txt
+--- src/nvcore/CMakeLists.txt.orig 2021-02-22 18:18:43.500403584 -0300
++++ src/nvcore/CMakeLists.txt 2021-02-22 18:19:32.913676238 -0300
+@@ -33,6 +33,10 @@ ENDIF(UNIX)
+ IF(NVCORE_SHARED)
+ ADD_DEFINITIONS(-DNVCORE_SHARED=1)
+ ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
++ SET_TARGET_PROPERTIES(nvcore
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVCORE_SHARED)
+ ADD_LIBRARY(nvcore ${CORE_SRCS})
+ ENDIF(NVCORE_SHARED)
+@@ -46,5 +50,5 @@ endif()
+
+ INSTALL(TARGETS nvcore
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+diff -up src/nvimage/CMakeLists.txt.orig src/nvimage/CMakeLists.txt
+--- src/nvimage/CMakeLists.txt.orig 2021-02-22 18:19:56.299805277 -0300
++++ src/nvimage/CMakeLists.txt 2021-02-22 18:20:51.082107555 -0300
+@@ -50,6 +50,10 @@ ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
+ IF(NVIMAGE_SHARED)
+ ADD_DEFINITIONS(-DNVIMAGE_SHARED=1)
+ ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS})
++ SET_TARGET_PROPERTIES(nvimage
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVIMAGE_SHARED)
+ ADD_LIBRARY(nvimage ${IMAGE_SRCS})
+ ENDIF(NVIMAGE_SHARED)
+@@ -58,6 +62,6 @@ TARGET_LINK_LIBRARIES(nvimage ${LIBS} nv
+
+ INSTALL(TARGETS nvimage
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+
+diff -up src/nvmath/CMakeLists.txt.orig src/nvmath/CMakeLists.txt
+--- src/nvmath/CMakeLists.txt.orig 2021-02-22 18:21:03.021173431 -0300
++++ src/nvmath/CMakeLists.txt 2021-02-22 18:21:57.570474430 -0300
+@@ -14,11 +14,20 @@ SET(MATH_SRCS
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+-ADD_LIBRARY(nvmath ${MATH_SRCS})
++IF(NVMATH_SHARED)
++ ADD_DEFINITIONS(-DNMATH_SHARED=1)
++ ADD_LIBRARY(nvmath SHARED ${MATH_SRCS})
++ SET_TARGET_PROPERTIES(nvmath
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
++ELSE(NVMATH_SHARED)
++ ADD_LIBRARY(nvmath ${MATH_SRCS})
++ENDIF(NVMATH_SHARED)
+
+ TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
+
+ INSTALL(TARGETS nvmath
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+diff -up src/nvthread/CMakeLists.txt.orig src/nvthread/CMakeLists.txt
+--- src/nvthread/CMakeLists.txt.orig 2021-02-23 04:45:54.643331358 -0300
++++ src/nvthread/CMakeLists.txt 2021-02-23 04:46:55.665643283 -0300
+@@ -16,6 +16,10 @@ ADD_DEFINITIONS(-DNVTHREAD_EXPORTS)
+
+ IF(NVTHREAD_SHARED)
+ ADD_LIBRARY(nvthread SHARED ${THREAD_SRCS})
++ SET_TARGET_PROPERTIES(nvthread
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVTHREAD_SHARED)
+ ADD_LIBRARY(nvthread ${THREAD_SRCS})
+ ENDIF(NVTHREAD_SHARED)
+@@ -24,5 +28,5 @@ TARGET_LINK_LIBRARIES(nvthread ${LIBS} n
+
+ INSTALL(TARGETS nvthread
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+diff -up src/nvtt/CMakeLists.txt.orig src/nvtt/CMakeLists.txt
+--- src/nvtt/CMakeLists.txt.orig 2021-02-22 18:22:16.155576979 -0300
++++ src/nvtt/CMakeLists.txt 2021-02-22 18:22:48.018752789 -0300
+@@ -49,6 +49,10 @@ ADD_DEFINITIONS(-DNVTT_EXPORTS)
+
+ IF(NVTT_SHARED)
+ ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS})
++ SET_TARGET_PROPERTIES(nvtt
++ PROPERTIES
++ VERSION ${PACKAGE_VERSION}
++ SOVERSION ${LIBRARY_SOVERSION})
+ ELSE(NVTT_SHARED)
+ ADD_LIBRARY(nvtt ${NVTT_SRCS})
+ ENDIF(NVTT_SHARED)
+@@ -57,7 +61,7 @@ TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcor
+
+ INSTALL(TARGETS nvtt
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
++ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION lib/static)
+
+ INSTALL(FILES nvtt.h nvtt_wrapper.h DESTINATION include/nvtt)
+diff -up extern/libsquish-1.15/CMakeLists.txt.orig extern/libsquish-1.15/CMakeLists.txt
+--- extern/libsquish-1.15/CMakeLists.txt.orig 2021-02-23 04:56:58.942749647 -0300
++++ extern/libsquish-1.15/CMakeLists.txt 2021-02-23 04:57:07.724795042 -0300
+@@ -108,10 +108,3 @@ IF (BUILD_SQUISH_EXTRA)
+ TARGET_LINK_LIBRARIES(squishpng squish ${PNG_LIBRARIES})
+ ENDIF (PNG_FOUND)
+ ENDIF (BUILD_SQUISH_EXTRA)
+-
+-INSTALL(
+- TARGETS squish
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
+- PUBLIC_HEADER DESTINATION include
+- )
diff --git a/nvidia-texture-tools-mips.patch b/nvidia-texture-tools-mips.patch
index 4773641..532ebc3 100644
--- a/nvidia-texture-tools-mips.patch
+++ b/nvidia-texture-tools-mips.patch
@@ -1,38 +1,14 @@
-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 -up src/nvcore/nvcore.h.orig src/nvcore/nvcore.h
+--- src/nvcore/nvcore.h.orig 2020-08-24 03:27:21.000000000 -0300
++++ src/nvcore/nvcore.h 2021-02-22 17:41:56.397423994 -0300
+@@ -115,6 +115,10 @@
+ # define NV_CPU_ARM_64 1
+ #elif defined POSH_CPU_E2K
+ # define NV_CPU_E2K 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 --git a/nvidia-texture-tools-ppcle.patch b/nvidia-texture-tools-ppcle.patch
index 0b25fd3..9b32672 100644
--- a/nvidia-texture-tools-ppcle.patch
+++ b/nvidia-texture-tools-ppcle.patch
@@ -1,39 +1,69 @@
-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 @@
+diff -up extern/libsquish-1.15/simd_ve.h.orig extern/libsquish-1.15/simd_ve.h
+--- extern/libsquish-1.15/simd_ve.h.orig 2021-02-24 16:12:12.187577193 -0300
++++ extern/libsquish-1.15/simd_ve.h 2021-02-24 16:24:04.568285598 -0300
+@@ -23,15 +23,15 @@
+
+ -------------------------------------------------------------------------- */
+
+-#ifndef SQUISH_SIMD_VE_H
+-#define SQUISH_SIMD_VE_H
++#ifndef NV_SQUISH_SIMD_VE_H
++#define NV_SQUISH_SIMD_VE_H
+
+ #include <altivec.h>
+ #undef bool
namespace squish {
--#define VEC4_CONST( X ) Vec4( ( vector float )( X ) )
-+#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
+-#define VEC4_CONST( X ) Vec4( ( vector float ){ X } )
++#define VEC4_CONST( X ) Vec4( ( vec_splats( (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;
- }
-
+
+ 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, vec_splats( -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
+
+ 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, vec_splats( -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 ) );
- }
-
+ 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, vec_splats( 1.0f ) );
+ return Vec4( vec_madd( diff, estimate, estimate ) );
+ }
+
+@@ -163,4 +163,4 @@ private:
+
+ } // namespace squish
+
+-#endif // ndef SQUISH_SIMD_VE_H
++#endif // ndef NV_SQUISH_SIMD_VE_H
+diff -up src/nvtt/squish/simd_ve.h.orig src/nvtt/squish/simd_ve.h
+--- src/nvtt/squish/simd_ve.h.orig 2021-02-24 16:12:00.057516674 -0300
++++ src/nvtt/squish/simd_ve.h 2021-02-24 16:12:52.778779698 -0300
+@@ -27,10 +27,8 @@
+ #ifndef SQUISH_SIMD_VE_H
+ #define SQUISH_SIMD_VE_H
+
+-#if !defined(__APPLE_ALTIVEC__) || defined(__PPC64__)
+ #include <altivec.h>
+ #undef bool
+-#endif
+
+ namespace nvsquish {
+
diff --git a/nvidia-texture-tools-s390.patch b/nvidia-texture-tools-s390.patch
index 93d2463..8ab2ade 100644
--- a/nvidia-texture-tools-s390.patch
+++ b/nvidia-texture-tools-s390.patch
@@ -1,23 +1,23 @@
-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"
+diff -up src/nvcore/nvcore.h.orig src/nvcore/nvcore.h
+--- src/nvcore/nvcore.h.orig 2021-02-22 17:43:36.159964579 -0300
++++ src/nvcore/nvcore.h 2021-02-22 17:43:56.917077055 -0300
+@@ -119,6 +119,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 extern/poshlib/posh.h.orig extern/poshlib/posh.h
+--- extern/poshlib/posh.h.orig 2021-02-24 14:04:24.455712030 -0300
++++ extern/poshlib/posh.h 2021-02-24 14:06:16.557482153 -0300
+@@ -560,6 +560,11 @@ LCC predefines the following:
+ # define POSH_CPU_STRING "MCST Elbrus 2000"
#endif
-+#if defined __s390__ || defined __s390x__
++#if defined __s390x__
+# define POSH_CPU_S390 1
+# define POSH_CPU_STRING "S390"
+#endif
diff --git a/nvidia-texture-tools-simd.patch b/nvidia-texture-tools-simd.patch
new file mode 100644
index 0000000..c1e2056
--- /dev/null
+++ b/nvidia-texture-tools-simd.patch
@@ -0,0 +1,42 @@
+diff -up extern/libsquish-1.15/CMakeLists.txt.orig extern/libsquish-1.15/CMakeLists.txt
+--- extern/libsquish-1.15/CMakeLists.txt.orig 2021-02-24 10:47:15.629070541 -0300
++++ extern/libsquish-1.15/CMakeLists.txt 2021-02-24 10:48:37.453467988 -0300
+@@ -36,9 +36,13 @@ IF (CMAKE_GENERATOR STREQUAL "Xcode")
+ ELSE (CMAKE_GENERATOR STREQUAL "Xcode")
+ IF (BUILD_SQUISH_WITH_SSE2 AND NOT WIN32)
+ ADD_DEFINITIONS(-DSQUISH_USE_SSE=2 -msse2)
++ ELSE (BUILD_SQUISH_WITH_SSE2 AND NOT WIN32)
++ ADD_DEFINITIONS(-DSQUISH_USE_SSE=0)
+ ENDIF (BUILD_SQUISH_WITH_SSE2 AND NOT WIN32)
+ IF (BUILD_SQUISH_WITH_ALTIVEC AND NOT WIN32)
+ ADD_DEFINITIONS(-DSQUISH_USE_ALTIVEC=1 -maltivec)
++ ELSE (BUILD_SQUISH_WITH_ALTIVEC AND NOT WIN32)
++ ADD_DEFINITIONS(-DSQUISH_USE_ALTIVEC=0)
+ ENDIF (BUILD_SQUISH_WITH_ALTIVEC AND NOT WIN32)
+ ENDIF (CMAKE_GENERATOR STREQUAL "Xcode")
+
+diff -up extern/CMP_Core/source/cmp_math_vec4.h.orig extern/CMP_Core/source/cmp_math_vec4.h
+--- extern/CMP_Core/source/cmp_math_vec4.h.orig 2021-02-24 13:17:51.629327597 -0300
++++ extern/CMP_Core/source/cmp_math_vec4.h 2021-02-24 13:45:22.725513798 -0300
+@@ -322,10 +322,13 @@ public:
+ };
+
+ #include <stdio.h>
++#if SQUISH_USE_SSE
+ #include "xmmintrin.h"
++#endif
+ #include <math.h>
+ #include <float.h>
+
++#if SQUISH_USE_SSE
+ // SSE Vec4
+ #ifdef _LINUX
+ class CMP_SSEVec4f
+@@ -419,6 +422,7 @@ public:
+ };
+
+ };
++#endif // SQUISH_USE_SSE
+
+ typedef Vec4<float> CMP_Vec4f;
+ typedef Vec4<double> CMP_Vec4d;
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index e6e6653..09c1262 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -1,12 +1,12 @@
-%global soversion 2.0
+%global soversion 2.1
Name: nvidia-texture-tools
-Version: 2.0.8
-Release: 26%{?dist}
+Version: 2.1.2
+Release: 1%{?dist}
Summary: Collection of image processing and texture manipulation tools
-License: MIT
-URL: http://code.google.com/p/nvidia-texture-tools/
-Source0: http://nvidia-texture-tools.googlecode.com/files/%{name}-%{version}-1.tar.gz
+License: MIT and ASL 2.0 and BSD
+URL: https://github.com/castano/nvidia-texture-tools/wiki
+Source0: https://github.com/castano/%{name}/archive/%{version}.tar.gz
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -17,29 +17,22 @@ BuildRequires: libtiff-devel
BuildRequires: openjpeg-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
-# 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
-# to conflict with other headers that do not use long long on 64 bit
-Patch1: %{name}-%{version}-wordsize.patch
-# from 0ad sources
-Patch2: %{name}-%{version}-png-api.patch
-# add soversion to libraries
-Patch3: %{name}-%{version}-soversion.patch
-# install libraries in proper directory
-Patch4: %{name}-%{version}-libdir.patch
-# add arm support
-Patch5: %{name}-arm.patch
-# add aarch64 support
-Patch6: %{name}-aarch64.patch
-# Return NULL not false on pointer returning functions
-Patch7: %{name}-bool-null.patch
+
+Patch0: %{name}-libs.patch
+Patch1: %{name}-check.patch
+Patch2: %{name}-docs.patch
# add MIPS support
-Patch8: %{name}-mips.patch
+Patch3: %{name}-mips.patch
# add S390 support
-Patch9: %{name}-s390.patch
+Patch4: %{name}-s390.patch
# add PPCLE support
-Patch10: %{name}-ppcle.patch
+Patch5: %{name}-ppcle.patch
+# Do not presume SSE is available
+Patch6: %{name}-simd.patch
+# Do not force compiler flags
+Patch7: %{name}-flags.patch
+# Only implemented for x86
+Patch8: %{name}-debug.patch
%description
The NVIDIA Texture Tools is a collection of image processing and texture
@@ -61,24 +54,31 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Headers and libraries for development with %{name}.
%prep
-%setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%setup -q
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%ifnarch %{ix86} x86_64
+%patch78 -p0
+%endif
%build
-%cmake -DNVTT_SHARED=1 -DCMAKE_SKIP_RPATH=1
+%cmake -DNVTT_SHARED=1 -DCMAKE_SKIP_RPATH=1 \
+%ifnarch %{ix86} x86_64
+ -DBUILD_SQUISH_WITH_SSE2=OFF \
+%endif
+%ifarch ppc64 ppc64le
+ -DBUILD_SQUISH_WITH_ALTIVEC=ON \
+%endif
+
%cmake_build
-sed -e 's/\r//' -i NVIDIA_*.txt
+sed -e 's/\r//' -i LICENSE
%install
%cmake_install
@@ -91,13 +91,14 @@ pushd $RPM_BUILD_ROOT/%{_bindir}
popd
%check
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir}:
%ctest
%ldconfig_scriptlets
%files
-%doc NVIDIA_Texture_Tools_LICENSE.txt
-%doc NVIDIA_Texture_Tools_README.txt
+%license LICENSE
+%doc README.md
%{_bindir}/*
%{_libdir}/lib*.%{version}
%{_libdir}/lib*.%{soversion}
@@ -109,6 +110,9 @@ popd
%{_libdir}/lib*.so
%changelog
+* Mon Feb 22 2021 pcpa <paulo.cesar.pereira.de.andrade(a)gmail.com> - 2.1.2-1
+- Update to version 2.1.2
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 9e78729..1797125 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7449c95ca1583b512561c83c5a5f401c nvidia-texture-tools-2.0.8-1.tar.gz
+SHA512 (2.1.2.tar.gz) = 4285e1a348c6ab9abbc34a499879fe1c8ff6976da01d0397eb95e19ae7fb566f3efb57613d2cee31e6c694b497a28b050e377267e137a4d114d093d681824adb
commit f0dfaf0cd5c142540716db1c1e07f19de6fb1100
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 21:48:21 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/nvidia-texture-tools.spec b/nvidia-texture-tools.spec
index e96ed16..e6e6653 100644
--- a/nvidia-texture-tools.spec
+++ b/nvidia-texture-tools.spec
@@ -2,7 +2,7 @@
Name: nvidia-texture-tools
Version: 2.0.8
-Release: 25%{?dist}
+Release: 26%{?dist}
Summary: Collection of image processing and texture manipulation tools
License: MIT
URL: http://code.google.com/p/nvidia-texture-tools/
@@ -109,6 +109,9 @@ popd
%{_libdir}/lib*.so
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Mon Oct 19 2020 Kalev Lember <klember(a)redhat.com> - 2.0.8-25
- Fix FTBFS with new cmake macros (#1865080)
1
0
26 Feb '21
The package rpms/giada.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/giada.git/commit/?id=6afe7833fa6a56…
https://src.fedoraproject.org/cgit/rpms/giada.git/commit/?id=b53581b055b00e….
Change:
-%ifnarch ppc64le
+%ifnarch ppc64le
Thanks.
Full change:
============
commit ed7012160cf8b4fe2868d0d4e555e4b6c12a9bd4
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Fri Feb 26 08:07:01 2021 -0500
Add Fedora 32 compatibility
diff --git a/giada.spec b/giada.spec
index 8b6a51d..0cb90bd 100644
--- a/giada.spec
+++ b/giada.spec
@@ -2,7 +2,7 @@
Name: giada
Version: 0.17.1
-Release: 4%{?dist}
+Release: 4%{?dist}.1
Summary: Your hardcore loop machine
# LICENSING NOTE:
@@ -67,7 +67,11 @@ BuildRequires: ninja-build
BuildRequires: pkgconfig(rtmidi)
+%if 0%{?fedora} == 32
+BuildRequires: fltk-devel
+%else
BuildRequires: cmake(FLTK)
+%endif
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(samplerate)
@@ -216,6 +220,9 @@ xvfb-run -a %{buildroot}%{_bindir}/giada --run-tests
%changelog
+* Fri Feb 26 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-4.1
+- Add Fedora 32 compatibility
+
* Thu Feb 25 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-4
- Remove VST 3 SDK and JUCE from source tarball for legal reasons; disable all
VST support
commit 043c8d40391c620f423ef381e5a5d526a0487f5f
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Thu Feb 25 17:42:30 2021 -0500
Remove stray debugging “find” commands
diff --git a/giada.spec b/giada.spec
index 7e7d003..8b6a51d 100644
--- a/giada.spec
+++ b/giada.spec
@@ -200,9 +200,6 @@ appstream-util validate-relax --nonet \
xvfb-run -a %{buildroot}%{_bindir}/giada --run-tests
%endif
-find %{_vpath_builddir} -type f
-find %{buildroot} -type f
-
%files
%license COPYING
@@ -223,6 +220,7 @@ find %{buildroot} -type f
- Remove VST 3 SDK and JUCE from source tarball for legal reasons; disable all
VST support
- Update License field to reflect the removed bundled dependencies
+- Remove stray debugging “find” commands
* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-3
- Add link to upstream issue for format-security patch
commit 6afe7833fa6a56ec7808dcdc89282e1c98ea3fd7
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Thu Feb 25 17:42:16 2021 -0500
Remove VST 3 SDK and JUCE from source tarball for legal reasons; disable all VST support; update License field to reflect the removed bundled dependencies
diff --git a/.gitignore b/.gitignore
index f1cbca4..0b6ef91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/giada-0.16.4-src.tar.gz
/giada-0.17.0-src.tar.gz
/giada-0.17.1-src.tar.gz
+/giada-0.17.1-src-distributable.tar.xz
diff --git a/download-and-filter-source.sh b/download-and-filter-source.sh
new file mode 100755
index 0000000..e681037
--- /dev/null
+++ b/download-and-filter-source.sh
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+set -o nounset
+set -o errexit
+
+if [ "$#" != '0' ]
+then
+ if [ "${1-}" != '-h' ] && [ "${1-}" != '--help' ]
+ then
+ code='0'
+ exec 1>&2
+ fi
+ cat <<EOF
+USAGE: $0
+
+Reads giada.spec from the same directory as the script. Uses the value of
+%upstream_source to download the upstream release archive; filters out
+non-redistributable files; and writes a distributable tarball to the current
+working directory.
+EOF
+ exit "${code-1}"
+fi
+
+OUTDIR="${PWD}"
+cd "$(dirname "$0")"
+SPEC="${PWD}/giada.spec"
+
+URL="$(
+ rpm -E "$(
+ awk -F: '
+ tolower($0) ~ /^(name|version|summary|url):/ {
+ colon = index($0, ":")
+ printf("%%global %s %s\n", tolower($1), substr($0, colon + 1))
+ }
+ ' "${SPEC}"
+ )
+ $(grep -E '^%global ' "${SPEC}")
+ %upstream_source
+ " | sed -r -e 's/^[[:blank:]]+//' -e 's/[[:blank:]]$//'
+)"
+ARCHIVE="$(echo "${URL}" | awk -F / '{ print $NF }')"
+
+cat 1>&2 <<EOF
+
+Downloading:
+
+ URL: ${URL}
+ Archive: ${ARCHIVE}
+
+EOF
+
+# Download the archive
+tmpdir="$(mktemp --directory)"
+trap "rm -rf '${tmpdir}'" INT TERM EXIT
+curl \
+ --location \
+ --proto-redir -all,https \
+ --output "${tmpdir}/${ARCHIVE}" \
+ "${URL}"
+
+phase() {
+cat <<EOF
+
+==============================================================================
+$1
+==============================================================================
+
+EOF
+}
+
+phase 'Extracting upstream archive'
+# Extract the archive
+xdir="${tmpdir}/x"
+mkdir "${xdir}"
+tar -C "${xdir}" -xzf "${tmpdir}/${ARCHIVE}"
+echo "Extracted ${ARCHIVE} ($(
+ stat --format=%s "${tmpdir}/${ARCHIVE}"
+) bytes)"
+
+
+phase 'Filtering upstream archive'
+(
+ set -o nounset
+ set -o errexit
+
+ cd "${xdir}"
+
+ echo '--> Removing VST 3 SDK'
+ rm -rf */src/deps/vst3sdk
+
+ echo '--> Removing JUCE'
+ rm -rf */src/deps/juce
+)
+
+phase 'Writing filtered archive'
+FILTERED_ARCHIVE="$(basename "${ARCHIVE}" .tar.gz)-distributable.tar"
+tar -C "${xdir}" -c . -f "./${FILTERED_ARCHIVE}"
+echo "Wrote ${FILTERED_ARCHIVE} ($(
+ stat --format=%s "${FILTERED_ARCHIVE}"
+) bytes)"
+
+phase 'Re-compressing filtered archive'
+rm -vf "${FILTERED_ARCHIVE}.xz"
+# We could re-compress as gzip with pigz almost instantly; xz takes quite a
+# while, but saves many megabytes in the source RPM, which is probably worth
+# it as long as we are re-compressing anyway.
+xz -9ev "${FILTERED_ARCHIVE}"
+
+phase 'Done'
+echo "Wrote ${FILTERED_ARCHIVE}.xz ($(
+ stat --format=%s "${FILTERED_ARCHIVE}.xz"
+) bytes)"
diff --git a/giada.spec b/giada.spec
index 5478b8c..7e7d003 100644
--- a/giada.spec
+++ b/giada.spec
@@ -2,52 +2,46 @@
Name: giada
Version: 0.17.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Your hardcore loop machine
+# LICENSING NOTE:
+#
+# The upstream source contains excerpts from the Steinberg VST 3 SDK, which has
+# additional restrictions on top of the GPLv3 that make it unsuitable for
+# distribution in Fedora. See
+# https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org….
+#
+# These problematic components are therefore filtered from the upstream source
+# archive using the script in Source1 to produce the distributable source
+# archive in Source0. The VST 3 SDK is removed, as is JUCE, which contains
+# components from the VST 3 SDK and is only used for VST 3 suport anyway.
+#
+# Note that this means Giada will *not* be built with VST3 support in Fedora.
+# (The situation for VST2 is even worse, as it is available only under a
+# proprietary license.)
+
# The entire source is GPLv3+, except:
# - src/deps/json is (MIT and CC0), where the overall license is MIT and the
# bundled copy of Hedley is CC0
-# - src/deps/juce is GPLv3, except:
-# * src/deps/juce/modules/juce_audio_basics is ISC, except:
-# > juce_GenericInterpolator.h, juce_Interpolators.cpp,
-# juce_Interpolators.h, and juce_WindowedSincInterpolator.cpp in
-# src/deps/juce/modules/juce_audio_basics/utilities are still GPLv3
-# * src/deps/juce/modules/juce_audio_devices is ISC, except:
-# > src/deps/juce/modules/juce_audio_devices/native/oboe/ is ASL 2.0
-# * src/deps/juce/modules/juce_audio_formats/codecs/flac is BSD
-# * src/deps/juce/modules/juce_audio_formats/codecs/oggvorbis is BSD
-# * src/deps/juce/modules/juce_audio_plugin_client/AUResources.r,
-# src/deps/juce/modules/juce_audio_plugin_client/AU/AUResources.r, and
-# src/deps/juce/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/
-# are MIT
-# * src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/base/,
-# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/public.sdk/,
-# and
-# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/vst/ivsttestplugprovider.h
-# are BSD
-# * src/deps/juce/modules/juce_blocks_basics/ is ISC
-# * src/deps/juce/modules/juce_box2d/box2d/ is zlib
-# * src/deps/juce/modules/juce_core/ is ISC, except:
-# > src/deps/juce/modules/juce_core/zip/zlib is zlib
-# * src/deps/juce/modules/juce_events/ is ISC
-# * src/deps/juce/modules/juce_graphics/image_formats/jpglib is IJG
-# * src/deps/juce/modules/juce_graphics/image_formats/pnglib is zlib
# - src/deps/rtaudio is MIT, except:
# * src/deps/rtaudio/include/soundcard.h is BSD
-# - src/deps/vst3sdk is GPLv3, except:
-# * src/deps/vst3sdk/base/, src/deps/vst3sdk/public.sdk/, and
-# src/deps/vst3sdk/pluginterfaces/vst/ivsttestplugprovider.h are BSD
#
-# The following sources, which would otherwise contribute to the License field,
-# are removed in prep: (none yet)
-License: GPLv3+ and MIT and CC0 and GPLv3 and ISC and ASL 2.0 and BSD and zlib and IJG
+# The following sources are present upstream, but not in the distributable
+# source tarball:
+#
+# - src/deps/juce
+# - src/deps/vst3sdk
+License: GPLv3+ and MIT and CC0 and BSD
URL: https://www.giadamusic.com
-Source0: %{url}/data/%{name}-%{version}-src.tar.gz
+# This macro is used by the script in Source1 as the upstream source archive.
+%global upstream_source %{url}/data/%{name}-%{version}-src.tar.gz
+Source0: %{name}-%{version}-src-distributable.tar.xz
+Source1: download-and-filter-source.sh
# https://github.com/monocasual/giada/pull/358
-Source1: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
+Source2: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
# https://github.com/monocasual/giada/pull/358
-Source2: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
+Source3: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
# We need to use pkg-config/pkgconf to find rtmidi and libsndfile.
# https://github.com/monocasual/giada/issues/451
@@ -121,65 +115,6 @@ Provides: bundled(nlohmann-json) = 3.9.1
Provides: bundled(hedley) = 13
# ============================================================================
-# ============================================================================
-# “JUCE”, https://juce.com/
-#
-# The version comes from ChangeLog. That, in turn, bundles a lot of libraries,
-# listed below.
-#
-# See https://github.com/juce-framework/JUCE/issues/860, where support for
-# unbundling these was requested.
-Provides: bundled(juce) = 6.0.4
-# “Oboe”, https://github.com/google/oboe
-#
-# The version comes from
-# src/deps/juce/modules/juce_audio_devices/native/oboe/readme.md.
-Provides: bundled(oboe) = 1.4.2
-# libogg
-#
-# The version is unclear.
-Provides: bundled(libogg)
-# libvorbis
-#
-# The version comes from the name of the subdirectory of
-# src/deps/juce/modules/juce_audio_formats/codecs/oggvorbis/
-Provides: bundled(libvorbis) = 1.3.7
-# libFLAC
-#
-# The version is unclear (only the API version is in the source code)
-Provides: bundled(flac)
-# Core Audio Utility Classes
-#
-# The version comes from the header of any arbitrary file in
-# src/deps/juce/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/.
-Provides: bundled(core-audio-utility-classes) = 1.1
-# VST3 SDK
-#
-# The version comes from “#define kVstVersionString” in
-# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/vst/vsttypes.h.
-Provides: bundled(vst3-sdk) = 3.6.13
-# Box2D
-#
-# The version comes from “b2Version b2_version” in
-# src/deps/juce/modules/juce_box2d/box2d/Common/b2Settings.cpp.
-Provides: bundled(Box2D) = 2.2.1
-# zlib
-#
-# The version comes from “#define ZLIB_VERSION” in
-# src/deps/juce/modules/juce_core/zip/zlib/zlib.h.
-Provides: bundled(zlib) = 1.2.3
-# “The Independent JPEG Group's JPEG software”
-#
-# The version comes from “#define JPEG_LIB_VERSION”, and the following comment,
-# in src/deps/juce/modules/juce_graphics/image_formats/jpglib/jpeglib.h.
-Provides: bundled(libjpeg) = 6b
-# libpng
-#
-# The version comes from the header comment of
-# src/deps/juce/modules/juce_graphics/image_formats/pnglib/png.h.
-Provides: bundled(libpng) = 1.6.37
-# ============================================================================
-
# ============================================================================
# RtAudio (https://github.com/thestk/rtaudio)
#
@@ -194,20 +129,9 @@ Provides: bundled(libpng) = 1.6.37
Provides: bundled(rtaudio) = 5.1.0
# ============================================================================
-# ============================================================================
-# VST3 SDK
-#
-# In addition to the copy bundled with the bundled JUCE, there is a second
-# bundled copy, where the version comes from “#define kVstVersionString” in
-# src/deps/vst3sdk/pluginterfaces/vst/vsttypes.h.
-Provides: bundled(vst3-sdk) = 3.7.0
-# ============================================================================
-
-
# Consistent behavior on F32
%undefine __cmake_in_source_build
-
%description
Giada is an open source, minimalistic and hardcore music production tool.
Designed for DJs, live performers and electronic musicians.
@@ -216,6 +140,26 @@ Designed for DJs, live performers and electronic musicians.
%prep
%autosetup -n %{name}-%{version}-src -p1
+# This is a last safeguard against something with an inappropriate license
+# slipping into the source tarball. It is no substitute for manual auditing.
+echo 'Checking for inappropriate source files:'
+echo '> Possible Steinberg proprietary license?'
+if grep -Frl 'This Software Development Kit may not be' .
+then
+ echo 'Found some concerning files!'
+ exit 1
+else
+ echo '> No concerning files were found.'
+fi
+echo '> Possible Steinberg VST 3 SDK (GPLv3 with conditions)?'
+if grep -Erli 'Project[[:blank:]]*:[[:blank:]]*VST SDK' .
+then
+ echo 'Found some concerning files!'
+ exit 1
+else
+ echo '> No concerning files were found.'
+fi
+
# At least on Fedora, this keeps CMake from expecting the static FLTK library.
# It is not clear whether this is an FLTK bug (upstream or Fedora), or a Giada
# bug, so we have not attempted to report it to any upstream.
@@ -223,24 +167,14 @@ sed -r -i 's/(FLTK)[[:blank:]]+CONFIG/\1/' CMakeLists.txt
%build
-# VST2 does not work:
-# In file included from ../src/deps/juce/modules/juce_audio_processors/juce_audio_processors.cpp:149:
-# ../src/deps/juce/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp:49:10: fatal error: pluginterfaces/vst2.x/aeffect.h: No such file or directory
-# 49 | #include <pluginterfaces/vst2.x/aeffect.h>
-# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# VST3 does not build on PPC64LE, and the solution is not obvious:
-# /usr/bin/ld: /usr/bin/ld: DWARF error: invalid abstract instance DIE ref
-# /tmp/ccVmiyyc.ltrans32.ltrans.o: in function `juce::PNGHelpers::readImageData(juce::pnglibNamespace::png_struct_def*, juce::pnglibNamespace::png_info_def*, __jmp_buf_tag (&) [1], unsigned char**)':
-# <artificial>:(.text+0x51d8): undefined reference to `juce::pnglibNamespace::png_init_filter_functions_vsx(juce::pnglibNamespace::png_struct_def*, unsigned int)
-
+# VST 2 SDK is only available under a proprietary license, and VST 3 SDK is
+# dual-licensed with a proprietary license and GPLv3, but additional
+# trademark-related conditions are imposed that are not acceptable in Fedora.
+# See the notes near the beginning of this spec file. Therefore the VST 3 SDK
+# and JUCE sources have been excluded, and all VST support must be disabled at
+# build time.
%cmake \
- -DWITH_VST2:BOOL=OFF \
-%ifnarch ppc64le
- -DWITH_VST3:BOOL=ON \
-%else
- -DWITH_VST3:BOOL=OFF \
-%endif
+ -DWITH_VST2:BOOL=OFF -DWITH_VST3:BOOL=OFF \
-DWITH_TESTS:BOOL=%{?with_tests:ON}%{?!with_tests:OFF} \
-GNinja
%cmake_build
@@ -249,9 +183,9 @@ sed -r -i 's/(FLTK)[[:blank:]]+CONFIG/\1/' CMakeLists.txt
%install
%cmake_install
# https://github.com/monocasual/giada/pull/358
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
# https://github.com/monocasual/giada/pull/358
-install -m 0644 -p -D -t %{buildroot}%{_metainfodir} %{SOURCE2}
+install -m 0644 -p -D -t %{buildroot}%{_metainfodir} %{SOURCE3}
install -m 0644 -p -D -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps \
extras/%{name}-logo.png
@@ -285,6 +219,11 @@ find %{buildroot} -type f
%changelog
+* Thu Feb 25 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-4
+- Remove VST 3 SDK and JUCE from source tarball for legal reasons; disable all
+ VST support
+- Update License field to reflect the removed bundled dependencies
+
* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-3
- Add link to upstream issue for format-security patch
- Add commentary on forked bundled rtaudio, with a link to upstream discussion
diff --git a/sources b/sources
index 82ffc5c..8cad3dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (giada-0.17.1-src.tar.gz) = 5e4c0f0c1a2dddbee54d2b026a7bf8aaec48f91d93939bde3c760dee2aa4b25b651b232095b15c5337f76df1155987bfa6d08a4d7196d6773fd89c95269cb530
+SHA512 (giada-0.17.1-src-distributable.tar.xz) = 7f73e54b8193988830feacd2aaffe3aacece24d5b641a1810c8babfd166082d3aaa4cab074f37edefd692ab5a46841376dc136ccf6822b51849202b751fb29de
commit 086d7e8b93e6b98b47d3a2bcd98f11473e2a4b05
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Wed Feb 24 10:28:41 2021 -0500
Add commentary on forked bundled rtaudio, with a link to upstream discussion
diff --git a/giada.spec b/giada.spec
index 5d9f17f..5478b8c 100644
--- a/giada.spec
+++ b/giada.spec
@@ -2,7 +2,7 @@
Name: giada
Version: 0.17.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Your hardcore loop machine
# The entire source is GPLv3+, except:
@@ -49,7 +49,7 @@ Source1: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2
# https://github.com/monocasual/giada/pull/358
Source2: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
-# We need to use pkg-config/pkgconf to find rtaudio and libsndfile.
+# We need to use pkg-config/pkgconf to find rtmidi and libsndfile.
# https://github.com/monocasual/giada/issues/451
Patch1: %{name}-0.17.1-find-external-dependencies.patch
# This is a C++ logging wrapper that passes its format string parameter through
@@ -181,7 +181,13 @@ Provides: bundled(libpng) = 1.6.37
# ============================================================================
# ============================================================================
-# rtaudio (https://github.com/thestk/rtaudio)
+# RtAudio (https://github.com/thestk/rtaudio)
+#
+# This version is slightly forked, so it is not possible to build with the
+# system copy of RtAudio. See
+# https://giadamusic.com/forum/viewtopic.php?f=2&t=177, where upstream
+# discusses the decision to maintain a forked copy of RtAudio in the Giada
+# source tree.
#
# The version comes from “#define RTAUDIO_VERSION” in
# src/deps/rtaudio/RtAudio.h.
@@ -279,6 +285,10 @@ find %{buildroot} -type f
%changelog
+* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-3
+- Add link to upstream issue for format-security patch
+- Add commentary on forked bundled rtaudio, with a link to upstream discussion
+
* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-2
- Disable VST3 on PPC64LE due to a non-obvious linker error
commit 54e911afcbc1fbe2c19f64f0064eb2cccdf5f400
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Feb 23 17:58:51 2021 -0500
Add link to upstream issue for format-security patch
diff --git a/giada.spec b/giada.spec
index d89e0db..5d9f17f 100644
--- a/giada.spec
+++ b/giada.spec
@@ -55,6 +55,8 @@ Patch1: %{name}-0.17.1-find-external-dependencies.patch
# This is a C++ logging wrapper that passes its format string parameter through
# to std::fprintf, which inherently means the format string cannot be a
# literal. We use GCC pragmas to suppress the warning in just this one spot.
+# See https://github.com/monocasual/giada/issues/447, where this is discussed,
+# and the patch is offered, upstream.
Patch2: %{name}-0.17.1-suppress-format-security.patch
# Binary should be installed as /usr/bin/giada, not /usr/giada; reported
# upstream with patch at https://github.com/monocasual/giada/issues/450.
commit b53581b055b00ecb59a100034684f1616c7b1b54
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Feb 23 10:55:54 2021 -0500
Disable VST3 on PPC64LE due to a non-obvious linker error
diff --git a/giada.spec b/giada.spec
index 94af237..d89e0db 100644
--- a/giada.spec
+++ b/giada.spec
@@ -2,7 +2,7 @@
Name: giada
Version: 0.17.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Your hardcore loop machine
# The entire source is GPLv3+, except:
@@ -221,9 +221,18 @@ sed -r -i 's/(FLTK)[[:blank:]]+CONFIG/\1/' CMakeLists.txt
# 49 | #include <pluginterfaces/vst2.x/aeffect.h>
# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# VST3 does not build on PPC64LE, and the solution is not obvious:
+# /usr/bin/ld: /usr/bin/ld: DWARF error: invalid abstract instance DIE ref
+# /tmp/ccVmiyyc.ltrans32.ltrans.o: in function `juce::PNGHelpers::readImageData(juce::pnglibNamespace::png_struct_def*, juce::pnglibNamespace::png_info_def*, __jmp_buf_tag (&) [1], unsigned char**)':
+# <artificial>:(.text+0x51d8): undefined reference to `juce::pnglibNamespace::png_init_filter_functions_vsx(juce::pnglibNamespace::png_struct_def*, unsigned int)
+
%cmake \
-DWITH_VST2:BOOL=OFF \
+%ifnarch ppc64le
-DWITH_VST3:BOOL=ON \
+%else
+ -DWITH_VST3:BOOL=OFF \
+%endif
-DWITH_TESTS:BOOL=%{?with_tests:ON}%{?!with_tests:OFF} \
-GNinja
%cmake_build
@@ -268,6 +277,9 @@ find %{buildroot} -type f
%changelog
+* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-2
+- Disable VST3 on PPC64LE due to a non-obvious linker error
+
* Mon Feb 22 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-2
- New upstream release 0.17.1
- Switch to CMake build system
commit a2780b32b23829b1bfb1a245cc9cc44d59c207da
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Sun Feb 21 08:59:33 2021 -0500
New upstream release 0.17.1
- Switch to CMake build system
- Add AppData and updated desktop file from
https://github.com/monocasual/giada/pull/358
- Add virtual Provides, and update License field, for bundled dependencies
- Update summary and description from upstream
- Build Giada with tests and run them
diff --git a/.gitignore b/.gitignore
index 8715bdf..f1cbca4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/giada-0.16.3.1-src.tar.gz
/giada-0.16.4-src.tar.gz
/giada-0.17.0-src.tar.gz
+/giada-0.17.1-src.tar.gz
diff --git a/com.giadamusic.Giada.appdata.xml b/com.giadamusic.Giada.appdata.xml
new file mode 100644
index 0000000..48f362a
--- /dev/null
+++ b/com.giadamusic.Giada.appdata.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2020 Giada Developers -->
+<component type="desktop">
+ <id>com.giadamusic.Giada</id>
+ <metadata_license>CC0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <name>Giada</name>
+ <summary>Your hardcore loop machine</summary>
+ <description>
+ <p>
+ Giada is an open source, minimalistic and hardcore music
+ production tool. Designed for DJs, live performers and electronic
+ musicians.
+ </p>
+ </description>
+ <content_rating type="oars-1.1" />
+ <launchable type="desktop-id">com.giadamusic.Giada.desktop</launchable>
+ <screenshots>
+ <screenshot type="default">
+ <image>
+ https://www.giadamusic.com/images/screenshots/giada-loop-machine-screenshot…
+ </image>
+ <caption>A fairly large project with samples and MIDI events</caption>
+ </screenshot>
+ <screenshot>
+ <image>
+ https://www.giadamusic.com/images/screenshots/giada-loop-machine-screenshot…
+ </image>
+ <caption>New Action Editor for MIDI events</caption>
+ </screenshot>
+ <screenshot>
+ <image>
+ https://www.giadamusic.com/images/screenshots/giada-loop-machine-screenshot…
+ </image>
+ <caption>Chopping samples in the advanced Sample Editor</caption>
+ </screenshot>
+ </screenshots>
+ <update_contact>giadaloopmachine_AT_gmail.com</update_contact>
+ <url type="homepage">https://www.giadamusic.com/</url>
+ <url type="help">https://www.giadamusic.com/forum</url>
+ <url type="bugtracker">https://github.com/monocasual/giada/issues</url>
+ <releases>
+ <release version="0.16.3.1" date="2020-06-21">
+ </release>
+ </releases>
+</component>
diff --git a/com.giadamusic.Giada.desktop b/com.giadamusic.Giada.desktop
new file mode 100644
index 0000000..766bdfb
--- /dev/null
+++ b/com.giadamusic.Giada.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Giada
+Name[es]=Giada
+GenericName=Drum machine and loop sequencer
+GenericName[es]=Caja de ritmos y secuenciador de loops
+Exec=giada %f
+Terminal=false
+Icon=giada-logo
+Categories=Music;AudioVideo;Audio;Midi;X-Digital_Processing;X-Jack;X-MIDI;
+Keywords=Giada;
\ No newline at end of file
diff --git a/giada-0.17.1-find-external-dependencies.patch b/giada-0.17.1-find-external-dependencies.patch
new file mode 100644
index 0000000..3db033c
--- /dev/null
+++ b/giada-0.17.1-find-external-dependencies.patch
@@ -0,0 +1,59 @@
+diff -Naur giada-0.17.1-src-original/CMakeLists.txt giada-0.17.1-src/CMakeLists.txt
+--- giada-0.17.1-src-original/CMakeLists.txt 2021-02-01 12:41:42.000000000 -0500
++++ giada-0.17.1-src/CMakeLists.txt 2021-02-22 11:19:35.817894245 -0500
+@@ -250,12 +250,25 @@
+ find_package(Threads REQUIRED)
+ list(APPEND LIBRARIES ${Threads_LIBRARY})
+
++# pkg-config/pkgconf, required to find some external dependencies on some
++# platforms
++find_package(PkgConfig)
++
+ # RtMidi
+
+ find_package(RtMidi CONFIG)
+ if (RtMidi_FOUND)
+ list(APPEND LIBRARIES RtMidi::rtmidi)
+-else()
++ message("RtMidi library found in " ${RtMidi_DIR})
++elseif (PkgConfig_FOUND)
++ pkg_check_modules(RtMidi IMPORTED_TARGET rtmidi)
++ if (RtMidi_FOUND)
++ list(APPEND LIBRARIES PkgConfig::RtMidi)
++ message("RtMidi library found")
++ endif()
++endif()
++
++if (NOT RtMidi_FOUND)
+ # Fallback to find_library mode (in case rtmidi is too old).
+ find_library(LIBRARY_RTMIDI NAMES rtmidi)
+ list(APPEND LIBRARIES ${LIBRARY_RTMIDI})
+@@ -269,10 +282,9 @@
+
+ find_path(LIBRARY_RTMIDI_INCLUDE_DIR RtMidi.h PATH_SUFFIXES rtmidi)
+ list(APPEND INCLUDE_DIRS ${LIBRARY_RTMIDI_INCLUDE_DIR})
++ message("RtMidi library found in " ${RtMidi_DIR})
+ endif()
+
+-message("RtMidi library found in " ${RtMidi_DIR})
+-
+ # FLTK
+
+ set(FLTK_SKIP_FLUID TRUE) # Don't search for FLTK's fluid
+@@ -287,7 +299,15 @@
+ if (SndFile_FOUND)
+ list(APPEND LIBRARIES SndFile::sndfile)
+ message("Libsndfile library found in " ${SndFile_DIR})
+-else()
++elseif(PkgConfig_FOUND)
++ pkg_check_modules(SndFile IMPORTED_TARGET sndfile)
++ if (SndFile_FOUND)
++ list(APPEND LIBRARIES PkgConfig::SndFile)
++ message("Libsndfile library found")
++ endif()
++endif()
++
++if (NOT SndFile_FOUND)
+ # Fallback to find_library mode (in case libsndfile is too old).
+ find_library(LIBRARY_SNDFILE NAMES sndfile libsndfile libsndfile-1)
+
diff --git a/giada-0.17.1-fix-install-path.patch b/giada-0.17.1-fix-install-path.patch
new file mode 100644
index 0000000..b3de28b
--- /dev/null
+++ b/giada-0.17.1-fix-install-path.patch
@@ -0,0 +1,12 @@
+diff -Naur giada-0.17.1-src-original/CMakeLists.txt giada-0.17.1-src/CMakeLists.txt
+--- giada-0.17.1-src-original/CMakeLists.txt 2021-02-01 12:41:42.000000000 -0500
++++ giada-0.17.1-src/CMakeLists.txt 2021-02-20 13:29:48.152058634 -0500
+@@ -500,7 +500,7 @@
+ # Install rules
+ # ------------------------------------------------------------------------------
+
+-install(TARGETS giada DESTINATION ${CMAKE_INSTALL_PREFIX})
++install(TARGETS giada DESTINATION bin)
+
+ # ------------------------------------------------------------------------------
+ # Extra
diff --git a/giada-0.17.1-suppress-format-security.patch b/giada-0.17.1-suppress-format-security.patch
new file mode 100644
index 0000000..5a000de
--- /dev/null
+++ b/giada-0.17.1-suppress-format-security.patch
@@ -0,0 +1,20 @@
+diff -Naur giada-0.17.1-src-original/src/utils/log.h giada-0.17.1-src/src/utils/log.h
+--- giada-0.17.1-src-original/src/utils/log.h 2021-02-01 12:41:42.000000000 -0500
++++ giada-0.17.1-src/src/utils/log.h 2021-02-19 15:59:03.741888609 -0500
+@@ -84,6 +84,8 @@
+
+ if (mode == LOG_MODE_FILE && stat == true) {
+ // Replace any std::string in the arguments by its C-string
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-security"
+ std::fprintf(f, format, string_to_c_str(std::forward<Args>(args))...);
+ #ifdef _WIN32
+ fflush(f);
+@@ -91,6 +93,7 @@
+ }
+ else
+ std::printf(format, string_to_c_str(std::forward<Args>(args))...);
++#pragma GCC diagnostic pop
+ }
+ } // giada::u::log
+
diff --git a/giada.desktop b/giada.desktop
deleted file mode 100644
index d4e864a..0000000
--- a/giada.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Giada
-Name[es]=Giada
-GenericName=Drum machine and loop sequencer
-GenericName[es]=Caja de ritmos y sequenciador de loops
-Icon=giada
-Type=Application
-Exec=giada
-Terminal=false
-Categories=AudioVideo;Audio;X-Digital_Processing;X-Jack;X-MIDI;Midi;
diff --git a/giada.spec b/giada.spec
index 55d5ed0..94af237 100644
--- a/giada.spec
+++ b/giada.spec
@@ -1,71 +1,282 @@
+%bcond_without tests
Name: giada
-Version: 0.17.0
-Release: 2%{?dist}
-Summary: An audio looping machine
-
-License: GPLv3+
+Version: 0.17.1
+Release: 1%{?dist}
+Summary: Your hardcore loop machine
+
+# The entire source is GPLv3+, except:
+# - src/deps/json is (MIT and CC0), where the overall license is MIT and the
+# bundled copy of Hedley is CC0
+# - src/deps/juce is GPLv3, except:
+# * src/deps/juce/modules/juce_audio_basics is ISC, except:
+# > juce_GenericInterpolator.h, juce_Interpolators.cpp,
+# juce_Interpolators.h, and juce_WindowedSincInterpolator.cpp in
+# src/deps/juce/modules/juce_audio_basics/utilities are still GPLv3
+# * src/deps/juce/modules/juce_audio_devices is ISC, except:
+# > src/deps/juce/modules/juce_audio_devices/native/oboe/ is ASL 2.0
+# * src/deps/juce/modules/juce_audio_formats/codecs/flac is BSD
+# * src/deps/juce/modules/juce_audio_formats/codecs/oggvorbis is BSD
+# * src/deps/juce/modules/juce_audio_plugin_client/AUResources.r,
+# src/deps/juce/modules/juce_audio_plugin_client/AU/AUResources.r, and
+# src/deps/juce/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/
+# are MIT
+# * src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/base/,
+# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/public.sdk/,
+# and
+# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/vst/ivsttestplugprovider.h
+# are BSD
+# * src/deps/juce/modules/juce_blocks_basics/ is ISC
+# * src/deps/juce/modules/juce_box2d/box2d/ is zlib
+# * src/deps/juce/modules/juce_core/ is ISC, except:
+# > src/deps/juce/modules/juce_core/zip/zlib is zlib
+# * src/deps/juce/modules/juce_events/ is ISC
+# * src/deps/juce/modules/juce_graphics/image_formats/jpglib is IJG
+# * src/deps/juce/modules/juce_graphics/image_formats/pnglib is zlib
+# - src/deps/rtaudio is MIT, except:
+# * src/deps/rtaudio/include/soundcard.h is BSD
+# - src/deps/vst3sdk is GPLv3, except:
+# * src/deps/vst3sdk/base/, src/deps/vst3sdk/public.sdk/, and
+# src/deps/vst3sdk/pluginterfaces/vst/ivsttestplugprovider.h are BSD
+#
+# The following sources, which would otherwise contribute to the License field,
+# are removed in prep: (none yet)
+License: GPLv3+ and MIT and CC0 and GPLv3 and ISC and ASL 2.0 and BSD and zlib and IJG
URL: https://www.giadamusic.com
Source0: %{url}/data/%{name}-%{version}-src.tar.gz
-# submitted upstream https://github.com/monocasual/giada/issues/5
-Source1: giada.desktop
+# https://github.com/monocasual/giada/pull/358
+Source1: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
+# https://github.com/monocasual/giada/pull/358
+Source2: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
+
+# We need to use pkg-config/pkgconf to find rtaudio and libsndfile.
+# https://github.com/monocasual/giada/issues/451
+Patch1: %{name}-0.17.1-find-external-dependencies.patch
+# This is a C++ logging wrapper that passes its format string parameter through
+# to std::fprintf, which inherently means the format string cannot be a
+# literal. We use GCC pragmas to suppress the warning in just this one spot.
+Patch2: %{name}-0.17.1-suppress-format-security.patch
+# Binary should be installed as /usr/bin/giada, not /usr/giada; reported
+# upstream with patch at https://github.com/monocasual/giada/issues/450.
+Patch3: %{name}-0.17.1-fix-install-path.patch
-BuildRequires: gcc-c++
-BuildRequires: libsndfile-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: fltk-fluid
-BuildRequires: fltk-devel
BuildRequires: desktop-file-utils
-BuildRequires: icoutils
-BuildRequires: jansson-devel
-BuildRequires: rtaudio-devel
-BuildRequires: rtmidi-devel
-BuildRequires: libXpm-devel
-BuildRequires: libXext-devel
-BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: libXcursor-devel
-BuildRequires: libXinerama-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: make
+# For AppData file validation
+BuildRequires: libappstream-glib
+
+BuildRequires: gcc-c++
+BuildRequires: cmake
+# It is our choice whether to use the make backend or the ninja backend.
+BuildRequires: ninja-build
+
+BuildRequires: pkgconfig(rtmidi)
+
+BuildRequires: cmake(FLTK)
+
+BuildRequires: pkgconfig(sndfile)
+BuildRequires: pkgconfig(samplerate)
+
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xcursor)
+BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xft)
+BuildRequires: pkgconfig(xinerama)
+BuildRequires: pkgconfig(xpm)
+BuildRequires: pkgconfig(xrandr)
+BuildRequires: pkgconfig(xrender)
+
+BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(libpulse-simple)
+BuildRequires: pkgconfig(fontconfig)
+BuildRequires: pkgconfig(jack)
+BuildRequires: pkgconfig(freetype2)
+
+%if %{with tests}
+BuildRequires: cmake(Catch2)
+# Support graphical tests in non-graphical environment
+BuildRequires: xorg-x11-server-Xvfb
+%endif
+
+# For /usr/share/icons/hicolor/*/apps
+Requires: hicolor-icon-theme
+
+# ============================================================================
+# “JSON for Modern C++”, https://github.com/nlohmann/json
+#
+# The version comes from the initial comment header, and from “#define
+# NLOHMANN_JSON_VERSION_MAJOR”, “#define NLOHMANN_JSON_VERSION_MINOR”, and
+# “#define NLOHMANN_JSON_VERSION_PATCH”, in
+# src/deps/json/single_include/nlohmann/json.hpp for version
+#
+# See https://github.com/nlohmann/json/issues/2651, where support for
+# unbundling Hedley was requested.
+Provides: bundled(nlohmann-json) = 3.9.1
+# That, in turn, bundles “Hedley”, https://nemequ.github.io/hedley
+#
+# The version comes from “#define JSON_HEDLEY_VERSION” in
+# src/deps/json/single_include/nlohmann/json.hpp.
+Provides: bundled(hedley) = 13
+# ============================================================================
+
+# ============================================================================
+# “JUCE”, https://juce.com/
+#
+# The version comes from ChangeLog. That, in turn, bundles a lot of libraries,
+# listed below.
+#
+# See https://github.com/juce-framework/JUCE/issues/860, where support for
+# unbundling these was requested.
+Provides: bundled(juce) = 6.0.4
+# “Oboe”, https://github.com/google/oboe
+#
+# The version comes from
+# src/deps/juce/modules/juce_audio_devices/native/oboe/readme.md.
+Provides: bundled(oboe) = 1.4.2
+# libogg
+#
+# The version is unclear.
+Provides: bundled(libogg)
+# libvorbis
+#
+# The version comes from the name of the subdirectory of
+# src/deps/juce/modules/juce_audio_formats/codecs/oggvorbis/
+Provides: bundled(libvorbis) = 1.3.7
+# libFLAC
+#
+# The version is unclear (only the API version is in the source code)
+Provides: bundled(flac)
+# Core Audio Utility Classes
+#
+# The version comes from the header of any arbitrary file in
+# src/deps/juce/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/.
+Provides: bundled(core-audio-utility-classes) = 1.1
+# VST3 SDK
+#
+# The version comes from “#define kVstVersionString” in
+# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/vst/vsttypes.h.
+Provides: bundled(vst3-sdk) = 3.6.13
+# Box2D
+#
+# The version comes from “b2Version b2_version” in
+# src/deps/juce/modules/juce_box2d/box2d/Common/b2Settings.cpp.
+Provides: bundled(Box2D) = 2.2.1
+# zlib
+#
+# The version comes from “#define ZLIB_VERSION” in
+# src/deps/juce/modules/juce_core/zip/zlib/zlib.h.
+Provides: bundled(zlib) = 1.2.3
+# “The Independent JPEG Group's JPEG software”
+#
+# The version comes from “#define JPEG_LIB_VERSION”, and the following comment,
+# in src/deps/juce/modules/juce_graphics/image_formats/jpglib/jpeglib.h.
+Provides: bundled(libjpeg) = 6b
+# libpng
+#
+# The version comes from the header comment of
+# src/deps/juce/modules/juce_graphics/image_formats/pnglib/png.h.
+Provides: bundled(libpng) = 1.6.37
+# ============================================================================
+
+# ============================================================================
+# rtaudio (https://github.com/thestk/rtaudio)
+#
+# The version comes from “#define RTAUDIO_VERSION” in
+# src/deps/rtaudio/RtAudio.h.
+Provides: bundled(rtaudio) = 5.1.0
+# ============================================================================
+
+# ============================================================================
+# VST3 SDK
+#
+# In addition to the copy bundled with the bundled JUCE, there is a second
+# bundled copy, where the version comes from “#define kVstVersionString” in
+# src/deps/vst3sdk/pluginterfaces/vst/vsttypes.h.
+Provides: bundled(vst3-sdk) = 3.7.0
+# ============================================================================
+
+
+# Consistent behavior on F32
+%undefine __cmake_in_source_build
%description
-giada is an audio looper for ALSA/JACK using the FLTK toolit.
-Load or record up to 32 samples, choose to play them in single mode
-(drum machine) or loop mode (sequencer) and start the show with your computer
-keyboard as a controller. Giada aims to be a compact and portable virtual
-device for Linux for production use and live sets.
+Giada is an open source, minimalistic and hardcore music production tool.
+Designed for DJs, live performers and electronic musicians.
+
+
%prep
-%setup -q -n %{name}-%{version}-src
+%autosetup -n %{name}-%{version}-src -p1
-# convert icon
-icotool -x src/ext/giada.ico
+# At least on Fedora, this keeps CMake from expecting the static FLTK library.
+# It is not clear whether this is an FLTK bug (upstream or Fedora), or a Giada
+# bug, so we have not attempted to report it to any upstream.
+sed -r -i 's/(FLTK)[[:blank:]]+CONFIG/\1/' CMakeLists.txt
-# fix build issue
-sed -i 's|%f|%.3f|' src/gui/elems/mainWindow/mainTimer.cpp
%build
-./autogen.sh
-%configure --prefix=%{_prefix} --target=linux --enable-system-catch
-%make_build
+# VST2 does not work:
+# In file included from ../src/deps/juce/modules/juce_audio_processors/juce_audio_processors.cpp:149:
+# ../src/deps/juce/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp:49:10: fatal error: pluginterfaces/vst2.x/aeffect.h: No such file or directory
+# 49 | #include <pluginterfaces/vst2.x/aeffect.h>
+# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+%cmake \
+ -DWITH_VST2:BOOL=OFF \
+ -DWITH_VST3:BOOL=ON \
+ -DWITH_TESTS:BOOL=%{?with_tests:ON}%{?!with_tests:OFF} \
+ -GNinja
+%cmake_build
+
%install
-%make_install
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %SOURCE1
-install -D -m 644 giada_1_48x48x32.png %{buildroot}%{_datadir}/pixmaps/giada.png
+%cmake_install
+# https://github.com/monocasual/giada/pull/358
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+# https://github.com/monocasual/giada/pull/358
+install -m 0644 -p -D -t %{buildroot}%{_metainfodir} %{SOURCE2}
+install -m 0644 -p -D -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps \
+ extras/%{name}-logo.png
+
+
+%check
+# Validate the installed AppData file. Fedora guidelines require validate-relax
+# to pass (but not validate-strict), and do require validation at build time.
+appstream-util validate-relax --nonet \
+ %{buildroot}%{_metainfodir}/com.giadamusic.Giada.appdata.xml
+
+%if %{with tests}
+xvfb-run -a %{buildroot}%{_bindir}/giada --run-tests
+%endif
+
+find %{_vpath_builddir} -type f
+find %{buildroot} -type f
+
%files
%license COPYING
%doc ChangeLog README.md
+
%{_bindir}/%{name}
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+
+# https://github.com/monocasual/giada/pull/358
+%{_metainfodir}/com.giadamusic.Giada.appdata.xml
+# https://github.com/monocasual/giada/pull/358
+%{_datadir}/applications/com.giadamusic.Giada.desktop
+# https://github.com/monocasual/giada/pull/358
+%{_datadir}/icons/hicolor/128x128/apps/%{name}-logo.png
+
%changelog
+* Mon Feb 22 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-2
+- New upstream release 0.17.1
+- Switch to CMake build system
+- Add AppData and updated desktop file from
+ https://github.com/monocasual/giada/pull/358
+- Add virtual Provides, and update License field, for bundled dependencies
+- Update summary and description from upstream
+- Build Giada with tests, and run them at build time
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.17.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 68f45db..82ffc5c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (giada-0.17.0-src.tar.gz) = 1a94da20d0901315b05adc225aa3f21e83abaa27157b810bfcf9d55fa2fa77ebaea8305aa20e37851a21797f9a986dde38e76cdb70a0ef3ffdf3a6e0d82b32c6
+SHA512 (giada-0.17.1-src.tar.gz) = 5e4c0f0c1a2dddbee54d2b026a7bf8aaec48f91d93939bde3c760dee2aa4b25b651b232095b15c5337f76df1155987bfa6d08a4d7196d6773fd89c95269cb530
commit 5e1191b8660169026992a49ba4e8571cccf1ff2b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 08:02:10 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/giada.spec b/giada.spec
index 4ebde3f..55d5ed0 100644
--- a/giada.spec
+++ b/giada.spec
@@ -1,7 +1,7 @@
Name: giada
Version: 0.17.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An audio looping machine
License: GPLv3+
@@ -66,6 +66,9 @@ install -D -m 644 giada_1_48x48x32.png %{buildroot}%{_datadir}/pixmaps/giada.png
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.17.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Tue Nov 24 2020 Erich Eickmeyer <erich(a)ericheickmeyer.com> - 0.17.0-1
- New upstream release
- Add CMake build system
commit 2b15c2adece5865026556ccecfc1c1698ffc5f73
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Fri Dec 18 23:18:06 2020 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/giada.spec b/giada.spec
index d3450fa..4ebde3f 100644
--- a/giada.spec
+++ b/giada.spec
@@ -30,6 +30,7 @@ BuildRequires: libXinerama-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
+BuildRequires: make
%description
commit 6a3c1fe7f9f5ffa465a190e94a39bf500b955807
Author: Erich Eickmeyer <erich(a)ericheickmeyer.com>
Date: Tue Nov 24 08:38:50 2020 -0800
Switch back to make macro
diff --git a/giada.spec b/giada.spec
index 363e0a6..d3450fa 100644
--- a/giada.spec
+++ b/giada.spec
@@ -50,10 +50,10 @@ sed -i 's|%f|%.3f|' src/gui/elems/mainWindow/mainTimer.cpp
%build
./autogen.sh
%configure --prefix=%{_prefix} --target=linux --enable-system-catch
-%cmake_build
+%make_build
%install
-%cmake_install
+%make_install
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %SOURCE1
install -D -m 644 giada_1_48x48x32.png %{buildroot}%{_datadir}/pixmaps/giada.png
commit 0f039404969b6e905fa55c6b2cff70f6d054ca31
Author: Erich Eickmeyer <erich(a)ericheickmeyer.com>
Date: Tue Nov 24 08:31:19 2020 -0800
New upstream release 0.17.0
diff --git a/.gitignore b/.gitignore
index 36cc752..8715bdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/giada-0.16.3.tar.gz
/giada-0.16.3.1-src.tar.gz
/giada-0.16.4-src.tar.gz
+/giada-0.17.0-src.tar.gz
diff --git a/giada.spec b/giada.spec
index a81b110..363e0a6 100644
--- a/giada.spec
+++ b/giada.spec
@@ -1,6 +1,6 @@
Name: giada
-Version: 0.16.4
+Version: 0.17.0
Release: 1%{?dist}
Summary: An audio looping machine
@@ -50,10 +50,10 @@ sed -i 's|%f|%.3f|' src/gui/elems/mainWindow/mainTimer.cpp
%build
./autogen.sh
%configure --prefix=%{_prefix} --target=linux --enable-system-catch
-%make_build
+%cmake_build
%install
-%make_install
+%cmake_install
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %SOURCE1
install -D -m 644 giada_1_48x48x32.png %{buildroot}%{_datadir}/pixmaps/giada.png
@@ -65,6 +65,29 @@ install -D -m 644 giada_1_48x48x32.png %{buildroot}%{_datadir}/pixmaps/giada.png
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Tue Nov 24 2020 Erich Eickmeyer <erich(a)ericheickmeyer.com> - 0.17.0-1
+- New upstream release
+- Add CMake build system
+- VST3 support
+- Show descriptive plug-in names in Plug-in List Window
+- Resizable plug-in list
+- New persistence mechanism for Plug-ins state
+- Improved text truncation for small buttons and text boxes
+- Beautify Sample Editor window
+- Resizable plug-in list window
+- Show descriptive plug-in name in plug-in list
+- Update JUCE, version 6.0.4
+- Update Catch2 to version 2.13.2
+- Replace old filesystem functions in fs.h with std::filesystem
+- Add VST3 SDK as git submodule
+- Set minimum macOS version to 10.14
+- Statically link the MSVC runtime library on Windows
+- Avoid crash on opening plug-in list with invalid plug-ins
+- Rewind sample channels in loop.once.bar mode on bar, if still playing (fix #403)
+- Modernize log::print() function to handle std::string arguments (PR #402)
+- Fix playStatus logic for ending sample channels in loop-once-bar mode (#404)
+- Fix shrinking beats that could glitch the output (#361)
+
* Thu Oct 08 2020 Erich Eickmeyer <erich(a)ericheickmeyer.com> - 0.16.4-1
- New upstream release
- Support for mono inputs
diff --git a/sources b/sources
index 8d1e03c..68f45db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (giada-0.16.4-src.tar.gz) = f4e528ccdd4decef82db03ae11322f282949e3a3ef5184a9527d9678e009f955907010142c20da8f806ac702827238441401f3ee75544619f8d080554f53cd99
+SHA512 (giada-0.17.0-src.tar.gz) = 1a94da20d0901315b05adc225aa3f21e83abaa27157b810bfcf9d55fa2fa77ebaea8305aa20e37851a21797f9a986dde38e76cdb70a0ef3ffdf3a6e0d82b32c6
1
0
26 Feb '21
The package rpms/giada.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/giada.git/commit/?id=6afe7833fa6a56….
Change:
-%ifnarch ppc64le
Thanks.
Full change:
============
commit 043c8d40391c620f423ef381e5a5d526a0487f5f
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Thu Feb 25 17:42:30 2021 -0500
Remove stray debugging “find” commands
diff --git a/giada.spec b/giada.spec
index 7e7d003..8b6a51d 100644
--- a/giada.spec
+++ b/giada.spec
@@ -200,9 +200,6 @@ appstream-util validate-relax --nonet \
xvfb-run -a %{buildroot}%{_bindir}/giada --run-tests
%endif
-find %{_vpath_builddir} -type f
-find %{buildroot} -type f
-
%files
%license COPYING
@@ -223,6 +220,7 @@ find %{buildroot} -type f
- Remove VST 3 SDK and JUCE from source tarball for legal reasons; disable all
VST support
- Update License field to reflect the removed bundled dependencies
+- Remove stray debugging “find” commands
* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-3
- Add link to upstream issue for format-security patch
commit 6afe7833fa6a56ec7808dcdc89282e1c98ea3fd7
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Thu Feb 25 17:42:16 2021 -0500
Remove VST 3 SDK and JUCE from source tarball for legal reasons; disable all VST support; update License field to reflect the removed bundled dependencies
diff --git a/.gitignore b/.gitignore
index f1cbca4..0b6ef91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/giada-0.16.4-src.tar.gz
/giada-0.17.0-src.tar.gz
/giada-0.17.1-src.tar.gz
+/giada-0.17.1-src-distributable.tar.xz
diff --git a/download-and-filter-source.sh b/download-and-filter-source.sh
new file mode 100755
index 0000000..e681037
--- /dev/null
+++ b/download-and-filter-source.sh
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+set -o nounset
+set -o errexit
+
+if [ "$#" != '0' ]
+then
+ if [ "${1-}" != '-h' ] && [ "${1-}" != '--help' ]
+ then
+ code='0'
+ exec 1>&2
+ fi
+ cat <<EOF
+USAGE: $0
+
+Reads giada.spec from the same directory as the script. Uses the value of
+%upstream_source to download the upstream release archive; filters out
+non-redistributable files; and writes a distributable tarball to the current
+working directory.
+EOF
+ exit "${code-1}"
+fi
+
+OUTDIR="${PWD}"
+cd "$(dirname "$0")"
+SPEC="${PWD}/giada.spec"
+
+URL="$(
+ rpm -E "$(
+ awk -F: '
+ tolower($0) ~ /^(name|version|summary|url):/ {
+ colon = index($0, ":")
+ printf("%%global %s %s\n", tolower($1), substr($0, colon + 1))
+ }
+ ' "${SPEC}"
+ )
+ $(grep -E '^%global ' "${SPEC}")
+ %upstream_source
+ " | sed -r -e 's/^[[:blank:]]+//' -e 's/[[:blank:]]$//'
+)"
+ARCHIVE="$(echo "${URL}" | awk -F / '{ print $NF }')"
+
+cat 1>&2 <<EOF
+
+Downloading:
+
+ URL: ${URL}
+ Archive: ${ARCHIVE}
+
+EOF
+
+# Download the archive
+tmpdir="$(mktemp --directory)"
+trap "rm -rf '${tmpdir}'" INT TERM EXIT
+curl \
+ --location \
+ --proto-redir -all,https \
+ --output "${tmpdir}/${ARCHIVE}" \
+ "${URL}"
+
+phase() {
+cat <<EOF
+
+==============================================================================
+$1
+==============================================================================
+
+EOF
+}
+
+phase 'Extracting upstream archive'
+# Extract the archive
+xdir="${tmpdir}/x"
+mkdir "${xdir}"
+tar -C "${xdir}" -xzf "${tmpdir}/${ARCHIVE}"
+echo "Extracted ${ARCHIVE} ($(
+ stat --format=%s "${tmpdir}/${ARCHIVE}"
+) bytes)"
+
+
+phase 'Filtering upstream archive'
+(
+ set -o nounset
+ set -o errexit
+
+ cd "${xdir}"
+
+ echo '--> Removing VST 3 SDK'
+ rm -rf */src/deps/vst3sdk
+
+ echo '--> Removing JUCE'
+ rm -rf */src/deps/juce
+)
+
+phase 'Writing filtered archive'
+FILTERED_ARCHIVE="$(basename "${ARCHIVE}" .tar.gz)-distributable.tar"
+tar -C "${xdir}" -c . -f "./${FILTERED_ARCHIVE}"
+echo "Wrote ${FILTERED_ARCHIVE} ($(
+ stat --format=%s "${FILTERED_ARCHIVE}"
+) bytes)"
+
+phase 'Re-compressing filtered archive'
+rm -vf "${FILTERED_ARCHIVE}.xz"
+# We could re-compress as gzip with pigz almost instantly; xz takes quite a
+# while, but saves many megabytes in the source RPM, which is probably worth
+# it as long as we are re-compressing anyway.
+xz -9ev "${FILTERED_ARCHIVE}"
+
+phase 'Done'
+echo "Wrote ${FILTERED_ARCHIVE}.xz ($(
+ stat --format=%s "${FILTERED_ARCHIVE}.xz"
+) bytes)"
diff --git a/giada.spec b/giada.spec
index 5478b8c..7e7d003 100644
--- a/giada.spec
+++ b/giada.spec
@@ -2,52 +2,46 @@
Name: giada
Version: 0.17.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Your hardcore loop machine
+# LICENSING NOTE:
+#
+# The upstream source contains excerpts from the Steinberg VST 3 SDK, which has
+# additional restrictions on top of the GPLv3 that make it unsuitable for
+# distribution in Fedora. See
+# https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org….
+#
+# These problematic components are therefore filtered from the upstream source
+# archive using the script in Source1 to produce the distributable source
+# archive in Source0. The VST 3 SDK is removed, as is JUCE, which contains
+# components from the VST 3 SDK and is only used for VST 3 suport anyway.
+#
+# Note that this means Giada will *not* be built with VST3 support in Fedora.
+# (The situation for VST2 is even worse, as it is available only under a
+# proprietary license.)
+
# The entire source is GPLv3+, except:
# - src/deps/json is (MIT and CC0), where the overall license is MIT and the
# bundled copy of Hedley is CC0
-# - src/deps/juce is GPLv3, except:
-# * src/deps/juce/modules/juce_audio_basics is ISC, except:
-# > juce_GenericInterpolator.h, juce_Interpolators.cpp,
-# juce_Interpolators.h, and juce_WindowedSincInterpolator.cpp in
-# src/deps/juce/modules/juce_audio_basics/utilities are still GPLv3
-# * src/deps/juce/modules/juce_audio_devices is ISC, except:
-# > src/deps/juce/modules/juce_audio_devices/native/oboe/ is ASL 2.0
-# * src/deps/juce/modules/juce_audio_formats/codecs/flac is BSD
-# * src/deps/juce/modules/juce_audio_formats/codecs/oggvorbis is BSD
-# * src/deps/juce/modules/juce_audio_plugin_client/AUResources.r,
-# src/deps/juce/modules/juce_audio_plugin_client/AU/AUResources.r, and
-# src/deps/juce/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/
-# are MIT
-# * src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/base/,
-# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/public.sdk/,
-# and
-# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/vst/ivsttestplugprovider.h
-# are BSD
-# * src/deps/juce/modules/juce_blocks_basics/ is ISC
-# * src/deps/juce/modules/juce_box2d/box2d/ is zlib
-# * src/deps/juce/modules/juce_core/ is ISC, except:
-# > src/deps/juce/modules/juce_core/zip/zlib is zlib
-# * src/deps/juce/modules/juce_events/ is ISC
-# * src/deps/juce/modules/juce_graphics/image_formats/jpglib is IJG
-# * src/deps/juce/modules/juce_graphics/image_formats/pnglib is zlib
# - src/deps/rtaudio is MIT, except:
# * src/deps/rtaudio/include/soundcard.h is BSD
-# - src/deps/vst3sdk is GPLv3, except:
-# * src/deps/vst3sdk/base/, src/deps/vst3sdk/public.sdk/, and
-# src/deps/vst3sdk/pluginterfaces/vst/ivsttestplugprovider.h are BSD
#
-# The following sources, which would otherwise contribute to the License field,
-# are removed in prep: (none yet)
-License: GPLv3+ and MIT and CC0 and GPLv3 and ISC and ASL 2.0 and BSD and zlib and IJG
+# The following sources are present upstream, but not in the distributable
+# source tarball:
+#
+# - src/deps/juce
+# - src/deps/vst3sdk
+License: GPLv3+ and MIT and CC0 and BSD
URL: https://www.giadamusic.com
-Source0: %{url}/data/%{name}-%{version}-src.tar.gz
+# This macro is used by the script in Source1 as the upstream source archive.
+%global upstream_source %{url}/data/%{name}-%{version}-src.tar.gz
+Source0: %{name}-%{version}-src-distributable.tar.xz
+Source1: download-and-filter-source.sh
# https://github.com/monocasual/giada/pull/358
-Source1: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
+Source2: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
# https://github.com/monocasual/giada/pull/358
-Source2: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
+Source3: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
# We need to use pkg-config/pkgconf to find rtmidi and libsndfile.
# https://github.com/monocasual/giada/issues/451
@@ -121,65 +115,6 @@ Provides: bundled(nlohmann-json) = 3.9.1
Provides: bundled(hedley) = 13
# ============================================================================
-# ============================================================================
-# “JUCE”, https://juce.com/
-#
-# The version comes from ChangeLog. That, in turn, bundles a lot of libraries,
-# listed below.
-#
-# See https://github.com/juce-framework/JUCE/issues/860, where support for
-# unbundling these was requested.
-Provides: bundled(juce) = 6.0.4
-# “Oboe”, https://github.com/google/oboe
-#
-# The version comes from
-# src/deps/juce/modules/juce_audio_devices/native/oboe/readme.md.
-Provides: bundled(oboe) = 1.4.2
-# libogg
-#
-# The version is unclear.
-Provides: bundled(libogg)
-# libvorbis
-#
-# The version comes from the name of the subdirectory of
-# src/deps/juce/modules/juce_audio_formats/codecs/oggvorbis/
-Provides: bundled(libvorbis) = 1.3.7
-# libFLAC
-#
-# The version is unclear (only the API version is in the source code)
-Provides: bundled(flac)
-# Core Audio Utility Classes
-#
-# The version comes from the header of any arbitrary file in
-# src/deps/juce/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/.
-Provides: bundled(core-audio-utility-classes) = 1.1
-# VST3 SDK
-#
-# The version comes from “#define kVstVersionString” in
-# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/vst/vsttypes.h.
-Provides: bundled(vst3-sdk) = 3.6.13
-# Box2D
-#
-# The version comes from “b2Version b2_version” in
-# src/deps/juce/modules/juce_box2d/box2d/Common/b2Settings.cpp.
-Provides: bundled(Box2D) = 2.2.1
-# zlib
-#
-# The version comes from “#define ZLIB_VERSION” in
-# src/deps/juce/modules/juce_core/zip/zlib/zlib.h.
-Provides: bundled(zlib) = 1.2.3
-# “The Independent JPEG Group's JPEG software”
-#
-# The version comes from “#define JPEG_LIB_VERSION”, and the following comment,
-# in src/deps/juce/modules/juce_graphics/image_formats/jpglib/jpeglib.h.
-Provides: bundled(libjpeg) = 6b
-# libpng
-#
-# The version comes from the header comment of
-# src/deps/juce/modules/juce_graphics/image_formats/pnglib/png.h.
-Provides: bundled(libpng) = 1.6.37
-# ============================================================================
-
# ============================================================================
# RtAudio (https://github.com/thestk/rtaudio)
#
@@ -194,20 +129,9 @@ Provides: bundled(libpng) = 1.6.37
Provides: bundled(rtaudio) = 5.1.0
# ============================================================================
-# ============================================================================
-# VST3 SDK
-#
-# In addition to the copy bundled with the bundled JUCE, there is a second
-# bundled copy, where the version comes from “#define kVstVersionString” in
-# src/deps/vst3sdk/pluginterfaces/vst/vsttypes.h.
-Provides: bundled(vst3-sdk) = 3.7.0
-# ============================================================================
-
-
# Consistent behavior on F32
%undefine __cmake_in_source_build
-
%description
Giada is an open source, minimalistic and hardcore music production tool.
Designed for DJs, live performers and electronic musicians.
@@ -216,6 +140,26 @@ Designed for DJs, live performers and electronic musicians.
%prep
%autosetup -n %{name}-%{version}-src -p1
+# This is a last safeguard against something with an inappropriate license
+# slipping into the source tarball. It is no substitute for manual auditing.
+echo 'Checking for inappropriate source files:'
+echo '> Possible Steinberg proprietary license?'
+if grep -Frl 'This Software Development Kit may not be' .
+then
+ echo 'Found some concerning files!'
+ exit 1
+else
+ echo '> No concerning files were found.'
+fi
+echo '> Possible Steinberg VST 3 SDK (GPLv3 with conditions)?'
+if grep -Erli 'Project[[:blank:]]*:[[:blank:]]*VST SDK' .
+then
+ echo 'Found some concerning files!'
+ exit 1
+else
+ echo '> No concerning files were found.'
+fi
+
# At least on Fedora, this keeps CMake from expecting the static FLTK library.
# It is not clear whether this is an FLTK bug (upstream or Fedora), or a Giada
# bug, so we have not attempted to report it to any upstream.
@@ -223,24 +167,14 @@ sed -r -i 's/(FLTK)[[:blank:]]+CONFIG/\1/' CMakeLists.txt
%build
-# VST2 does not work:
-# In file included from ../src/deps/juce/modules/juce_audio_processors/juce_audio_processors.cpp:149:
-# ../src/deps/juce/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp:49:10: fatal error: pluginterfaces/vst2.x/aeffect.h: No such file or directory
-# 49 | #include <pluginterfaces/vst2.x/aeffect.h>
-# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# VST3 does not build on PPC64LE, and the solution is not obvious:
-# /usr/bin/ld: /usr/bin/ld: DWARF error: invalid abstract instance DIE ref
-# /tmp/ccVmiyyc.ltrans32.ltrans.o: in function `juce::PNGHelpers::readImageData(juce::pnglibNamespace::png_struct_def*, juce::pnglibNamespace::png_info_def*, __jmp_buf_tag (&) [1], unsigned char**)':
-# <artificial>:(.text+0x51d8): undefined reference to `juce::pnglibNamespace::png_init_filter_functions_vsx(juce::pnglibNamespace::png_struct_def*, unsigned int)
-
+# VST 2 SDK is only available under a proprietary license, and VST 3 SDK is
+# dual-licensed with a proprietary license and GPLv3, but additional
+# trademark-related conditions are imposed that are not acceptable in Fedora.
+# See the notes near the beginning of this spec file. Therefore the VST 3 SDK
+# and JUCE sources have been excluded, and all VST support must be disabled at
+# build time.
%cmake \
- -DWITH_VST2:BOOL=OFF \
-%ifnarch ppc64le
- -DWITH_VST3:BOOL=ON \
-%else
- -DWITH_VST3:BOOL=OFF \
-%endif
+ -DWITH_VST2:BOOL=OFF -DWITH_VST3:BOOL=OFF \
-DWITH_TESTS:BOOL=%{?with_tests:ON}%{?!with_tests:OFF} \
-GNinja
%cmake_build
@@ -249,9 +183,9 @@ sed -r -i 's/(FLTK)[[:blank:]]+CONFIG/\1/' CMakeLists.txt
%install
%cmake_install
# https://github.com/monocasual/giada/pull/358
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
# https://github.com/monocasual/giada/pull/358
-install -m 0644 -p -D -t %{buildroot}%{_metainfodir} %{SOURCE2}
+install -m 0644 -p -D -t %{buildroot}%{_metainfodir} %{SOURCE3}
install -m 0644 -p -D -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps \
extras/%{name}-logo.png
@@ -285,6 +219,11 @@ find %{buildroot} -type f
%changelog
+* Thu Feb 25 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-4
+- Remove VST 3 SDK and JUCE from source tarball for legal reasons; disable all
+ VST support
+- Update License field to reflect the removed bundled dependencies
+
* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-3
- Add link to upstream issue for format-security patch
- Add commentary on forked bundled rtaudio, with a link to upstream discussion
diff --git a/sources b/sources
index 82ffc5c..8cad3dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (giada-0.17.1-src.tar.gz) = 5e4c0f0c1a2dddbee54d2b026a7bf8aaec48f91d93939bde3c760dee2aa4b25b651b232095b15c5337f76df1155987bfa6d08a4d7196d6773fd89c95269cb530
+SHA512 (giada-0.17.1-src-distributable.tar.xz) = 7f73e54b8193988830feacd2aaffe3aacece24d5b641a1810c8babfd166082d3aaa4cab074f37edefd692ab5a46841376dc136ccf6822b51849202b751fb29de
commit 086d7e8b93e6b98b47d3a2bcd98f11473e2a4b05
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Wed Feb 24 10:28:41 2021 -0500
Add commentary on forked bundled rtaudio, with a link to upstream discussion
diff --git a/giada.spec b/giada.spec
index 5d9f17f..5478b8c 100644
--- a/giada.spec
+++ b/giada.spec
@@ -2,7 +2,7 @@
Name: giada
Version: 0.17.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Your hardcore loop machine
# The entire source is GPLv3+, except:
@@ -49,7 +49,7 @@ Source1: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2
# https://github.com/monocasual/giada/pull/358
Source2: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
-# We need to use pkg-config/pkgconf to find rtaudio and libsndfile.
+# We need to use pkg-config/pkgconf to find rtmidi and libsndfile.
# https://github.com/monocasual/giada/issues/451
Patch1: %{name}-0.17.1-find-external-dependencies.patch
# This is a C++ logging wrapper that passes its format string parameter through
@@ -181,7 +181,13 @@ Provides: bundled(libpng) = 1.6.37
# ============================================================================
# ============================================================================
-# rtaudio (https://github.com/thestk/rtaudio)
+# RtAudio (https://github.com/thestk/rtaudio)
+#
+# This version is slightly forked, so it is not possible to build with the
+# system copy of RtAudio. See
+# https://giadamusic.com/forum/viewtopic.php?f=2&t=177, where upstream
+# discusses the decision to maintain a forked copy of RtAudio in the Giada
+# source tree.
#
# The version comes from “#define RTAUDIO_VERSION” in
# src/deps/rtaudio/RtAudio.h.
@@ -279,6 +285,10 @@ find %{buildroot} -type f
%changelog
+* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-3
+- Add link to upstream issue for format-security patch
+- Add commentary on forked bundled rtaudio, with a link to upstream discussion
+
* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-2
- Disable VST3 on PPC64LE due to a non-obvious linker error
commit 54e911afcbc1fbe2c19f64f0064eb2cccdf5f400
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Feb 23 17:58:51 2021 -0500
Add link to upstream issue for format-security patch
diff --git a/giada.spec b/giada.spec
index d89e0db..5d9f17f 100644
--- a/giada.spec
+++ b/giada.spec
@@ -55,6 +55,8 @@ Patch1: %{name}-0.17.1-find-external-dependencies.patch
# This is a C++ logging wrapper that passes its format string parameter through
# to std::fprintf, which inherently means the format string cannot be a
# literal. We use GCC pragmas to suppress the warning in just this one spot.
+# See https://github.com/monocasual/giada/issues/447, where this is discussed,
+# and the patch is offered, upstream.
Patch2: %{name}-0.17.1-suppress-format-security.patch
# Binary should be installed as /usr/bin/giada, not /usr/giada; reported
# upstream with patch at https://github.com/monocasual/giada/issues/450.
1
0
Package that edited their arches constraints (1)
=============================================
- sysbench
was ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
is ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
List of packages currently excluding arches (1889)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- GoldenCheetah
ExclusiveArch: %{qt5_qtwebengine_arches}
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- OpenImageIO
ExclusiveArch: x86_64 ppc64le
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-V8
ExclusiveArch: %{nodejs_arches}
- RdRand
ExclusiveArch: %{ix86} x86_64
- RediSearch
ExclusiveArch: x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aboot
ExclusiveArch: alpha
- accel-config
ExclusiveArch: x86_64
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- algobox
ExclusiveArch: %{qt5_qtwebengine_arches}
- alleyoop
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64
- anet
ExclusiveArch: %{GPRbuild_arches}
- anki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- apmd
ExclusiveArch: %{ix86}
- appstream-generator
ExclusiveArch: %{ldc_arches}
- arduino
ExclusiveArch: %{go_arches}
- arduino-builder
ExclusiveArch: %{go_arches}
- arm-trusted-firmware
ExclusiveArch: aarch64
- aunit
ExclusiveArch: %GPRbuild_arches
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- bareftp
ExclusiveArch: %{mono_arches}
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64} aarch64 s390x armv7hl
- bcm283x-firmware
ExclusiveArch: %{arm} aarch64
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- blender
ExclusiveArch: x86_64 aarch64 ppc64le
- bless
ExclusiveArch: %mono_arches
- bpftrace
ExclusiveArch: x86_64 %{power64} aarch64 s390x
- calamares
ExclusiveArch: %{ix86} x86_64
- calibre
ExclusiveArch: %{qt5_qtwebengine_arches}
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- ceph
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- chromium
ExclusiveArch: x86_64 i686
ExclusiveArch: x86_64 i686 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- clevis-pin-tpm2
ExclusiveArch: %{rust_arches}
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- coffee-script
ExclusiveArch: %{nodejs_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- cpu-x
ExclusiveArch: i686 x86_64
- cpuid
ExclusiveArch: %{ix86} x86_64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- crash-gcore-command
ExclusiveArch: aarch64 ppc64le x86_64
- crash-trace-command
ExclusiveArch: aarch64 ppc64le s390x x86_64
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- cryptlib
ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le
- cryptobone
ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64
- daq
ExclusiveArch: x86_64 aarch64
- darktable
ExclusiveArch: x86_64 aarch64
ExclusiveArch: x86_64 ppc64le
- dbus-parsec
ExclusiveArch: %{rust_arches}
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- dbxtool
ExclusiveArch: i386 x86_64 aarch64
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-desktop-schemas
ExclusiveArch: %{go_arches}
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dolphin-emu
ExclusiveArch: x86_64 aarch64 ppc64le
- dotnet-build-reference-packages
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet3.1
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet5.0
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- dotnet5.0-build-reference-packages
ExclusiveArch: aarch64 x86_64
ExclusiveArch: x86_64
- doublecmd
ExclusiveArch: %{ix86} x86_64
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dssi-vst
ExclusiveArch: %{ix86} x86_64
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc64le aarch64
- e3
ExclusiveArch: %{ix86} x86_64
- edk2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: x86_64 aarch64
- efibootmgr
ExclusiveArch: %{efi}
- efifs
ExclusiveArch: %{efi}
- efitools
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- emacs-slime
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- embree
ExclusiveArch: x86_64
- enki
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- eric
ExclusiveArch: %{qt5_qtwebengine_arches} noarch
- extlinux-bootloader
ExclusiveArch: %{arm} aarch64
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- fes
ExclusiveArch: %{ix86} x86_64
- flannel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- florist
ExclusiveArch: %{GPRbuild_arches}
- fpc
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 ppc64le
- frescobaldi
ExclusiveArch: %{qt5_qtwebengine_arches}
- frysk
ExclusiveArch: %{ix86} x86_64 ppc64
- fwts
ExclusiveArch: x86_64 %{arm} aarch64 s390x riscv64 %{power64}
- ga
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- gbrainy
ExclusiveArch: %mono_arches
- gdata-sharp
ExclusiveArch: %mono_arches
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gearhead1
ExclusiveArch: %{fpc_arches}
- gela-asis
ExclusiveArch: %GPRbuild_arches
- ghdl
ExclusiveArch: %{GNAT_arches}
- ghostwriter
ExclusiveArch: %{qt5_qtwebengine_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- glibc32
ExclusiveArch: x86_64
- glibd
ExclusiveArch: %{ldc_arches}
- gmqcc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- gnatcoll
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-bindings
ExclusiveArch: %{GPRbuild_arches}
- gnatcoll-db
ExclusiveArch: %{GPRbuild_arches}
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-guitar
ExclusiveArch: %{mono_arches}
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- go-compilers
ExclusiveArch: %{go_arches}
- go-rpm-macros
ExclusiveArch: %{golang_arches} %{gccgo_arches}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang
ExclusiveArch: %{golang_arches}
- gomtree
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- goverlay
ExclusiveArch: %{fpc_arches}
- gprbuild
ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha
- grafana
ExclusiveArch: %{grafana_arches}
- grafana-pcp
ExclusiveArch: %{grafanapcp_arches}
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- gudev-sharp
ExclusiveArch: %mono_arches
- hedgewars
ExclusiveArch: %{fpc_arches}
- hsakmt
ExclusiveArch: x86_64 aarch64
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64
- i3status-rs
ExclusiveArch: %{rust_arches}
- icaro
ExclusiveArch: %{ix86} x86_64 noarch
- ignition
ExclusiveArch: %{go_arches}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- intel-cmt-cat
ExclusiveArch: x86_64 i686 i586
ExclusiveArch: x86_64 i686 i586
- intel-gmmlib
ExclusiveArch: x86_64 i686
- intel-ipsec-mb
ExclusiveArch: x86_64
ExclusiveArch: x86_64
- intel-mediasdk
ExclusiveArch: x86_64
- intel-undervolt
ExclusiveArch: i386 x86_64
- ioport
ExclusiveArch: %{ix86} x86_64
- ipmctl
ExclusiveArch: x86_64
- ipw2100-firmware
ExclusiveArch: noarch i386 x86_64
- ipw2200-firmware
ExclusiveArch: noarch i386 x86_64
- ispc
ExclusiveArch: x86_64 aarch64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iyfct
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- keepass
ExclusiveArch: %{mono_arches}
- kernel
ExclusiveArch: x86_64 s390x %{arm} aarch64 ppc64le
ExclusiveArch: noarch i386 i686 x86_64 s390x %{arm} aarch64 ppc64le
- keyring-ima-signer
ExclusiveArch: %{rust_arches}
- kf5-akonadi-search
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-audiocd-kio
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kalarmcal
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kblog
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarcore
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kcalendarutils
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kitinerary
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-kmailtransport
ExclusiveArch: x86_64 %{arm}
- kf5-ktnef
ExclusiveArch: x86_64 ppc64le aarch64 %{arm}
- kf5-libkdcraw
ExclusiveArch: x86_64 ppc64le %{arm}
- kicad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- kiwix-desktop
ExclusiveArch: %{qt5_qtwebengine_arches}
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- knotes
ExclusiveArch: x86_64 %{arm}
- kompose
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- lazarus
ExclusiveArch: %{fpc_arches}
- lazpaint
ExclusiveArch: %{fpc_arches}
- ldc
ExclusiveArch: %{ldc_arches}
- libbsr
ExclusiveArch: %{power64}
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libdfp
ExclusiveArch: ppc ppc64 ppc64le s390 s390x x86_64
- libdispatch
ExclusiveArch: x86_64 aarch64
- libguestfs
ExclusiveArch: %{kernel_arches}
- libica
ExclusiveArch: s390 s390x
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libnxz
ExclusiveArch: ppc64le
- libocxl
ExclusiveArch: ppc64le
- libpmemobj-cpp
ExclusiveArch: x86_64
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- libretro-desmume2015
ExclusiveArch: i686 x86_64
- librtas
ExclusiveArch: %{power64}
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64
- libva-intel-hybrid-driver
ExclusiveArch: %{ix86} x86_64 ia64
- libvma
ExclusiveArch: x86_64 ppc64le ppc64 aarch64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzfcphbaapi
ExclusiveArch: s390 s390x
- lightdm
ExclusiveArch: x86_64 ppc64le
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 s390x ppc64le
- luxcorerender
ExclusiveArch: x86_64
- mactel-boot
ExclusiveArch: x86_64
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- mantle
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matreshka
ExclusiveArch: %GPRbuild_arches
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mbpfan
ExclusiveArch: x86_64
- mcelog
ExclusiveArch: i686 x86_64
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- megapixels
ExclusiveArch: aarch64 armv7hl
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- memtest86+
ExclusiveArch: %{ix86} x86_64
- mesos
ExclusiveArch: x86_64
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} %{ix86} x86_64
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mirrorlist-server
ExclusiveArch: %{rust_arches}
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- mod_mono
ExclusiveArch: %mono_arches
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monobristol
ExclusiveArch: %{mono_arches}
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- monosim
ExclusiveArch: %mono_arches
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mustache-d
ExclusiveArch: %{ldc_arches}
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- nant
ExclusiveArch: %mono_arches
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- newsflash
ExclusiveArch: %{rust_arches}
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nispor
ExclusiveArch: %{rust_arches}
- nodejs
ExclusiveArch: %{nodejs_arches}
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nodemon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supervisor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: x86_64 ppc64le
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64 ppc64le
- nwchem
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- obs-service-rust2rpm
ExclusiveArch: %{rust_arches} noarch
- oci-kvm-hook
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-seccomp-bpf-hook
ExclusiveArch: x86_64 %%{power64} aarch64 s390x armv7hl
- oci-umount
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- oidn
ExclusiveArch: x86_64
- olpc-kbdshim
ExclusiveArch: %{ix86} %{arm}
- olpc-netutils
ExclusiveArch: %{ix86} %{arm}
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- onednn
ExclusiveArch: x86_64 aarch64 ppc64le
- onedrive
ExclusiveArch: %{ldc_arches}
- opae
ExclusiveArch: x86_64
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjfx
ExclusiveArch: x86_64
- openjfx8
ExclusiveArch: x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openni
ExclusiveArch: %{ix86} x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openshadinglanguage
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- openssl-ibmca
ExclusiveArch: s390 s390x
- origin
ExclusiveArch: %{go_arches}
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- orion
ExclusiveArch: %{qt5_qtwebengine_arches}
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- paflib
ExclusiveArch: ppc %{power64}
- parsec
ExclusiveArch: %{rust_arches}
- parsec-tool
ExclusiveArch: %{rust_arches}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdbg
ExclusiveArch: ppc64le
- pdfmod
ExclusiveArch: %mono_arches
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: x86_64
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- pmdk-convert
ExclusiveArch: x86_64
- pmemkv
ExclusiveArch: x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- powerpc-utils
ExclusiveArch: ppc %{power64}
- ppc64-diag
ExclusiveArch: ppc %{power64}
- psi-plus
ExclusiveArch: %{qt5_qtwebengine_arches}
- pveclib
ExclusiveArch: ppc %{power64}
- pvs-sbcl
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- pyqtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-healpy
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-javabridge
ExclusiveArch: i686 x86_64
- python-openoffice
ExclusiveArch: noarch x86_64
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-rpi-gpio
ExclusiveArch: %{arm} aarch64
- python-setuptools-rust
ExclusiveArch: %{rust_arches}
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qemu-sanity-check
ExclusiveArch: %{kernel_arches}
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qmapshack
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- quantum-espresso
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- redhat-lsb
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- reg
ExclusiveArch: x86_64
- renderdoc
ExclusiveArch: x86_64
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm}
- rescene
ExclusiveArch: %{mono_arches}
- restsharp
ExclusiveArch: %{mono_arches}
- rhythmbox-alternative-toolbar
ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le
- rmd
ExclusiveArch: %{ix86} x86_64
- rocm-runtime
ExclusiveArch: x86_64 aarch64
- rocminfo
ExclusiveArch: x86_64 aarch64
- rpm-ostree
ExclusiveArch: %{rust_arches}
- rr
ExclusiveArch: %{ix86} x86_64
- rssguard
ExclusiveArch: %{qt5_qtwebengine_arches}
- rubygem-childprocess
ExclusiveArch: %{ix86} x86_64 noarch
- runc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x
- rust
ExclusiveArch: %{rust_arches}
- rust-ab_glyph_rasterizer
ExclusiveArch: %{rust_arches}
- rust-abomonation
ExclusiveArch: %{rust_arches}
- rust-actix
ExclusiveArch: %{rust_arches}
- rust-actix-codec
ExclusiveArch: %{rust_arches}
- rust-actix-connect
ExclusiveArch: %{rust_arches}
- rust-actix-files
ExclusiveArch: %{rust_arches}
- rust-actix-http
ExclusiveArch: %{rust_arches}
- rust-actix-macros
ExclusiveArch: %{rust_arches}
- rust-actix-router
ExclusiveArch: %{rust_arches}
- rust-actix-rt
ExclusiveArch: %{rust_arches}
- rust-actix-server
ExclusiveArch: %{rust_arches}
- rust-actix-server-config
ExclusiveArch: %{rust_arches}
- rust-actix-service
ExclusiveArch: %{rust_arches}
- rust-actix-testing
ExclusiveArch: %{rust_arches}
- rust-actix-threadpool
ExclusiveArch: %{rust_arches}
- rust-actix-tls
ExclusiveArch: %{rust_arches}
- rust-actix-utils
ExclusiveArch: %{rust_arches}
- rust-actix-web
ExclusiveArch: %{rust_arches}
- rust-actix-web-codegen
ExclusiveArch: %{rust_arches}
- rust-actix_derive
ExclusiveArch: %{rust_arches}
- rust-addr2line
ExclusiveArch: %{rust_arches}
- rust-adler
ExclusiveArch: %{rust_arches}
- rust-adler32
ExclusiveArch: %{rust_arches}
- rust-aead
ExclusiveArch: %{rust_arches}
- rust-aes
ExclusiveArch: %{rust_arches}
- rust-aes-gcm
ExclusiveArch: %{rust_arches}
- rust-aes-soft
ExclusiveArch: %{rust_arches}
- rust-afterburn
ExclusiveArch: %{rust_arches}
- rust-ahash
ExclusiveArch: %{rust_arches}
- rust-aho-corasick
ExclusiveArch: %{rust_arches}
- rust-alacritty
ExclusiveArch: %{rust_arches}
- rust-alacritty_config_derive
ExclusiveArch: %{rust_arches}
- rust-alacritty_terminal
ExclusiveArch: %{rust_arches}
- rust-alga
ExclusiveArch: %{rust_arches}
- rust-alga_derive
ExclusiveArch: %{rust_arches}
- rust-alloc-no-stdlib
ExclusiveArch: %{rust_arches}
- rust-alloc-stdlib
ExclusiveArch: %{rust_arches}
- rust-alphanumeric-sort
ExclusiveArch: %{rust_arches}
- rust-ammonia
ExclusiveArch: %{rust_arches}
- rust-andrew
ExclusiveArch: %{rust_arches}
- rust-ansi_colours
ExclusiveArch: %{rust_arches}
- rust-ansi_term
ExclusiveArch: %{rust_arches}
- rust-ansi_term0.11
ExclusiveArch: %{rust_arches}
- rust-antidote
ExclusiveArch: %{rust_arches}
- rust-anyhow
ExclusiveArch: %{rust_arches}
- rust-anymap
ExclusiveArch: %{rust_arches}
- rust-aom-sys
ExclusiveArch: %{rust_arches}
- rust-app_dirs
ExclusiveArch: %{rust_arches}
- rust-approx
ExclusiveArch: %{rust_arches}
- rust-arbitrary
ExclusiveArch: %{rust_arches}
- rust-arc-swap
ExclusiveArch: %{rust_arches}
- rust-arg_enum_proc_macro
ExclusiveArch: %{rust_arches}
- rust-argparse
ExclusiveArch: %{rust_arches}
- rust-array-init
ExclusiveArch: %{rust_arches}
- rust-arraydeque
ExclusiveArch: %{rust_arches}
- rust-arrayref
ExclusiveArch: %{rust_arches}
- rust-arrayvec
ExclusiveArch: %{rust_arches}
- rust-article_scraper
ExclusiveArch: %{rust_arches}
- rust-ascii
ExclusiveArch: %{rust_arches}
- rust-askalono
ExclusiveArch: %{rust_arches}
- rust-askalono-cli
ExclusiveArch: %{rust_arches}
- rust-askama
ExclusiveArch: %{rust_arches}
- rust-askama_derive
ExclusiveArch: %{rust_arches}
- rust-askama_escape
ExclusiveArch: %{rust_arches}
- rust-askama_shared
ExclusiveArch: %{rust_arches}
- rust-assert-json-diff
ExclusiveArch: %{rust_arches}
- rust-assert_approx_eq
ExclusiveArch: %{rust_arches}
- rust-assert_cli
ExclusiveArch: %{rust_arches}
- rust-assert_cmd
ExclusiveArch: %{rust_arches}
- rust-assert_fs
ExclusiveArch: %{rust_arches}
- rust-assert_matches
ExclusiveArch: %{rust_arches}
- rust-assign
ExclusiveArch: %{rust_arches}
- rust-async-attributes
ExclusiveArch: %{rust_arches}
- rust-async-compression
ExclusiveArch: %{rust_arches}
- rust-async-io
ExclusiveArch: %{rust_arches}
- rust-async-task
ExclusiveArch: %{rust_arches}
- rust-async-trait
ExclusiveArch: %{rust_arches}
- rust-asyncgit
ExclusiveArch: %{rust_arches}
- rust-atk
ExclusiveArch: %{rust_arches}
- rust-atk-sys
ExclusiveArch: %{rust_arches}
- rust-atom
ExclusiveArch: %{rust_arches}
- rust-atomicwrites
ExclusiveArch: %{rust_arches}
- rust-attohttpc
ExclusiveArch: %{rust_arches}
- rust-atty
ExclusiveArch: %{rust_arches}
- rust-autocfg
ExclusiveArch: %{rust_arches}
- rust-av-metrics
ExclusiveArch: %{rust_arches}
- rust-average
ExclusiveArch: %{rust_arches}
- rust-awc
ExclusiveArch: %{rust_arches}
- rust-backtrace
ExclusiveArch: %{rust_arches}
- rust-backtrace-sys
ExclusiveArch: %{rust_arches}
- rust-base100
ExclusiveArch: %{rust_arches}
- rust-base64
ExclusiveArch: %{rust_arches}
- rust-base64-0.10
ExclusiveArch: %{rust_arches}
- rust-base64-0.11
ExclusiveArch: %{rust_arches}
- rust-base64_0.12
ExclusiveArch: %{rust_arches}
- rust-bat
ExclusiveArch: %{rust_arches}
- rust-battery
ExclusiveArch: %{rust_arches}
- rust-bencher
ExclusiveArch: %{rust_arches}
- rust-better-panic
ExclusiveArch: %{rust_arches}
- rust-bincode
ExclusiveArch: %{rust_arches}
- rust-bincode0.8
ExclusiveArch: %{rust_arches}
- rust-bindgen
ExclusiveArch: %{rust_arches}
- rust-binfarce
ExclusiveArch: %{rust_arches}
- rust-biscuit
ExclusiveArch: %{rust_arches}
- rust-bit-set
ExclusiveArch: %{rust_arches}
- rust-bit-vec
ExclusiveArch: %{rust_arches}
- rust-bitfield
ExclusiveArch: %{rust_arches}
- rust-bitflags
ExclusiveArch: %{rust_arches}
- rust-bitmaps
ExclusiveArch: %{rust_arches}
- rust-bitstream-io
ExclusiveArch: %{rust_arches}
- rust-bitvec
ExclusiveArch: %{rust_arches}
- rust-blake2
ExclusiveArch: %{rust_arches}
- rust-blobby
ExclusiveArch: %{rust_arches}
- rust-blobby0.1
ExclusiveArch: %{rust_arches}
- rust-block-buffer
ExclusiveArch: %{rust_arches}
- rust-block-buffer0.7
ExclusiveArch: %{rust_arches}
- rust-block-cipher
ExclusiveArch: %{rust_arches}
- rust-block-modes
ExclusiveArch: %{rust_arches}
- rust-block-padding
ExclusiveArch: %{rust_arches}
- rust-blsctl
ExclusiveArch: %{rust_arches}
- rust-bodhi
ExclusiveArch: %{rust_arches}
- rust-bodhi-cli
ExclusiveArch: %{rust_arches}
- rust-bootupd
ExclusiveArch: x86_64 aarch64
- rust-box_drawing
ExclusiveArch: %{rust_arches}
- rust-brev
ExclusiveArch: %{rust_arches}
- rust-brotli
ExclusiveArch: %{rust_arches}
- rust-brotli-decompressor
ExclusiveArch: %{rust_arches}
- rust-brotli-sys
ExclusiveArch: %{rust_arches}
- rust-brotli2
ExclusiveArch: %{rust_arches}
- rust-bstr
ExclusiveArch: %{rust_arches}
- rust-buf-min
ExclusiveArch: %{rust_arches}
- rust-buf_redux
ExclusiveArch: %{rust_arches}
- rust-bufsize
ExclusiveArch: %{rust_arches}
- rust-bufstream
ExclusiveArch: %{rust_arches}
- rust-build_const
ExclusiveArch: %{rust_arches}
- rust-bumpalo
ExclusiveArch: %{rust_arches}
- rust-byte-tools
ExclusiveArch: %{rust_arches}
- rust-byte-unit
ExclusiveArch: %{rust_arches}
- rust-byte-unit3
ExclusiveArch: %{rust_arches}
- rust-bytecount
ExclusiveArch: %{rust_arches}
- rust-bytelines
ExclusiveArch: %{rust_arches}
- rust-bytemuck
ExclusiveArch: %{rust_arches}
- rust-bytemuck_derive
ExclusiveArch: %{rust_arches}
- rust-byteorder
ExclusiveArch: %{rust_arches}
- rust-bytes
ExclusiveArch: %{rust_arches}
- rust-bytes0.3
ExclusiveArch: %{rust_arches}
- rust-bytes0.4
ExclusiveArch: %{rust_arches}
- rust-bytes0.5
ExclusiveArch: %{rust_arches}
- rust-bytes0.6
ExclusiveArch: %{rust_arches}
- rust-bytesize
ExclusiveArch: %{rust_arches}
- rust-bytestring
ExclusiveArch: %{rust_arches}
- rust-bzip2
ExclusiveArch: %{rust_arches}
- rust-bzip2-sys
ExclusiveArch: %{rust_arches}
- rust-c_vec
ExclusiveArch: %{rust_arches}
- rust-cache-padded
ExclusiveArch: %{rust_arches}
- rust-cairo-rs
ExclusiveArch: %{rust_arches}
- rust-cairo-sys-rs
ExclusiveArch: %{rust_arches}
- rust-calloop
ExclusiveArch: %{rust_arches}
- rust-caps
ExclusiveArch: %{rust_arches}
- rust-cargo
ExclusiveArch: %{rust_arches}
- rust-cargo-bloat
ExclusiveArch: %{rust_arches}
- rust-cargo-c
ExclusiveArch: %{rust_arches}
- rust-cargo-husky
ExclusiveArch: %{rust_arches}
- rust-cargo-insta
ExclusiveArch: %{rust_arches}
- rust-cargo-platform
ExclusiveArch: %{rust_arches}
- rust-cargo-readme
ExclusiveArch: %{rust_arches}
- rust-cargo_metadata
ExclusiveArch: %{rust_arches}
- rust-cassowary
ExclusiveArch: %{rust_arches}
- rust-cast
ExclusiveArch: %{rust_arches}
- rust-cbindgen
ExclusiveArch: %{rust_arches}
- rust-cc
ExclusiveArch: %{rust_arches}
- rust-cedarwood
ExclusiveArch: %{rust_arches}
- rust-cexpr
ExclusiveArch: %{rust_arches}
- rust-cfg-if
ExclusiveArch: %{rust_arches}
- rust-cfg-if0.1
ExclusiveArch: %{rust_arches}
- rust-chainerror
ExclusiveArch: %{rust_arches}
- rust-charset
ExclusiveArch: %{rust_arches}
- rust-chbs
ExclusiveArch: %{rust_arches}
- rust-checked_int_cast
ExclusiveArch: %{rust_arches}
- rust-choosier
ExclusiveArch: %{rust_arches}
- rust-chrono
ExclusiveArch: %{rust_arches}
- rust-chrono-humanize
ExclusiveArch: %{rust_arches}
- rust-chrono-tz
ExclusiveArch: %{rust_arches}
- rust-chunked_transfer
ExclusiveArch: %{rust_arches}
- rust-cipher
ExclusiveArch: %{rust_arches}
- rust-clang-sys
ExclusiveArch: %{rust_arches}
- rust-clap
ExclusiveArch: %{rust_arches}
- rust-clap2
ExclusiveArch: %{rust_arches}
- rust-clap_derive
ExclusiveArch: %{rust_arches}
- rust-clicolors-control
ExclusiveArch: %{rust_arches}
- rust-cmake
ExclusiveArch: %{rust_arches}
- rust-codespan-reporting
ExclusiveArch: %{rust_arches}
- rust-codicon
ExclusiveArch: %{rust_arches}
- rust-color-backtrace
ExclusiveArch: %{rust_arches}
- rust-color_quant
ExclusiveArch: %{rust_arches}
- rust-colored
ExclusiveArch: %{rust_arches}
- rust-colored1
ExclusiveArch: %{rust_arches}
- rust-colored_json
ExclusiveArch: %{rust_arches}
- rust-colorful
ExclusiveArch: %{rust_arches}
- rust-compiletest_rs
ExclusiveArch: %{rust_arches}
- rust-comrak
ExclusiveArch: %{rust_arches}
- rust-concurrent-queue
ExclusiveArch: %{rust_arches}
- rust-config
ExclusiveArch: %{rust_arches}
- rust-console
ExclusiveArch: %{rust_arches}
- rust-console0.11
ExclusiveArch: %{rust_arches}
- rust-console0.12
ExclusiveArch: %{rust_arches}
- rust-console0.13
ExclusiveArch: %{rust_arches}
- rust-console0.9
ExclusiveArch: %{rust_arches}
- rust-const-cstr
ExclusiveArch: %{rust_arches}
- rust-const-random
ExclusiveArch: %{rust_arches}
- rust-const-random-macro
ExclusiveArch: %{rust_arches}
- rust-const_fn
ExclusiveArch: %{rust_arches}
- rust-content_inspector
ExclusiveArch: %{rust_arches}
- rust-conv
ExclusiveArch: %{rust_arches}
- rust-cookie
ExclusiveArch: %{rust_arches}
- rust-cookie_store
ExclusiveArch: %{rust_arches}
- rust-copydeps
ExclusiveArch: %{rust_arches}
- rust-copyless
ExclusiveArch: %{rust_arches}
- rust-copypasta
ExclusiveArch: %{rust_arches}
- rust-coreos-installer
ExclusiveArch: %{rust_arches}
- rust-cpio
ExclusiveArch: %{rust_arches}
- rust-cpp_demangle
ExclusiveArch: %{rust_arches}
- rust-cpuid-bool
ExclusiveArch: %{rust_arches}
- rust-cpython
ExclusiveArch: %{rust_arches}
- rust-crates-io
ExclusiveArch: %{rust_arches}
- rust-crc
ExclusiveArch: %{rust_arches}
- rust-crc-any
ExclusiveArch: %{rust_arches}
- rust-crc-core
ExclusiveArch: %{rust_arches}
- rust-crc32fast
ExclusiveArch: %{rust_arches}
- rust-criterion
ExclusiveArch: %{rust_arches}
- rust-criterion-plot
ExclusiveArch: %{rust_arches}
- rust-crossbeam
ExclusiveArch: %{rust_arches}
- rust-crossbeam-channel
ExclusiveArch: %{rust_arches}
- rust-crossbeam-channel0.4
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque0.7
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch0.8
ExclusiveArch: %{rust_arches}
- rust-crossbeam-queue
ExclusiveArch: %{rust_arches}
- rust-crossbeam-queue0.2
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils0.7
ExclusiveArch: %{rust_arches}
- rust-crossbeam0.7
ExclusiveArch: %{rust_arches}
- rust-crossfont
ExclusiveArch: %{rust_arches}
- rust-crossterm
ExclusiveArch: %{rust_arches}
- rust-crossterm0.17
ExclusiveArch: %{rust_arches}
- rust-crosstermion
ExclusiveArch: %{rust_arches}
- rust-crypto-hash
ExclusiveArch: %{rust_arches}
- rust-crypto-mac
ExclusiveArch: %{rust_arches}
- rust-crypto-mac0.8
ExclusiveArch: %{rust_arches}
- rust-cryptovec
ExclusiveArch: %{rust_arches}
- rust-cssparser
ExclusiveArch: %{rust_arches}
- rust-cssparser-macros
ExclusiveArch: %{rust_arches}
- rust-csv
ExclusiveArch: %{rust_arches}
- rust-csv-core
ExclusiveArch: %{rust_arches}
- rust-ctor
ExclusiveArch: %{rust_arches}
- rust-ctr
ExclusiveArch: %{rust_arches}
- rust-ctrlc
ExclusiveArch: %{rust_arches}
- rust-cty
ExclusiveArch: %{rust_arches}
- rust-curl
ExclusiveArch: %{rust_arches}
- rust-curl-sys
ExclusiveArch: %{rust_arches}
- rust-custom_derive
ExclusiveArch: %{rust_arches}
- rust-cxx
ExclusiveArch: %{rust_arches}
- rust-cxx-build
ExclusiveArch: %{rust_arches}
- rust-cxx-gen
ExclusiveArch: %{rust_arches}
- rust-cxxbridge-flags
ExclusiveArch: %{rust_arches}
- rust-cxxbridge-macro
ExclusiveArch: %{rust_arches}
- rust-darling
ExclusiveArch: %{rust_arches}
- rust-darling_core
ExclusiveArch: %{rust_arches}
- rust-darling_macro
ExclusiveArch: %{rust_arches}
- rust-dashmap
ExclusiveArch: %{rust_arches}
- rust-data-encoding
ExclusiveArch: %{rust_arches}
- rust-data-url
ExclusiveArch: %{rust_arches}
- rust-datetime
ExclusiveArch: %{rust_arches}
- rust-dav1d-sys
ExclusiveArch: %{rust_arches}
- rust-dbus
ExclusiveArch: %{rust_arches}
- rust-dbus-codegen
ExclusiveArch: %{rust_arches}
- rust-dbus-crossroads
ExclusiveArch: %{rust_arches}
- rust-dbus0.2
ExclusiveArch: %{rust_arches}
- rust-dbus0.6
ExclusiveArch: %{rust_arches}
- rust-dbus0.8
ExclusiveArch: %{rust_arches}
- rust-debug-helper
ExclusiveArch: %{rust_arches}
- rust-decimal
ExclusiveArch: %{rust_arches}
- rust-deflate
ExclusiveArch: %{rust_arches}
- rust-defmac
ExclusiveArch: %{rust_arches}
- rust-delta_e
ExclusiveArch: %{rust_arches}
- rust-derivative
ExclusiveArch: %{rust_arches}
- rust-derive-new
ExclusiveArch: %{rust_arches}
- rust-derive_arbitrary
ExclusiveArch: %{rust_arches}
- rust-derive_builder
ExclusiveArch: %{rust_arches}
- rust-derive_builder_core
ExclusiveArch: %{rust_arches}
- rust-derive_more
ExclusiveArch: %{rust_arches}
- rust-des
ExclusiveArch: %{rust_arches}
- rust-desed
ExclusiveArch: %{rust_arches}
- rust-deunicode
ExclusiveArch: %{rust_arches}
- rust-devicemapper
ExclusiveArch: %{rust_arches}
- rust-dialoguer
ExclusiveArch: %{rust_arches}
- rust-diesel
ExclusiveArch: %{rust_arches}
- rust-diesel_derives
ExclusiveArch: %{rust_arches}
- rust-diesel_migrations
ExclusiveArch: %{rust_arches}
- rust-diff
ExclusiveArch: %{rust_arches}
- rust-difference
ExclusiveArch: %{rust_arches}
- rust-digest
ExclusiveArch: %{rust_arches}
- rust-digest0.8
ExclusiveArch: %{rust_arches}
- rust-directories
ExclusiveArch: %{rust_arches}
- rust-dirs
ExclusiveArch: %{rust_arches}
- rust-dirs-next
ExclusiveArch: %{rust_arches}
- rust-dirs-sys
ExclusiveArch: %{rust_arches}
- rust-dirs-sys-next
ExclusiveArch: %{rust_arches}
- rust-dirs2
ExclusiveArch: %{rust_arches}
- rust-diskonaut
ExclusiveArch: %{rust_arches}
- rust-dissimilar
ExclusiveArch: %{rust_arches}
- rust-dlib
ExclusiveArch: %{rust_arches}
- rust-dlv-list
ExclusiveArch: %{rust_arches}
- rust-dns-lookup
ExclusiveArch: %{rust_arches}
- rust-dns-parser
ExclusiveArch: %{rust_arches}
- rust-doc-comment
ExclusiveArch: %{rust_arches}
- rust-docmatic
ExclusiveArch: %{rust_arches}
- rust-docopt
ExclusiveArch: %{rust_arches}
- rust-dotenv
ExclusiveArch: %{rust_arches}
- rust-downcast-rs
ExclusiveArch: %{rust_arches}
- rust-dtoa
ExclusiveArch: %{rust_arches}
- rust-dtoa-short
ExclusiveArch: %{rust_arches}
- rust-dua-cli
ExclusiveArch: %{rust_arches}
- rust-duct
ExclusiveArch: %{rust_arches}
- rust-dummy
ExclusiveArch: %{rust_arches}
- rust-dunce
ExclusiveArch: %{rust_arches}
- rust-dutree
ExclusiveArch: %{rust_arches}
- rust-easy-parallel
ExclusiveArch: %{rust_arches}
- rust-edit-distance
ExclusiveArch: %{rust_arches}
- rust-either
ExclusiveArch: %{rust_arches}
- rust-elasticlunr-rs
ExclusiveArch: %{rust_arches}
- rust-encode_unicode
ExclusiveArch: %{rust_arches}
- rust-encoding
ExclusiveArch: %{rust_arches}
- rust-encoding-index-japanese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-korean
ExclusiveArch: %{rust_arches}
- rust-encoding-index-simpchinese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-singlebyte
ExclusiveArch: %{rust_arches}
- rust-encoding-index-tradchinese
ExclusiveArch: %{rust_arches}
- rust-encoding_index_tests
ExclusiveArch: %{rust_arches}
- rust-encoding_rs
ExclusiveArch: %{rust_arches}
- rust-encoding_rs_io
ExclusiveArch: %{rust_arches}
- rust-entities
ExclusiveArch: %{rust_arches}
- rust-enum-as-inner
ExclusiveArch: %{rust_arches}
- rust-enum_primitive
ExclusiveArch: %{rust_arches}
- rust-enumflags2
ExclusiveArch: %{rust_arches}
- rust-enumflags2_derive
ExclusiveArch: %{rust_arches}
- rust-env_logger
ExclusiveArch: %{rust_arches}
- rust-env_logger0.4
ExclusiveArch: %{rust_arches}
- rust-env_logger0.5
ExclusiveArch: %{rust_arches}
- rust-env_logger0.6
ExclusiveArch: %{rust_arches}
- rust-env_logger0.7
ExclusiveArch: %{rust_arches}
- rust-environment
ExclusiveArch: %{rust_arches}
- rust-envsubst
ExclusiveArch: %{rust_arches}
- rust-erased-serde
ExclusiveArch: %{rust_arches}
- rust-err-derive
ExclusiveArch: %{rust_arches}
- rust-errln
ExclusiveArch: %{rust_arches}
- rust-errno
ExclusiveArch: %{rust_arches}
- rust-error-chain
ExclusiveArch: %{rust_arches}
- rust-escaper
ExclusiveArch: %{rust_arches}
- rust-escargot
ExclusiveArch: %{rust_arches}
- rust-euclid
ExclusiveArch: %{rust_arches}
- rust-exa
ExclusiveArch: %{rust_arches}
- rust-expat-sys
ExclusiveArch: %{rust_arches}
- rust-extend
ExclusiveArch: %{rust_arches}
- rust-extprim
ExclusiveArch: %{rust_arches}
- rust-extprim_literals_macros
ExclusiveArch: %{rust_arches}
- rust-fail
ExclusiveArch: %{rust_arches}
- rust-failure
ExclusiveArch: %{rust_arches}
- rust-failure-tools
ExclusiveArch: %{rust_arches}
- rust-failure_derive
ExclusiveArch: %{rust_arches}
- rust-fake
ExclusiveArch: %{rust_arches}
- rust-fake-simd
ExclusiveArch: %{rust_arches}
- rust-fake_clock
ExclusiveArch: %{rust_arches}
- rust-fallible-iterator
ExclusiveArch: %{rust_arches}
- rust-fastrand
ExclusiveArch: %{rust_arches}
- rust-fbthrift_codegen_includer_proc_macro
ExclusiveArch: %{rust_arches}
- rust-fd-find
ExclusiveArch: %{rust_arches}
- rust-fdlimit
ExclusiveArch: %{rust_arches}
- rust-fedora
ExclusiveArch: %{rust_arches}
- rust-fedora-coreos-pinger
ExclusiveArch: %{rust_arches}
- rust-fedora-update-feedback
ExclusiveArch: %{rust_arches}
- rust-feed-rs
ExclusiveArch: %{rust_arches}
- rust-feedbin_api
ExclusiveArch: %{rust_arches}
- rust-feedly_api
ExclusiveArch: %{rust_arches}
- rust-fern
ExclusiveArch: %{rust_arches}
- rust-fever_api
ExclusiveArch: %{rust_arches}
- rust-ffsend
ExclusiveArch: %{rust_arches}
- rust-ffsend-api
ExclusiveArch: %{rust_arches}
- rust-filesize
ExclusiveArch: %{rust_arches}
- rust-filetime
ExclusiveArch: %{rust_arches}
- rust-findshlibs
ExclusiveArch: %{rust_arches}
- rust-fixedbitset
ExclusiveArch: %{rust_arches}
- rust-flame
ExclusiveArch: %{rust_arches}
- rust-flate2
ExclusiveArch: %{rust_arches}
- rust-float-cmp
ExclusiveArch: %{rust_arches}
- rust-float-cmp0.6
ExclusiveArch: %{rust_arches}
- rust-float-ord
ExclusiveArch: %{rust_arches}
- rust-flume
ExclusiveArch: %{rust_arches}
- rust-fnv
ExclusiveArch: %{rust_arches}
- rust-font-kit
ExclusiveArch: %{rust_arches}
- rust-foreign-types
ExclusiveArch: %{rust_arches}
- rust-foreign-types-macros
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared0.1
ExclusiveArch: %{rust_arches}
- rust-foreign-types0.3
ExclusiveArch: %{rust_arches}
- rust-form_urlencoded
ExclusiveArch: %{rust_arches}
- rust-fragile
ExclusiveArch: %{rust_arches}
- rust-freetype
ExclusiveArch: %{rust_arches}
- rust-freetype-rs
ExclusiveArch: %{rust_arches}
- rust-freetype-sys
ExclusiveArch: %{rust_arches}
- rust-fs2
ExclusiveArch: %{rust_arches}
- rust-fs_extra
ExclusiveArch: %{rust_arches}
- rust-funty
ExclusiveArch: %{rust_arches}
- rust-fuse
ExclusiveArch: %{rust_arches}
- rust-futf
ExclusiveArch: %{rust_arches}
- rust-futures
ExclusiveArch: %{rust_arches}
- rust-futures-channel
ExclusiveArch: %{rust_arches}
- rust-futures-core
ExclusiveArch: %{rust_arches}
- rust-futures-cpupool
ExclusiveArch: %{rust_arches}
- rust-futures-executor
ExclusiveArch: %{rust_arches}
- rust-futures-io
ExclusiveArch: %{rust_arches}
- rust-futures-lite
ExclusiveArch: %{rust_arches}
- rust-futures-macro
ExclusiveArch: %{rust_arches}
- rust-futures-sink
ExclusiveArch: %{rust_arches}
- rust-futures-task
ExclusiveArch: %{rust_arches}
- rust-futures-timer
ExclusiveArch: %{rust_arches}
- rust-futures-util
ExclusiveArch: %{rust_arches}
- rust-futures0.1
ExclusiveArch: %{rust_arches}
- rust-fuzzy-matcher
ExclusiveArch: %{rust_arches}
- rust-fxhash
ExclusiveArch: %{rust_arches}
- rust-gcsf
ExclusiveArch: %{rust_arches}
- rust-gdk
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf-sys
ExclusiveArch: %{rust_arches}
- rust-gdk-sys
ExclusiveArch: %{rust_arches}
- rust-generic-array
ExclusiveArch: %{rust_arches}
- rust-generic-array0.12
ExclusiveArch: %{rust_arches}
- rust-getch
ExclusiveArch: %{rust_arches}
- rust-gethostname
ExclusiveArch: %{rust_arches}
- rust-getopts
ExclusiveArch: %{rust_arches}
- rust-getrandom
ExclusiveArch: %{rust_arches}
- rust-getrandom0.1
ExclusiveArch: %{rust_arches}
- rust-gettext-rs
ExclusiveArch: %{rust_arches}
- rust-gettext-sys
ExclusiveArch: %{rust_arches}
- rust-ghash
ExclusiveArch: %{rust_arches}
- rust-ghost
ExclusiveArch: %{rust_arches}
- rust-gif
ExclusiveArch: %{rust_arches}
- rust-gif0.10
ExclusiveArch: %{rust_arches}
- rust-gimli
ExclusiveArch: %{rust_arches}
- rust-gio
ExclusiveArch: %{rust_arches}
- rust-gio-sys
ExclusiveArch: %{rust_arches}
- rust-gir-format-check
ExclusiveArch: %{rust_arches}
- rust-git-delta
ExclusiveArch: %{rust_arches}
- rust-git2
ExclusiveArch: %{rust_arches}
- rust-git2-curl
ExclusiveArch: %{rust_arches}
- rust-gitui
ExclusiveArch: %{rust_arches}
- rust-gl_generator
ExclusiveArch: %{rust_arches}
- rust-glib
ExclusiveArch: %{rust_arches}
- rust-glib-macros
ExclusiveArch: %{rust_arches}
- rust-glib-sys
ExclusiveArch: %{rust_arches}
- rust-glob
ExclusiveArch: %{rust_arches}
- rust-globset
ExclusiveArch: %{rust_arches}
- rust-globwalk
ExclusiveArch: %{rust_arches}
- rust-glutin
ExclusiveArch: %{rust_arches}
- rust-glutin_egl_sys
ExclusiveArch: %{rust_arches}
- rust-glutin_glx_sys
ExclusiveArch: %{rust_arches}
- rust-gobject-sys
ExclusiveArch: %{rust_arches}
- rust-goblin
ExclusiveArch: %{rust_arches}
- rust-google-drive3-fork
ExclusiveArch: %{rust_arches}
- rust-gptman
ExclusiveArch: %{rust_arches}
- rust-grep
ExclusiveArch: %{rust_arches}
- rust-grep-cli
ExclusiveArch: %{rust_arches}
- rust-grep-matcher
ExclusiveArch: %{rust_arches}
- rust-grep-pcre2
ExclusiveArch: %{rust_arches}
- rust-grep-printer
ExclusiveArch: %{rust_arches}
- rust-grep-regex
ExclusiveArch: %{rust_arches}
- rust-grep-searcher
ExclusiveArch: %{rust_arches}
- rust-groupable
ExclusiveArch: %{rust_arches}
- rust-gspell
ExclusiveArch: %{rust_arches}
- rust-gspell-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer
ExclusiveArch: %{rust_arches}
- rust-gstreamer-audio
ExclusiveArch: %{rust_arches}
- rust-gstreamer-audio-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-base
ExclusiveArch: %{rust_arches}
- rust-gstreamer-base-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-editing-services
ExclusiveArch: %{rust_arches}
- rust-gstreamer-editing-services-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-pbutils
ExclusiveArch: %{rust_arches}
- rust-gstreamer-pbutils-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-player
ExclusiveArch: %{rust_arches}
- rust-gstreamer-player-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-sys
ExclusiveArch: %{rust_arches}
- rust-gstreamer-video
ExclusiveArch: %{rust_arches}
- rust-gstreamer-video-sys
ExclusiveArch: %{rust_arches}
- rust-gtk
ExclusiveArch: %{rust_arches}
- rust-gtk-macros
ExclusiveArch: %{rust_arches}
- rust-gtk-rs-lgpl-docs
ExclusiveArch: %{rust_arches}
- rust-gtk-source-sys
ExclusiveArch: %{rust_arches}
- rust-gtk-sys
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-h2
ExclusiveArch: %{rust_arches}
- rust-half
ExclusiveArch: %{rust_arches}
- rust-hamcrest
ExclusiveArch: %{rust_arches}
- rust-handlebars
ExclusiveArch: %{rust_arches}
- rust-hashbrown
ExclusiveArch: %{rust_arches}
- rust-headers
ExclusiveArch: %{rust_arches}
- rust-headers-core
ExclusiveArch: %{rust_arches}
- rust-headers-derive
ExclusiveArch: %{rust_arches}
- rust-heapsize
ExclusiveArch: %{rust_arches}
- rust-heatseeker
ExclusiveArch: %{rust_arches}
- rust-heck
ExclusiveArch: %{rust_arches}
- rust-hex
ExclusiveArch: %{rust_arches}
- rust-hex-literal
ExclusiveArch: %{rust_arches}
- rust-hex-literal-impl
ExclusiveArch: %{rust_arches}
- rust-hex-literal0.2
ExclusiveArch: %{rust_arches}
- rust-hexyl
ExclusiveArch: %{rust_arches}
- rust-hkdf
ExclusiveArch: %{rust_arches}
- rust-hmac
ExclusiveArch: %{rust_arches}
- rust-home
ExclusiveArch: %{rust_arches}
- rust-horrorshow
ExclusiveArch: %{rust_arches}
- rust-hostname
ExclusiveArch: %{rust_arches}
- rust-hostname-validator
ExclusiveArch: %{rust_arches}
- rust-html2pango
ExclusiveArch: %{rust_arches}
- rust-html5ever
ExclusiveArch: %{rust_arches}
- rust-http
ExclusiveArch: %{rust_arches}
- rust-http-body
ExclusiveArch: %{rust_arches}
- rust-http0.1
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-httpdate
ExclusiveArch: %{rust_arches}
- rust-humansize
ExclusiveArch: %{rust_arches}
- rust-humantime
ExclusiveArch: %{rust_arches}
- rust-humantime1
ExclusiveArch: %{rust_arches}
- rust-hyper
ExclusiveArch: %{rust_arches}
- rust-hyper-native-tls
ExclusiveArch: %{rust_arches}
- rust-hyper-staticfile
ExclusiveArch: %{rust_arches}
- rust-hyper-tls
ExclusiveArch: %{rust_arches}
- rust-hyper0.10
ExclusiveArch: %{rust_arches}
- rust-hyperfine
ExclusiveArch: %{rust_arches}
- rust-i3ipc
ExclusiveArch: %{rust_arches}
- rust-id_tree
ExclusiveArch: %{rust_arches}
- rust-ident_case
ExclusiveArch: %{rust_arches}
- rust-idna
ExclusiveArch: %{rust_arches}
- rust-idna0.1
ExclusiveArch: %{rust_arches}
- rust-ignore
ExclusiveArch: %{rust_arches}
- rust-im-rc
ExclusiveArch: %{rust_arches}
- rust-image
ExclusiveArch: %{rust_arches}
- rust-imgref
ExclusiveArch: %{rust_arches}
- rust-indexmap
ExclusiveArch: %{rust_arches}
- rust-indicatif
ExclusiveArch: %{rust_arches}
- rust-indoc
ExclusiveArch: %{rust_arches}
- rust-inflate
ExclusiveArch: %{rust_arches}
- rust-inotify
ExclusiveArch: %{rust_arches}
- rust-inotify-sys
ExclusiveArch: %{rust_arches}
- rust-input_buffer
ExclusiveArch: %{rust_arches}
- rust-insta
ExclusiveArch: %{rust_arches}
- rust-instant
ExclusiveArch: %{rust_arches}
- rust-interpolate_name
ExclusiveArch: %{rust_arches}
- rust-intervaltree
ExclusiveArch: %{rust_arches}
- rust-invalidstring
ExclusiveArch: %{rust_arches}
- rust-inventory
ExclusiveArch: %{rust_arches}
- rust-inventory-impl
ExclusiveArch: %{rust_arches}
- rust-iocuddle
ExclusiveArch: %{rust_arches}
- rust-iovec
ExclusiveArch: %{rust_arches}
- rust-ipnet
ExclusiveArch: %{rust_arches}
- rust-ipnetwork
ExclusiveArch: %{rust_arches}
- rust-iron
ExclusiveArch: %{rust_arches}
- rust-isahc
ExclusiveArch: %{rust_arches}
- rust-iso8601
ExclusiveArch: %{rust_arches}
- rust-iter-read
ExclusiveArch: %{rust_arches}
- rust-itertools
ExclusiveArch: %{rust_arches}
- rust-itertools-num
ExclusiveArch: %{rust_arches}
- rust-itertools0.8
ExclusiveArch: %{rust_arches}
- rust-itertools0.9
ExclusiveArch: %{rust_arches}
- rust-itoa
ExclusiveArch: %{rust_arches}
- rust-ivf
ExclusiveArch: %{rust_arches}
- rust-javascriptcore-rs
ExclusiveArch: %{rust_arches}
- rust-javascriptcore-rs-sys
ExclusiveArch: %{rust_arches}
- rust-jetscii
ExclusiveArch: %{rust_arches}
- rust-jieba-rs
ExclusiveArch: %{rust_arches}
- rust-jobserver
ExclusiveArch: %{rust_arches}
- rust-jpeg-decoder
ExclusiveArch: %{rust_arches}
- rust-jql
ExclusiveArch: %{rust_arches}
- rust-js-sys
ExclusiveArch: %{rust_arches}
- rust-js_int
ExclusiveArch: %{rust_arches}
- rust-json
ExclusiveArch: %{rust_arches}
- rust-jwalk
ExclusiveArch: %{rust_arches}
- rust-keccak
ExclusiveArch: %{rust_arches}
- rust-khronos_api
ExclusiveArch: %{rust_arches}
- rust-kstring
ExclusiveArch: %{rust_arches}
- rust-kv-log-macro
ExclusiveArch: %{rust_arches}
- rust-lab
ExclusiveArch: %{rust_arches}
- rust-language-tags
ExclusiveArch: %{rust_arches}
- rust-lazy-init
ExclusiveArch: %{rust_arches}
- rust-lazy_static
ExclusiveArch: %{rust_arches}
- rust-lazycell
ExclusiveArch: %{rust_arches}
- rust-leb128
ExclusiveArch: %{rust_arches}
- rust-letter-avatar
ExclusiveArch: %{rust_arches}
- rust-lexical-core
ExclusiveArch: %{rust_arches}
- rust-libc
ExclusiveArch: %{rust_arches}
- rust-libcryptsetup-rs
ExclusiveArch: %{rust_arches}
- rust-libcryptsetup-rs-sys
ExclusiveArch: %{rust_arches}
- rust-libdbus-sys
ExclusiveArch: %{rust_arches}
- rust-libflate
ExclusiveArch: %{rust_arches}
- rust-libflate_lz77
ExclusiveArch: %{rust_arches}
- rust-libgit2-sys
ExclusiveArch: %{rust_arches}
- rust-libhandy
ExclusiveArch: %{rust_arches}
- rust-libhandy-sys
ExclusiveArch: %{rust_arches}
- rust-libloading
ExclusiveArch: %{rust_arches}
- rust-libm
ExclusiveArch: %{rust_arches}
- rust-libmount
ExclusiveArch: %{rust_arches}
- rust-libnotcurses-sys
ExclusiveArch: %{rust_arches}
- rust-liboverdrop
ExclusiveArch: %{rust_arches}
- rust-libpulse-binding
ExclusiveArch: %{rust_arches}
- rust-libpulse-sys
ExclusiveArch: %{rust_arches}
- rust-libslirp
ExclusiveArch: %{rust_arches}
- rust-libslirp-sys
ExclusiveArch: %{rust_arches}
- rust-libsqlite3-sys
ExclusiveArch: %{rust_arches}
- rust-libssh2-sys
ExclusiveArch: %{rust_arches}
- rust-libsystemd
ExclusiveArch: %{rust_arches}
- rust-libudev
ExclusiveArch: %{rust_arches}
- rust-libudev-sys
ExclusiveArch: %{rust_arches}
- rust-libxml
ExclusiveArch: %{rust_arches}
- rust-libz-sys
ExclusiveArch: %{rust_arches}
- rust-line-wrap
ExclusiveArch: %{rust_arches}
- rust-line_drawing
ExclusiveArch: %{rust_arches}
- rust-link-cplusplus
ExclusiveArch: %{rust_arches}
- rust-linked-hash-map
ExclusiveArch: %{rust_arches}
- rust-linkify
ExclusiveArch: %{rust_arches}
- rust-lipsum
ExclusiveArch: %{rust_arches}
- rust-liquid
ExclusiveArch: %{rust_arches}
- rust-liquid-core
ExclusiveArch: %{rust_arches}
- rust-liquid-derive
ExclusiveArch: %{rust_arches}
- rust-liquid-lib
ExclusiveArch: %{rust_arches}
- rust-listenfd
ExclusiveArch: %{rust_arches}
- rust-lmdb
ExclusiveArch: %{rust_arches}
- rust-lmdb-sys
ExclusiveArch: %{rust_arches}
- rust-locale
ExclusiveArch: %{rust_arches}
- rust-locale_config
ExclusiveArch: %{rust_arches}
- rust-lock_api
ExclusiveArch: %{rust_arches}
- rust-lockfree
ExclusiveArch: %{rust_arches}
- rust-log
ExclusiveArch: %{rust_arches}
- rust-log-mdc
ExclusiveArch: %{rust_arches}
- rust-log-panics
ExclusiveArch: %{rust_arches}
- rust-log0.3
ExclusiveArch: %{rust_arches}
- rust-log4rs
ExclusiveArch: %{rust_arches}
- rust-loggerv
ExclusiveArch: %{rust_arches}
- rust-loopdev
ExclusiveArch: %{rust_arches}
- rust-lru-cache
ExclusiveArch: %{rust_arches}
- rust-lru_time_cache
ExclusiveArch: %{rust_arches}
- rust-lscolors
ExclusiveArch: %{rust_arches}
- rust-lsd
ExclusiveArch: %{rust_arches}
- rust-lzma-sys
ExclusiveArch: %{rust_arches}
- rust-lzw
ExclusiveArch: %{rust_arches}
- rust-mac
ExclusiveArch: %{rust_arches}
- rust-macro-attr
ExclusiveArch: %{rust_arches}
- rust-magic-crypt
ExclusiveArch: %{rust_arches}
- rust-maildir
ExclusiveArch: %{rust_arches}
- rust-mailparse
ExclusiveArch: %{rust_arches}
- rust-man
ExclusiveArch: %{rust_arches}
- rust-maplit
ExclusiveArch: %{rust_arches}
- rust-markup5ever
ExclusiveArch: %{rust_arches}
- rust-markup5ever_rcdom
ExclusiveArch: %{rust_arches}
- rust-match_cfg
ExclusiveArch: %{rust_arches}
- rust-matches
ExclusiveArch: %{rust_arches}
- rust-matrixmultiply
ExclusiveArch: %{rust_arches}
- rust-maxminddb
ExclusiveArch: %{rust_arches}
- rust-maybe-uninit
ExclusiveArch: %{rust_arches}
- rust-mbox
ExclusiveArch: %{rust_arches}
- rust-md-5
ExclusiveArch: %{rust_arches}
- rust-md5
ExclusiveArch: %{rust_arches}
- rust-mdl
ExclusiveArch: %{rust_arches}
- rust-memchr
ExclusiveArch: %{rust_arches}
- rust-memmap
ExclusiveArch: %{rust_arches}
- rust-memmap2
ExclusiveArch: %{rust_arches}
- rust-memoffset
ExclusiveArch: %{rust_arches}
- rust-memoffset0.5
ExclusiveArch: %{rust_arches}
- rust-metadeps
ExclusiveArch: %{rust_arches}
- rust-migrations_internals
ExclusiveArch: %{rust_arches}
- rust-migrations_macros
ExclusiveArch: %{rust_arches}
- rust-mime
ExclusiveArch: %{rust_arches}
- rust-mime-sniffer
ExclusiveArch: %{rust_arches}
- rust-mime0.2
ExclusiveArch: %{rust_arches}
- rust-mime_guess
ExclusiveArch: %{rust_arches}
- rust-mime_guess1
ExclusiveArch: %{rust_arches}
- rust-miniflux_api
ExclusiveArch: %{rust_arches}
- rust-minify-html
ExclusiveArch: %{rust_arches}
- rust-miniz-sys
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide0.3
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide_c_api
ExclusiveArch: %{rust_arches}
- rust-mint
ExclusiveArch: %{rust_arches}
- rust-mio
ExclusiveArch: %{rust_arches}
- rust-mio-extras
ExclusiveArch: %{rust_arches}
- rust-mio-uds
ExclusiveArch: %{rust_arches}
- rust-mio0.6
ExclusiveArch: %{rust_arches}
- rust-mktemp
ExclusiveArch: %{rust_arches}
- rust-mnt
ExclusiveArch: %{rust_arches}
- rust-mockito
ExclusiveArch: %{rust_arches}
- rust-modifier
ExclusiveArch: %{rust_arches}
- rust-more-asserts
ExclusiveArch: %{rust_arches}
- rust-muldiv
ExclusiveArch: %{rust_arches}
- rust-multimap
ExclusiveArch: %{rust_arches}
- rust-multipart
ExclusiveArch: %{rust_arches}
- rust-mustache
ExclusiveArch: %{rust_arches}
- rust-nasm-rs
ExclusiveArch: %{rust_arches}
- rust-native-tls
ExclusiveArch: %{rust_arches}
- rust-natord
ExclusiveArch: %{rust_arches}
- rust-nb-connect
ExclusiveArch: %{rust_arches}
- rust-net2
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-core
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-route
ExclusiveArch: %{rust_arches}
- rust-netlink-packet-utils
ExclusiveArch: %{rust_arches}
- rust-netlink-proto
ExclusiveArch: %{rust_arches}
- rust-netlink-sys
ExclusiveArch: %{rust_arches}
- rust-netmap_sys
ExclusiveArch: %{rust_arches}
- rust-new_debug_unreachable
ExclusiveArch: %{rust_arches}
- rust-news-flash
ExclusiveArch: %{rust_arches}
- rust-newtype_derive
ExclusiveArch: %{rust_arches}
- rust-nickel
ExclusiveArch: %{rust_arches}
- rust-nix
ExclusiveArch: %{rust_arches}
- rust-nix0.14
ExclusiveArch: %{rust_arches}
- rust-nix0.17
ExclusiveArch: %{rust_arches}
- rust-nix0.18
ExclusiveArch: %{rust_arches}
- rust-no-panic
ExclusiveArch: %{rust_arches}
- rust-nodrop
ExclusiveArch: %{rust_arches}
- rust-nom
ExclusiveArch: %{rust_arches}
- rust-nom4
ExclusiveArch: %{rust_arches}
- rust-nom5
ExclusiveArch: %{rust_arches}
- rust-noop_proc_macro
ExclusiveArch: %{rust_arches}
- rust-normalize-line-endings
ExclusiveArch: %{rust_arches}
- rust-notify
ExclusiveArch: %{rust_arches}
- rust-notify-rust
ExclusiveArch: %{rust_arches}
- rust-num
ExclusiveArch: %{rust_arches}
- rust-num-bigint
ExclusiveArch: %{rust_arches}
- rust-num-bigint-dig
ExclusiveArch: %{rust_arches}
- rust-num-complex
ExclusiveArch: %{rust_arches}
- rust-num-derive
ExclusiveArch: %{rust_arches}
- rust-num-integer
ExclusiveArch: %{rust_arches}
- rust-num-iter
ExclusiveArch: %{rust_arches}
- rust-num-rational
ExclusiveArch: %{rust_arches}
- rust-num-traits
ExclusiveArch: %{rust_arches}
- rust-num-traits0.1
ExclusiveArch: %{rust_arches}
- rust-num_cpus
ExclusiveArch: %{rust_arches}
- rust-number_prefix
ExclusiveArch: %{rust_arches}
- rust-numtoa
ExclusiveArch: %{rust_arches}
- rust-obfstr
ExclusiveArch: %{rust_arches}
- rust-object
ExclusiveArch: %{rust_arches}
- rust-odds
ExclusiveArch: %{rust_arches}
- rust-oid
ExclusiveArch: %{rust_arches}
- rust-once_cell
ExclusiveArch: %{rust_arches}
- rust-onig
ExclusiveArch: %{rust_arches}
- rust-onig_sys
ExclusiveArch: %{rust_arches}
- rust-oorandom
ExclusiveArch: %{rust_arches}
- rust-opaque-debug
ExclusiveArch: %{rust_arches}
- rust-open
ExclusiveArch: %{rust_arches}
- rust-openat
ExclusiveArch: %{rust_arches}
- rust-openat-ext
ExclusiveArch: %{rust_arches}
- rust-opener
ExclusiveArch: %{rust_arches}
- rust-openssh-keys
ExclusiveArch: %{rust_arches}
- rust-openssl
ExclusiveArch: %{rust_arches}
- rust-openssl-probe
ExclusiveArch: %{rust_arches}
- rust-openssl-sys
ExclusiveArch: %{rust_arches}
- rust-ord_subset
ExclusiveArch: %{rust_arches}
- rust-ordered-float
ExclusiveArch: %{rust_arches}
- rust-ordered-multimap
ExclusiveArch: %{rust_arches}
- rust-os_info
ExclusiveArch: %{rust_arches}
- rust-os_pipe
ExclusiveArch: %{rust_arches}
- rust-os_str_bytes
ExclusiveArch: %{rust_arches}
- rust-osmesa-sys
ExclusiveArch: %{rust_arches}
- rust-osstrtools
ExclusiveArch: %{rust_arches}
- rust-ostree
ExclusiveArch: %{rust_arches}
- rust-ostree-sys
ExclusiveArch: %{rust_arches}
- rust-owned-alloc
ExclusiveArch: %{rust_arches}
- rust-owned_ttf_parser
ExclusiveArch: %{rust_arches}
- rust-owning_ref
ExclusiveArch: %{rust_arches}
- rust-packaging
ExclusiveArch: %{rust_arches}
- rust-pad
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-palette
ExclusiveArch: %{rust_arches}
- rust-palette_derive
ExclusiveArch: %{rust_arches}
- rust-pango
ExclusiveArch: %{rust_arches}
- rust-pango-sys
ExclusiveArch: %{rust_arches}
- rust-pangocairo
ExclusiveArch: %{rust_arches}
- rust-pangocairo-sys
ExclusiveArch: %{rust_arches}
- rust-parity-wasm
ExclusiveArch: %{rust_arches}
- rust-parking
ExclusiveArch: %{rust_arches}
- rust-parking_lot
ExclusiveArch: %{rust_arches}
- rust-parking_lot_core
ExclusiveArch: %{rust_arches}
- rust-parse-zoneinfo
ExclusiveArch: %{rust_arches}
- rust-parse_cfg
ExclusiveArch: %{rust_arches}
- rust-parsec-client
ExclusiveArch: %{rust_arches}
- rust-parsec-interface
ExclusiveArch: %{rust_arches}
- rust-partial-io
ExclusiveArch: %{rust_arches}
- rust-paste
ExclusiveArch: %{rust_arches}
- rust-paste-impl
ExclusiveArch: %{rust_arches}
- rust-path-absolutize
ExclusiveArch: %{rust_arches}
- rust-path-dedot
ExclusiveArch: %{rust_arches}
- rust-path-slash
ExclusiveArch: %{rust_arches}
- rust-pathdiff
ExclusiveArch: %{rust_arches}
- rust-pathfinder_geometry
ExclusiveArch: %{rust_arches}
- rust-pathfinder_simd
ExclusiveArch: %{rust_arches}
- rust-pbr
ExclusiveArch: %{rust_arches}
- rust-pcap
ExclusiveArch: %{rust_arches}
- rust-pcre2
ExclusiveArch: %{rust_arches}
- rust-pcre2-sys
ExclusiveArch: %{rust_arches}
- rust-peeking_take_while
ExclusiveArch: %{rust_arches}
- rust-peg
ExclusiveArch: %{rust_arches}
- rust-peg-macros
ExclusiveArch: %{rust_arches}
- rust-peg-runtime
ExclusiveArch: %{rust_arches}
- rust-peg0.5
ExclusiveArch: %{rust_arches}
- rust-pem
ExclusiveArch: %{rust_arches}
- rust-percent-encoding
ExclusiveArch: %{rust_arches}
- rust-percent-encoding1
ExclusiveArch: %{rust_arches}
- rust-peresil
ExclusiveArch: %{rust_arches}
- rust-permutate
ExclusiveArch: %{rust_arches}
- rust-permutohedron
ExclusiveArch: %{rust_arches}
- rust-pest
ExclusiveArch: %{rust_arches}
- rust-pest_derive
ExclusiveArch: %{rust_arches}
- rust-pest_generator
ExclusiveArch: %{rust_arches}
- rust-pest_meta
ExclusiveArch: %{rust_arches}
- rust-petgraph
ExclusiveArch: %{rust_arches}
- rust-phf
ExclusiveArch: %{rust_arches}
- rust-phf0.7
ExclusiveArch: %{rust_arches}
- rust-phf_codegen
ExclusiveArch: %{rust_arches}
- rust-phf_codegen0.7
ExclusiveArch: %{rust_arches}
- rust-phf_generator
ExclusiveArch: %{rust_arches}
- rust-phf_generator0.7
ExclusiveArch: %{rust_arches}
- rust-phf_macros
ExclusiveArch: %{rust_arches}
- rust-phf_macros0.7
ExclusiveArch: %{rust_arches}
- rust-phf_shared
ExclusiveArch: %{rust_arches}
- rust-phf_shared0.7
ExclusiveArch: %{rust_arches}
- rust-picky-asn1
ExclusiveArch: %{rust_arches}
- rust-picky-asn1-der
ExclusiveArch: %{rust_arches}
- rust-picky-asn1-x509
ExclusiveArch: %{rust_arches}
- rust-pico-args
ExclusiveArch: %{rust_arches}
- rust-pin-project
ExclusiveArch: %{rust_arches}
- rust-pin-project-internal
ExclusiveArch: %{rust_arches}
- rust-pin-project-internal0.4
ExclusiveArch: %{rust_arches}
- rust-pin-project-lite
ExclusiveArch: %{rust_arches}
- rust-pin-project-lite0.1
ExclusiveArch: %{rust_arches}
- rust-pin-project0.4
ExclusiveArch: %{rust_arches}
- rust-pin-utils
ExclusiveArch: %{rust_arches}
- rust-pipe
ExclusiveArch: %{rust_arches}
- rust-piper
ExclusiveArch: %{rust_arches}
- rust-pkcs11
ExclusiveArch: %{rust_arches}
- rust-pkg-config
ExclusiveArch: %{rust_arches}
- rust-plain
ExclusiveArch: %{rust_arches}
- rust-platform-dirs
ExclusiveArch: %{rust_arches}
- rust-platforms
ExclusiveArch: %{rust_arches}
- rust-plist
ExclusiveArch: %{rust_arches}
- rust-plotters
ExclusiveArch: %{rust_arches}
- rust-plugin
ExclusiveArch: %{rust_arches}
- rust-pnet_base
ExclusiveArch: %{rust_arches}
- rust-pnet_datalink
ExclusiveArch: %{rust_arches}
- rust-pnet_sys
ExclusiveArch: %{rust_arches}
- rust-png
ExclusiveArch: %{rust_arches}
- rust-podio
ExclusiveArch: %{rust_arches}
- rust-polling
ExclusiveArch: %{rust_arches}
- rust-polyval
ExclusiveArch: %{rust_arches}
- rust-pommes
ExclusiveArch: %{rust_arches}
- rust-ppv-lite86
ExclusiveArch: %{rust_arches}
- rust-pq-sys
ExclusiveArch: %{rust_arches}
- rust-precomputed-hash
ExclusiveArch: %{rust_arches}
- rust-predicates
ExclusiveArch: %{rust_arches}
- rust-predicates-core
ExclusiveArch: %{rust_arches}
- rust-predicates-tree
ExclusiveArch: %{rust_arches}
- rust-pretty-git-prompt
ExclusiveArch: %{rust_arches}
- rust-pretty-hex
ExclusiveArch: %{rust_arches}
- rust-pretty_assertions
ExclusiveArch: %{rust_arches}
- rust-pretty_env_logger
ExclusiveArch: %{rust_arches}
- rust-prettytable-rs
ExclusiveArch: %{rust_arches}
- rust-proc-macro-crate
ExclusiveArch: %{rust_arches}
- rust-proc-macro-error
ExclusiveArch: %{rust_arches}
- rust-proc-macro-error-attr
ExclusiveArch: %{rust_arches}
- rust-proc-macro-hack
ExclusiveArch: %{rust_arches}
- rust-proc-macro-nested
ExclusiveArch: %{rust_arches}
- rust-proc-macro2
ExclusiveArch: %{rust_arches}
- rust-proc-macro2-0.4
ExclusiveArch: %{rust_arches}
- rust-proc-quote
ExclusiveArch: %{rust_arches}
- rust-proc-quote-impl
ExclusiveArch: %{rust_arches}
- rust-procedural-masquerade
ExclusiveArch: %{rust_arches}
- rust-process_path
ExclusiveArch: %{rust_arches}
- rust-procfs
ExclusiveArch: %{rust_arches}
- rust-procfs0.8
ExclusiveArch: %{rust_arches}
- rust-procs
ExclusiveArch: %{rust_arches}
- rust-progress-streams
ExclusiveArch: %{rust_arches}
- rust-prometheus
ExclusiveArch: %{rust_arches}
- rust-proptest
ExclusiveArch: %{rust_arches}
- rust-proptest-derive
ExclusiveArch: %{rust_arches}
- rust-prost
ExclusiveArch: %{rust_arches}
- rust-prost-build
ExclusiveArch: %{rust_arches}
- rust-prost-derive
ExclusiveArch: %{rust_arches}
- rust-prost-types
ExclusiveArch: %{rust_arches}
- rust-protobuf
ExclusiveArch: %{rust_arches}
- rust-protobuf-codegen
ExclusiveArch: %{rust_arches}
- rust-protobuf-codegen-pure
ExclusiveArch: %{rust_arches}
- rust-protoc
ExclusiveArch: %{rust_arches}
- rust-protoc-rust
ExclusiveArch: %{rust_arches}
- rust-psa-crypto
ExclusiveArch: %{rust_arches}
- rust-psa-crypto-sys
ExclusiveArch: %{rust_arches}
- rust-psm
ExclusiveArch: %{rust_arches}
- rust-psutil
ExclusiveArch: %{rust_arches}
- rust-publicsuffix
ExclusiveArch: %{rust_arches}
- rust-pulldown-cmark
ExclusiveArch: %{rust_arches}
- rust-pulse
ExclusiveArch: %{rust_arches}
- rust-pure-rust-locales
ExclusiveArch: %{rust_arches}
- rust-pyo3
ExclusiveArch: %{rust_arches}
- rust-pyo3-macros
ExclusiveArch: %{rust_arches}
- rust-pyo3-macros-backend
ExclusiveArch: %{rust_arches}
- rust-python3-sys
ExclusiveArch: %{rust_arches}
- rust-qr2term
ExclusiveArch: %{rust_arches}
- rust-qrcode
ExclusiveArch: %{rust_arches}
- rust-quick-error
ExclusiveArch: %{rust_arches}
- rust-quick-error1
ExclusiveArch: %{rust_arches}
- rust-quick-xml
ExclusiveArch: %{rust_arches}
- rust-quickcheck
ExclusiveArch: %{rust_arches}
- rust-quickcheck0.6
ExclusiveArch: %{rust_arches}
- rust-quickcheck_macros
ExclusiveArch: %{rust_arches}
- rust-quickersort
ExclusiveArch: %{rust_arches}
- rust-quote
ExclusiveArch: %{rust_arches}
- rust-quote0.3
ExclusiveArch: %{rust_arches}
- rust-quote0.6
ExclusiveArch: %{rust_arches}
- rust-quoted_printable
ExclusiveArch: %{rust_arches}
- rust-r2d2
ExclusiveArch: %{rust_arches}
- rust-radium
ExclusiveArch: %{rust_arches}
- rust-rand
ExclusiveArch: %{rust_arches}
- rust-rand0.4
ExclusiveArch: %{rust_arches}
- rust-rand0.5
ExclusiveArch: %{rust_arches}
- rust-rand0.6
ExclusiveArch: %{rust_arches}
- rust-rand0.7
ExclusiveArch: %{rust_arches}
- rust-rand_chacha
ExclusiveArch: %{rust_arches}
- rust-rand_chacha0.1
ExclusiveArch: %{rust_arches}
- rust-rand_chacha0.2
ExclusiveArch: %{rust_arches}
- rust-rand_core
ExclusiveArch: %{rust_arches}
- rust-rand_core0.3
ExclusiveArch: %{rust_arches}
- rust-rand_core0.4
ExclusiveArch: %{rust_arches}
- rust-rand_core0.5
ExclusiveArch: %{rust_arches}
- rust-rand_distr
ExclusiveArch: %{rust_arches}
- rust-rand_distr0.2
ExclusiveArch: %{rust_arches}
- rust-rand_hc
ExclusiveArch: %{rust_arches}
- rust-rand_hc0.1
ExclusiveArch: %{rust_arches}
- rust-rand_isaac
ExclusiveArch: %{rust_arches}
- rust-rand_isaac0.1
ExclusiveArch: %{rust_arches}
- rust-rand_jitter
ExclusiveArch: %{rust_arches}
- rust-rand_jitter0.1
ExclusiveArch: %{rust_arches}
- rust-rand_os
ExclusiveArch: %{rust_arches}
- rust-rand_os0.1
ExclusiveArch: %{rust_arches}
- rust-rand_pcg
ExclusiveArch: %{rust_arches}
- rust-rand_pcg0.1
ExclusiveArch: %{rust_arches}
- rust-rand_pcg0.2
ExclusiveArch: %{rust_arches}
- rust-rand_xorshift
ExclusiveArch: %{rust_arches}
- rust-rand_xorshift0.1
ExclusiveArch: %{rust_arches}
- rust-rand_xoshiro
ExclusiveArch: %{rust_arches}
- rust-random-fast-rng
ExclusiveArch: %{rust_arches}
- rust-random-trait
ExclusiveArch: %{rust_arches}
- rust-randomize
ExclusiveArch: %{rust_arches}
- rust-rav1e
ExclusiveArch: %{rust_arches}
- rust-raw-window-handle
ExclusiveArch: %{rust_arches}
- rust-rawpointer
ExclusiveArch: %{rust_arches}
- rust-rawslice
ExclusiveArch: %{rust_arches}
- rust-rayon
ExclusiveArch: %{rust_arches}
- rust-rayon-core
ExclusiveArch: %{rust_arches}
- rust-readability-fork
ExclusiveArch: %{rust_arches}
- rust-readwrite
ExclusiveArch: %{rust_arches}
- rust-recycler
ExclusiveArch: %{rust_arches}
- rust-ref-cast
ExclusiveArch: %{rust_arches}
- rust-ref-cast-impl
ExclusiveArch: %{rust_arches}
- rust-regex
ExclusiveArch: %{rust_arches}
- rust-regex-automata
ExclusiveArch: %{rust_arches}
- rust-regex-syntax
ExclusiveArch: %{rust_arches}
- rust-region
ExclusiveArch: %{rust_arches}
- rust-relative-path
ExclusiveArch: %{rust_arches}
- rust-relay
ExclusiveArch: %{rust_arches}
- rust-remove_dir_all
ExclusiveArch: %{rust_arches}
- rust-reqwest
ExclusiveArch: %{rust_arches}
- rust-resize
ExclusiveArch: %{rust_arches}
- rust-resolv-conf
ExclusiveArch: %{rust_arches}
- rust-restson
ExclusiveArch: %{rust_arches}
- rust-retry
ExclusiveArch: %{rust_arches}
- rust-rgb
ExclusiveArch: %{rust_arches}
- rust-ring
ExclusiveArch: %{rust_arches}
- rust-ripgrep
ExclusiveArch: %{rust_arches}
- rust-rle-decode-fast
ExclusiveArch: %{rust_arches}
- rust-rmp
ExclusiveArch: %{rust_arches}
- rust-rmp-serde
ExclusiveArch: %{rust_arches}
- rust-roff
ExclusiveArch: %{rust_arches}
- rust-ron
ExclusiveArch: %{rust_arches}
- rust-roxmltree
ExclusiveArch: %{rust_arches}
- rust-rpassword
ExclusiveArch: %{rust_arches}
- rust-rpick
ExclusiveArch: %{rust_arches}
- rust-rsa
ExclusiveArch: %{rust_arches}
- rust-rtnetlink
ExclusiveArch: %{rust_arches}
- rust-ruma
ExclusiveArch: %{rust_arches}
- rust-ruma-api
ExclusiveArch: %{rust_arches}
- rust-ruma-api-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-appservice-api
ExclusiveArch: %{rust_arches}
- rust-ruma-client-api
ExclusiveArch: %{rust_arches}
- rust-ruma-common
ExclusiveArch: %{rust_arches}
- rust-ruma-events
ExclusiveArch: %{rust_arches}
- rust-ruma-events-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-federation-api
ExclusiveArch: %{rust_arches}
- rust-ruma-identifiers
ExclusiveArch: %{rust_arches}
- rust-ruma-identifiers-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-identifiers-validation
ExclusiveArch: %{rust_arches}
- rust-ruma-identity-service-api
ExclusiveArch: %{rust_arches}
- rust-ruma-push-gateway-api
ExclusiveArch: %{rust_arches}
- rust-ruma-serde
ExclusiveArch: %{rust_arches}
- rust-ruma-serde-macros
ExclusiveArch: %{rust_arches}
- rust-ruma-signatures
ExclusiveArch: %{rust_arches}
- rust-rust-embed
ExclusiveArch: %{rust_arches}
- rust-rust-embed-impl
ExclusiveArch: %{rust_arches}
- rust-rust-embed-utils
ExclusiveArch: %{rust_arches}
- rust-rust-ini
ExclusiveArch: %{rust_arches}
- rust-rust-stemmers
ExclusiveArch: %{rust_arches}
- rust-rust_decimal
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_normal_macro
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_proc_macro
ExclusiveArch: %{rust_arches}
- rust-rust_hawktracer_sys
ExclusiveArch: %{rust_arches}
- rust-rustc-demangle
ExclusiveArch: %{rust_arches}
- rust-rustc-hash
ExclusiveArch: %{rust_arches}
- rust-rustc-serialize
ExclusiveArch: %{rust_arches}
- rust-rustc-test
ExclusiveArch: %{rust_arches}
- rust-rustc_tools_util
ExclusiveArch: %{rust_arches}
- rust-rustc_version
ExclusiveArch: %{rust_arches}
- rust-rustdoc-stripper
ExclusiveArch: %{rust_arches}
- rust-rustfilt
ExclusiveArch: %{rust_arches}
- rust-rustfix
ExclusiveArch: %{rust_arches}
- rust-rustio
ExclusiveArch: %{rust_arches}
- rust-rusttype
ExclusiveArch: %{rust_arches}
- rust-rustversion
ExclusiveArch: %{rust_arches}
- rust-rusty-fork
ExclusiveArch: %{rust_arches}
- rust-rustyline
ExclusiveArch: %{rust_arches}
- rust-rustyline-derive
ExclusiveArch: %{rust_arches}
- rust-ryu
ExclusiveArch: %{rust_arches}
- rust-safe-transmute
ExclusiveArch: %{rust_arches}
- rust-safemem
ExclusiveArch: %{rust_arches}
- rust-same-file
ExclusiveArch: %{rust_arches}
- rust-sass-rs
ExclusiveArch: %{rust_arches}
- rust-sass-sys
ExclusiveArch: %{rust_arches}
- rust-scan_fmt
ExclusiveArch: %{rust_arches}
- rust-scheduled-thread-pool
ExclusiveArch: %{rust_arches}
- rust-scoped-tls
ExclusiveArch: %{rust_arches}
- rust-scoped-tls-hkt
ExclusiveArch: %{rust_arches}
- rust-scoped_threadpool
ExclusiveArch: %{rust_arches}
- rust-scopeguard
ExclusiveArch: %{rust_arches}
- rust-scopetime
ExclusiveArch: %{rust_arches}
- rust-scratch
ExclusiveArch: %{rust_arches}
- rust-scroll
ExclusiveArch: %{rust_arches}
- rust-scroll_derive
ExclusiveArch: %{rust_arches}
- rust-sct
ExclusiveArch: %{rust_arches}
- rust-sd
ExclusiveArch: %{rust_arches}
- rust-sd-notify
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-secrecy
ExclusiveArch: %{rust_arches}
- rust-secret-service
ExclusiveArch: %{rust_arches}
- rust-semver
ExclusiveArch: %{rust_arches}
- rust-semver-parser
ExclusiveArch: %{rust_arches}
- rust-semver-parser0.7
ExclusiveArch: %{rust_arches}
- rust-semver-parser0.9
ExclusiveArch: %{rust_arches}
- rust-semver0.10
ExclusiveArch: %{rust_arches}
- rust-semver0.9
ExclusiveArch: %{rust_arches}
- rust-serde
ExclusiveArch: %{rust_arches}
- rust-serde-big-array
ExclusiveArch: %{rust_arches}
- rust-serde-pickle
ExclusiveArch: %{rust_arches}
- rust-serde-value
ExclusiveArch: %{rust_arches}
- rust-serde-xml-rs
ExclusiveArch: %{rust_arches}
- rust-serde_bytes
ExclusiveArch: %{rust_arches}
- rust-serde_cbor
ExclusiveArch: %{rust_arches}
- rust-serde_derive
ExclusiveArch: %{rust_arches}
- rust-serde_ignored
ExclusiveArch: %{rust_arches}
- rust-serde_json
ExclusiveArch: %{rust_arches}
- rust-serde_repr
ExclusiveArch: %{rust_arches}
- rust-serde_stacker
ExclusiveArch: %{rust_arches}
- rust-serde_test
ExclusiveArch: %{rust_arches}
- rust-serde_url_params
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded0.6
ExclusiveArch: %{rust_arches}
- rust-serde_with_macros
ExclusiveArch: %{rust_arches}
- rust-serde_yaml
ExclusiveArch: %{rust_arches}
- rust-serial_test
ExclusiveArch: %{rust_arches}
- rust-serial_test_derive
ExclusiveArch: %{rust_arches}
- rust-servo-fontconfig
ExclusiveArch: %{rust_arches}
- rust-servo-fontconfig-sys
ExclusiveArch: %{rust_arches}
- rust-sha-1
ExclusiveArch: %{rust_arches}
- rust-sha1
ExclusiveArch: %{rust_arches}
- rust-sha2
ExclusiveArch: %{rust_arches}
- rust-sha3
ExclusiveArch: %{rust_arches}
- rust-shared_child
ExclusiveArch: %{rust_arches}
- rust-shared_library
ExclusiveArch: %{rust_arches}
- rust-shell-escape
ExclusiveArch: %{rust_arches}
- rust-shell-words
ExclusiveArch: %{rust_arches}
- rust-shellexpand
ExclusiveArch: %{rust_arches}
- rust-shlex
ExclusiveArch: %{rust_arches}
- rust-signal-hook
ExclusiveArch: %{rust_arches}
- rust-signal-hook-registry
ExclusiveArch: %{rust_arches}
- rust-silver
ExclusiveArch: %{rust_arches}
- rust-simd_helpers
ExclusiveArch: %{rust_arches}
- rust-simple_asn1
ExclusiveArch: %{rust_arches}
- rust-simple_logger
ExclusiveArch: %{rust_arches}
- rust-simplelog
ExclusiveArch: %{rust_arches}
- rust-siphasher
ExclusiveArch: %{rust_arches}
- rust-size
ExclusiveArch: %{rust_arches}
- rust-sized-chunks
ExclusiveArch: %{rust_arches}
- rust-skeptic
ExclusiveArch: %{rust_arches}
- rust-skim
ExclusiveArch: %{rust_arches}
- rust-slab
ExclusiveArch: %{rust_arches}
- rust-slash-formatter
ExclusiveArch: %{rust_arches}
- rust-slice-deque
ExclusiveArch: %{rust_arches}
- rust-slog
ExclusiveArch: %{rust_arches}
- rust-slog-async
ExclusiveArch: %{rust_arches}
- rust-slog-scope
ExclusiveArch: %{rust_arches}
- rust-slog-term
ExclusiveArch: %{rust_arches}
- rust-slotmap
ExclusiveArch: %{rust_arches}
- rust-slug
ExclusiveArch: %{rust_arches}
- rust-sluice
ExclusiveArch: %{rust_arches}
- rust-smallvec
ExclusiveArch: %{rust_arches}
- rust-smart-default
ExclusiveArch: %{rust_arches}
- rust-smawk
ExclusiveArch: %{rust_arches}
- rust-smithay-client-toolkit
ExclusiveArch: %{rust_arches}
- rust-smithay-clipboard
ExclusiveArch: %{rust_arches}
- rust-snafu
ExclusiveArch: %{rust_arches}
- rust-snafu-derive
ExclusiveArch: %{rust_arches}
- rust-snowflake
ExclusiveArch: %{rust_arches}
- rust-socket2
ExclusiveArch: %{rust_arches}
- rust-soup-sys
ExclusiveArch: %{rust_arches}
- rust-sourceview
ExclusiveArch: %{rust_arches}
- rust-spin
ExclusiveArch: %{rust_arches}
- rust-spin_on
ExclusiveArch: %{rust_arches}
- rust-spinning_top
ExclusiveArch: %{rust_arches}
- rust-spmc
ExclusiveArch: %{rust_arches}
- rust-ssh-key-dir
ExclusiveArch: %{rust_arches}
- rust-stable_deref_trait
ExclusiveArch: %{rust_arches}
- rust-stacker
ExclusiveArch: %{rust_arches}
- rust-standback
ExclusiveArch: %{rust_arches}
- rust-starship
ExclusiveArch: %{rust_arches}
- rust-starship_module_config_derive
ExclusiveArch: %{rust_arches}
- rust-static_assertions
ExclusiveArch: %{rust_arches}
- rust-statistical
ExclusiveArch: %{rust_arches}
- rust-stb_truetype
ExclusiveArch: %{rust_arches}
- rust-stream-cipher
ExclusiveArch: %{rust_arches}
- rust-streaming-stats
ExclusiveArch: %{rust_arches}
- rust-string
ExclusiveArch: %{rust_arches}
- rust-string_cache
ExclusiveArch: %{rust_arches}
- rust-string_cache_codegen
ExclusiveArch: %{rust_arches}
- rust-string_cache_shared
ExclusiveArch: %{rust_arches}
- rust-strings
ExclusiveArch: %{rust_arches}
- rust-strip-ansi-escapes
ExclusiveArch: %{rust_arches}
- rust-strsim
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-structopt-derive
ExclusiveArch: %{rust_arches}
- rust-structopt-derive0.2
ExclusiveArch: %{rust_arches}
- rust-structopt0.2
ExclusiveArch: %{rust_arches}
- rust-strum
ExclusiveArch: %{rust_arches}
- rust-strum_macros
ExclusiveArch: %{rust_arches}
- rust-subtle
ExclusiveArch: %{rust_arches}
- rust-sudo_plugin
ExclusiveArch: %{rust_arches}
- rust-sudo_plugin-sys
ExclusiveArch: %{rust_arches}
- rust-sval
ExclusiveArch: %{rust_arches}
- rust-sval_derive
ExclusiveArch: %{rust_arches}
- rust-svg_metadata
ExclusiveArch: %{rust_arches}
- rust-sxd-document
ExclusiveArch: %{rust_arches}
- rust-syn
ExclusiveArch: %{rust_arches}
- rust-syn-mid
ExclusiveArch: %{rust_arches}
- rust-syn0.15
ExclusiveArch: %{rust_arches}
- rust-synom
ExclusiveArch: %{rust_arches}
- rust-synstructure
ExclusiveArch: %{rust_arches}
- rust-syntect
ExclusiveArch: %{rust_arches}
- rust-sys-info
ExclusiveArch: %{rust_arches}
- rust-sysinfo
ExclusiveArch: %{rust_arches}
- rust-system-deps
ExclusiveArch: %{rust_arches}
- rust-tabwriter
ExclusiveArch: %{rust_arches}
- rust-take
ExclusiveArch: %{rust_arches}
- rust-take_mut
ExclusiveArch: %{rust_arches}
- rust-tap
ExclusiveArch: %{rust_arches}
- rust-tar
ExclusiveArch: %{rust_arches}
- rust-target-lexicon
ExclusiveArch: %{rust_arches}
- rust-tealdeer
ExclusiveArch: %{rust_arches}
- rust-teloxide
ExclusiveArch: %{rust_arches}
- rust-teloxide-macros
ExclusiveArch: %{rust_arches}
- rust-tempdir
ExclusiveArch: %{rust_arches}
- rust-tempfile
ExclusiveArch: %{rust_arches}
- rust-tendril
ExclusiveArch: %{rust_arches}
- rust-tera
ExclusiveArch: %{rust_arches}
- rust-term
ExclusiveArch: %{rust_arches}
- rust-term_grid
ExclusiveArch: %{rust_arches}
- rust-term_size
ExclusiveArch: %{rust_arches}
- rust-termcolor
ExclusiveArch: %{rust_arches}
- rust-terminal_size
ExclusiveArch: %{rust_arches}
- rust-terminfo
ExclusiveArch: %{rust_arches}
- rust-termion
ExclusiveArch: %{rust_arches}
- rust-termios
ExclusiveArch: %{rust_arches}
- rust-test-assembler
ExclusiveArch: %{rust_arches}
- rust-tester
ExclusiveArch: %{rust_arches}
- rust-testing_logger
ExclusiveArch: %{rust_arches}
- rust-textwrap
ExclusiveArch: %{rust_arches}
- rust-textwrap0.11
ExclusiveArch: %{rust_arches}
- rust-textwrap0.12
ExclusiveArch: %{rust_arches}
- rust-thiserror
ExclusiveArch: %{rust_arches}
- rust-thiserror-impl
ExclusiveArch: %{rust_arches}
- rust-thread-id
ExclusiveArch: %{rust_arches}
- rust-thread-scoped
ExclusiveArch: %{rust_arches}
- rust-thread_local
ExclusiveArch: %{rust_arches}
- rust-threadpool
ExclusiveArch: %{rust_arches}
- rust-tiff
ExclusiveArch: %{rust_arches}
- rust-tiger-digest
ExclusiveArch: %{rust_arches}
- rust-time
ExclusiveArch: %{rust_arches}
- rust-time-macros
ExclusiveArch: %{rust_arches}
- rust-time-macros-impl
ExclusiveArch: %{rust_arches}
- rust-time0.1
ExclusiveArch: %{rust_arches}
- rust-timebomb
ExclusiveArch: %{rust_arches}
- rust-timer
ExclusiveArch: %{rust_arches}
- rust-timerfd
ExclusiveArch: %{rust_arches}
- rust-tiny_http
ExclusiveArch: %{rust_arches}
- rust-tinytemplate
ExclusiveArch: %{rust_arches}
- rust-tinyvec
ExclusiveArch: %{rust_arches}
- rust-tinyvec0.3
ExclusiveArch: %{rust_arches}
- rust-tinyvec_macros
ExclusiveArch: %{rust_arches}
- rust-tokei
ExclusiveArch: %{rust_arches}
- rust-tokio
ExclusiveArch: %{rust_arches}
- rust-tokio-codec
ExclusiveArch: %{rust_arches}
- rust-tokio-core
ExclusiveArch: %{rust_arches}
- rust-tokio-current-thread
ExclusiveArch: %{rust_arches}
- rust-tokio-executor
ExclusiveArch: %{rust_arches}
- rust-tokio-fs
ExclusiveArch: %{rust_arches}
- rust-tokio-io
ExclusiveArch: %{rust_arches}
- rust-tokio-io-pool
ExclusiveArch: %{rust_arches}
- rust-tokio-macros
ExclusiveArch: %{rust_arches}
- rust-tokio-macros0.2
ExclusiveArch: %{rust_arches}
- rust-tokio-mock-task
ExclusiveArch: %{rust_arches}
- rust-tokio-openssl
ExclusiveArch: %{rust_arches}
- rust-tokio-reactor
ExclusiveArch: %{rust_arches}
- rust-tokio-socks
ExclusiveArch: %{rust_arches}
- rust-tokio-sync
ExclusiveArch: %{rust_arches}
- rust-tokio-tcp
ExclusiveArch: %{rust_arches}
- rust-tokio-test
ExclusiveArch: %{rust_arches}
- rust-tokio-threadpool
ExclusiveArch: %{rust_arches}
- rust-tokio-timer
ExclusiveArch: %{rust_arches}
- rust-tokio-tls
ExclusiveArch: %{rust_arches}
- rust-tokio-tls0.2
ExclusiveArch: %{rust_arches}
- rust-tokio-tungstenite
ExclusiveArch: %{rust_arches}
- rust-tokio-udp
ExclusiveArch: %{rust_arches}
- rust-tokio-uds
ExclusiveArch: %{rust_arches}
- rust-tokio-util
ExclusiveArch: %{rust_arches}
- rust-tokio-util0.2
ExclusiveArch: %{rust_arches}
- rust-tokio0.1
ExclusiveArch: %{rust_arches}
- rust-tokio0.2
ExclusiveArch: %{rust_arches}
- rust-toml
ExclusiveArch: %{rust_arches}
- rust-toml0.4
ExclusiveArch: %{rust_arches}
- rust-tower-layer
ExclusiveArch: %{rust_arches}
- rust-tower-service
ExclusiveArch: %{rust_arches}
- rust-tower-test
ExclusiveArch: %{rust_arches}
- rust-tower-util
ExclusiveArch: %{rust_arches}
- rust-tpm2-policy
ExclusiveArch: %{rust_arches}
- rust-tracing
ExclusiveArch: %{rust_arches}
- rust-tracing-attributes
ExclusiveArch: %{rust_arches}
- rust-tracing-core
ExclusiveArch: %{rust_arches}
- rust-tracing-futures
ExclusiveArch: %{rust_arches}
- rust-traitobject
ExclusiveArch: %{rust_arches}
- rust-treebitmap
ExclusiveArch: %{rust_arches}
- rust-treeline
ExclusiveArch: %{rust_arches}
- rust-trust-dns-native-tls
ExclusiveArch: %{rust_arches}
- rust-trust-dns-openssl
ExclusiveArch: %{rust_arches}
- rust-trust-dns-proto
ExclusiveArch: %{rust_arches}
- rust-trust-dns-resolver
ExclusiveArch: %{rust_arches}
- rust-try-lock
ExclusiveArch: %{rust_arches}
- rust-try_from
ExclusiveArch: %{rust_arches}
- rust-try_or
ExclusiveArch: %{rust_arches}
- rust-trybuild
ExclusiveArch: %{rust_arches}
- rust-tss-esapi
ExclusiveArch: %{rust_arches}
- rust-ttf-parser
ExclusiveArch: %{rust_arches}
- rust-tui
ExclusiveArch: %{rust_arches}
- rust-tui-react
ExclusiveArch: %{rust_arches}
- rust-tui0.11
ExclusiveArch: %{rust_arches}
- rust-tui0.9
ExclusiveArch: %{rust_arches}
- rust-tuikit
ExclusiveArch: %{rust_arches}
- rust-tungstenite
ExclusiveArch: %{rust_arches}
- rust-twoway
ExclusiveArch: %{rust_arches}
- rust-typeable
ExclusiveArch: %{rust_arches}
- rust-typed-arena
ExclusiveArch: %{rust_arches}
- rust-typemap
ExclusiveArch: %{rust_arches}
- rust-typenum
ExclusiveArch: %{rust_arches}
- rust-typetag-impl
ExclusiveArch: %{rust_arches}
- rust-ucd-parse
ExclusiveArch: %{rust_arches}
- rust-ucd-trie
ExclusiveArch: %{rust_arches}
- rust-ucd-util
ExclusiveArch: %{rust_arches}
- rust-unchecked-index
ExclusiveArch: %{rust_arches}
- rust-unescape
ExclusiveArch: %{rust_arches}
- rust-unic-char-property
ExclusiveArch: %{rust_arches}
- rust-unic-char-range
ExclusiveArch: %{rust_arches}
- rust-unic-common
ExclusiveArch: %{rust_arches}
- rust-unic-segment
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-category
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-common
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-segment
ExclusiveArch: %{rust_arches}
- rust-unic-ucd-version
ExclusiveArch: %{rust_arches}
- rust-unicase
ExclusiveArch: %{rust_arches}
- rust-unicase1
ExclusiveArch: %{rust_arches}
- rust-unicode-bidi
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-segmentation
ExclusiveArch: %{rust_arches}
- rust-unicode-width
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-unicode-xid0.1
ExclusiveArch: %{rust_arches}
- rust-unicode_categories
ExclusiveArch: %{rust_arches}
- rust-unindent
ExclusiveArch: %{rust_arches}
- rust-universal-hash
ExclusiveArch: %{rust_arches}
- rust-unix_socket
ExclusiveArch: %{rust_arches}
- rust-unreachable
ExclusiveArch: %{rust_arches}
- rust-unsafe-any
ExclusiveArch: %{rust_arches}
- rust-untrusted
ExclusiveArch: %{rust_arches}
- rust-uom
ExclusiveArch: %{rust_arches}
- rust-url
ExclusiveArch: %{rust_arches}
- rust-url1
ExclusiveArch: %{rust_arches}
- rust-url_serde
ExclusiveArch: %{rust_arches}
- rust-urlencoding
ExclusiveArch: %{rust_arches}
- rust-urlocator
ExclusiveArch: %{rust_arches}
- rust-urlshortener
ExclusiveArch: %{rust_arches}
- rust-users
ExclusiveArch: %{rust_arches}
- rust-users0.10
ExclusiveArch: %{rust_arches}
- rust-utf-8
ExclusiveArch: %{rust_arches}
- rust-utf8-ranges
ExclusiveArch: %{rust_arches}
- rust-utf8-width
ExclusiveArch: %{rust_arches}
- rust-utf8parse
ExclusiveArch: %{rust_arches}
- rust-uuid
ExclusiveArch: %{rust_arches}
- rust-uuid0.7
ExclusiveArch: %{rust_arches}
- rust-v_escape
ExclusiveArch: %{rust_arches}
- rust-v_escape_derive
ExclusiveArch: %{rust_arches}
- rust-v_frame
ExclusiveArch: %{rust_arches}
- rust-v_htmlescape
ExclusiveArch: %{rust_arches}
- rust-varlink
ExclusiveArch: %{rust_arches}
- rust-varlink-cli
ExclusiveArch: %{rust_arches}
- rust-varlink_generator
ExclusiveArch: %{rust_arches}
- rust-varlink_parser
ExclusiveArch: %{rust_arches}
- rust-varlink_stdinterfaces
ExclusiveArch: %{rust_arches}
- rust-vec-arena
ExclusiveArch: %{rust_arches}
- rust-vec_map
ExclusiveArch: %{rust_arches}
- rust-vergen
ExclusiveArch: %{rust_arches}
- rust-version
ExclusiveArch: %{rust_arches}
- rust-version-compare
ExclusiveArch: %{rust_arches}
- rust-version-sync
ExclusiveArch: %{rust_arches}
- rust-version-sync0.8
ExclusiveArch: %{rust_arches}
- rust-version_check
ExclusiveArch: %{rust_arches}
- rust-vmw_backdoor
ExclusiveArch: %{rust_arches}
- rust-void
ExclusiveArch: %{rust_arches}
- rust-vte
ExclusiveArch: %{rust_arches}
- rust-vte0.3
ExclusiveArch: %{rust_arches}
- rust-vte_generate_state_changes
ExclusiveArch: %{rust_arches}
- rust-wait-timeout
ExclusiveArch: %{rust_arches}
- rust-waker-fn
ExclusiveArch: %{rust_arches}
- rust-walkdir
ExclusiveArch: %{rust_arches}
- rust-want
ExclusiveArch: %{rust_arches}
- rust-warp
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-backend
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-macro
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-macro-support
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-shared
ExclusiveArch: %{rust_arches}
- rust-wasm-bindgen-test-macro
ExclusiveArch: %{rust_arches}
- rust-wayland-client
ExclusiveArch: %{rust_arches}
- rust-wayland-commons
ExclusiveArch: %{rust_arches}
- rust-wayland-cursor
ExclusiveArch: %{rust_arches}
- rust-wayland-egl
ExclusiveArch: %{rust_arches}
- rust-wayland-protocols
ExclusiveArch: %{rust_arches}
- rust-wayland-scanner
ExclusiveArch: %{rust_arches}
- rust-wayland-server
ExclusiveArch: %{rust_arches}
- rust-wayland-sys
ExclusiveArch: %{rust_arches}
- rust-web-sys
ExclusiveArch: %{rust_arches}
- rust-webkit2gtk
ExclusiveArch: %{rust_arches}
- rust-webkit2gtk-sys
ExclusiveArch: %{rust_arches}
- rust-websocket
ExclusiveArch: %{rust_arches}
- rust-websocket-base
ExclusiveArch: %{rust_arches}
- rust-weezl
ExclusiveArch: %{rust_arches}
- rust-which
ExclusiveArch: %{rust_arches}
- rust-wild
ExclusiveArch: %{rust_arches}
- rust-wildmatch
ExclusiveArch: %{rust_arches}
- rust-winit
ExclusiveArch: %{rust_arches}
- rust-ws
ExclusiveArch: %{rust_arches}
- rust-wyz
ExclusiveArch: %{rust_arches}
- rust-x11
ExclusiveArch: %{rust_arches}
- rust-x11-clipboard
ExclusiveArch: %{rust_arches}
- rust-x11-dl
ExclusiveArch: %{rust_arches}
- rust-xattr
ExclusiveArch: %{rust_arches}
- rust-xcb
ExclusiveArch: %{rust_arches}
- rust-xcursor
ExclusiveArch: %{rust_arches}
- rust-xdg
ExclusiveArch: %{rust_arches}
- rust-xkbcommon
ExclusiveArch: %{rust_arches}
- rust-xml-rs
ExclusiveArch: %{rust_arches}
- rust-xml5ever
ExclusiveArch: %{rust_arches}
- rust-xmlparser
ExclusiveArch: %{rust_arches}
- rust-xz2
ExclusiveArch: %{rust_arches}
- rust-y4m
ExclusiveArch: %{rust_arches}
- rust-yaml-rust
ExclusiveArch: %{rust_arches}
- rust-yaml-rust0.3
ExclusiveArch: %{rust_arches}
- rust-ybaas
ExclusiveArch: %{rust_arches}
- rust-ytop
ExclusiveArch: %{rust_arches}
- rust-yubibomb
ExclusiveArch: %{rust_arches}
- rust-yup-oauth2
ExclusiveArch: %{rust_arches}
- rust-zbus
ExclusiveArch: %{rust_arches}
- rust-zbus_macros
ExclusiveArch: %{rust_arches}
- rust-zeroize
ExclusiveArch: %{rust_arches}
- rust-zeroize_derive
ExclusiveArch: %{rust_arches}
- rust-zincati
ExclusiveArch: %{rust_arches}
- rust-zip
ExclusiveArch: %{rust_arches}
- rust-zoneinfo_compiled
ExclusiveArch: %{rust_arches}
- rust-zoxide
ExclusiveArch: %{rust_arches}
- rust-zram-generator
ExclusiveArch: %{rust_arches}
- rust-zstd
ExclusiveArch: %{rust_arches}
- rust-zstd-safe
ExclusiveArch: %{rust_arches}
- rust-zstd-sys
ExclusiveArch: %{rust_arches}
- rust-zvariant
ExclusiveArch: %{rust_arches}
- rust-zvariant_derive
ExclusiveArch: %{rust_arches}
- s390utils
ExclusiveArch: s390 s390x
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc64le
- sagemath
ExclusiveArch: aarch64 %{ix86} x86_64 ppc sparcv9
- sbcl
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- sbd
ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- seabios
ExclusiveArch: x86_64
- seadrive-gui
ExclusiveArch: %{qt5_qtwebengine_arches}
- seafile-client
ExclusiveArch: %{qt5_qtwebengine_arches}
- seamonkey
ExclusiveArch: x86_64
- seqan3
ExclusiveArch: %{power64} x86_64 aarch64
- servicelog
ExclusiveArch: ppc %{power64}
- sgabios
ExclusiveArch: %{ix86} x86_64
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigul
ExclusiveArch: x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- snapd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- soup-sharp
ExclusiveArch: %{mono_arches}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- springlobby
ExclusiveArch: %{ix86} x86_64
- squeekboard
ExclusiveArch: %{rust_arches}
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- statsd
ExclusiveArch: %{nodejs_arches} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- supercollider
ExclusiveArch: %{qt5_qtwebengine_arches}
- supermin
ExclusiveArch: %{kernel_arches}
- svt-av1
ExclusiveArch: x86_64
- svt-vp9
ExclusiveArch: x86_64
- swift-lang
ExclusiveArch: x86_64 aarch64
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64le s390x
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tarantool
ExclusiveArch: %{ix86} x86_64
- tboot
ExclusiveArch: %{ix86} x86_64
- tdlib
ExclusiveArch: x86_64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- testcloud
ExclusiveArch: %{kernel_arches} noarch
- themonospot-base
ExclusiveArch: %mono_arches
- themonospot-console
ExclusiveArch: %mono_arches
- themonospot-gui-gtk
ExclusiveArch: %mono_arches
- themonospot-plugin-avi
ExclusiveArch: %mono_arches
- themonospot-plugin-mkv
ExclusiveArch: %mono_arches
- thermald
ExclusiveArch: %{ix86} x86_64
- tilix
ExclusiveArch: %{ldc_arches}
- tmux-top
ExclusiveArch: %{go_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- torbrowser-launcher
ExclusiveArch: %{ix86} x86_64
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- ugene
ExclusiveArch: %{ix86} x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
- uglify-js1
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- unetbootin
ExclusiveArch: %{ix86} x86_64
- ursa-major
ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vapoursynth
ExclusiveArch: %{ix86} x86_64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- virt-p2v
ExclusiveArch: x86_64
- virt-v2v
ExclusiveArch: x86_64
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- virtualplanet
ExclusiveArch: %{fpc_arches}
- vkd3d
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- vmaf
ExclusiveArch: x86_64
- vmem
ExclusiveArch: x86_64
- vmemcache
ExclusiveArch: x86_64 ppc64 ppc64le s390x aarch64
- vrq
ExclusiveArch: %{ix86} x86_64
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- webkit2-sharp
ExclusiveArch: %mono_arches
- wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: %{ix86} %{arm}
- wine-dxvk
ExclusiveArch: %{ix86} x86_64
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- xe-guest-utilities-latest
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: %{ix86} x86_64 armv7hl aarch64
- xmlada
ExclusiveArch: %{GPRbuild_arches}
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- yarnpkg
ExclusiveArch: %{nodejs_arches} noarch
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ng
ExclusiveArch: aarch64 i686 ppc64le s390x x86_64
- zola
ExclusiveArch: %{rust_arches}
1
0
Architecture specific change in rpms/rust-crossbeam-utils.git
by githook-noreply＠fedoraproject.org 25 Feb '21
by githook-noreply＠fedoraproject.org 25 Feb '21
25 Feb '21
The package rpms/rust-crossbeam-utils.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-crossbeam-utils.git/commit/?id….
Change:
+%ifarch %{arm}
Thanks.
Full change:
============
commit 259bb30020678f9cd09d128fd749e4ee787e80e2
Author: Fabio Valentini <decathorpe(a)gmail.com>
Date: Fri Feb 26 01:02:25 2021 +0100
temporarily disable doc tests on armv7hl
diff --git a/rust-crossbeam-utils.spec b/rust-crossbeam-utils.spec
index e4beba6..1473e10 100644
--- a/rust-crossbeam-utils.spec
+++ b/rust-crossbeam-utils.spec
@@ -6,7 +6,7 @@
Name: rust-%{crate}
Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Utilities for concurrent programming
# Upstream license specification: MIT OR Apache-2.0
@@ -106,10 +106,19 @@ which use "std" feature of "%{crate}" crate.
%if %{with check}
%check
+%ifarch %{arm}
+# one of the doc tests fails on armv7hl
+# https://github.com/crossbeam-rs/crossbeam/issues/668
+%cargo_test -- --lib
+%else
%cargo_test
%endif
+%endif
%changelog
+* Thu Feb 25 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.8.3-2
+- Temporarily disable doc tests on armv7hl.
+
* Thu Feb 25 2021 Fabio Valentini <decathorpe(a)gmail.com> - 0.8.3-1
- Update to version 0.8.3.
- Fixes RHBZ#1931105
1
0
25 Feb '21
The package rpms/giada.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/giada.git/commit/?id=6afe7833fa6a56….
Change:
-%ifnarch ppc64le
Thanks.
Full change:
============
commit 043c8d40391c620f423ef381e5a5d526a0487f5f
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Thu Feb 25 17:42:30 2021 -0500
Remove stray debugging “find” commands
diff --git a/giada.spec b/giada.spec
index 7e7d003..8b6a51d 100644
--- a/giada.spec
+++ b/giada.spec
@@ -200,9 +200,6 @@ appstream-util validate-relax --nonet \
xvfb-run -a %{buildroot}%{_bindir}/giada --run-tests
%endif
-find %{_vpath_builddir} -type f
-find %{buildroot} -type f
-
%files
%license COPYING
@@ -223,6 +220,7 @@ find %{buildroot} -type f
- Remove VST 3 SDK and JUCE from source tarball for legal reasons; disable all
VST support
- Update License field to reflect the removed bundled dependencies
+- Remove stray debugging “find” commands
* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-3
- Add link to upstream issue for format-security patch
commit 6afe7833fa6a56ec7808dcdc89282e1c98ea3fd7
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Thu Feb 25 17:42:16 2021 -0500
Remove VST 3 SDK and JUCE from source tarball for legal reasons; disable all VST support; update License field to reflect the removed bundled dependencies
diff --git a/.gitignore b/.gitignore
index f1cbca4..0b6ef91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/giada-0.16.4-src.tar.gz
/giada-0.17.0-src.tar.gz
/giada-0.17.1-src.tar.gz
+/giada-0.17.1-src-distributable.tar.xz
diff --git a/download-and-filter-source.sh b/download-and-filter-source.sh
new file mode 100755
index 0000000..e681037
--- /dev/null
+++ b/download-and-filter-source.sh
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+set -o nounset
+set -o errexit
+
+if [ "$#" != '0' ]
+then
+ if [ "${1-}" != '-h' ] && [ "${1-}" != '--help' ]
+ then
+ code='0'
+ exec 1>&2
+ fi
+ cat <<EOF
+USAGE: $0
+
+Reads giada.spec from the same directory as the script. Uses the value of
+%upstream_source to download the upstream release archive; filters out
+non-redistributable files; and writes a distributable tarball to the current
+working directory.
+EOF
+ exit "${code-1}"
+fi
+
+OUTDIR="${PWD}"
+cd "$(dirname "$0")"
+SPEC="${PWD}/giada.spec"
+
+URL="$(
+ rpm -E "$(
+ awk -F: '
+ tolower($0) ~ /^(name|version|summary|url):/ {
+ colon = index($0, ":")
+ printf("%%global %s %s\n", tolower($1), substr($0, colon + 1))
+ }
+ ' "${SPEC}"
+ )
+ $(grep -E '^%global ' "${SPEC}")
+ %upstream_source
+ " | sed -r -e 's/^[[:blank:]]+//' -e 's/[[:blank:]]$//'
+)"
+ARCHIVE="$(echo "${URL}" | awk -F / '{ print $NF }')"
+
+cat 1>&2 <<EOF
+
+Downloading:
+
+ URL: ${URL}
+ Archive: ${ARCHIVE}
+
+EOF
+
+# Download the archive
+tmpdir="$(mktemp --directory)"
+trap "rm -rf '${tmpdir}'" INT TERM EXIT
+curl \
+ --location \
+ --proto-redir -all,https \
+ --output "${tmpdir}/${ARCHIVE}" \
+ "${URL}"
+
+phase() {
+cat <<EOF
+
+==============================================================================
+$1
+==============================================================================
+
+EOF
+}
+
+phase 'Extracting upstream archive'
+# Extract the archive
+xdir="${tmpdir}/x"
+mkdir "${xdir}"
+tar -C "${xdir}" -xzf "${tmpdir}/${ARCHIVE}"
+echo "Extracted ${ARCHIVE} ($(
+ stat --format=%s "${tmpdir}/${ARCHIVE}"
+) bytes)"
+
+
+phase 'Filtering upstream archive'
+(
+ set -o nounset
+ set -o errexit
+
+ cd "${xdir}"
+
+ echo '--> Removing VST 3 SDK'
+ rm -rf */src/deps/vst3sdk
+
+ echo '--> Removing JUCE'
+ rm -rf */src/deps/juce
+)
+
+phase 'Writing filtered archive'
+FILTERED_ARCHIVE="$(basename "${ARCHIVE}" .tar.gz)-distributable.tar"
+tar -C "${xdir}" -c . -f "./${FILTERED_ARCHIVE}"
+echo "Wrote ${FILTERED_ARCHIVE} ($(
+ stat --format=%s "${FILTERED_ARCHIVE}"
+) bytes)"
+
+phase 'Re-compressing filtered archive'
+rm -vf "${FILTERED_ARCHIVE}.xz"
+# We could re-compress as gzip with pigz almost instantly; xz takes quite a
+# while, but saves many megabytes in the source RPM, which is probably worth
+# it as long as we are re-compressing anyway.
+xz -9ev "${FILTERED_ARCHIVE}"
+
+phase 'Done'
+echo "Wrote ${FILTERED_ARCHIVE}.xz ($(
+ stat --format=%s "${FILTERED_ARCHIVE}.xz"
+) bytes)"
diff --git a/giada.spec b/giada.spec
index 5478b8c..7e7d003 100644
--- a/giada.spec
+++ b/giada.spec
@@ -2,52 +2,46 @@
Name: giada
Version: 0.17.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Your hardcore loop machine
+# LICENSING NOTE:
+#
+# The upstream source contains excerpts from the Steinberg VST 3 SDK, which has
+# additional restrictions on top of the GPLv3 that make it unsuitable for
+# distribution in Fedora. See
+# https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org….
+#
+# These problematic components are therefore filtered from the upstream source
+# archive using the script in Source1 to produce the distributable source
+# archive in Source0. The VST 3 SDK is removed, as is JUCE, which contains
+# components from the VST 3 SDK and is only used for VST 3 suport anyway.
+#
+# Note that this means Giada will *not* be built with VST3 support in Fedora.
+# (The situation for VST2 is even worse, as it is available only under a
+# proprietary license.)
+
# The entire source is GPLv3+, except:
# - src/deps/json is (MIT and CC0), where the overall license is MIT and the
# bundled copy of Hedley is CC0
-# - src/deps/juce is GPLv3, except:
-# * src/deps/juce/modules/juce_audio_basics is ISC, except:
-# > juce_GenericInterpolator.h, juce_Interpolators.cpp,
-# juce_Interpolators.h, and juce_WindowedSincInterpolator.cpp in
-# src/deps/juce/modules/juce_audio_basics/utilities are still GPLv3
-# * src/deps/juce/modules/juce_audio_devices is ISC, except:
-# > src/deps/juce/modules/juce_audio_devices/native/oboe/ is ASL 2.0
-# * src/deps/juce/modules/juce_audio_formats/codecs/flac is BSD
-# * src/deps/juce/modules/juce_audio_formats/codecs/oggvorbis is BSD
-# * src/deps/juce/modules/juce_audio_plugin_client/AUResources.r,
-# src/deps/juce/modules/juce_audio_plugin_client/AU/AUResources.r, and
-# src/deps/juce/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/
-# are MIT
-# * src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/base/,
-# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/public.sdk/,
-# and
-# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/vst/ivsttestplugprovider.h
-# are BSD
-# * src/deps/juce/modules/juce_blocks_basics/ is ISC
-# * src/deps/juce/modules/juce_box2d/box2d/ is zlib
-# * src/deps/juce/modules/juce_core/ is ISC, except:
-# > src/deps/juce/modules/juce_core/zip/zlib is zlib
-# * src/deps/juce/modules/juce_events/ is ISC
-# * src/deps/juce/modules/juce_graphics/image_formats/jpglib is IJG
-# * src/deps/juce/modules/juce_graphics/image_formats/pnglib is zlib
# - src/deps/rtaudio is MIT, except:
# * src/deps/rtaudio/include/soundcard.h is BSD
-# - src/deps/vst3sdk is GPLv3, except:
-# * src/deps/vst3sdk/base/, src/deps/vst3sdk/public.sdk/, and
-# src/deps/vst3sdk/pluginterfaces/vst/ivsttestplugprovider.h are BSD
#
-# The following sources, which would otherwise contribute to the License field,
-# are removed in prep: (none yet)
-License: GPLv3+ and MIT and CC0 and GPLv3 and ISC and ASL 2.0 and BSD and zlib and IJG
+# The following sources are present upstream, but not in the distributable
+# source tarball:
+#
+# - src/deps/juce
+# - src/deps/vst3sdk
+License: GPLv3+ and MIT and CC0 and BSD
URL: https://www.giadamusic.com
-Source0: %{url}/data/%{name}-%{version}-src.tar.gz
+# This macro is used by the script in Source1 as the upstream source archive.
+%global upstream_source %{url}/data/%{name}-%{version}-src.tar.gz
+Source0: %{name}-%{version}-src-distributable.tar.xz
+Source1: download-and-filter-source.sh
# https://github.com/monocasual/giada/pull/358
-Source1: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
+Source2: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
# https://github.com/monocasual/giada/pull/358
-Source2: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
+Source3: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
# We need to use pkg-config/pkgconf to find rtmidi and libsndfile.
# https://github.com/monocasual/giada/issues/451
@@ -121,65 +115,6 @@ Provides: bundled(nlohmann-json) = 3.9.1
Provides: bundled(hedley) = 13
# ============================================================================
-# ============================================================================
-# “JUCE”, https://juce.com/
-#
-# The version comes from ChangeLog. That, in turn, bundles a lot of libraries,
-# listed below.
-#
-# See https://github.com/juce-framework/JUCE/issues/860, where support for
-# unbundling these was requested.
-Provides: bundled(juce) = 6.0.4
-# “Oboe”, https://github.com/google/oboe
-#
-# The version comes from
-# src/deps/juce/modules/juce_audio_devices/native/oboe/readme.md.
-Provides: bundled(oboe) = 1.4.2
-# libogg
-#
-# The version is unclear.
-Provides: bundled(libogg)
-# libvorbis
-#
-# The version comes from the name of the subdirectory of
-# src/deps/juce/modules/juce_audio_formats/codecs/oggvorbis/
-Provides: bundled(libvorbis) = 1.3.7
-# libFLAC
-#
-# The version is unclear (only the API version is in the source code)
-Provides: bundled(flac)
-# Core Audio Utility Classes
-#
-# The version comes from the header of any arbitrary file in
-# src/deps/juce/modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/.
-Provides: bundled(core-audio-utility-classes) = 1.1
-# VST3 SDK
-#
-# The version comes from “#define kVstVersionString” in
-# src/deps/juce/modules/juce_audio_processors/format_types/VST3_SDK/pluginterfaces/vst/vsttypes.h.
-Provides: bundled(vst3-sdk) = 3.6.13
-# Box2D
-#
-# The version comes from “b2Version b2_version” in
-# src/deps/juce/modules/juce_box2d/box2d/Common/b2Settings.cpp.
-Provides: bundled(Box2D) = 2.2.1
-# zlib
-#
-# The version comes from “#define ZLIB_VERSION” in
-# src/deps/juce/modules/juce_core/zip/zlib/zlib.h.
-Provides: bundled(zlib) = 1.2.3
-# “The Independent JPEG Group's JPEG software”
-#
-# The version comes from “#define JPEG_LIB_VERSION”, and the following comment,
-# in src/deps/juce/modules/juce_graphics/image_formats/jpglib/jpeglib.h.
-Provides: bundled(libjpeg) = 6b
-# libpng
-#
-# The version comes from the header comment of
-# src/deps/juce/modules/juce_graphics/image_formats/pnglib/png.h.
-Provides: bundled(libpng) = 1.6.37
-# ============================================================================
-
# ============================================================================
# RtAudio (https://github.com/thestk/rtaudio)
#
@@ -194,20 +129,9 @@ Provides: bundled(libpng) = 1.6.37
Provides: bundled(rtaudio) = 5.1.0
# ============================================================================
-# ============================================================================
-# VST3 SDK
-#
-# In addition to the copy bundled with the bundled JUCE, there is a second
-# bundled copy, where the version comes from “#define kVstVersionString” in
-# src/deps/vst3sdk/pluginterfaces/vst/vsttypes.h.
-Provides: bundled(vst3-sdk) = 3.7.0
-# ============================================================================
-
-
# Consistent behavior on F32
%undefine __cmake_in_source_build
-
%description
Giada is an open source, minimalistic and hardcore music production tool.
Designed for DJs, live performers and electronic musicians.
@@ -216,6 +140,26 @@ Designed for DJs, live performers and electronic musicians.
%prep
%autosetup -n %{name}-%{version}-src -p1
+# This is a last safeguard against something with an inappropriate license
+# slipping into the source tarball. It is no substitute for manual auditing.
+echo 'Checking for inappropriate source files:'
+echo '> Possible Steinberg proprietary license?'
+if grep -Frl 'This Software Development Kit may not be' .
+then
+ echo 'Found some concerning files!'
+ exit 1
+else
+ echo '> No concerning files were found.'
+fi
+echo '> Possible Steinberg VST 3 SDK (GPLv3 with conditions)?'
+if grep -Erli 'Project[[:blank:]]*:[[:blank:]]*VST SDK' .
+then
+ echo 'Found some concerning files!'
+ exit 1
+else
+ echo '> No concerning files were found.'
+fi
+
# At least on Fedora, this keeps CMake from expecting the static FLTK library.
# It is not clear whether this is an FLTK bug (upstream or Fedora), or a Giada
# bug, so we have not attempted to report it to any upstream.
@@ -223,24 +167,14 @@ sed -r -i 's/(FLTK)[[:blank:]]+CONFIG/\1/' CMakeLists.txt
%build
-# VST2 does not work:
-# In file included from ../src/deps/juce/modules/juce_audio_processors/juce_audio_processors.cpp:149:
-# ../src/deps/juce/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp:49:10: fatal error: pluginterfaces/vst2.x/aeffect.h: No such file or directory
-# 49 | #include <pluginterfaces/vst2.x/aeffect.h>
-# | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# VST3 does not build on PPC64LE, and the solution is not obvious:
-# /usr/bin/ld: /usr/bin/ld: DWARF error: invalid abstract instance DIE ref
-# /tmp/ccVmiyyc.ltrans32.ltrans.o: in function `juce::PNGHelpers::readImageData(juce::pnglibNamespace::png_struct_def*, juce::pnglibNamespace::png_info_def*, __jmp_buf_tag (&) [1], unsigned char**)':
-# <artificial>:(.text+0x51d8): undefined reference to `juce::pnglibNamespace::png_init_filter_functions_vsx(juce::pnglibNamespace::png_struct_def*, unsigned int)
-
+# VST 2 SDK is only available under a proprietary license, and VST 3 SDK is
+# dual-licensed with a proprietary license and GPLv3, but additional
+# trademark-related conditions are imposed that are not acceptable in Fedora.
+# See the notes near the beginning of this spec file. Therefore the VST 3 SDK
+# and JUCE sources have been excluded, and all VST support must be disabled at
+# build time.
%cmake \
- -DWITH_VST2:BOOL=OFF \
-%ifnarch ppc64le
- -DWITH_VST3:BOOL=ON \
-%else
- -DWITH_VST3:BOOL=OFF \
-%endif
+ -DWITH_VST2:BOOL=OFF -DWITH_VST3:BOOL=OFF \
-DWITH_TESTS:BOOL=%{?with_tests:ON}%{?!with_tests:OFF} \
-GNinja
%cmake_build
@@ -249,9 +183,9 @@ sed -r -i 's/(FLTK)[[:blank:]]+CONFIG/\1/' CMakeLists.txt
%install
%cmake_install
# https://github.com/monocasual/giada/pull/358
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
# https://github.com/monocasual/giada/pull/358
-install -m 0644 -p -D -t %{buildroot}%{_metainfodir} %{SOURCE2}
+install -m 0644 -p -D -t %{buildroot}%{_metainfodir} %{SOURCE3}
install -m 0644 -p -D -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps \
extras/%{name}-logo.png
@@ -285,6 +219,11 @@ find %{buildroot} -type f
%changelog
+* Thu Feb 25 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-4
+- Remove VST 3 SDK and JUCE from source tarball for legal reasons; disable all
+ VST support
+- Update License field to reflect the removed bundled dependencies
+
* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-3
- Add link to upstream issue for format-security patch
- Add commentary on forked bundled rtaudio, with a link to upstream discussion
diff --git a/sources b/sources
index 82ffc5c..8cad3dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (giada-0.17.1-src.tar.gz) = 5e4c0f0c1a2dddbee54d2b026a7bf8aaec48f91d93939bde3c760dee2aa4b25b651b232095b15c5337f76df1155987bfa6d08a4d7196d6773fd89c95269cb530
+SHA512 (giada-0.17.1-src-distributable.tar.xz) = 7f73e54b8193988830feacd2aaffe3aacece24d5b641a1810c8babfd166082d3aaa4cab074f37edefd692ab5a46841376dc136ccf6822b51849202b751fb29de
commit 086d7e8b93e6b98b47d3a2bcd98f11473e2a4b05
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Wed Feb 24 10:28:41 2021 -0500
Add commentary on forked bundled rtaudio, with a link to upstream discussion
diff --git a/giada.spec b/giada.spec
index 5d9f17f..5478b8c 100644
--- a/giada.spec
+++ b/giada.spec
@@ -2,7 +2,7 @@
Name: giada
Version: 0.17.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Your hardcore loop machine
# The entire source is GPLv3+, except:
@@ -49,7 +49,7 @@ Source1: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2
# https://github.com/monocasual/giada/pull/358
Source2: https://raw.githubusercontent.com/monocasual/giada/ff1ba651301a2419d6a2b768…
-# We need to use pkg-config/pkgconf to find rtaudio and libsndfile.
+# We need to use pkg-config/pkgconf to find rtmidi and libsndfile.
# https://github.com/monocasual/giada/issues/451
Patch1: %{name}-0.17.1-find-external-dependencies.patch
# This is a C++ logging wrapper that passes its format string parameter through
@@ -181,7 +181,13 @@ Provides: bundled(libpng) = 1.6.37
# ============================================================================
# ============================================================================
-# rtaudio (https://github.com/thestk/rtaudio)
+# RtAudio (https://github.com/thestk/rtaudio)
+#
+# This version is slightly forked, so it is not possible to build with the
+# system copy of RtAudio. See
+# https://giadamusic.com/forum/viewtopic.php?f=2&t=177, where upstream
+# discusses the decision to maintain a forked copy of RtAudio in the Giada
+# source tree.
#
# The version comes from “#define RTAUDIO_VERSION” in
# src/deps/rtaudio/RtAudio.h.
@@ -279,6 +285,10 @@ find %{buildroot} -type f
%changelog
+* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-3
+- Add link to upstream issue for format-security patch
+- Add commentary on forked bundled rtaudio, with a link to upstream discussion
+
* Tue Feb 23 2021 Benjamin A. Beasley <code(a)musicinmybrain.net> - 0.17.1-2
- Disable VST3 on PPC64LE due to a non-obvious linker error
commit 54e911afcbc1fbe2c19f64f0064eb2cccdf5f400
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Feb 23 17:58:51 2021 -0500
Add link to upstream issue for format-security patch
diff --git a/giada.spec b/giada.spec
index d89e0db..5d9f17f 100644
--- a/giada.spec
+++ b/giada.spec
@@ -55,6 +55,8 @@ Patch1: %{name}-0.17.1-find-external-dependencies.patch
# This is a C++ logging wrapper that passes its format string parameter through
# to std::fprintf, which inherently means the format string cannot be a
# literal. We use GCC pragmas to suppress the warning in just this one spot.
+# See https://github.com/monocasual/giada/issues/447, where this is discussed,
+# and the patch is offered, upstream.
Patch2: %{name}-0.17.1-suppress-format-security.patch
# Binary should be installed as /usr/bin/giada, not /usr/giada; reported
# upstream with patch at https://github.com/monocasual/giada/issues/450.
1
0
Architecture specific change in rpms/prusa-slicer.git
by githook-noreply＠fedoraproject.org 25 Feb '21
by githook-noreply＠fedoraproject.org 25 Feb '21
25 Feb '21
The package rpms/prusa-slicer.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/prusa-slicer.git/commit/?id=0e9b06d….
Change:
+%ifarch %{arm}
Thanks.
Full change:
============
commit eacebd188085eec0beff8bef8d9deb933f2454cf
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Jan 4 16:37:50 2021 +0100
Rebuilt for openvdb 8.0
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index f3b396e..e921605 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -8,7 +8,7 @@
Name: prusa-slicer
Version: 2.2.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -412,6 +412,10 @@ find %buildroot%_datadir/PrusaSlicer/localization -type d | sed '
%changelog
+* Mon Jan 04 2021 Miro Hrončok <mhroncok(a)redhat.com> - 2.2.0-8
+- Rebuilt for openvdb 8.0
+- Fixes: rhbz#1912499
+
* Fri Jan 01 2021 Richard Shaw <hobbes1069(a)gmail.com> - 2.2.0-7
- Rebuild for OpenEXR 2.5.3.
commit 88e4812c685145308627bec42f233fdf6657f497
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Fri Jan 1 16:22:51 2021 -0600
Rebuild for OpenEXR 2.5.3.
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 9feb044..f3b396e 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -8,7 +8,7 @@
Name: prusa-slicer
Version: 2.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -412,6 +412,9 @@ find %buildroot%_datadir/PrusaSlicer/localization -type d | sed '
%changelog
+* Fri Jan 01 2021 Richard Shaw <hobbes1069(a)gmail.com> - 2.2.0-7
+- Rebuild for OpenEXR 2.5.3.
+
* Wed Aug 26 2020 Jan Beran <jaberan(a)redhat.com> - 2.2.0-6
- Add fixes for the flatpak build:
disable perltests by default when building flatpak
commit d552b687e59f0c8493f61e3286ad7671a90b6205
Author: Jan Beran <jaberan(a)redhat.com>
Date: Wed Aug 26 10:01:29 2020 +0200
Fix flatpak build
When building prusa-slicer as flatpak, Perl test suite is unable to build
because of many build-related errors (Perl tests have many dependencies
which have to be built with /app prefix, which is not always simple).
As we are unable to pass any flags to rpmbuild to switch off
the Perl tests, we need to switch them off for flatpak build directly in the spec file.
The second change is related to %{perl_vendorlib} and %{perl_vendorarch} macros,
which are not set during flatpak build (a build %without perltests).
When the %{flatpak} macro is not set, there should be no change in functionality.
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 4a8d6b5..9feb044 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -1,9 +1,14 @@
# Currently all of the test suite requires the old Perl infrastructure to run.
+# When building flatpak, tests have to be disabled by default due to some missing dependencies.
+%if 0%{?flatpak}
+%bcond_with perltests
+%else
%bcond_without perltests
+%endif
Name: prusa-slicer
Version: 2.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -352,8 +357,11 @@ desktop-file-install --dir=%buildroot%_datadir/applications %SOURCE1
# we want the test suite to run. It could be placed into a subpackage, but
# nothing needs it currently and it would conflict with the other slic3r
# package.
-rm -rf %buildroot/%perl_vendorarch
-rm -rf %buildroot/%perl_vendorlib
+#
+# The %%perl_vendorarch and %%perl_vendorlib can be undefined,
+# which would cause deleting of the whole buildroot.
+%{?perl_vendorarch:rm -rf %buildroot/%perl_vendorarch}
+%{?perl_vendorlib:rm -rf %buildroot/%perl_vendorlib}
# Upstream installs the translation source files when they probably shouldn't
ls -lR %buildroot%_datadir/PrusaSlicer/localization
@@ -404,6 +412,11 @@ find %buildroot%_datadir/PrusaSlicer/localization -type d | sed '
%changelog
+* Wed Aug 26 2020 Jan Beran <jaberan(a)redhat.com> - 2.2.0-6
+- Add fixes for the flatpak build:
+ disable perltests by default when building flatpak
+ don't remove Perl modules when building without perltests
+
* Mon Aug 24 2020 Miro Hrončok <mhroncok(a)redhat.com> - 2.2.0-5
- Rebuilt for openvdb 7.1
commit 2cebe758972e7591a050567aa420ea46a4113f32
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Aug 24 13:16:35 2020 +0200
Rebuilt for openvdb 7.1
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 88c97a7..4a8d6b5 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -3,7 +3,7 @@
Name: prusa-slicer
Version: 2.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -404,6 +404,9 @@ find %buildroot%_datadir/PrusaSlicer/localization -type d | sed '
%changelog
+* Mon Aug 24 2020 Miro Hrončok <mhroncok(a)redhat.com> - 2.2.0-5
+- Rebuilt for openvdb 7.1
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.0-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 0e9b06d7c8f668d10b92fb64cbd36920a1ca372a
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Fri Aug 7 10:45:14 2020 +0200
Disable LTO on arm temporarily
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index bc6df62..88c97a7 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -31,6 +31,11 @@ Patch1: endian.patch
%global _smp_ncpus_max 8
%endif
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1865257
+%ifarch %{arm}
+%global _lto_cflags %{nil}
+%endif
+
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: cereal-devel
commit 96833091efa3dec87c8caca4ebcbc13167a2fa0a
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Aug 4 10:15:44 2020 +0200
https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index e27c63e..bc6df62 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -217,6 +217,9 @@ Obsoletes: slic3r-prusa3d < 1.41.3-2
Provides: slic3r-prusa3d = %version-%release
%endif
+# Get Fedora 33++ behavior on anything older
+%undefine __cmake_in_source_build
+
%description
PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code
instructions for FFF printers or PNG layers for mSLA 3D printers. It's
@@ -290,20 +293,16 @@ commit "Remove xfail tests."
%build
-mkdir Build
-pushd Build
-
# -DSLIC3R_PCH=0 - Disable precompiled headers, which break cmake for some reason
# -DSLIC3R_FHS=1 - Enable FHS layout instead of installing things into the resources directory
# -DSLIC3R_WX_STABLE=1 - Allow use of wxGTK version 3.0 instead of 3.1.
-%cmake .. -DSLIC3R_PCH=0 -DSLIC3R_FHS=1 -DSLIC3R_WX_STABLE=1 -DSLIC3R_GTK=3 \
+%cmake -DSLIC3R_PCH=0 -DSLIC3R_FHS=1 -DSLIC3R_WX_STABLE=1 -DSLIC3R_GTK=3 \
-DSLIC3R_BUILD_TESTS=1 -DCMAKE_BUILD_TYPE=Release \
%if %{with perltests}
-DSLIC3R_PERL_XS=1
%endif
-%make_build
-popd
+%cmake_build
# Extract multiple sizes of PNG from the included .ico file. The order of
# extracted files can change, so a bit of magic is required to get stable
@@ -325,9 +324,7 @@ popd
%install
-pushd Build
-%make_install
-popd
+%cmake_install
# Since the binary segfaults under Wayland, we have to wrap it.
mv %buildroot%_bindir/prusa-slicer %buildroot%_bindir/prusa-slicer.wrapped
@@ -386,8 +383,7 @@ find %buildroot%_datadir/PrusaSlicer/localization -type d | sed '
# Some tests are Perl but there is a framework for other tests even though
# currently the only thing that uses them is one of the bundled libraries.
# There's no reason not to run as much as we can.
-pushd Build
-make test ARGS=-V
+%cmake_build -- test ARGS=-V
%files -f license-files -f lang-files
commit e29535c96928d93c8f5f2b5231252544e192fd98
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Aug 1 07:14:28 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 1b75f6e..e27c63e 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -3,7 +3,7 @@
Name: prusa-slicer
Version: 2.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -403,6 +403,10 @@ make test ARGS=-V
%changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.0-4
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit fc6de5d9edc6b0f34c56c99ff15eaf6ad1e2fddf
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 28 23:04:51 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index eea3d93..1b75f6e 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -3,7 +3,7 @@
Name: prusa-slicer
Version: 2.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -403,6 +403,9 @@ make test ARGS=-V
%changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Tue Jun 02 2020 Miro Hrončok <mhroncok(a)redhat.com> - 2.2.0-2
- Rebuilt and fix for Boost 1.73.0 (#1842011)
commit 998832ef5e936a6bf6bdec5b622a055700095f47
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Jun 3 10:25:50 2020 +0200
Rebuilt and fix for Boost 1.73.0 (second attempt)
diff --git a/endian.patch b/endian.patch
new file mode 100644
index 0000000..c970c77
--- /dev/null
+++ b/endian.patch
@@ -0,0 +1,50 @@
+diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp
+index 390fe56..7ac2704 100644
+--- a/src/admesh/stlinit.cpp
++++ b/src/admesh/stlinit.cpp
+@@ -28,7 +28,6 @@
+
+ #include <boost/log/trivial.hpp>
+ #include <boost/nowide/cstdio.hpp>
+-#include <boost/detail/endian.hpp>
+
+ #include "stl.h"
+
+@@ -36,9 +35,9 @@
+ #error "SEEK_SET not defined"
+ #endif
+
+-#ifndef BOOST_LITTLE_ENDIAN
++#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
+ extern void stl_internal_reverse_quads(char *buf, size_t cnt);
+-#endif /* BOOST_LITTLE_ENDIAN */
++#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
+
+ static FILE* stl_open_count_facets(stl_file *stl, const char *file)
+ {
+@@ -89,10 +88,10 @@ static FILE* stl_open_count_facets(stl_file *stl, const char *file)
+ // Read the int following the header. This should contain # of facets.
+ uint32_t header_num_facets;
+ bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0;
+-#ifndef BOOST_LITTLE_ENDIAN
++#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
+ // Convert from little endian to big endian.
+ stl_internal_reverse_quads((char*)&header_num_facets, 4);
+-#endif /* BOOST_LITTLE_ENDIAN */
++#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
+ if (! header_num_faces_read || num_facets != header_num_facets)
+ BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file;
+ }
+@@ -158,10 +157,10 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first)
+ // Read a single facet from a binary .STL file. We assume little-endian architecture!
+ if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET)
+ return false;
+-#ifndef BOOST_LITTLE_ENDIAN
++#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
+ // Convert the loaded little endian data to big endian.
+ stl_internal_reverse_quads((char*)&facet, 48);
+-#endif /* BOOST_LITTLE_ENDIAN */
++#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
+ } else {
+ // Read a single facet from an ASCII .STL file
+ // skip solid/endsolid
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 6a8bdae..eea3d93 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -3,7 +3,7 @@
Name: prusa-slicer
Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -20,6 +20,12 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version.
Source1: %name.desktop
Source2: %name.appdata.xml
+# Boost 1.73 support
+# https://bugzilla.redhat.com/show_bug.cgi?id=1842011
+# https://github.com/prusa3d/PrusaSlicer/issues/4264
+# https://github.com/prusa3d/PrusaSlicer/pull/4340
+Patch1: endian.patch
+
# Highly-parallel uild can run out of memory on PPC64le
%ifarch ppc64le
%global _smp_ncpus_max 8
@@ -397,6 +403,9 @@ make test ARGS=-V
%changelog
+* Tue Jun 02 2020 Miro Hrončok <mhroncok(a)redhat.com> - 2.2.0-2
+- Rebuilt and fix for Boost 1.73.0 (#1842011)
+
* Tue Mar 31 2020 Alexander Jacocks <alexander(a)redhat.com> - 2.2.0-1
- Update to 2.2.0.
commit 393c0474b35b739e2a7bac841134960ec7507969
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Jun 2 01:29:53 2020 +0200
Revert "Rebuilt and fix for Boost 1.73.0"
The fix breaks s390x
This reverts commit a8cfa9157e6885690d521ae031123fde1918d90d.
diff --git a/boost-1.73.patch b/boost-1.73.patch
deleted file mode 100644
index 1032073..0000000
--- a/boost-1.73.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d982345f52b6afbcc30c532828e161b2c956acf4 Mon Sep 17 00:00:00 2001
-From: Christophe Lermytte <gentoo(a)lermytte.be>
-Date: Mon, 18 May 2020 22:41:58 +0200
-Subject: [PATCH] Replace deprecated Boost endianness headers (#4264)
-
----
- src/admesh/stlinit.cpp | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp
-index 390fe56a4..792e60ae6 100644
---- a/src/admesh/stlinit.cpp
-+++ b/src/admesh/stlinit.cpp
-@@ -28,7 +28,7 @@
-
- #include <boost/log/trivial.hpp>
- #include <boost/nowide/cstdio.hpp>
--#include <boost/detail/endian.hpp>
-+#include <boost/predef/other/endian.h>
-
- #include "stl.h"
-
-@@ -36,9 +36,9 @@
- #error "SEEK_SET not defined"
- #endif
-
--#ifndef BOOST_LITTLE_ENDIAN
-+#ifndef BOOST_ENDIAN_LITTLE_BYTE
- extern void stl_internal_reverse_quads(char *buf, size_t cnt);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* BOOST_ENDIAN_LITTLE_BYTE */
-
- static FILE* stl_open_count_facets(stl_file *stl, const char *file)
- {
-@@ -89,10 +89,10 @@ static FILE* stl_open_count_facets(stl_file *stl, const char *file)
- // Read the int following the header. This should contain # of facets.
- uint32_t header_num_facets;
- bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0;
--#ifndef BOOST_LITTLE_ENDIAN
-+#ifndef BOOST_ENDIAN_LITTLE_BYTE
- // Convert from little endian to big endian.
- stl_internal_reverse_quads((char*)&header_num_facets, 4);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* BOOST_ENDIAN_LITTLE_BYTE */
- if (! header_num_faces_read || num_facets != header_num_facets)
- BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file;
- }
-@@ -158,10 +158,10 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first)
- // Read a single facet from a binary .STL file. We assume little-endian architecture!
- if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET)
- return false;
--#ifndef BOOST_LITTLE_ENDIAN
-+#ifndef BOOST_ENDIAN_LITTLE_BYTE
- // Convert the loaded little endian data to big endian.
- stl_internal_reverse_quads((char*)&facet, 48);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* BOOST_ENDIAN_LITTLE_BYTE */
- } else {
- // Read a single facet from an ASCII .STL file
- // skip solid/endsolid
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 02db76e..6a8bdae 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -3,7 +3,7 @@
Name: prusa-slicer
Version: 2.2.0
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -20,11 +20,6 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version.
Source1: %name.desktop
Source2: %name.appdata.xml
-# Boost 1.73 support
-# https://bugzilla.redhat.com/show_bug.cgi?id=1842011
-# https://github.com/prusa3d/PrusaSlicer/issues/4264
-Patch1: https://github.com/kobboi/PrusaSlicer/commit/d982345f.patch#/boost-1.73.pat…
-
# Highly-parallel uild can run out of memory on PPC64le
%ifarch ppc64le
%global _smp_ncpus_max 8
@@ -402,9 +397,6 @@ make test ARGS=-V
%changelog
-* Mon Jun 01 2020 Miro Hrončok <mhroncok(a)redhat.com> - 2.2.0-2
-- Rebuilt and fix for Boost 1.73.0 (#1842011)
-
* Tue Mar 31 2020 Alexander Jacocks <alexander(a)redhat.com> - 2.2.0-1
- Update to 2.2.0.
commit a8cfa9157e6885690d521ae031123fde1918d90d
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Jun 1 16:25:16 2020 +0200
Rebuilt and fix for Boost 1.73.0
Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1842011
diff --git a/boost-1.73.patch b/boost-1.73.patch
new file mode 100644
index 0000000..1032073
--- /dev/null
+++ b/boost-1.73.patch
@@ -0,0 +1,60 @@
+From d982345f52b6afbcc30c532828e161b2c956acf4 Mon Sep 17 00:00:00 2001
+From: Christophe Lermytte <gentoo(a)lermytte.be>
+Date: Mon, 18 May 2020 22:41:58 +0200
+Subject: [PATCH] Replace deprecated Boost endianness headers (#4264)
+
+---
+ src/admesh/stlinit.cpp | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp
+index 390fe56a4..792e60ae6 100644
+--- a/src/admesh/stlinit.cpp
++++ b/src/admesh/stlinit.cpp
+@@ -28,7 +28,7 @@
+
+ #include <boost/log/trivial.hpp>
+ #include <boost/nowide/cstdio.hpp>
+-#include <boost/detail/endian.hpp>
++#include <boost/predef/other/endian.h>
+
+ #include "stl.h"
+
+@@ -36,9 +36,9 @@
+ #error "SEEK_SET not defined"
+ #endif
+
+-#ifndef BOOST_LITTLE_ENDIAN
++#ifndef BOOST_ENDIAN_LITTLE_BYTE
+ extern void stl_internal_reverse_quads(char *buf, size_t cnt);
+-#endif /* BOOST_LITTLE_ENDIAN */
++#endif /* BOOST_ENDIAN_LITTLE_BYTE */
+
+ static FILE* stl_open_count_facets(stl_file *stl, const char *file)
+ {
+@@ -89,10 +89,10 @@ static FILE* stl_open_count_facets(stl_file *stl, const char *file)
+ // Read the int following the header. This should contain # of facets.
+ uint32_t header_num_facets;
+ bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0;
+-#ifndef BOOST_LITTLE_ENDIAN
++#ifndef BOOST_ENDIAN_LITTLE_BYTE
+ // Convert from little endian to big endian.
+ stl_internal_reverse_quads((char*)&header_num_facets, 4);
+-#endif /* BOOST_LITTLE_ENDIAN */
++#endif /* BOOST_ENDIAN_LITTLE_BYTE */
+ if (! header_num_faces_read || num_facets != header_num_facets)
+ BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file;
+ }
+@@ -158,10 +158,10 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first)
+ // Read a single facet from a binary .STL file. We assume little-endian architecture!
+ if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET)
+ return false;
+-#ifndef BOOST_LITTLE_ENDIAN
++#ifndef BOOST_ENDIAN_LITTLE_BYTE
+ // Convert the loaded little endian data to big endian.
+ stl_internal_reverse_quads((char*)&facet, 48);
+-#endif /* BOOST_LITTLE_ENDIAN */
++#endif /* BOOST_ENDIAN_LITTLE_BYTE */
+ } else {
+ // Read a single facet from an ASCII .STL file
+ // skip solid/endsolid
diff --git a/prusa-slicer.spec b/prusa-slicer.spec
index 6a8bdae..02db76e 100644
--- a/prusa-slicer.spec
+++ b/prusa-slicer.spec
@@ -3,7 +3,7 @@
Name: prusa-slicer
Version: 2.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
# The main PrusaSlicer code and resources are AGPLv3, with small parts as
@@ -20,6 +20,11 @@ Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_%version.
Source1: %name.desktop
Source2: %name.appdata.xml
+# Boost 1.73 support
+# https://bugzilla.redhat.com/show_bug.cgi?id=1842011
+# https://github.com/prusa3d/PrusaSlicer/issues/4264
+Patch1: https://github.com/kobboi/PrusaSlicer/commit/d982345f.patch#/boost-1.73.pat…
+
# Highly-parallel uild can run out of memory on PPC64le
%ifarch ppc64le
%global _smp_ncpus_max 8
@@ -397,6 +402,9 @@ make test ARGS=-V
%changelog
+* Mon Jun 01 2020 Miro Hrončok <mhroncok(a)redhat.com> - 2.2.0-2
+- Rebuilt and fix for Boost 1.73.0 (#1842011)
+
* Tue Mar 31 2020 Alexander Jacocks <alexander(a)redhat.com> - 2.2.0-1
- Update to 2.2.0.
1
0
25 Feb '21
The package rpms/xrootd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xrootd.git/commit/?id=89a88a6b873fb….
Change:
+%ifarch %{ix86} %{arm}
Thanks.
Full change:
============
commit 89a88a6b873fbd94ddd3f79e2de7a2a6a90df71d
Author: Mattias Ellert <mattias.ellert(a)physics.uu.se>
Date: Thu Feb 25 13:52:36 2021 +0100
Update to version 5.1.0
Add scitokens plugin package
Packages xrootd-ceph and xrdcl-http are now built as part of xrootd
replacing the packages built from separate source rpms
Drop patches (accepted upstream or previously backported)
Fix broken library dependency in XrdCeph cmake file
diff --git a/sources b/sources
index 466606b..b11d92a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrootd-5.0.3.tar.gz) = e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
+SHA512 (xrootd-5.1.0.tar.gz) = f9bb293433e16b86d3395f29cf23f10a4a5447b367aa762219559278b3f75402892be85e0ca914762bfe892ad0dcc05bcfc64ac1ad0316c5855586141b537bad
diff --git a/xrootd-ceph-deps.patch b/xrootd-ceph-deps.patch
new file mode 100644
index 0000000..5b8a78b
--- /dev/null
+++ b/xrootd-ceph-deps.patch
@@ -0,0 +1,31 @@
+From 534d9c051b8aaf486ff6ee380f1d29bc42721960 Mon Sep 17 00:00:00 2001
+From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
+Date: Thu, 25 Feb 2021 04:47:57 +0100
+Subject: [PATCH] When building as a submodule, dependencies on libraries in
+ the main package should use target names rather than paths.
+
+If paths are used, cmake does not handle dependencies between targets
+and may attempt to build them in the wrong order:
+
+gmake[2]: *** No rule to make target 'src/libXrdUtils.so', needed by
+'src/XrdCeph/src/libXrdCephPosix.so.0.0.1'. Stop.
+---
+ cmake/FindXRootD.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/XrdCeph/cmake/FindXRootD.cmake b/src/XrdCeph/cmake/FindXRootD.cmake
+index 66d9a90b..48fe966b 100644
+--- a/src/XrdCeph/cmake/FindXRootD.cmake
++++ b/src/XrdCeph/cmake/FindXRootD.cmake
+@@ -7,7 +7,7 @@
+
+ if( XRDCEPH_SUBMODULE )
+ set( XROOTD_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src )
+- set( XROOTD_LIBRARIES ${CMAKE_BINARY_DIR}/src/libXrdUtils.so )
++ set( XROOTD_LIBRARIES XrdUtils )
+ else()
+ find_path( XROOTD_INCLUDE_DIRS XrdSfs/XrdSfsAio.hh
+ HINTS
+--
+2.29.2
+
diff --git a/xrootd-correct-version-checking-to-prevent-false-neg.patch b/xrootd-correct-version-checking-to-prevent-false-neg.patch
deleted file mode 100644
index 99f11e8..0000000
--- a/xrootd-correct-version-checking-to-prevent-false-neg.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 44670dd88e75b313d1fe449d876749d98f6072f7 Mon Sep 17 00:00:00 2001
-From: Andrew Hanushevsky <abh(a)stanford.edu>
-Date: Tue, 17 Nov 2020 21:47:55 -0800
-Subject: [PATCH] [Server] Correct version checking to prevent false negatives.
-
----
- src/XrdApps/XrdPinls.cc | 2 +-
- src/XrdSys/XrdSysPlugin.cc | 36 ++++++++++++++++++------------------
- src/XrdVersionPlugin.hh | 7 +++----
- 3 files changed, 22 insertions(+), 23 deletions(-)
-
-diff --git a/src/XrdApps/XrdPinls.cc b/src/XrdApps/XrdPinls.cc
-index 55b470e61..10b9e41c3 100644
---- a/src/XrdApps/XrdPinls.cc
-+++ b/src/XrdApps/XrdPinls.cc
-@@ -77,7 +77,7 @@ void Display(const char *drctv, XrdVersionPlugin *vP)
-
- // Establish minimum version
- //
-- if (vP->vMinLow > 99) snprintf(buff, sizeof(buff), "%2d.x ", vP->vMajLow);
-+ if (vP->vMinLow < 0) snprintf(buff, sizeof(buff), "%2d.x ", vP->vMajLow);
- else snprintf(buff, sizeof(buff), "%2d.%-2d", vP->vMajLow, vP->vMinLow);
-
- // Output the line
-diff --git a/src/XrdSys/XrdSysPlugin.cc b/src/XrdSys/XrdSysPlugin.cc
-index 09ed94e41..abd84d08b 100644
---- a/src/XrdSys/XrdSysPlugin.cc
-+++ b/src/XrdSys/XrdSysPlugin.cc
-@@ -85,10 +85,12 @@ XrdSysPlugin::cvResult XrdSysPlugin::badVersion(XrdVersionInfo &urInfo,
- const char *path;
- char buff1[512], buff2[128];
-
-- if (minv > 99) minv = 99;
-+ if (minv < 0) strcpy(buff2, "y");
-+ else sprintf(buff2, "%d", minv);
-+
- snprintf(buff1, sizeof(buff1), "version %s is incompatible with %s "
-- "(must be %c= %d.%d.x)",
-- myInfo->vStr, urInfo.vStr, mmv, majv, minv);
-+ "(must be %c= %d.%s.x)",
-+ myInfo->vStr, urInfo.vStr, mmv, majv, buff2);
-
- path = msgSuffix(" in ", buff2, sizeof(buff2));
-
-@@ -189,31 +191,29 @@ XrdSysPlugin::cvResult XrdSysPlugin::chkVersion(XrdVersionInfo &urInfo,
-
- // The major version must always be compatible
- //
-- if ((vinP->vMajLow >= 0 && pMajor < vinP->vMajLow)
-- || (vinP->vMajLow < 0 && pMajor != vMajor))
-+ if (vinP->vMajLow >= 0 && pMajor < vinP->vMajLow)
- return badVersion(urInfo, '>', vinP->vMajLow, vinP->vMinLow);
-
--// The major version may not be greater than our versin
--//
-- if (pMajor > vMajor) return badVersion(urInfo, '<', vMajor, vMinor);
-+ if (vinP->vMajLow < 0 && pMajor != vMajor)
-+ return badVersion(urInfo, '=', vMajor, -1);
-
--// If we do not need to check minor versions then we are done
-+// The plugin version may not be greater than our version)
- //
-- if (vinP->vMinLow > 99) return cvClean;
-+ if (pMajor > vMajor || (pMajor == vMajor && pMinor > vMinor))
-+ return badVersion(urInfo, '<', vMajor, vMinor);
-
--// In no case can the plug-in mnor version be greater than our version
-+// If we do not need to check minor versions then we are done
- //
-- if (pMajor == vMajor && pMinor > vMinor)
-- return badVersion(urInfo, '<', vMajor, vMinor);
-+ if (vinP->vMinLow < 0) return cvClean;
-
- // Verify compatible minor versions
- //
-- if ((vinP->vMinLow >= 0 && pMinor >= vinP->vMinLow)
-- || (vinP->vMinLow < 0 && pMinor == vMinor)) return cvClean;
-+ if (pMajor == vinP->vMajLow && pMinor < vinP->vMinLow)
-+ return badVersion(urInfo, '>', vinP->vMajLow, vinP->vMinLow);
-
--// Incompatible versions
-+// Compatible versions
- //
-- return badVersion(urInfo, '>', vinP->vMajLow, vinP->vMinLow);
-+ return cvClean;
- }
-
- /******************************************************************************/
-@@ -331,7 +331,7 @@ void *XrdSysPlugin::getPlugin(const char *pname, int optional, bool global)
- msgSuffix(" from ", buff, sizeof(buff));
- msgCnt--;
- if (cvRC == cvClean)
-- {const char *wTxt=(urInfo.vNum == XrdVNUMUNK ? "unreleased ":0);
-+ {const char *wTxt=(urInfo.vNum == XrdVNUMUNK ? "unreleased ":"");
- Inform("loaded ", wTxt, urInfo.vStr, buff, libPath);
- }
- else if (cvRC == cvMissing)
-diff --git a/src/XrdVersionPlugin.hh b/src/XrdVersionPlugin.hh
-index a481c3211..21133526e 100644
---- a/src/XrdVersionPlugin.hh
-+++ b/src/XrdVersionPlugin.hh
-@@ -40,7 +40,7 @@
- char vSfxLen; //!< Generic rule suffix length for preceeding
- int vProcess; //!< version: <0 skip, =0 optional, >0 required
- short vMajLow; //!< Lowest compatible major version number
-- short vMinLow; //!< Lowest compatible minor (>99 don't check).
-+ short vMinLow; //!< Lowest compatible minor (< 0 don't check).
- };
-
- /* The rules are defined here because they apply to every class that uses a
-@@ -74,9 +74,8 @@
- >= 0: is the lowest valid major version number allowed.
-
- minorVer: The required minor version number, It is check as follows:
-- < 0: minor version numbers must be identical.
-+ < 0: Do not check the minor version number, it's immaterial.
- >= 0: the lowest valid minor version for the major number allowed.
-- > 99: Do not check the minor version number, it's immaterial.
-
- piSymbol: The plugin's object creator's unquoted function name. When this
- symbol is looked-up, the defined version rule is applied.
-@@ -87,7 +86,7 @@
- */
- #define XrdVERSIONPLUGINRULES \
- XrdVERSIONPLUGIN_Rule(Required, 5, 0, SecEntityPin )\
-- XrdVERSIONPLUGIN_Rule(Required, 5, 0, TcpMonPin )\
-+ XrdVERSIONPLUGIN_Rule(Required, 4, 8, TcpMonPin )\
- XrdVERSIONPLUGIN_Rule(Required, 5, 0, XrdAccAuthorizeObject )\
- XrdVERSIONPLUGIN_Rule(Required, 5, 0, XrdAccAuthorizeObjAdd )\
- XrdVERSIONPLUGIN_Rule(Optional, 5, 0, XrdBwmPolicyObject )\
---
-2.28.0
-
diff --git a/xrootd-fix-gcc11.patch b/xrootd-fix-gcc11.patch
deleted file mode 100644
index e69abd2..0000000
--- a/xrootd-fix-gcc11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/XrdOuc/XrdOucPsx.cc b/src/XrdOuc/XrdOucPsx.cc
-index 393b41137..93cb88281 100644
---- a/src/XrdOuc/XrdOucPsx.cc
-+++ b/src/XrdOuc/XrdOucPsx.cc
-@@ -703,7 +703,7 @@ bool XrdOucPsx::ParseSet(XrdSysError *Eroute, XrdOucStream &Config)
- {
- char kword[256], *val;
- int kval, noGo;
-- static struct {const char *Sopt; const char *Copt; int isT;} Sopts[] =
-+ static struct sopts {const char *Sopt; const char *Copt; int isT;} Sopts[] =
- {
- {"ConnectTimeout", "ConnectionWindow",1}, // Default 120
- {"ConnectionRetry", "ConnectionRetry",1}, // Default 5
-@@ -732,7 +732,7 @@ bool XrdOucPsx::ParseSet(XrdSysError *Eroute, XrdOucStream &Config)
- {"TransactionTimeout", "",1},
- {"WorkerThreads", "WorkerThreads",0} // Set To 64
- };
-- int i, numopts = sizeof(Sopts)/sizeof(const char *);
-+ int i, numopts = sizeof(Sopts)/sizeof(struct sopts);
-
- if (!(val = Config.GetWord()))
- {Eroute->Emsg("Config", "setopt keyword not specified"); return false;}
diff --git a/xrootd-fix-wrong-section-number-in-xrootdfs.1-manpage.patch b/xrootd-fix-wrong-section-number-in-xrootdfs.1-manpage.patch
deleted file mode 100644
index 22b9e6f..0000000
--- a/xrootd-fix-wrong-section-number-in-xrootdfs.1-manpage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c0b18894497295e5c484f7320107abab26151adb Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Wed, 18 Nov 2020 15:40:59 +0100
-Subject: [PATCH 1/2] Fix wrong section number in xrootdfs.1 manpage
-
-Fixes lintian packaging warning:
-W: xrootd-fuse: wrong-manual-section usr/share/man/man1/xrootdfs.1.gz:1 1 != 8
----
- docs/man/xrootdfs.1 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/man/xrootdfs.1 b/docs/man/xrootdfs.1
-index f404dc23d..522a4a15f 100644
---- a/docs/man/xrootdfs.1
-+++ b/docs/man/xrootdfs.1
-@@ -1,4 +1,4 @@
--.TH xrootdfs 8 "__VERSION__"
-+.TH xrootdfs 1 "__VERSION__"
- .SH NAME
- xrootdfs - xrootd FUSE file system daemon
- .SH SYNOPSIS
---
-2.28.0
-
diff --git a/xrootd-uninitialized-var.patch b/xrootd-uninitialized-var.patch
deleted file mode 100644
index 6fe07f3..0000000
--- a/xrootd-uninitialized-var.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c04fc2649044401d17bb412cbe68cc92d012b9d1 Mon Sep 17 00:00:00 2001
-From: Michal Simon <michal.simon(a)cern.ch>
-Date: Tue, 8 Dec 2020 11:12:49 +0100
-Subject: [PATCH] Fix fedora rawhide build.
-
-/root/rpmbuild/BUILD/xrootd/xrootd/src/XrdPfc/XrdPfc.hh:204:30: error: 't' may be used uninitialized [-Werror=maybe-uninitialized]
- 204 | if (parse_as_lfn && (t == 0 || * get_reminder() == 0))
- | ~~^~~~
-/root/rpmbuild/BUILD/xrootd/xrootd/src/XrdPfc/XrdPfc.hh: In member function 'void XrdPfc::Cache::copy_out_active_stats_and_update_data_fs_state()':
-/root/rpmbuild/BUILD/xrootd/xrootd/src/XrdPfc/XrdPfc.hh:197:13: note: 't' declared here
- 197 | char *t;
- | ^
-cc1plus: all warnings being treated as errors
----
- src/XrdPfc/XrdPfc.hh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/XrdPfc/XrdPfc.hh b/src/XrdPfc/XrdPfc.hh
-index d96abedf3..66e7cae68 100644
---- a/src/XrdPfc/XrdPfc.hh
-+++ b/src/XrdPfc/XrdPfc.hh
-@@ -194,7 +194,7 @@ struct PathTokenizer : private SplitParser
-
- m_dirs.reserve(max_depth);
-
-- char *t;
-+ char *t = 0;
- for (int i = 0; i < max_depth; ++i)
- {
- t = get_token();
---
-2.29.2
-
diff --git a/xrootd-use-system-tinyxml-library-if-available.patch b/xrootd-use-system-tinyxml-library-if-available.patch
deleted file mode 100644
index 4ec5eaf..0000000
--- a/xrootd-use-system-tinyxml-library-if-available.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From d90094c9e9a35559c6a256cb0c6c8be311d26603 Mon Sep 17 00:00:00 2001
-From: Mattias Ellert <mattias.ellert(a)physics.uu.se>
-Date: Wed, 18 Nov 2020 15:43:43 +0100
-Subject: [PATCH 2/2] Use system tinyxml library if available
-
-Fixes lintion packaging error:
-E: libxrdxml3: embedded-library usr/lib/x86_64-linux-gnu/libXrdXml.so.3.0.0: tinyxml
----
- cmake/FindTinyXml.cmake | 18 ++++++++++++
- cmake/XRootDFindLibs.cmake | 2 ++
- src/XrdXml.cmake | 34 +++++++++++++---------
- src/XrdXml/XrdXmlRdrTiny.cc | 2 +-
- src/XrdXml/{ => tinyxml}/tinystr.cpp | 0
- src/XrdXml/{ => tinyxml}/tinystr.h | 0
- src/XrdXml/{ => tinyxml}/tinyxml.cpp | 0
- src/XrdXml/{ => tinyxml}/tinyxml.h | 0
- src/XrdXml/{ => tinyxml}/tinyxmlerror.cpp | 0
- src/XrdXml/{ => tinyxml}/tinyxmlparser.cpp | 0
- 10 files changed, 42 insertions(+), 14 deletions(-)
- create mode 100644 cmake/FindTinyXml.cmake
- rename src/XrdXml/{ => tinyxml}/tinystr.cpp (100%)
- rename src/XrdXml/{ => tinyxml}/tinystr.h (100%)
- rename src/XrdXml/{ => tinyxml}/tinyxml.cpp (100%)
- rename src/XrdXml/{ => tinyxml}/tinyxml.h (100%)
- rename src/XrdXml/{ => tinyxml}/tinyxmlerror.cpp (100%)
- rename src/XrdXml/{ => tinyxml}/tinyxmlparser.cpp (100%)
-
-diff --git a/cmake/FindTinyXml.cmake b/cmake/FindTinyXml.cmake
-new file mode 100644
-index 000000000..75c752707
---- /dev/null
-+++ b/cmake/FindTinyXml.cmake
-@@ -0,0 +1,18 @@
-+FIND_PATH(TINYXML_INCLUDE_DIR tinyxml.h
-+ HINTS
-+ ${TINYXML_DIR}
-+ $ENV{TINYXML_DIR}
-+ /usr
-+ PATH_SUFFIXES include
-+)
-+
-+FIND_LIBRARY(TINYXML_LIBRARIES tinyxml
-+ HINTS
-+ ${TINYXML_DIR}
-+ $ENV{TINYXML_DIR}
-+ /usr
-+ PATH_SUFFIXES lib
-+)
-+
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(TinyXml DEFAULT_MSG TINYXML_LIBRARIES TINYXML_INCLUDE_DIR)
-diff --git a/cmake/XRootDFindLibs.cmake b/cmake/XRootDFindLibs.cmake
-index 04692e9f8..bcea5fafe 100644
---- a/cmake/XRootDFindLibs.cmake
-+++ b/cmake/XRootDFindLibs.cmake
-@@ -19,6 +19,8 @@ if( ZLIB_FOUND )
- add_definitions( -DHAVE_LIBZ )
- endif()
-
-+find_package( TinyXml )
-+
- find_package( LibXml2 )
- if( LIBXML2_FOUND )
- add_definitions( -DHAVE_XML2 )
-diff --git a/src/XrdXml.cmake b/src/XrdXml.cmake
-index ca7e67481..970509266 100644
---- a/src/XrdXml.cmake
-+++ b/src/XrdXml.cmake
-@@ -1,14 +1,23 @@
-
- include( XRootDCommon )
-
-+if ( TINYXML_FOUND )
-+ set( TINYXML_FILES "" )
-+ set( TINYXML_LIBRARIES ${TINYXML_LIBRARIES} )
-+else()
-+ set( TINYXML_FILES
-+ XrdXml/tinyxml/tinystr.cpp XrdXml/tinyxml/tinystr.h
-+ XrdXml/tinyxml/tinyxml.cpp XrdXml/tinyxml/tinyxml.h
-+ XrdXml/tinyxml/tinyxmlerror.cpp
-+ XrdXml/tinyxml/tinyxmlparser.cpp )
-+ set( TINYXML_LIBRARIES "" )
-+endif()
-+
- if ( LIBXML2_FOUND )
- set( XRDXML2_READER_FILES
- XrdXml/XrdXmlRdrXml2.cc
- XrdXml/XrdXmlRdrXml2.hh )
- set( XRDXML2_LIBRARIES ${LIBXML2_LIBRARIES} )
-- if( CMAKE_VERSION VERSION_LESS "2.8" OR ${Solaris} STREQUAL "TRUE")
-- INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} )
-- endif()
- else()
- set( XRDXML2_READER_FILES "" )
- set( XRDXML2_LIBRARIES "" )
-@@ -28,10 +37,7 @@ set( XRD_XML_PRELOAD_SOVERSION 2 )
- add_library(
- XrdXml
- SHARED
-- XrdXml/tinystr.cpp XrdXml/tinystr.h
-- XrdXml/tinyxml.cpp XrdXml/tinyxml.h
-- XrdXml/tinyxmlerror.cpp
-- XrdXml/tinyxmlparser.cpp
-+ ${TINYXML_FILES}
- XrdXml/XrdXmlMetaLink.cc XrdXml/XrdXmlMetaLink.hh
- XrdXml/XrdXmlRdrTiny.cc XrdXml/XrdXmlRdrTiny.hh
- XrdXml/XrdXmlReader.cc XrdXml/XrdXmlReader.hh
-@@ -40,24 +46,26 @@ add_library(
- target_link_libraries(
- XrdXml
- XrdUtils
-+ ${TINYXML_LIBRARIES}
- ${XRDXML2_LIBRARIES}
- pthread )
--# INCLUDE_DIRECTORIES /usr/include/libxml2
-
- set_target_properties(
- XrdXml
- PROPERTIES
-- INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/XrdXml/.
- VERSION ${XRD_XML_VERSION}
- SOVERSION ${XRD_XML_SOVERSION}
- INTERFACE_LINK_LIBRARIES ""
- LINK_INTERFACE_LIBRARIES "" )
-
-+if ( TINYXML_FOUND )
-+ target_include_directories( XrdXml PRIVATE ${TINYXML_INCLUDE_DIR} )
-+else()
-+ target_include_directories( XrdXml PRIVATE XrdXml/tinyxml )
-+endif()
-+
- if ( LIBXML2_FOUND )
-- set_target_properties(
-- XrdXml
-- PROPERTIES
-- INCLUDE_DIRECTORIES ${LIBXML2_INCLUDE_DIR} )
-+ target_include_directories( XrdXml PRIVATE ${LIBXML2_INCLUDE_DIR} )
- endif()
-
- #-------------------------------------------------------------------------------
-diff --git a/src/XrdXml/XrdXmlRdrTiny.cc b/src/XrdXml/XrdXmlRdrTiny.cc
-index 45196f02a..624654837 100644
---- a/src/XrdXml/XrdXmlRdrTiny.cc
-+++ b/src/XrdXml/XrdXmlRdrTiny.cc
-@@ -36,7 +36,7 @@
- #include <iostream>
-
- #include "XrdSys/XrdSysE2T.hh"
--#include "XrdXml/tinyxml.h"
-+#include "tinyxml.h"
- #include "XrdXml/XrdXmlRdrTiny.hh"
-
- /******************************************************************************/
-diff --git a/src/XrdXml/tinystr.cpp b/src/XrdXml/tinyxml/tinystr.cpp
-similarity index 100%
-rename from src/XrdXml/tinystr.cpp
-rename to src/XrdXml/tinyxml/tinystr.cpp
-diff --git a/src/XrdXml/tinystr.h b/src/XrdXml/tinyxml/tinystr.h
-similarity index 100%
-rename from src/XrdXml/tinystr.h
-rename to src/XrdXml/tinyxml/tinystr.h
-diff --git a/src/XrdXml/tinyxml.cpp b/src/XrdXml/tinyxml/tinyxml.cpp
-similarity index 100%
-rename from src/XrdXml/tinyxml.cpp
-rename to src/XrdXml/tinyxml/tinyxml.cpp
-diff --git a/src/XrdXml/tinyxml.h b/src/XrdXml/tinyxml/tinyxml.h
-similarity index 100%
-rename from src/XrdXml/tinyxml.h
-rename to src/XrdXml/tinyxml/tinyxml.h
-diff --git a/src/XrdXml/tinyxmlerror.cpp b/src/XrdXml/tinyxml/tinyxmlerror.cpp
-similarity index 100%
-rename from src/XrdXml/tinyxmlerror.cpp
-rename to src/XrdXml/tinyxml/tinyxmlerror.cpp
-diff --git a/src/XrdXml/tinyxmlparser.cpp b/src/XrdXml/tinyxml/tinyxmlparser.cpp
-similarity index 100%
-rename from src/XrdXml/tinyxmlparser.cpp
-rename to src/XrdXml/tinyxml/tinyxmlparser.cpp
---
-2.28.0
-
diff --git a/xrootd.spec b/xrootd.spec
index f7438b4..9b28a34 100644
--- a/xrootd.spec
+++ b/xrootd.spec
@@ -3,33 +3,31 @@
%define _lto_cflags %{nil}
%endif
+%if %{?fedora}%{!?fedora:0}
+%ifarch %{ix86} %{arm}
+%global ceph 0
+%else
+%global ceph 1
+%endif
+%else
+%global ceph 0
+%endif
+
%undefine __cmake_in_source_build
%undefine __cmake3_in_source_build
Name: xrootd
Epoch: 1
-Version: 5.0.3
-Release: 5%{?dist}
+Version: 5.1.0
+Release: 1%{?dist}
Summary: Extended ROOT file server
License: LGPLv3+
URL: http://xrootd.org/
Source0: http://xrootd.org/download/v%{version}/%{name}-%{version}.tar.gz
-# Correct version checking to prevent false negatives
-# Backport from upstream GIT repo
-Patch0: xrootd-correct-version-checking-to-prevent-false-neg.patch
-# Fix wrong section number in xrootdfs.1 manpage
-# https://github.com/xrootd/xrootd/pull/1329
-Patch1: xrootd-fix-wrong-section-number-in-xrootdfs.1-manpage.patch
-# Use system tinyxml library (unbundle)
-# https://github.com/xrootd/xrootd/pull/1329
-Patch2: xrootd-use-system-tinyxml-library-if-available.patch
-# Fix array length calculation (gcc 11 error)
-# https://github.com/xrootd/xrootd/pull/1355
-Patch3: xrootd-fix-gcc11.patch
-# Fix uninitialized variable error
-# Backport from upstream git
-Patch4: xrootd-uninitialized-var.patch
+# Library dependency should use target name
+# https://github.com/xrootd/xrootd-ceph/pull/14
+Patch0: %{name}-ceph-deps.patch
BuildRequires: gcc-c++
BuildRequires: cmake3 >= 3.1
@@ -62,6 +60,12 @@ BuildRequires: json-c-devel
BuildRequires: libmacaroons-devel
BuildRequires: libuuid-devel
BuildRequires: voms-devel >= 2.0.6
+BuildRequires: scitokens-cpp-devel
+BuildRequires: davix-devel
+%if %{ceph}
+BuildRequires: librados-devel
+BuildRequires: libradosstriper-devel
+%endif
Requires: %{name}-server%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-selinux = %{epoch}:%{version}-%{release}
@@ -191,7 +195,7 @@ This package contains the FUSE (file system in user space) xrootd mount
tool.
%package voms
-Summary: VOMS attribute extractor plug-in for XRootD
+Summary: VOMS attribute extractor plugin for XRootD
Provides: vomsxrd = %{epoch}:%{version}-%{release}
Provides: %{name}-voms-plugin = %{epoch}:%{version}-%{release}
Provides: xrdhttpvoms = %{epoch}:%{version}-%{release}
@@ -201,7 +205,37 @@ Obsoletes: xrdhttpvoms < 0.2.5-9
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description voms
-The VOMS attribute extractor plug-in for XRootD.
+The VOMS attribute extractor plugin for XRootD.
+
+%package scitokens
+Summary: SciTokens authorization support for XRootD
+Requires: %{name}-server%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description scitokens
+This ACC (authorization) plugin for the XRootD framework utilizes the
+SciTokens library to validate and extract authorization claims from a
+SciToken passed during a transfer. Configured appropriately, this
+allows the XRootD server admin to delegate authorization decisions for
+a subset of the namespace to an external issuer.
+
+%package -n xrdcl-http
+Summary: HTTP client plugin for XRootD
+Requires: %{name}-client-libs%{?_isa} = %{epoch}:%{version}-%{release}
+License: BSD
+
+%description -n xrdcl-http
+xrdcl-http is an XRootD client plugin which allows XRootD to interact
+with HTTP repositories.
+
+%if %{ceph}
+%package ceph
+Summary: XRootD plugin for interfacing with the Ceph storage platform
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description ceph
+The xrootd-ceph is an OSS layer plugin for the XRootD server for
+interfacing with the Ceph storage platform.
+%endif
%if %{?rhel}%{!?rhel:0} == 7
%package -n python2-%{name}
@@ -246,14 +280,14 @@ This package contains the API documentation of the xrootd libraries.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
%cmake3 \
-DUSE_LIBC_SEMAPHORE:BOOL=1 \
+%if %{ceph}
+ -DXRDCEPH_SUBMODULE=TRUE \
+%endif
+ -DXRDCLHTTP_SUBMODULE=TRUE \
%if %{?rhel}%{!?rhel:0} == 7
-DPYTHON_EXECUTABLE:PATH=%{__python2}
%else
@@ -285,6 +319,8 @@ make -C bindings/python/docs html
%install
%cmake3_install
+rm -f %{buildroot}%{_libdir}/libXrdCephPosix.so
+
%if %{?rhel}%{!?rhel:0} == 7
pushd %{_vpath_builddir}/bindings/python
%py3_install
@@ -322,6 +358,8 @@ install -m 644 -p packaging/common/client.conf \
%{buildroot}%{_sysconfdir}/%{name}/client.conf
sed 's!/usr/lib/!!' packaging/common/client-plugin.conf.example > \
%{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/client-plugin.conf.example
+sed 's!/usr/local/lib/!!' src/XrdClHttp/config/http.client.conf.example > \
+ %{buildroot}%{_sysconfdir}/%{name}/client.plugins.d/xrdcl-http-plugin.conf
chmod 644 %{buildroot}%{_datadir}/%{name}/utils/XrdCmsNotify.pm
@@ -454,6 +492,7 @@ fi
%{_libdir}/libXrdSecpwd-5.so
%{_libdir}/libXrdSecsss-5.so
%{_libdir}/libXrdSecunix-5.so
+%{_libdir}/libXrdSecztn-5.so
%license COPYING* LICENSE
%files devel
@@ -564,6 +603,23 @@ fi
%doc %{_mandir}/man1/libXrdVoms.1*
%doc %{_mandir}/man1/libXrdSecgsiVOMS.1*
+%files scitokens
+%{_libdir}/libXrdAccSciTokens-5.so
+%doc src/XrdSciTokens/README.md
+
+%files -n xrdcl-http
+%{_libdir}/libXrdClHttp-5.so
+%{_sysconfdir}/xrootd/client.plugins.d/xrdcl-http-plugin.conf
+%license src/XrdClHttp/LICENSE
+%doc src/XrdClHttp/README.md
+
+%if %{ceph}
+%files ceph
+%{_libdir}/libXrdCeph-5.so
+%{_libdir}/libXrdCephXattr-5.so
+%{_libdir}/libXrdCephPosix.so.*
+%endif
+
%if %{?rhel}%{!?rhel:0} == 7
%files -n python2-%{name}
%{python2_sitearch}/xrootd-*.egg-info
@@ -587,6 +643,14 @@ fi
%doc %{_pkgdocdir}
%changelog
+* Tue Feb 23 2021 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:5.1.0-1
+- Update to version 5.1.0
+- Add scitokens plugin package
+- Packages xrootd-ceph and xrdcl-http are now built as part of xrootd
+ replacing the packages built from separate source rpms
+- Drop patches (accepted upstream or previously backported)
+- Fix broken library dependency in XrdCeph cmake file
+
* Sat Feb 13 2021 Mattias Ellert <mattias.ellert(a)physics.uu.se> - 1:5.0.3-5
- Drop workaround for false positive warning from gcc 11
1
0