From nobody Mon Jul 29 09:18:32 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WXXpc3bcSz5RbXB; Mon, 29 Jul 2024 09:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WXXpc2l92z4Djh; Mon, 29 Jul 2024 09:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722244712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u0oOEAZVUNW0RxHRuT1BCWxkRzlOlaJKHnNJ+0ffmPE=; b=IFQKoK2ya+4wukan+riNR7AQQVEJrcYKOutfpYUAcEGweL0iW///khB4Ss5unvfoOkrO88 VTBW+eSQPXaIHgNBkL7H0axEYYrpmGs90bvXXWTIkw18mhUNpdNjQbokdZI8tRpc28IQAI T6wB5LNW3WtATSnNOCEsRWq3d2qRw1VpxFzqMX8FUkOU6r2DVSGcUHAVhYYNnXUuyzZokp jQeVlfLw5MCvSgGNLyLha8vOdZMh+eav02aN63w14Timy9a9jdYgq0vQkCxecF/klsU/7N rBAXGXGPPJFReK7yZJrldxchka5x1ybqfH9/dfQ4+K7u1nQ+bWLMRjmF31AKyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722244712; a=rsa-sha256; cv=none; b=yrC+fsBDP5F2EKcZH8MUAtgxKLtYkqPjNAtx/hUXYqgmTK+ibkyJFN67sO9E9ddC/LSxsM 9cZaJd4LhcyzHYAQxacAW1y24xzTjgLsKVmKGvwYRNlJPRJ9E5ND1hktaf6fHzK7sunXC0 P4VipPYGrknNQOSJNESGBlTwE6s02rbd4e56YT8nVqMC7INIqgEJkW2KbrPcX77lWAsnDf LGeivbRxthW0jmPI10tgVILX/WiJcOjWt6v2faDzerCrA1Tagek0XQfXP5nzbz7biaO4nM kJE1wV+U93b5i4/P8w6VBC7h/wAJ0ICSeTy74cN7r0q5a0c7UkwQW34H9OGB2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722244712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u0oOEAZVUNW0RxHRuT1BCWxkRzlOlaJKHnNJ+0ffmPE=; b=JxRafhG3X2OfrJLRQjLp5bBR4v8uSSrrpHku37i2q0riaQ7q6Zz6X9yt2ddV0IgYAxQ1rZ d7aGzkAFJcHIyxGClI8JH3DHrpplt3LgX/E3qxQLe2ih9nyXDQljDXRdPkjDqjFRCSLfJ2 lApbDt7jjxCyhs6Lh5AtOa+dUPICNgBd92JGcpd9RVUWWp69AN2+x7lr9+mORM9TFDbb/B 34vy+czBv9idBGK8FbZeFBnd9xuhQNIZ/yp6Dox/uTY7gR0ELwJ1tSJT8Y6xeBVflbGeeP pf3wJsPJgLau7jw/+60p/+UwvhbE9WgWLcXGrZoO5RV437QOmhsJw5qu61s+SQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WXXpc2DN5zSH8; Mon, 29 Jul 2024 09:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46T9IWXt054477; Mon, 29 Jul 2024 09:18:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46T9IW6u054474; Mon, 29 Jul 2024 09:18:32 GMT (envelope-from git) Date: Mon, 29 Jul 2024 09:18:32 GMT Message-Id: <202407290918.46T9IW6u054474@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: 20f4b6899375 - main - graphics/darktable: Update to 4.8.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20f4b68993752fdbfd6575380f0911612cd0a247 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/ports/commit/?id=20f4b68993752fdbfd6575380f0911612cd0a247 commit 20f4b68993752fdbfd6575380f0911612cd0a247 Author: Jean-Sébastien Pédron AuthorDate: 2024-07-29 09:11:13 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2024-07-29 09:17:44 +0000 graphics/darktable: Update to 4.8.1 Release notes: * https://github.com/darktable-org/darktable/releases/tag/release-4.8.0 * https://github.com/darktable-org/darktable/releases/tag/release-4.8.1 PR: 277742, 280065, 280450 Reported by: Andrew --- graphics/darktable/Makefile | 3 +-- graphics/darktable/distinfo | 6 +++--- graphics/darktable/files/patch-src_CMakeLists.txt | 12 ++++++------ graphics/darktable/files/patch-src_common_darktable.h | 6 +++--- ...patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake | 4 ++-- graphics/darktable/files/patch-src_iop_channelmixerrgb.c | 8 ++++---- graphics/darktable/files/patch-src_iop_lens.cc | 4 ++-- graphics/darktable/pkg-plist | 4 +++- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index eb74b4f4f251..be672f264454 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -1,6 +1,5 @@ PORTNAME= darktable -PORTVERSION= 4.6.0 -PORTREVISION= 2 +PORTVERSION= 4.8.1 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo index 634652c53e49..5a6e1e2de011 100644 --- a/graphics/darktable/distinfo +++ b/graphics/darktable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1703677622 -SHA256 (darktable-4.6.0.tar.xz) = 724b27e3204d1822de6dc53ea090a6b1ce55f7c32226d34642689775c68aacc2 -SIZE (darktable-4.6.0.tar.xz) = 6129572 +TIMESTAMP = 1722071148 +SHA256 (darktable-4.8.1.tar.xz) = 901b0e2caed36fb8619fdf4c60edfb8d31134b947d3054b5c66fd55c38af5991 +SIZE (darktable-4.8.1.tar.xz) = 6258312 diff --git a/graphics/darktable/files/patch-src_CMakeLists.txt b/graphics/darktable/files/patch-src_CMakeLists.txt index f18807197ee4..6448d422928b 100644 --- a/graphics/darktable/files/patch-src_CMakeLists.txt +++ b/graphics/darktable/files/patch-src_CMakeLists.txt @@ -1,11 +1,11 @@ ---- src/CMakeLists.txt.orig 2023-12-14 19:44:41 UTC +--- src/CMakeLists.txt.orig 2024-07-27 09:22:01 UTC +++ src/CMakeLists.txt -@@ -475,7 +475,7 @@ if(USE_OPENJPEG) +@@ -489,7 +489,7 @@ if(USE_OPENJPEG) + if(OpenJPEG_FOUND) add_definitions("-DHAVE_OPENJPEG") list(APPEND SOURCES "imageio/imageio_j2k.c") - -- include_directories(SYSTEM ${OpenJPEG_INCLUDE_DIRS}) -+ include_directories(BEFORE SYSTEM ${OpenJPEG_INCLUDE_DIRS}) - list(APPEND LIBS ${OpenJPEG_LIBRARIES}) +- include_directories(SYSTEM ${OPENJPEG_INCLUDE_DIRS}) ++ include_directories(BEFORE SYSTEM ${OPENJPEG_INCLUDE_DIRS}) + list(APPEND LIBS ${OPENJPEG_LIBRARIES}) set(DT_SUPPORTED_EXTENSIONS ${DT_SUPPORTED_EXTENSIONS} j2c j2k jp2 jpc CACHE INTERNAL "") endif(OpenJPEG_FOUND) diff --git a/graphics/darktable/files/patch-src_common_darktable.h b/graphics/darktable/files/patch-src_common_darktable.h index f53e478d8234..ff1d21a3784b 100644 --- a/graphics/darktable/files/patch-src_common_darktable.h +++ b/graphics/darktable/files/patch-src_common_darktable.h @@ -1,7 +1,7 @@ ---- src/common/darktable.h.orig 2023-08-23 11:50:51 UTC +--- src/common/darktable.h.orig 2024-07-17 15:29:39 UTC +++ src/common/darktable.h -@@ -143,7 +143,7 @@ extern "C" { - #if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) +@@ -153,7 +153,7 @@ extern "C" { + #if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && !defined(__APPLE__) # 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/files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake b/graphics/darktable/files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake index fc9628d19599..b1604f52e2ec 100644 --- a/graphics/darktable/files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake +++ b/graphics/darktable/files/patch-src_external_rawspeed_cmake_Modules_CheckZLIB.cmake @@ -1,6 +1,6 @@ ---- src/external/rawspeed/cmake/Modules/CheckZLIB.cmake.orig 2023-12-10 23:28:08 UTC +--- src/external/rawspeed/cmake/Modules/CheckZLIB.cmake.orig 2024-06-15 01:29:22 UTC +++ src/external/rawspeed/cmake/Modules/CheckZLIB.cmake -@@ -45,7 +45,7 @@ CHECK_PROTOTYPE_DEFINITION(zError +@@ -47,7 +47,7 @@ CHECK_PROTOTYPE_DEFINITION(zError CHECK_PROTOTYPE_DEFINITION(zError "const char* zError(int zErrorCode)" "NULL" diff --git a/graphics/darktable/files/patch-src_iop_channelmixerrgb.c b/graphics/darktable/files/patch-src_iop_channelmixerrgb.c index e202f067cba4..dff094642bbb 100644 --- a/graphics/darktable/files/patch-src_iop_channelmixerrgb.c +++ b/graphics/darktable/files/patch-src_iop_channelmixerrgb.c @@ -1,4 +1,4 @@ ---- src/iop/channelmixerrgb.c.orig 2023-07-06 21:20:42 UTC +--- src/iop/channelmixerrgb.c.orig 2024-07-27 09:15:05 UTC +++ src/iop/channelmixerrgb.c @@ -16,23 +16,6 @@ along with darktable. If not, see . @@ -21,6 +21,6 @@ - "tree-vectorize", "no-math-errno") -#endif - - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif + // #define AI_ACTIVATED + /* AI feature not good enough so disabled for now + If enabled there must be $DESCRIPTION: entries in illuminants.h for bauhaus diff --git a/graphics/darktable/files/patch-src_iop_lens.cc b/graphics/darktable/files/patch-src_iop_lens.cc index 2c5707cc613a..c93f18ebba55 100644 --- a/graphics/darktable/files/patch-src_iop_lens.cc +++ b/graphics/darktable/files/patch-src_iop_lens.cc @@ -1,6 +1,6 @@ ---- src/iop/lens.cc.orig 2023-12-14 19:44:41 UTC +--- src/iop/lens.cc.orig 2024-07-17 15:29:39 UTC +++ src/iop/lens.cc -@@ -64,7 +64,7 @@ extern "C" { +@@ -66,7 +66,7 @@ extern "C" { #if LF_VERSION == ((0 << 24) | (3 << 16) | (95 << 8) | 0) #define LF_0395 diff --git a/graphics/darktable/pkg-plist b/graphics/darktable/pkg-plist index 0e02b696c9ef..950827f4ae46 100644 --- a/graphics/darktable/pkg-plist +++ b/graphics/darktable/pkg-plist @@ -46,6 +46,7 @@ lib/darktable/plugins/libcolorbalancergb.so lib/darktable/plugins/libcolorchecker.so lib/darktable/plugins/libcolorcontrast.so lib/darktable/plugins/libcolorcorrection.so +lib/darktable/plugins/libcolorequal.so lib/darktable/plugins/libcolorin.so lib/darktable/plugins/libcolorize.so lib/darktable/plugins/libcolormapping.so @@ -59,6 +60,7 @@ lib/darktable/plugins/libdemosaic.so lib/darktable/plugins/libdenoiseprofile.so lib/darktable/plugins/libdiffuse.so lib/darktable/plugins/libdither.so +lib/darktable/plugins/libenlargecanvas.so lib/darktable/plugins/libequalizer.so lib/darktable/plugins/libexposure.so lib/darktable/plugins/libfilmic.so @@ -85,6 +87,7 @@ lib/darktable/plugins/libmonochrome.so lib/darktable/plugins/libnegadoctor.so lib/darktable/plugins/libnlmeans.so lib/darktable/plugins/liboverexposed.so +lib/darktable/plugins/liboverlay.so lib/darktable/plugins/libprimaries.so lib/darktable/plugins/libprofile_gamma.so lib/darktable/plugins/librawdenoise.so @@ -156,7 +159,6 @@ lib/darktable/plugins/lighttable/libview_toolbox.so lib/darktable/plugins/lighttable/libviewswitcher.so lib/darktable/plugins/libsigmoid.so lib/darktable/views/libdarkroom.so -lib/darktable/views/libknight.so lib/darktable/views/liblighttable.so lib/darktable/views/libmap.so %%PRINT%%lib/darktable/views/libprint.so