diff options
author | Freemor <freemor@freemor.ca> | 2020-02-02 21:32:34 -0400 |
---|---|---|
committer | Freemor <freemor@freemor.ca> | 2020-02-02 21:32:34 -0400 |
commit | ea548925d4875a20e20b07f392f8845986abdeb3 (patch) | |
tree | 3cd97ab45fad83d82cdc138e59b7b350f51cb974 | |
parent | cfa35f80290dfc8f49bde95427e1513c4e980250 (diff) |
WiP to bring nonprism/darktable] up-to-date /nonprism-WiP
Builds fine for x86_64, but upstream no longer supports non 64bit builds. thus /
i686 and armv7h can not build. I imagine getting this to be 32 bit clean would be major /
work. Not sure if we should try to keep old version alive or try to patch so it builds on /
32bit systems.
-rw-r--r-- | nonprism/darktable/PKGBUILD | 29 | ||||
-rw-r--r-- | nonprism/darktable/fixCompileFlag.patch | 12 |
2 files changed, 15 insertions, 26 deletions
diff --git a/nonprism/darktable/PKGBUILD b/nonprism/darktable/PKGBUILD index a2829e2e4..7461dbcfe 100644 --- a/nonprism/darktable/PKGBUILD +++ b/nonprism/darktable/PKGBUILD @@ -7,28 +7,28 @@ pkgname=darktable epoch=2 -pkgver=2.6.3 -pkgrel=1.nonprism1 +pkgver=3.0.0 +pkgrel=1 +pkgrel+=.nonprism1 pkgdesc="Utility to organize and develop raw images, without flickcurl support" arch=(i686 x86_64 armv7h) url="https://darktable.org" license=(GPL3) -depends=(pugixml libjpeg-turbo colord-gtk libgphoto2 openexr lensfun iso-codes - exiv2 openjpeg2 graphicsmagick lua osm-gps-map libsecret) -makedepends=(cmake intltool desktop-file-utils llvm clang python-jsonschema libwebp libxslt) -source=("https://github.com/darktable-org/darktable/releases/download/release-${pkgver}/darktable-${pkgver/rc/.rc}.tar.xz"{,.asc} - fixCompileFlag.patch) -sha256sums=('a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0' - 'SKIP' - '4529cf75dc0fd68f3aed9b3c917106eeac58adffa608b57b79256f66fd23959b') - +depends=(pugixml libjpeg-turbo colord-gtk libgphoto2 openexr lensfun iso-codes zlib + exiv2 openjpeg2 graphicsmagick libxslt lua osm-gps-map libsecret openmp) +optdepends=('dcraw: base curve script' + 'perl-image-exiftool: base curve script' + 'imagemagick: base curve and noise profile scripts' + 'ghostscript: noise profile script' + 'gnuplot: noise profile script') +makedepends=(cmake intltool desktop-file-utils llvm clang python-jsonschema libwebp) +source=("https://github.com/darktable-org/darktable/releases/download/release-${pkgver}/darktable-${pkgver/rc/.rc}.tar.xz"{,.asc}) +sha256sums=('7195a5ff7ee95ab7c5a57e4e84f8c90cc4728b2c917359203c21293ab754c0db' + 'SKIP') validpgpkeys=(C4CBC150699956E2A3268EF5BB5CC8295B1779C9 # darktable releases <release@darktable.org> F10F9686652B0E949FCD94C318DCA123F949BD3B) # Pascal Obry <pascal@obry.net> prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch --strip=1 --input=../fixCompileFlag.patch - cd "$srcdir" mkdir -p build } @@ -37,6 +37,7 @@ build() { cmake ../${pkgname}-${pkgver/rc/~rc} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \ -DCMAKE_BUILD_TYPE=Release \ -DBINARY_PACKAGE_BUILD=1 \ -DBUILD_USERMANUAL=False \ diff --git a/nonprism/darktable/fixCompileFlag.patch b/nonprism/darktable/fixCompileFlag.patch deleted file mode 100644 index cfa81e909..000000000 --- a/nonprism/darktable/fixCompileFlag.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --unified --recursive --text a/cmake/compiler-warnings.cmake b/cmake/compiler-warnings.cmake ---- a/cmake/compiler-warnings.cmake 2019-10-20 09:39:07.000000000 -0300 -+++ b/cmake/compiler-warnings.cmake 2019-12-01 21:23:51.750926133 -0400 -@@ -26,8 +26,6 @@ - - CHECK_COMPILER_FLAG_AND_ENABLE_IT(-Wold-style-declaration) - --CHECK_COMPILER_FLAG_AND_ENABLE_IT(-Wthread-safety) -- - # may be our bug :( - CHECK_COMPILER_FLAG_AND_ENABLE_IT(-Wno-error=varargs) - |