jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

digikam: update to 7.0.0.

Browse source
This commit is contained in:
Helmut Pozimski 2020-07-18 12:57:29 +02:00
parent d47832fba0
commit f2a03b871f
2 changed files with 9 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
srcpkgs/digikam/patches/altivec.patch
View file

@ -1,83 +0,0 @@
The AltiVec header typically defines the keywords "vector" and "bool" that
can be used within vector code, however this is not really compatible with
C++, so these tend to be undef'd in a C++ environment.
This is what happens here, at least in our specific environment, so use the
prefixed gcc/clang versions, which are available builtin, so the compilation
does not fail.
--- core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/simd4f.h
+++ core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/simd4f.h
@@ -109,7 +109,7 @@
class simd4f
{
typedef union {
- vector float v;
+ __vector float v;
float x[4];
} v4f;
@@ -118,7 +118,7 @@
public:
inline simd4f() : x{0,0,0,0} {}
inline simd4f(const simd4f& v) : x(v.x) { }
- inline simd4f(const vector float& v) : x{v} { }
+ inline simd4f(const __vector float& v) : x{v} { }
inline simd4f(const simd4i& v) {
x.x[0]=v[0]; x.x[1]=v[1]; x.x[2]=v[2]; x.x[3]=v[3];
@@ -132,7 +132,7 @@
inline simd4f& operator=(const simd4f& v) { x = v.x; return *this; }
inline simd4f& operator=(const float& v) { *this = simd4f(v); return *this; }
- inline vector float operator() () const { return x.v; }
+ inline __vector float operator() () const { return x.v; }
inline float operator[](unsigned int idx) const { return x.x[idx]; }
inline void load_aligned(const float* ptr) { x.v = vec_ld(0, ptr); }
--- core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/simd4i.h
+++ core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/simd4i.h
@@ -73,8 +73,8 @@
class simd4i
{
typedef union {
- vector signed int v;
- vector bool int b;
+ __vector signed int v;
+ __vector __bool int b;
signed int x[4];
} v4i;
@@ -83,8 +83,8 @@
public:
inline simd4i() : x{0,0,0,0} { }
inline simd4i(const simd4i& v) : x(v.x) { }
- inline simd4i(const vector int& v) : x{v} { }
- inline simd4i(const vector bool int& b) { x.b=b; }
+ inline simd4i(const __vector int& v) : x{v} { }
+ inline simd4i(const __vector __bool int& b) { x.b=b; }
inline simd4i(int32 f) : x{f,f,f,f} { }
inline simd4i(int32 r0, int32 r1, int32 r2, int32 r3)
@@ -93,10 +93,10 @@
inline simd4i& operator=(const simd4i& v) { x = v.x; return *this; }
inline simd4i& operator=(const int32& v) { *this = simd4i(v); return *this; }
- inline vector signed int operator() () const { return x.v; }
+ inline __vector signed int operator() () const { return x.v; }
inline int32 operator[](unsigned int idx) const { return x.x[idx]; }
- inline vector bool int to_bool() const { return x.b; }
+ inline __vector __bool int to_bool() const { return x.b; }
// intrinsics now seem to use xxpermdi automatically now
inline void load_aligned(const int32* ptr) { x.v = vec_ld(0, ptr); }
@@ -230,7 +230,7 @@
_lhs[2]*_rhs[2],
_lhs[3]*_rhs[3]);
#elif defined(DLIB_HAVE_VSX)
- vector int a = lhs(), b = rhs();
+ __vector int a = lhs(), b = rhs();
asm("vmuluwm %0, %0, %1\n\t" : "+&v" (a) : "v" (b) );
return simd4i(a);
#else

13
srcpkgs/digikam/template
View file

@ -1,7 +1,7 @@
# Template file for 'digikam'
pkgname=digikam
version=6.4.0
revision=2
version=7.0.0
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules gettext pkg-config bison flex"
makedepends="qt5-devel libjpeg-turbo-devel qt5-plugin-mysql qt5-plugin-odbc
@ -12,12 +12,17 @@ makedepends="qt5-devel libjpeg-turbo-devel qt5-plugin-mysql qt5-plugin-odbc
knotifyconfig-devel knotifications-devel threadweaver-devel
akonadi-contacts-devel libksane-devel kcalendarcore-devel tiff-devel
lcms2-devel qtav libopencv-devel liblqr-devel marble5-devel libgphoto2-devel
lensfun-devel eigen jasper-devel MesaLib-devel glu-devel"
lensfun-devel eigen jasper-devel MesaLib-devel glu-devel qt5-webengine-devel
qt5-webchannel-devel"
short_desc="Advanced digital photo management application"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.digikam.org"
distfiles="${KDE_SITE}/digikam/${version}/digikam-${version}.tar.xz"
checksum=775012ff515bdd25a0b894c95bf5d33e7122b523da9c0f3af260ec3eff498d6f
checksum=dc0718e30031e692d7f05367b44e797fed61f12d27063641b6a5cf4d8b26e911
CXXFLAGS="-Wl,-lpthread"
case "$XBPS_TARGET_MACHINE" in
arm*) broken="qt5-webengine-devel unavailable" ;;
esac