summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRené Wagner2020-05-23 20:34:58 +0200
committerRené Wagner2020-05-23 20:34:58 +0200
commita0e8e64d95e1c3d0a3cdf864b0dedb59f0201eef (patch)
treeffb089ebb5b33547a45b2d8d821a3a52b8de6a4e
parentd23c1c55380be95aad8d99d500a715cdd723dff1 (diff)
downloadaur-a0e8e64d95e1c3d0a3cdf864b0dedb59f0201eef.tar.gz
remove tcmalloc, add cmakelists.patch for gcc 10.1
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
-rw-r--r--cmakelists.patch13
3 files changed, 17 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 38106a8700b..06efa9d79b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,8 +26,10 @@ pkgbase = art-rawconverter
conflicts = art-rawconverter-git
source = art-rawconverter_1.3::git+https://bitbucket.org/agriggio/art.git#tag=1.3
source = bft_20.zip::https://discuss.pixls.us/uploads/short-url/fG7iCaIWBWBem30O67V15EfO521.zip
+ source = cmakelists.patch
sha256sums = SKIP
sha256sums = 7381c57e48b1437bec6b775029370f99f6fc14eced53678972e9f0b7e02a4346
+ sha256sums = ae3646842985338b700b68987879c3eb8d4483c895e58134bf512fe3df33c39b
pkgname = art-rawconverter
diff --git a/PKGBUILD b/PKGBUILD
index 4941ae87537..9fc2389fbf4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ license=('GPL3')
depends=('gperftools' 'lensfun' 'exiv2' 'fftw' 'gtk3' 'glibmm' 'gtkmm3' 'lcms2' 'libcanberra' 'libiptcdata' 'desktop-file-utils')
makedepends=('pkgconf' 'cmake' 'git' 'gcc' 'hicolor-icon-theme' 'fakeroot')
conflicts=('art-rawconverter-git')
-source=("${pkgname}_${pkgver}::git+https://bitbucket.org/agriggio/art.git#tag=${pkgver}" "bft_20.zip::https://discuss.pixls.us/uploads/short-url/fG7iCaIWBWBem30O67V15EfO521.zip" "cmakelists.patch")
+source=("${pkgname}_${pkgver}::git+https://bitbucket.org/agriggio/art.git#tag=${pkgver}" "bft_20.zip::https://discuss.pixls.us/uploads/short-url/fG7iCaIWBWBem30O67V15EfO521.zip" "cmakelists.patch")
sha256sums=('SKIP' '7381c57e48b1437bec6b775029370f99f6fc14eced53678972e9f0b7e02a4346' 'ae3646842985338b700b68987879c3eb8d4483c895e58134bf512fe3df33c39b')
build() {
@@ -22,8 +22,6 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DPROC_TARGET_NUMBER="2" \
- -DENABLE_TCMALLOC="ON" \
- -DTCMALLOC_LIB_DIR=/usr/lib \
-DWITH_LTO="ON"
NPROC=$(getconf _NPROCESSORS_ONLN)
@@ -31,7 +29,7 @@ build() {
}
prepare() {
- cd "$srcdir/${pkgname}_src"
+ cd "$srcdir/${pkgname}_${pkgver}"
patch --forward --strip=1 --input="${srcdir}/cmakelists.patch"
}
diff --git a/cmakelists.patch b/cmakelists.patch
new file mode 100644
index 00000000000..6c605d7655c
--- /dev/null
+++ b/cmakelists.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ff798134e..56e9792e4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,7 +56,7 @@ set(PROC_TARGET_NUMBER 0 CACHE STRING "Selected target processor from the list a
+
+ # Set special compilation flags for rtengine which get added to CMAKE_CXX_FLAGS:
+ # Some Linux distros build with -O2 instead of -O3. We explicitly enable auto vectorization by using -ftree-vectorize
+-set(RTENGINE_CXX_FLAGS "-ftree-vectorize" CACHE STRING "Special compilation flags for RTEngine")
++set(RTENGINE_CXX_FLAGS "-ftree-vectorize -fno-tree-loop-vectorize" CACHE STRING "Special compilation flags for RTEngine")
+
+ # Loads the ProcessorTargets list:
+ include(ProcessorTargets.cmake)