diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index d1a92e9fecd..68eedb4923b 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS= amd64 aarch64 COMMENT= virtual lighttable and darkroom for photographers -V= 4.6.1 +V= 4.8.1 DISTNAME= darktable-$V PORTROACH= limitw:1,even skipv:release-$V EXTRACT_SUFX= .tar.xz diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo index c3e05f3580f..d00cef2e7b4 100644 --- a/graphics/darktable/distinfo +++ b/graphics/darktable/distinfo @@ -1,2 +1,2 @@ -SHA256 (darktable-4.6.1.tar.xz) = Fu3AoHApPi082k6hDkm9qb3pMuI/nmLi+i56x0rPev0= -SIZE (darktable-4.6.1.tar.xz) = 6240188 +SHA256 (darktable-4.8.1.tar.xz) = kBsOLK7Tb7hhn99MYO37jTETS5R9MFS1xm/VXDivWZE= +SIZE (darktable-4.8.1.tar.xz) = 6258312 diff --git a/graphics/darktable/patches/patch-CMakeLists_txt b/graphics/darktable/patches/patch-CMakeLists_txt index 536cfe4adf6..0bed40674f0 100644 --- a/graphics/darktable/patches/patch-CMakeLists_txt +++ b/graphics/darktable/patches/patch-CMakeLists_txt @@ -6,7 +6,7 @@ fails with _XOPEN_SOURCE set; Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -488,6 +488,8 @@ endif(BUILD_TESTING) +@@ -463,6 +463,8 @@ endif(BUILD_TESTING) if(NOT WIN32) if(CMAKE_SYSTEM MATCHES "SunOS.*") add_definitions("-D_XOPEN_SOURCE=600") diff --git a/graphics/darktable/patches/patch-src_CMakeLists_txt b/graphics/darktable/patches/patch-src_CMakeLists_txt index e665673dee3..08848be6a53 100644 --- a/graphics/darktable/patches/patch-src_CMakeLists_txt +++ b/graphics/darktable/patches/patch-src_CMakeLists_txt @@ -1,7 +1,7 @@ Index: src/CMakeLists.txt --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt -@@ -644,7 +644,7 @@ if(NOT CUSTOM_CFLAGS) +@@ -654,7 +654,7 @@ if(NOT CUSTOM_CFLAGS) #-g MUST be set for ALL builds, or there will be no support for them when bugs happen set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -ftree-vectorize") @@ -10,7 +10,7 @@ Index: src/CMakeLists.txt if(CMAKE_COMPILER_IS_GNUCC) if(BUILD_SSE2_CODEPATHS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse") -@@ -658,7 +658,7 @@ if(NOT CUSTOM_CFLAGS) +@@ -668,7 +668,7 @@ if(NOT CUSTOM_CFLAGS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MARCH} ${DT_REQ_INSTRUCTIONS} -g") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -ftree-vectorize") @@ -19,7 +19,7 @@ Index: src/CMakeLists.txt if(CMAKE_COMPILER_IS_GNUCXX) if(BUILD_SSE2_CODEPATHS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse") -@@ -952,7 +952,6 @@ if(LIB_DEPS) +@@ -967,7 +967,6 @@ if(LIB_DEPS) endif() target_link_libraries(lib_darktable PUBLIC ${STATIC_LIBS}) diff --git a/graphics/darktable/patches/patch-src_common_darktable_h b/graphics/darktable/patches/patch-src_common_darktable_h index d9694d282a3..0d3cb3da402 100644 --- a/graphics/darktable/patches/patch-src_common_darktable_h +++ b/graphics/darktable/patches/patch-src_common_darktable_h @@ -5,22 +5,12 @@ but we don't have ifunc support in the toolchain, so it fails to link. Index: src/common/darktable.h --- src/common/darktable.h.orig +++ src/common/darktable.h -@@ -140,18 +140,7 @@ extern "C" { +@@ -150,7 +150,7 @@ extern "C" { /* Create cloned functions for various CPU SSE generations */ /* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */ /* TL;DR : use only on SIMD functions containing low-level paralellized/vectorized loops */ --#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) --# if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) --#define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4"))) --# elif defined(__PPC64__) --/* __PPC64__ is the only macro tested for in is_supported_platform.h, other macros would fail there anyway. */ --#define __DT_CLONE_TARGETS__ __attribute__((target_clones("default","cpu=power9"))) --# else - #define __DT_CLONE_TARGETS__ --# endif --#else --#define __DT_CLONE_TARGETS__ --#endif - - typedef int32_t dt_imgid_t; - #define NO_IMGID (0) +-#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && !defined(__APPLE__) ++#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && !defined(__APPLE__) && !defined(__OpenBSD__) + # if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) + #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4"))) + # elif defined(__PPC64__) diff --git a/graphics/darktable/pkg/PLIST b/graphics/darktable/pkg/PLIST index e265ba558eb..428665607b5 100644 --- a/graphics/darktable/pkg/PLIST +++ b/graphics/darktable/pkg/PLIST @@ -50,6 +50,7 @@ lib/darktable/plugins/imageio/storage/ @so lib/darktable/plugins/libcolorchecker.so @so lib/darktable/plugins/libcolorcontrast.so @so lib/darktable/plugins/libcolorcorrection.so +@so lib/darktable/plugins/libcolorequal.so @so lib/darktable/plugins/libcolorin.so @so lib/darktable/plugins/libcolorize.so @so lib/darktable/plugins/libcolormapping.so @@ -63,6 +64,7 @@ lib/darktable/plugins/imageio/storage/ @so lib/darktable/plugins/libdenoiseprofile.so @so lib/darktable/plugins/libdiffuse.so @so lib/darktable/plugins/libdither.so +@so lib/darktable/plugins/libenlargecanvas.so @so lib/darktable/plugins/libequalizer.so @so lib/darktable/plugins/libexposure.so @so lib/darktable/plugins/libfilmic.so @@ -89,6 +91,7 @@ lib/darktable/plugins/imageio/storage/ @so lib/darktable/plugins/libnegadoctor.so @so lib/darktable/plugins/libnlmeans.so @so lib/darktable/plugins/liboverexposed.so +@so lib/darktable/plugins/liboverlay.so @so lib/darktable/plugins/libprimaries.so @so lib/darktable/plugins/libprofile_gamma.so @so lib/darktable/plugins/librawdenoise.so @@ -160,7 +163,6 @@ lib/darktable/plugins/lighttable/ @so lib/darktable/plugins/lighttable/libviewswitcher.so lib/darktable/views/ @so lib/darktable/views/libdarkroom.so -@so lib/darktable/views/libknight.so @so lib/darktable/views/liblighttable.so @so lib/darktable/views/libprint.so @so lib/darktable/views/libslideshow.so @@ -393,7 +395,6 @@ share/locale/pt_BR/LC_MESSAGES/darktable.mo share/locale/ru/LC_MESSAGES/darktable.mo share/locale/sl/LC_MESSAGES/darktable.mo share/locale/sq/LC_MESSAGES/darktable.mo -share/locale/tr/LC_MESSAGES/darktable.mo share/locale/uk/LC_MESSAGES/darktable.mo share/locale/zh_CN/LC_MESSAGES/darktable.mo share/locale/zh_TW/LC_MESSAGES/darktable.mo