snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

Merge pull request #3214 from lemmi/darktable 

darktable: update to 2.0.0.
This commit is contained in:
Juan RP 2015-12-24 08:17:37 +01:00
parent 9502e37d8d 8b8350da8e
commit 84e54054a8
3 changed files with 21 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
srcpkgs/darktable/INSTALL.msg Normal file
View File

@ -0,0 +1,11 @@
Quote from the release page:
> when updating from the currently stable 1.6.x series, please bear in mind
> that your edits will be preserved during this process, but it will not be
> possible to downgrade from 2.0 to 1.6.x any more.
To avoid risking your work, backup your images and ~/.config/darktable/ or
downgrade to darktable-1.6.9:
# xdowngrade /var/cache/xbps/darktable-1.6.9_2.x86_64.xbps
# xbps-pkgdb -m hold darktable

61
srcpkgs/darktable/patches/0001-musl.patch
View File

@ -1,61 +0,0 @@
From 60c3edbc4ccb15680c0305e787bd236933c85bad Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 12 May 2015 08:40:56 +0200
Subject: [PATCH] musl
diff --git src/control/jobs/control_jobs.c src/control/jobs/control_jobs.c
index ea61eb1..28ec5ea 100644
--- src/control/jobs/control_jobs.c
+++ src/control/jobs/control_jobs.c
@@ -941,7 +941,7 @@ static int32_t dt_control_export_job_run(dt_job_t *job)
const __attribute__((__unused__)) int num_threads = 1;
#if !defined(__SUNOS__) && !defined(__NetBSD__) && !defined(__WIN32__)
#pragma omp parallel default(none) private(imgid) \
- shared(control, fraction, w, h, stderr, mformat, mstorage, t, sdata, job, progress, darktable, settings) \
+ shared(control, fraction, w, h, mformat, mstorage, t, sdata, job, progress, darktable, settings) \
num_threads(num_threads) if(num_threads > 1)
#else
#pragma omp parallel private(imgid) shared(control, fraction, w, h, mformat, mstorage, t, sdata, job, \
@@ -993,7 +993,6 @@ static int32_t dt_control_export_job_run(dt_job_t *job)
if(!g_file_test(imgfilename, G_FILE_TEST_IS_REGULAR))
{
dt_control_log(_("image `%s' is currently unavailable"), image->filename);
- fprintf(stderr, "image `%s' is currently unavailable", imgfilename);
// dt_image_remove(imgid);
dt_image_cache_read_release(darktable.image_cache, image);
}
diff --git src/develop/blend.c src/develop/blend.c
index b39afde..e327634 100644
--- src/develop/blend.c
+++ src/develop/blend.c
@@ -2276,7 +2276,7 @@ void dt_develop_blend_process(struct dt_iop_module_t *self, struct dt_dev_pixelp
#ifdef _OPENMP
#if !defined(__SUNOS__) && !defined(__NetBSD__) && !defined(__WIN32__)
-#pragma omp parallel for default(none) shared(i, roi_out, o, mask, blend, d, stderr)
+#pragma omp parallel for default(none) shared(i, roi_out, o, mask, blend, d)
#else
#pragma omp parallel for shared(i, roi_out, o, mask, blend, d)
#endif
@@ -2327,7 +2327,7 @@ void dt_develop_blend_process(struct dt_iop_module_t *self, struct dt_dev_pixelp
{
#ifdef _OPENMP
#if !defined(__SUNOS__) && !defined(__WIN32__)
-#pragma omp parallel for default(none) shared(roi_out, mask, stderr)
+#pragma omp parallel for default(none) shared(roi_out, mask)
#else
#pragma omp parallel for shared(roi_out, mask)
#endif
@@ -2342,7 +2342,7 @@ void dt_develop_blend_process(struct dt_iop_module_t *self, struct dt_dev_pixelp
/* now apply blending with per-pixel opacity value as defined in mask */
#ifdef _OPENMP
#if !defined(__SUNOS__) && !defined(__WIN32__)
-#pragma omp parallel for default(none) shared(i, roi_out, o, mask, blend, stderr)
+#pragma omp parallel for default(none) shared(i, roi_out, o, mask, blend)
#else
#pragma omp parallel for shared(i, roi_out, o, mask, blend)
#endif
--
2.4.0

20
srcpkgs/darktable/template
View File

@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=1.6.9
revision=2
version=2.0.0
revision=1
build_style=cmake
# this makes sure to use -march=generic and -msse3
configure_args="-DBINARY_PACKAGE_BUILD=ON"
@ -10,12 +10,12 @@ homepage="http://www.darktable.org/"
license="GPL-3"
short_desc="Virtual lighttable and darkroom for photographers"
hostmakedepends="cmake pkg-config intltool"
makedepends="gtk+-devel glib-devel exiv2-devel lcms2-devel
libglade-devel libxslt-devel dbus-glib-devel libcurl-devel libgphoto2-devel
libwebp-devel libsoup-devel lensfun-devel sqlite-devel librsvg-devel
lua52-devel json-glib-devel libgomp-devel colord-devel
libopenjpeg-devel libopenexr-devel libgraphicsmagick-devel
SDL-devel libsecret-devel glu-devel"
only_for_archs="i686 i686-musl x86_64 x86_64-musl" # too much SSE2 stuff all over
makedepends="gtk+3-devel glib-devel exiv2-devel libglade-devel libxslt-devel
dbus-glib-devel libcurl-devel libgphoto2-devel libwebp-devel libsoup-devel
lensfun-devel sqlite-devel librsvg-devel lua52-devel json-glib-devel
libgomp-devel libopenjpeg-devel libopenexr-devel libgraphicsmagick-devel
SDL-devel libsecret-devel pugixml-devel libosmgpsmap-devel flickcurl-devel"
depends="adwaita-icon-theme"
only_for_archs="i686 x86_64" # too much SSE2 stuff all over
distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"
checksum=0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173
checksum=d4f2f525bbbb1355bc3470e74cc158d79d7e236f3925928f67a88461f1df7cb1