[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/

2024-03-16 Thread Conrad Kostecki
commit: 7d68213be176c432b7be47bc70bbf9020356bdfd
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Feb 25 15:41:50 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Mar 16 12:13:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d68213b

media-gfx/darktable: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...darktable-3.0.2_cmake-march-autodetection.patch |  26 ---
 .../files/darktable-4.2.1-exiv2-0.28.patch | 215 -
 2 files changed, 241 deletions(-)

diff --git 
a/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch 
b/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch
deleted file mode 100644
index 8ad4f0e9329f..
--- a/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Darktable and RawSpeed upstream support two build modes: if 
BINARY_PACKAGE_BUILD==1
-they pass -mtune=generic to the compiler, otherwise they use -march=native.
-In either case, these options override externally set CFLAGS.
-
-Disable this behaviour so that the users' settings provided to the ebuild by 
Portage
-are respected.
-
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -521,7 +521,7 @@
- set(DT_REQ_INSTRUCTIONS "-msse2")
-   endif()
- 
--  include(march-mtune)
-+  set(MARCH "")
- 
-   #if(NOT BUILD_SSE2_CODEPATHS)
-   #  set(MARCH "${MARCH} -mno-sse2 -D__DISABLE_SSE2__ -U__SSE2__ 
-D__DISABLE_SSE__ -U__SSE__")
 a/src/external/rawspeed/cmake/compiler-flags.cmake
-+++ b/src/external/rawspeed/cmake/compiler-flags.cmake
-@@ -1,5 +1,4 @@
- include(CheckCXXCompilerFlag)
--include(CpuMarch)
- include(CheckCXXCompilerFlagAndEnableIt)
- 
- # yes, need to keep both the CMAKE_CXX_FLAGS and CMAKE_CXX_STANDARD.

diff --git a/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch 
b/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch
deleted file mode 100644
index 1be8577ae369..
--- a/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-diff --git a/src/common/exif.cc b/src/common/exif.cc
-index 484ebf2207..91ea8e64d0 100644
 a/src/common/exif.cc
-+++ b/src/common/exif.cc
-@@ -80,6 +80,11 @@ extern "C" {
- 
- #define DT_XMP_EXIF_VERSION 5
- 
-+#if EXIV2_TEST_VERSION(0,28,0)
-+#define AnyError Error
-+#define toLong toInt64
-+#endif
-+
- // persistent list of exiv2 tags. set up in dt_init()
- static GList *exiv2_taglist = NULL;
- 
-@@ -2658,39 +2663,39 @@ static GList *read_history_v2(Exiv2::XmpData , 
const char *filename)
-   if(g_str_has_prefix(key_iter, "darktable:operation"))
-   {
- current_entry->have_operation = TRUE;
--current_entry->operation = 
g_strdup(history->value().toString().c_str());
-+current_entry->operation = g_strdup(history->toString().c_str());
-   }
-   else if(g_str_has_prefix(key_iter, "darktable:num"))
-   {
--current_entry->num = history->value().toLong();
-+current_entry->num = history->toLong();
-   }
-   else if(g_str_has_prefix(key_iter, "darktable:enabled"))
-   {
--current_entry->enabled = history->value().toLong() == 1;
-+current_entry->enabled = history->toLong() == 1;
-   }
-   else if(g_str_has_prefix(key_iter, "darktable:modversion"))
-   {
- current_entry->have_modversion = TRUE;
--current_entry->modversion = history->value().toLong();
-+current_entry->modversion = history->toLong();
-   }
-   else if(g_str_has_prefix(key_iter, "darktable:params"))
-   {
- current_entry->have_params = TRUE;
--current_entry->params = 
dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(),
-+current_entry->params = 
dt_exif_xmp_decode(history->toString().c_str(), history->size(),
-
_entry->params_len);
-   }
-   else if(g_str_has_prefix(key_iter, "darktable:multi_name"))
-   {
--current_entry->multi_name = 
g_strdup(history->value().toString().c_str());
-+current_entry->multi_name = g_strdup(history->toString().c_str());
-   }
-   else if(g_str_has_prefix(key_iter, "darktable:multi_priority"))
-   {
--current_entry->multi_priority = history->value().toLong();
-+current_entry->multi_priority = history->toLong();
-   }
-   else if(g_str_has_prefix(key_iter, "darktable:iop_order"))
-   {
- // we ensure reading the iop_order as a high precision float
--string str = g_strdup(history->value().toString().c_str());
-+string str = g_strdup(history->toString().c_str());
- static const std::locale& c_locale = std::locale("C");
- std::istringstream istring(str);
- istring.imbue(c_locale);
-@@ -2698,12 +2703,12 @@ static GList 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2024-02-23 Thread Markus Meier
commit: 446de51215ebb6491a08f25997a0062c71d0229c
Author: Markus Meier  gentoo  org>
AuthorDate: Fri Feb 23 21:06:44 2024 +
Commit: Markus Meier  gentoo  org>
CommitDate: Fri Feb 23 21:06:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=446de512

media-gfx/darktable: set CMAKE_BUILD_TYPE in src_configure, bug #925097

Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/darktable-4.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-4.6.1.ebuild 
b/media-gfx/darktable/darktable-4.6.1.ebuild
index 99e89a9019b5..4d008c42995f 100644
--- a/media-gfx/darktable/darktable-4.6.1.ebuild
+++ b/media-gfx/darktable/darktable-4.6.1.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_BUILD_TYPE="Release"
 LUA_COMPAT=( lua5-4 )
 
 inherit cmake flag-o-matic lua-single toolchain-funcs xdg
@@ -134,6 +133,7 @@ src_prepare() {
 }
 
 src_configure() {
+   CMAKE_BUILD_TYPE="Release"
local mycmakeargs=(
-DBUILD_CURVE_TOOLS=$(usex tools)
-DBUILD_NOISE_TOOLS=$(usex tools)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2024-02-20 Thread Markus Meier
commit: b2c94e6a549968124f817e67644f0a4e521e780d
Author: Markus Meier  gentoo  org>
AuthorDate: Tue Feb 20 16:49:15 2024 +
Commit: Markus Meier  gentoo  org>
CommitDate: Tue Feb 20 16:49:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c94e6a

media-gfx/darktable: remove unused flickr description and explicitly install 
pdf docs

Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/darktable-4.6.1.ebuild | 5 -
 media-gfx/darktable/metadata.xml   | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-gfx/darktable/darktable-4.6.1.ebuild 
b/media-gfx/darktable/darktable-4.6.1.ebuild
index f97294854990..99e89a9019b5 100644
--- a/media-gfx/darktable/darktable-4.6.1.ebuild
+++ b/media-gfx/darktable/darktable-4.6.1.ebuild
@@ -170,7 +170,10 @@ src_configure() {
 src_install() {
cmake_src_install
# This USE flag is masked for -
-   use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf
+   if use doc; then
+   dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.en.pdf
+   use l10n_uk && dodoc 
"${DISTDIR}"/${PN}-usermanual-${DOC_PV}.uk.pdf
+   fi
 
if use nls; then
for lang in ${LANGS} ; do

diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 151fbda93990..be183534803a 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -10,7 +10,6 @@
Markus Meier


-   Add support for uploading photos to 
flickr
Support using game controllers as input 
devices
Enable geotagging support
Enable encrypted storage of passwords with 
kde-frameworks/kwallet



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2024-02-19 Thread Markus Meier
commit: 5be69e36e96a91e70acc34456fec145e09a07e05
Author: Markus Meier  gentoo  org>
AuthorDate: Mon Feb 19 16:22:34 2024 +
Commit: Markus Meier  gentoo  org>
CommitDate: Mon Feb 19 16:24:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be69e36

media-gfx/darktable: version bump

Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest   |   3 +
 media-gfx/darktable/darktable-4.6.1.ebuild | 194 +
 2 files changed, 197 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index dd27d19c844d..36029acce877 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,7 +1,10 @@
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B 
bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752
 SHA512 
05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
 DIST darktable-4.4.2.tar.xz 6033932 BLAKE2B 
99fec3b3ebc80a03af068d9a9a27a1cbd601183a15d52129495e1bb924be03d274cb768a34ec8c6ad432946f46a78a5d2ba325ae133a82988d828c2170f70991
 SHA512 
7b87879e865001491bbeaa12b9ac42b006bfa3fbcb50e73384c76cce0ee5d87200be3ce9b11f56d669d5eaf9b1add0a018ec5a021653bb84dfb6a0b379cb5594
 DIST darktable-4.6.0.tar.xz 6129572 BLAKE2B 
170d874f6a35c4fe5af308bc541885968b8b5535402f8087ad4d47ee93f3d22a78c633f9b3e14584d1925a7dd682a5f3e2bd187ef2f58d0dc2a407b9bb27
 SHA512 
825a63c9b8bd7420f5c4b53a9281587be92088e1cd617faaf1de2b455503092cc7476872803a1d82c7bf57fcc57f85a40fc4af8ca04367e48719030f08726df7
+DIST darktable-4.6.1.tar.xz 6240188 BLAKE2B 
cf0055a4dd5f0a246b8de8ca5a29488fd77162cf2e0d7b681235499da39e4dad69dc5e5f7083f67364171d89aa76e940e8338eadee959f6529fb27658f43b75b
 SHA512 
a5bcbdded7cacbc22d82cc982ad1387dc316cf4c0369f6f215abf9f60906024f2236a988dc025c0553bc2d8d7ca9d7bee9eb28b164fa1d9312eef1a084156fb6
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 
144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88
 SHA512 
a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
 DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B 
e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b
 SHA512 
ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61
 DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 
98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67
 SHA512 
90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3
 DIST darktable-usermanual-4.4.uk.pdf 33796107 BLAKE2B 
060218ec9b7fbcec947506ea9fdf355411d0b1242d41b9ffb7abd8dd991ece29e75c06231251d2ec2701e319e1b1e8134c08603649fe7e933d21b4aef597f7c3
 SHA512 
f2a6837a05114d4254fade358382be5fabcbd980a3c4fad702b1102176c7e261fd8646aeef1c0328001da8f7cb25d50b06c9f1163a54987985f556c616728bf5
+DIST darktable-usermanual-4.6.en.pdf 26844087 BLAKE2B 
5bdb5e012cd8ba7bace733006136b1f9e510214179e84a9cba0664a3c2e4b19828e2cc54addaf5999579b910b592bf0e9cd9796cf89f3a4e6ae369e8187fbfce
 SHA512 
a1d610c42ae3d1ae4d0bf3e827ed9ccae6faeea20cbc03e7c12d74c3c41175bf3f61d9eba43406b9ba86750edf976c1539357ddf774733f566a076418c34f558
+DIST darktable-usermanual-4.6.uk.pdf 27013345 BLAKE2B 
4c0da0038576e8ea97da88a4481e1afdf4e5b5df6b8a52475d18b488ac10066db4ef679681a38a194dd84771e340f58beea0450ec60726abd19d600e73fc40f1
 SHA512 
6e2f036e3f845791aa8b6eb565230136bfb6ae7f9b1ee56a9201cd25bb09391fd2ec45ba7fa1ddd11b4c193ab6b097fae32107af6c11b6cd6eeada60b002d4b3

diff --git a/media-gfx/darktable/darktable-4.6.1.ebuild 
b/media-gfx/darktable/darktable-4.6.1.ebuild
new file mode 100644
index ..f97294854990
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.6.1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   #DOC_PV=$(ver_cut 1-2)
+   DOC_PV="4.6"
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2024-02-19 Thread Markus Meier
commit: 0642119e06f63d4725de0d6508ed94620aadb60d
Author: Markus Meier  gentoo  org>
AuthorDate: Mon Feb 19 16:23:57 2024 +
Commit: Markus Meier  gentoo  org>
CommitDate: Mon Feb 19 16:24:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0642119e

media-gfx/darktable: remove old

Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest   |   4 -
 media-gfx/darktable/darktable-4.2.1.ebuild | 194 -
 media-gfx/darktable/darktable-4.4.2.ebuild | 192 
 3 files changed, 390 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 36029acce877..cbf2776ca5d3 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,9 +1,5 @@
-DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B 
bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752
 SHA512 
05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
-DIST darktable-4.4.2.tar.xz 6033932 BLAKE2B 
99fec3b3ebc80a03af068d9a9a27a1cbd601183a15d52129495e1bb924be03d274cb768a34ec8c6ad432946f46a78a5d2ba325ae133a82988d828c2170f70991
 SHA512 
7b87879e865001491bbeaa12b9ac42b006bfa3fbcb50e73384c76cce0ee5d87200be3ce9b11f56d669d5eaf9b1add0a018ec5a021653bb84dfb6a0b379cb5594
 DIST darktable-4.6.0.tar.xz 6129572 BLAKE2B 
170d874f6a35c4fe5af308bc541885968b8b5535402f8087ad4d47ee93f3d22a78c633f9b3e14584d1925a7dd682a5f3e2bd187ef2f58d0dc2a407b9bb27
 SHA512 
825a63c9b8bd7420f5c4b53a9281587be92088e1cd617faaf1de2b455503092cc7476872803a1d82c7bf57fcc57f85a40fc4af8ca04367e48719030f08726df7
 DIST darktable-4.6.1.tar.xz 6240188 BLAKE2B 
cf0055a4dd5f0a246b8de8ca5a29488fd77162cf2e0d7b681235499da39e4dad69dc5e5f7083f67364171d89aa76e940e8338eadee959f6529fb27658f43b75b
 SHA512 
a5bcbdded7cacbc22d82cc982ad1387dc316cf4c0369f6f215abf9f60906024f2236a988dc025c0553bc2d8d7ca9d7bee9eb28b164fa1d9312eef1a084156fb6
-DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 
144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88
 SHA512 
a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
-DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B 
e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b
 SHA512 
ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61
 DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 
98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67
 SHA512 
90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3
 DIST darktable-usermanual-4.4.uk.pdf 33796107 BLAKE2B 
060218ec9b7fbcec947506ea9fdf355411d0b1242d41b9ffb7abd8dd991ece29e75c06231251d2ec2701e319e1b1e8134c08603649fe7e933d21b4aef597f7c3
 SHA512 
f2a6837a05114d4254fade358382be5fabcbd980a3c4fad702b1102176c7e261fd8646aeef1c0328001da8f7cb25d50b06c9f1163a54987985f556c616728bf5
 DIST darktable-usermanual-4.6.en.pdf 26844087 BLAKE2B 
5bdb5e012cd8ba7bace733006136b1f9e510214179e84a9cba0664a3c2e4b19828e2cc54addaf5999579b910b592bf0e9cd9796cf89f3a4e6ae369e8187fbfce
 SHA512 
a1d610c42ae3d1ae4d0bf3e827ed9ccae6faeea20cbc03e7c12d74c3c41175bf3f61d9eba43406b9ba86750edf976c1539357ddf774733f566a076418c34f558

diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild 
b/media-gfx/darktable/darktable-4.2.1.ebuild
deleted file mode 100644
index 49a831c89ab6..
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-   DOC_PV=$(ver_cut 1-2)
-   MY_PV="${PV/_/}"
-   MY_P="${P/_/.}"
-
-   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? (
-   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
-   l10n_uk? (
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2024-02-12 Thread Sam James
commit: b45acf6e9b33053ca513933a9fd0fc87e3df982c
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 12 10:30:11 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 12 10:30:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b45acf6e

media-gfx/darktable: Stabilize 4.6.0 amd64, #923426

Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-4.6.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/darktable/darktable-4.6.0.ebuild 
b/media-gfx/darktable/darktable-4.6.0.ebuild
index 4da939721ef7..437afc9b907f 100644
--- a/media-gfx/darktable/darktable-4.6.0.ebuild
+++ b/media-gfx/darktable/darktable-4.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,7 +32,7 @@ else
)
)"
 
-   KEYWORDS="~amd64 ~arm64 -x86"
+   KEYWORDS="amd64 ~arm64 -x86"
LANGS=" cs de es fi fr hu it ja nl pl pt-BR ru sl sq uk zh-CN zh-TW"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-12-23 Thread Arthur Zamarin
commit: 09b9947834d6aacab372e5c988ad0506c912b55f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 23 17:17:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 23 17:17:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b99478

media-gfx/darktable: Stabilize 4.4.2 amd64, #920561

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/darktable/darktable-4.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-4.4.2.ebuild 
b/media-gfx/darktable/darktable-4.4.2.ebuild
index 59cff9becad9..6257b2ff5824 100644
--- a/media-gfx/darktable/darktable-4.4.2.ebuild
+++ b/media-gfx/darktable/darktable-4.4.2.ebuild
@@ -31,7 +31,7 @@ else
)
)"
 
-   KEYWORDS="~amd64 ~arm64 -x86"
+   KEYWORDS="amd64 ~arm64 -x86"
LANGS=" de es fr he hu ja pl pt-BR sl sq uk zh-CN zh-TW"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-12-22 Thread Markus Meier
commit: e8c5e6abb1eef1ef8dea31a547dc0b71a7f8cf52
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Dec 23 07:15:31 2023 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Dec 23 07:15:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c5e6ab

media-gfx/darktable: version bump

Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest   |   1 +
 media-gfx/darktable/darktable-4.6.0.ebuild | 193 +
 2 files changed, 194 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 50779f4c2b9d..dd27d19c844d 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,6 @@
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B 
bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752
 SHA512 
05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
 DIST darktable-4.4.2.tar.xz 6033932 BLAKE2B 
99fec3b3ebc80a03af068d9a9a27a1cbd601183a15d52129495e1bb924be03d274cb768a34ec8c6ad432946f46a78a5d2ba325ae133a82988d828c2170f70991
 SHA512 
7b87879e865001491bbeaa12b9ac42b006bfa3fbcb50e73384c76cce0ee5d87200be3ce9b11f56d669d5eaf9b1add0a018ec5a021653bb84dfb6a0b379cb5594
+DIST darktable-4.6.0.tar.xz 6129572 BLAKE2B 
170d874f6a35c4fe5af308bc541885968b8b5535402f8087ad4d47ee93f3d22a78c633f9b3e14584d1925a7dd682a5f3e2bd187ef2f58d0dc2a407b9bb27
 SHA512 
825a63c9b8bd7420f5c4b53a9281587be92088e1cd617faaf1de2b455503092cc7476872803a1d82c7bf57fcc57f85a40fc4af8ca04367e48719030f08726df7
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 
144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88
 SHA512 
a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
 DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B 
e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b
 SHA512 
ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61
 DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 
98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67
 SHA512 
90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3

diff --git a/media-gfx/darktable/darktable-4.6.0.ebuild 
b/media-gfx/darktable/darktable-4.6.0.ebuild
new file mode 100644
index ..4da939721ef7
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.6.0.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   #DOC_PV=$(ver_cut 1-2)
+   DOC_PV="4.4"
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
+   l10n_uk? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
+   -> ${PN}-usermanual-${DOC_PV}.uk.pdf
+   )
+   )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" cs de es fi fr hu it ja nl pl pt-BR ru sl sq uk zh-CN zh-TW"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad 
geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua 
midi nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+# It is sometimes requested, by both users and certain devs, to have 
sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with sys-devel/clang so we'd have to have 
that, as an alternative,
+#in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and 
virtual/rust) which
+#by default pull in sys-devel/clang
+#  - as a result of the 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/, sci-libs/linbox/, sci-geosciences/qgis/, ...

2023-12-18 Thread Michał Górny
commit: 3ec937d53b8f20927ef7566842ed1c7f984d43b2
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Dec 17 15:45:49 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Dec 18 18:52:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec937d5

profiles/use.desc: Make USE=opencl global

Add a global USE=opencl flag.  The flag is used consistently in 30
packages, and most of them do not provide any additional information
worth preserving.

Signed-off-by: Michał Górny  gentoo.org>

 app-emulation/crossover-bin/metadata.xml | 1 -
 app-emulation/wine-staging/metadata.xml  | 1 -
 app-emulation/wine-vanilla/metadata.xml  | 1 -
 app-misc/fastfetch/metadata.xml  | 1 -
 dev-libs/starpu/metadata.xml | 1 -
 games-util/basis_universal/metadata.xml  | 3 ---
 media-gfx/darktable/metadata.xml | 1 -
 media-gfx/imagemagick/metadata.xml   | 1 -
 media-libs/opencv/metadata.xml   | 1 -
 media-libs/opensubdiv/metadata.xml   | 4 
 media-libs/x264/metadata.xml | 1 -
 media-video/ffmpeg/metadata.xml  | 1 -
 net-misc/xmrig/metadata.xml  | 3 ---
 profiles/use.desc| 1 +
 sci-geosciences/grass/metadata.xml   | 1 -
 sci-geosciences/qgis/metadata.xml| 1 -
 sci-libs/caffe2/metadata.xml | 1 -
 sci-libs/clblast/metadata.xml| 3 ---
 sci-libs/gdal/metadata.xml   | 1 -
 sci-libs/libgeodecomp/metadata.xml   | 3 ---
 sci-libs/linbox/metadata.xml | 6 --
 sci-misc/boinc/metadata.xml  | 1 -
 sci-physics/lammps/metadata.xml  | 1 -
 sys-apps/cpu-x/metadata.xml  | 2 --
 24 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/app-emulation/crossover-bin/metadata.xml 
b/app-emulation/crossover-bin/metadata.xml
index 10bb6fcf1fa8..c176b5ef980c 100644
--- a/app-emulation/crossover-bin/metadata.xml
+++ b/app-emulation/crossover-bin/metadata.xml
@@ -8,7 +8,6 @@

Enable ISDN support via CAPI
Add support for OpenGL in bitmaps using 
libOSMesa
-   Enable OpenCL support
Support packet capture software (e.g. 
wireshark)

 

diff --git a/app-emulation/wine-staging/metadata.xml 
b/app-emulation/wine-staging/metadata.xml
index 65b7853a79b7..41ee07d0e044 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -23,7 +23,6 @@ This variant of the Wine packaging includes the Wine-Staging 
patchset.
Build PE files using a MinGW toolchain for 
better compatibility
Enable .NET support using 
app-emulation/wine-mono
Enable support for configuring remote 
shares using net-fs/samba
-   Enable OpenCL support
Enable off-screen rendering (OpenGL in 
bitmaps) support
Support packet capture software (e.g. 
wireshark)
Install helpers that require perl 
(winedump/winemaker)

diff --git a/app-emulation/wine-vanilla/metadata.xml 
b/app-emulation/wine-vanilla/metadata.xml
index f035ae003809..2759332a8b82 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -23,7 +23,6 @@ This variant of the Wine packaging does not include external 
patchsets
Build PE files using a MinGW toolchain for 
better compatibility
Enable .NET support using 
app-emulation/wine-mono
Enable support for configuring remote 
shares using net-fs/samba
-   Enable OpenCL support
Enable off-screen rendering (OpenGL in 
bitmaps) support
Support packet capture software (e.g. 
wireshark)
Install helpers that require perl 
(winedump/winemaker)

diff --git a/app-misc/fastfetch/metadata.xml b/app-misc/fastfetch/metadata.xml
index 9a686caf5d73..52543767b237 100644
--- a/app-misc/fastfetch/metadata.xml
+++ b/app-misc/fastfetch/metadata.xml
@@ -12,7 +12,6 @@
Enables text/graphics renderer with 
media-gfx/chafa
Use app-misc/ddcutil to query monitor 
settings
Enables support for X.org's 
x11-libs/libdrm
-   Enables OpenCL support
Enables offscreen rendering support from 
media-libs/mesa
Enables reading GPU via 
sys-apps/pciutils
Enables reading GPU via 
media-libs/vulkan-loader

diff --git a/dev-libs/starpu/metadata.xml b/dev-libs/starpu/metadata.xml
index e5514e797709..6c582c6644fd 100644
--- a/dev-libs/starpu/metadata.xml
+++ b/dev-libs/starpu/metadata.xml
@@ -14,7 +14,6 @@
 
   Enable NVIDIA CUDA toolkit support
   Enable GCC extension plugin (experimental)
-  Enable OpenCL support
   Enable spinlock check
 
 

diff --git a/games-util/basis_universal/metadata.xml 
b/games-util/basis_universal/metadata.xml
index 20e5846d4192..60720a5dc5a3 100644
--- a/games-util/basis_universal/metadata.xml
+++ b/games-util/basis_universal/metadata.xml
@@ 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/, profiles/base/

2023-12-15 Thread Arthur Zamarin
commit: 0daaeca9fb2d1450d6ad3ae593ea4365a18abefe
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 20:53:39 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 20:55:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0daaeca9

media-gfx/darktable: remove IUSE=gmic

The package behind it, media-gfx/gmic, was masked and just
tree-cleaned. The use flag was already masked before, so this is
just a nop removal.

Bug: https://bugs.gentoo.org/916289
Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/darktable/darktable-4.2.1.ebuild | 5 ++---
 media-gfx/darktable/darktable-4.4.2.ebuild | 5 ++---
 media-gfx/darktable/metadata.xml   | 1 -
 profiles/base/package.use.mask | 4 
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild 
b/media-gfx/darktable/darktable-4.2.1.ebuild
index 7a803774aebb..49a831c89ab6 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -35,7 +35,7 @@ else
LANGS=" cs de es fi fr he hu it ja nl pl pt-BR ru sl sq tr uk zh-CN 
zh-TW"
 fi
 
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua 
midi nls opencl openmp openexr test tools webp
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua midi nls 
opencl openmp openexr test tools webp
${LANGS// / l10n_}"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -80,7 +80,6 @@ DEPEND="dev-db/sqlite:3
flickr? ( media-libs/flickcurl )
gamepad? ( media-libs/libsdl2 )
geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-   gmic? ( media-gfx/gmic )
keyring? ( >=app-crypt/libsecret-0.18 )
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
@@ -149,7 +148,7 @@ src_configure() {
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-DUSE_FLICKR=$(usex flickr)
-   -DUSE_GMIC=$(usex gmic)
+   -DUSE_GMIC=OFF
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-DUSE_KWALLET=$(usex kwallet)
-DUSE_LIBSECRET=$(usex keyring)

diff --git a/media-gfx/darktable/darktable-4.4.2.ebuild 
b/media-gfx/darktable/darktable-4.4.2.ebuild
index fae521dd6702..59cff9becad9 100644
--- a/media-gfx/darktable/darktable-4.4.2.ebuild
+++ b/media-gfx/darktable/darktable-4.4.2.ebuild
@@ -35,7 +35,7 @@ else
LANGS=" de es fr he hu ja pl pt-BR sl sq uk zh-CN zh-TW"
 fi
 
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad 
geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto 
lua midi nls opencl openmp openexr test tools webp
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad 
geolocation keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua 
midi nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -79,7 +79,6 @@ DEPEND="dev-db/sqlite:3
cups? ( net-print/cups )
gamepad? ( media-libs/libsdl2 )
geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-   gmic? ( media-gfx/gmic )
keyring? ( >=app-crypt/libsecret-0.18 )
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
@@ -146,7 +145,7 @@ src_configure() {
-DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-   -DUSE_GMIC=$(usex gmic)
+   -DUSE_GMIC=OFF
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-DUSE_JXL=$(usex jpegxl)
-DUSE_KWALLET=$(usex kwallet)

diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 9b9fd1acd37e..3c374e9499ae 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -13,7 +13,6 @@
Add support for uploading photos to 
flickr
Support using game controllers as input 
devices
Enable geotagging support
-   Use the G'MIC image-processing framework 
(media-gfx/gmic), e.g. to support Colour LUTs compressed using their 
compression scheme
Enable encrypted storage of passwords with 
kde-frameworks/kwallet
Enable link-time optimisations in the RawSpeed 
library
Support using MIDI input devices such as 
Behringer X-Touch Mini, Arturia Beatstep or Korg nanoKONTROL2, as input 
devices

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index a9d0ac6dd1c6..fc1ef621d64c 100644
--- a/profiles/base/package.use.mask
+++ 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/

2023-10-22 Thread Marek Szuba
commit: 3b2025ac27d01c123701173faec2bd429fd7fb57
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Oct 22 10:53:24 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Oct 22 11:03:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2025ac

media-gfx/darktable: fix musl build error

Closes: https://bugs.gentoo.org/915596
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-4.4.2.ebuild|  1 +
 .../files/darktable-4.4.2_fix-has-attribute-musl.patch| 11 +++
 2 files changed, 12 insertions(+)

diff --git a/media-gfx/darktable/darktable-4.4.2.ebuild 
b/media-gfx/darktable/darktable-4.4.2.ebuild
index c9b9baea653e..fae521dd6702 100644
--- a/media-gfx/darktable/darktable-4.4.2.ebuild
+++ b/media-gfx/darktable/darktable-4.4.2.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
+   "${FILESDIR}"/${PN}-4.4.2_fix-has-attribute-musl.patch
 )
 
 S="${WORKDIR}/${P/_/~}"

diff --git 
a/media-gfx/darktable/files/darktable-4.4.2_fix-has-attribute-musl.patch 
b/media-gfx/darktable/files/darktable-4.4.2_fix-has-attribute-musl.patch
new file mode 100644
index ..0aad42605c9e
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-4.4.2_fix-has-attribute-musl.patch
@@ -0,0 +1,11 @@
+--- a/src/common/darktable.h
 b/src/common/darktable.h
+@@ -140,7 +140,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 __has_attribute(target_clones) && !defined(_WIN32) && 
!defined(NATIVE_ARCH) && defined(__GLIBC__)
+ # 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__)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-08-21 Thread Marek Szuba
commit: 1b8e1e1d2253038c753615c6e0acccef34c702ff
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 21 14:50:43 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 21 14:56:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8e1e1d

media-gfx/darktable: drop 4.4.1

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   |   1 -
 media-gfx/darktable/darktable-4.4.1.ebuild | 192 -
 2 files changed, 193 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index aa03c1b42466..50779f4c2b9d 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,4 @@
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B 
bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752
 SHA512 
05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
-DIST darktable-4.4.1.tar.xz 5956860 BLAKE2B 
429086161c56005f902565509525d84a86fb54d318584c4ce8c2da65ea23bebf5772440a5f4cfa023f4738526b2b19c5055257702b2ae1f49349a77462ccd78d
 SHA512 
20af12232957416693515745d28e49351c8e2c20a5c0ea4b11672167aa8521b5377cdbd17fad1a258d97aad0e9f31f55b9f86c816e613e91ef1910edc7d71099
 DIST darktable-4.4.2.tar.xz 6033932 BLAKE2B 
99fec3b3ebc80a03af068d9a9a27a1cbd601183a15d52129495e1bb924be03d274cb768a34ec8c6ad432946f46a78a5d2ba325ae133a82988d828c2170f70991
 SHA512 
7b87879e865001491bbeaa12b9ac42b006bfa3fbcb50e73384c76cce0ee5d87200be3ce9b11f56d669d5eaf9b1add0a018ec5a021653bb84dfb6a0b379cb5594
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 
144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88
 SHA512 
a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
 DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B 
e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b
 SHA512 
ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61

diff --git a/media-gfx/darktable/darktable-4.4.1.ebuild 
b/media-gfx/darktable/darktable-4.4.1.ebuild
deleted file mode 100644
index c9b9baea653e..
--- a/media-gfx/darktable/darktable-4.4.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-   DOC_PV=$(ver_cut 1-2)
-   MY_PV="${PV/_/}"
-   MY_P="${P/_/.}"
-
-   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? (
-   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
-   l10n_uk? (
-   
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
-   -> ${PN}-usermanual-${DOC_PV}.uk.pdf
-   )
-   )"
-
-   KEYWORDS="~amd64 ~arm64 -x86"
-   LANGS=" de es fr he hu ja pl pt-BR sl sq uk zh-CN zh-TW"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad 
geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto 
lua midi nls opencl openmp openexr test tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-# It is sometimes requested, by both users and certain devs, to have 
sys-devel/gcc[graphite]
-# in BDEPEND. This has not been done *on purpose*, for the following reason:
-#  - darktable can also be built with sys-devel/clang so we'd have to have 
that, as an alternative,
-#in BDEPEND too
-#  - there are at least two darktable dependencies (media-libs/mesa and 
virtual/rust) which
-#by default pull in sys-devel/clang
-#  - as a result of the above, for most gcc users adding the above to BDEPEND 
is a no-op
-#(and curiously enough, empirical observations suggest current versions of 
Portage are
-#more likely to pull in Clang to build darktable with than to request 
enabling USE=graphite
-#on GCC; that might be a bug though)
-BDEPEND="dev-util/intltool
-   virtual/pkgconfig
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-07-29 Thread Marek Szuba
commit: 280b73db8c4b0fd9b1ad4a763223b00f47ffc5db
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Jul 29 14:56:59 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Jul 29 17:24:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=280b73db

media-gfx/darktable: add 4.4.2

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   |   1 +
 media-gfx/darktable/darktable-4.4.2.ebuild | 192 +
 2 files changed, 193 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index a1dc79b70ff0..aa03c1b42466 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,6 @@
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B 
bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752
 SHA512 
05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
 DIST darktable-4.4.1.tar.xz 5956860 BLAKE2B 
429086161c56005f902565509525d84a86fb54d318584c4ce8c2da65ea23bebf5772440a5f4cfa023f4738526b2b19c5055257702b2ae1f49349a77462ccd78d
 SHA512 
20af12232957416693515745d28e49351c8e2c20a5c0ea4b11672167aa8521b5377cdbd17fad1a258d97aad0e9f31f55b9f86c816e613e91ef1910edc7d71099
+DIST darktable-4.4.2.tar.xz 6033932 BLAKE2B 
99fec3b3ebc80a03af068d9a9a27a1cbd601183a15d52129495e1bb924be03d274cb768a34ec8c6ad432946f46a78a5d2ba325ae133a82988d828c2170f70991
 SHA512 
7b87879e865001491bbeaa12b9ac42b006bfa3fbcb50e73384c76cce0ee5d87200be3ce9b11f56d669d5eaf9b1add0a018ec5a021653bb84dfb6a0b379cb5594
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 
144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88
 SHA512 
a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
 DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B 
e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b
 SHA512 
ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61
 DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 
98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67
 SHA512 
90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3

diff --git a/media-gfx/darktable/darktable-4.4.2.ebuild 
b/media-gfx/darktable/darktable-4.4.2.ebuild
new file mode 100644
index ..c9b9baea653e
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.4.2.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV=$(ver_cut 1-2)
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
+   l10n_uk? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
+   -> ${PN}-usermanual-${DOC_PV}.uk.pdf
+   )
+   )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" de es fr he hu ja pl pt-BR sl sq uk zh-CN zh-TW"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad 
geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto 
lua midi nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+# It is sometimes requested, by both users and certain devs, to have 
sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with sys-devel/clang so we'd have to have 
that, as an alternative,
+#in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and 
virtual/rust) which
+#by default pull in sys-devel/clang
+#  - as a result of the above, for most gcc users adding the 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-07-02 Thread Markus Meier
commit: b3396f8c8aa886707cbb19751e0a702e6fe56f54
Author: Markus Meier  gentoo  org>
AuthorDate: Sun Jul  2 08:32:32 2023 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sun Jul  2 08:32:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3396f8c

media-gfx/darktable: version bump and add jpegxl support by cfuga on github MR 
31632

Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest  | 2 +-
 .../darktable/{darktable-4.4.0-r1.ebuild => darktable-4.4.1.ebuild}   | 4 +++-
 media-gfx/darktable/metadata.xml  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 713f6a2b76a4..a1dc79b70ff0 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,5 @@
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B 
bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752
 SHA512 
05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
-DIST darktable-4.4.0.tar.xz 5794168 BLAKE2B 
39bc8225175d7e5ea54924d50c9083752ae32bff82bb9630ed774c7f6e9254a61e6e5d912287825d0922d7c58a6504c261fb8d13ba73f4c64eaae11cc26c18c4
 SHA512 
61a0280b78c6862cc1cac009ee41a20077b17f75eede28c3598ce01951dd122fd65e2baf891ae69be9202736d139bb8cf53ad71afd87ab112e66ce389d635861
+DIST darktable-4.4.1.tar.xz 5956860 BLAKE2B 
429086161c56005f902565509525d84a86fb54d318584c4ce8c2da65ea23bebf5772440a5f4cfa023f4738526b2b19c5055257702b2ae1f49349a77462ccd78d
 SHA512 
20af12232957416693515745d28e49351c8e2c20a5c0ea4b11672167aa8521b5377cdbd17fad1a258d97aad0e9f31f55b9f86c816e613e91ef1910edc7d71099
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 
144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88
 SHA512 
a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
 DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B 
e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b
 SHA512 
ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61
 DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 
98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67
 SHA512 
90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3

diff --git a/media-gfx/darktable/darktable-4.4.0-r1.ebuild 
b/media-gfx/darktable/darktable-4.4.1.ebuild
similarity index 97%
rename from media-gfx/darktable/darktable-4.4.0-r1.ebuild
rename to media-gfx/darktable/darktable-4.4.1.ebuild
index 79cd8fb54c65..c9b9baea653e 100644
--- a/media-gfx/darktable/darktable-4.4.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-4.4.1.ebuild
@@ -35,7 +35,7 @@ else
LANGS=" de es fr he hu ja pl pt-BR sl sq uk zh-CN zh-TW"
 fi
 
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad 
geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua 
midi nls opencl openmp openexr test tools webp
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad 
geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto 
lua midi nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -85,6 +85,7 @@ DEPEND="dev-db/sqlite:3
graphicsmagick? ( media-gfx/graphicsmagick )
heif? ( media-libs/libheif:= )
jpeg2k? ( media-libs/openjpeg:2= )
+   jpegxl? ( media-libs/libjxl:= )
lua? ( ${LUA_DEPS} )
midi? ( media-libs/portmidi )
opencl? ( virtual/opencl )
@@ -146,6 +147,7 @@ src_configure() {
-DUSE_COLORD=$(usex colord)
-DUSE_GMIC=$(usex gmic)
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+   -DUSE_JXL=$(usex jpegxl)
-DUSE_KWALLET=$(usex kwallet)
-DUSE_LIBSECRET=$(usex keyring)
-DUSE_LUA=$(usex lua)

diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index c20058315b0b..5c009a50a935 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -15,6 +15,7 @@
Support using game controllers as input 
devices
Enable geotagging support
Use the G'MIC image-processing framework 
(media-gfx/gmic), e.g. to support Colour LUTs compressed using their 
compression scheme
+   Enable support for JPEG XL image 
format
Enable 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-06-29 Thread Marek Szuba
commit: 7147641fae9b8d22b49187484af8825a48f80095
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Jun 29 10:12:10 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Jun 29 10:22:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7147641f

media-gfx/darktable: drop IUSE=flickr from 4.4.0

Gone now.

Closes: https://bugs.gentoo.org/909318
Signed-off-by: Marek Szuba  gentoo.org>

 .../darktable/{darktable-4.4.0.ebuild => darktable-4.4.0-r1.ebuild}   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-gfx/darktable/darktable-4.4.0.ebuild 
b/media-gfx/darktable/darktable-4.4.0-r1.ebuild
similarity index 96%
rename from media-gfx/darktable/darktable-4.4.0.ebuild
rename to media-gfx/darktable/darktable-4.4.0-r1.ebuild
index 1c21427c289e..79cd8fb54c65 100644
--- a/media-gfx/darktable/darktable-4.4.0.ebuild
+++ b/media-gfx/darktable/darktable-4.4.0-r1.ebuild
@@ -35,7 +35,7 @@ else
LANGS=" de es fr he hu ja pl pt-BR sl sq uk zh-CN zh-TW"
 fi
 
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua 
midi nls opencl openmp openexr test tools webp
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad 
geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua 
midi nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -77,7 +77,6 @@ DEPEND="dev-db/sqlite:3
avif? ( >=media-libs/libavif-0.8.2:= )
colord? ( x11-libs/colord-gtk:= )
cups? ( net-print/cups )
-   flickr? ( media-libs/flickcurl )
gamepad? ( media-libs/libsdl2 )
geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
gmic? ( media-gfx/gmic )
@@ -145,7 +144,6 @@ src_configure() {
-DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-   -DUSE_FLICKR=$(usex flickr)
-DUSE_GMIC=$(usex gmic)
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-DUSE_KWALLET=$(usex kwallet)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-06-27 Thread Markus Meier
commit: eeabcd9e5ddcf579a31a34a6966d19de35656dd2
Author: Markus Meier  gentoo  org>
AuthorDate: Tue Jun 27 15:36:23 2023 +
Commit: Markus Meier  gentoo  org>
CommitDate: Tue Jun 27 15:36:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeabcd9e

media-gfx/darktable: version bump

Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest   |   3 +
 media-gfx/darktable/darktable-4.4.0.ebuild | 192 +
 2 files changed, 195 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 872cb5750919..713f6a2b76a4 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,3 +1,6 @@
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B 
bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752
 SHA512 
05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
+DIST darktable-4.4.0.tar.xz 5794168 BLAKE2B 
39bc8225175d7e5ea54924d50c9083752ae32bff82bb9630ed774c7f6e9254a61e6e5d912287825d0922d7c58a6504c261fb8d13ba73f4c64eaae11cc26c18c4
 SHA512 
61a0280b78c6862cc1cac009ee41a20077b17f75eede28c3598ce01951dd122fd65e2baf891ae69be9202736d139bb8cf53ad71afd87ab112e66ce389d635861
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 
144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88
 SHA512 
a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
 DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B 
e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b
 SHA512 
ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61
+DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 
98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67
 SHA512 
90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3
+DIST darktable-usermanual-4.4.uk.pdf 33796107 BLAKE2B 
060218ec9b7fbcec947506ea9fdf355411d0b1242d41b9ffb7abd8dd991ece29e75c06231251d2ec2701e319e1b1e8134c08603649fe7e933d21b4aef597f7c3
 SHA512 
f2a6837a05114d4254fade358382be5fabcbd980a3c4fad702b1102176c7e261fd8646aeef1c0328001da8f7cb25d50b06c9f1163a54987985f556c616728bf5

diff --git a/media-gfx/darktable/darktable-4.4.0.ebuild 
b/media-gfx/darktable/darktable-4.4.0.ebuild
new file mode 100644
index ..1c21427c289e
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.4.0.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV=$(ver_cut 1-2)
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
+   l10n_uk? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
+   -> ${PN}-usermanual-${DOC_PV}.uk.pdf
+   )
+   )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" de es fr he hu ja pl pt-BR sl sq uk zh-CN zh-TW"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua 
midi nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+# It is sometimes requested, by both users and certain devs, to have 
sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with sys-devel/clang so we'd have to have 
that, as an alternative,
+#in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and 
virtual/rust) which
+#by default pull in sys-devel/clang
+#  - as a result of the above, for most gcc 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-06-08 Thread Andreas Sturmlechner
commit: fc0ed6548ca5bf0b791071fab08302590dc36f5b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  8 19:24:00 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  8 19:38:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0ed654

media-gfx/darktable: fix whitespace, add bugref

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/darktable/darktable-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild 
b/media-gfx/darktable/darktable-4.2.1.ebuild
index bcd74d9a9e34..7a803774aebb 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -100,7 +100,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
# patch by ArchLinux
-"${FILESDIR}"/${P}-exiv2-0.28.patch
+   "${FILESDIR}"/${P}-exiv2-0.28.patch # bug 906466
 )
 
 S="${WORKDIR}/${P/_/~}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/

2023-06-08 Thread Andreas Sturmlechner
commit: db72a304c8b761ee3254ea42867d5e5e802770d3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  8 13:47:19 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  8 14:05:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db72a304

media-gfx/darktable: Fix build with >=exiv2-0.28

Closes: https://bugs.gentoo.org/906466
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/darktable/darktable-4.2.1.ebuild |   2 +
 .../files/darktable-4.2.1-exiv2-0.28.patch | 215 +
 2 files changed, 217 insertions(+)

diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild 
b/media-gfx/darktable/darktable-4.2.1.ebuild
index 48162abb7759..bcd74d9a9e34 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -99,6 +99,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
+   # patch by ArchLinux
+"${FILESDIR}"/${P}-exiv2-0.28.patch
 )
 
 S="${WORKDIR}/${P/_/~}"

diff --git a/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch 
b/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch
new file mode 100644
index ..1be8577ae369
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-4.2.1-exiv2-0.28.patch
@@ -0,0 +1,215 @@
+diff --git a/src/common/exif.cc b/src/common/exif.cc
+index 484ebf2207..91ea8e64d0 100644
+--- a/src/common/exif.cc
 b/src/common/exif.cc
+@@ -80,6 +80,11 @@ extern "C" {
+ 
+ #define DT_XMP_EXIF_VERSION 5
+ 
++#if EXIV2_TEST_VERSION(0,28,0)
++#define AnyError Error
++#define toLong toInt64
++#endif
++
+ // persistent list of exiv2 tags. set up in dt_init()
+ static GList *exiv2_taglist = NULL;
+ 
+@@ -2658,39 +2663,39 @@ static GList *read_history_v2(Exiv2::XmpData , 
const char *filename)
+   if(g_str_has_prefix(key_iter, "darktable:operation"))
+   {
+ current_entry->have_operation = TRUE;
+-current_entry->operation = 
g_strdup(history->value().toString().c_str());
++current_entry->operation = g_strdup(history->toString().c_str());
+   }
+   else if(g_str_has_prefix(key_iter, "darktable:num"))
+   {
+-current_entry->num = history->value().toLong();
++current_entry->num = history->toLong();
+   }
+   else if(g_str_has_prefix(key_iter, "darktable:enabled"))
+   {
+-current_entry->enabled = history->value().toLong() == 1;
++current_entry->enabled = history->toLong() == 1;
+   }
+   else if(g_str_has_prefix(key_iter, "darktable:modversion"))
+   {
+ current_entry->have_modversion = TRUE;
+-current_entry->modversion = history->value().toLong();
++current_entry->modversion = history->toLong();
+   }
+   else if(g_str_has_prefix(key_iter, "darktable:params"))
+   {
+ current_entry->have_params = TRUE;
+-current_entry->params = 
dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(),
++current_entry->params = 
dt_exif_xmp_decode(history->toString().c_str(), history->size(),
+
_entry->params_len);
+   }
+   else if(g_str_has_prefix(key_iter, "darktable:multi_name"))
+   {
+-current_entry->multi_name = 
g_strdup(history->value().toString().c_str());
++current_entry->multi_name = g_strdup(history->toString().c_str());
+   }
+   else if(g_str_has_prefix(key_iter, "darktable:multi_priority"))
+   {
+-current_entry->multi_priority = history->value().toLong();
++current_entry->multi_priority = history->toLong();
+   }
+   else if(g_str_has_prefix(key_iter, "darktable:iop_order"))
+   {
+ // we ensure reading the iop_order as a high precision float
+-string str = g_strdup(history->value().toString().c_str());
++string str = g_strdup(history->toString().c_str());
+ static const std::locale& c_locale = std::locale("C");
+ std::istringstream istring(str);
+ istring.imbue(c_locale);
+@@ -2698,12 +2703,12 @@ static GList *read_history_v2(Exiv2::XmpData , 
const char *filename)
+   }
+   else if(g_str_has_prefix(key_iter, "darktable:blendop_version"))
+   {
+-current_entry->blendop_version = history->value().toLong();
++current_entry->blendop_version = history->toLong();
+   }
+   else if(g_str_has_prefix(key_iter, "darktable:blendop_params"))
+   {
+-current_entry->blendop_params = 
dt_exif_xmp_decode(history->value().toString().c_str(),
+-   
history->value().size(),
++current_entry->blendop_params = 
dt_exif_xmp_decode(history->toString().c_str(),
++   history->size(),
+ 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-05-18 Thread Andreas Sturmlechner
commit: 49f2ab1660acf27052169b289b677ec4cb625170
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 14 12:16:50 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 18 12:09:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f2ab16

media-gfx/darktable: Rename USE=gnome-keyring -> keyring

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/darktable/darktable-4.2.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild 
b/media-gfx/darktable/darktable-4.2.1.ebuild
index 0c74ea008ae7..48162abb7759 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -35,7 +35,7 @@ else
LANGS=" cs de es fi fr he hu it ja nl pl pt-BR ru sl sq tr uk zh-CN 
zh-TW"
 fi
 
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto 
lua midi nls opencl openmp openexr test tools webp
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto lua 
midi nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -81,7 +81,7 @@ DEPEND="dev-db/sqlite:3
gamepad? ( media-libs/libsdl2 )
geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
gmic? ( media-gfx/gmic )
-   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+   keyring? ( >=app-crypt/libsecret-0.18 )
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
heif? ( media-libs/libheif:= )
@@ -150,7 +150,7 @@ src_configure() {
-DUSE_GMIC=$(usex gmic)
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-DUSE_KWALLET=$(usex kwallet)
-   -DUSE_LIBSECRET=$(usex gnome-keyring)
+   -DUSE_LIBSECRET=$(usex keyring)
-DUSE_LUA=$(usex lua)
-DUSE_MAP=$(usex geolocation)
-DUSE_NLS=$(usex nls)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/

2023-03-30 Thread Marek Szuba
commit: f0451f8a7dc1ff9898ee51aae65a51c9b7ebc842
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Mar 30 11:48:59 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Mar 30 11:48:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0451f8a

media-gfx/darktable: drop 4.0.1-r1

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   |   3 -
 media-gfx/darktable/darktable-4.0.1-r1.ebuild  | 189 -
 .../files/darktable-3.0.0_find-opencl-header.patch |  12 --
 .../darktable-4.0.1_libs-deps-automagic.patch  |  37 
 .../darktable-4.2.0_libs-deps-automagic.patch  |  44 -
 5 files changed, 285 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 13913dd738a1..872cb5750919 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,6 +1,3 @@
-DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 
677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3
 SHA512 
f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B 
bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752
 SHA512 
05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
-DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 
85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618
 SHA512 
789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
-DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 
6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c
 SHA512 
e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 
144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88
 SHA512 
a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
 DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B 
e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b
 SHA512 
ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61

diff --git a/media-gfx/darktable/darktable-4.0.1-r1.ebuild 
b/media-gfx/darktable/darktable-4.0.1-r1.ebuild
deleted file mode 100644
index 1597b944fbd4..
--- a/media-gfx/darktable/darktable-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-   DOC_PV=$(ver_cut 1-2)
-   MY_PV="${PV/_/}"
-   MY_P="${P/_/.}"
-
-   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? (
-   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
-   l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
-   )"
-
-   KEYWORDS="amd64 ~arm64 -x86"
-   LANGS=" cs de eo es fi fr he hu it ja nl pt-BR ru sl tr uk zh-CN"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto 
lua midi nls opencl openmp openexr test tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-# It is sometimes requested, by both users and certain devs, to have 
sys-devel/gcc[graphite]
-# in BDEPEND. This has not been done *on purpose*, for the following reason:
-#  - darktable can also be built with sys-devel/clang so we'd have to have 
that, as an alternative,
-#in BDEPEND too
-#  - there are at least two darktable dependencies 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-03-25 Thread Marek Szuba
commit: 9df8d1e483b916ac6a014546965b6f275d9d4000
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Mar 25 21:51:49 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Mar 25 21:51:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df8d1e4

media-gfx/darktable: stabilize 4.2.1 for amd64

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild 
b/media-gfx/darktable/darktable-4.2.1.ebuild
index aba89cc810c2..0c74ea008ae7 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -31,7 +31,7 @@ else
)
)"
 
-   KEYWORDS="~amd64 ~arm64 -x86"
+   KEYWORDS="amd64 ~arm64 -x86"
LANGS=" cs de es fi fr he hu it ja nl pl pt-BR ru sl sq tr uk zh-CN 
zh-TW"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-03-25 Thread Marek Szuba
commit: e5c626bf9b16f036d1265b32eb394c545ad35adf
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Mar 25 21:50:18 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Mar 25 21:50:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c626bf

media-gfx/darktable: drop 4.2.0

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   |   1 -
 media-gfx/darktable/darktable-4.2.0.ebuild | 189 -
 2 files changed, 190 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index c5c5033cf47f..13913dd738a1 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,4 @@
 DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 
677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3
 SHA512 
f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
-DIST darktable-4.2.0.tar.xz 5862080 BLAKE2B 
eb1c6ab821587cd9d79628d2be24659db6e698a52ee7a7f830b386dd409c96b243a017644a09cf38fcc366c9d7563d057200904aed3ac6f17d4a07fc2758f466
 SHA512 
17f3e1a97f0af8928b6a7936e1f8923e164344c6adb8393c7aaabce6e62541f2d941929b331283d4f73c477081850c98d694d01f9a002add71c0a41e2272289f
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B 
bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752
 SHA512 
05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
 DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 
85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618
 SHA512 
789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
 DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 
6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c
 SHA512 
e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846

diff --git a/media-gfx/darktable/darktable-4.2.0.ebuild 
b/media-gfx/darktable/darktable-4.2.0.ebuild
deleted file mode 100644
index 7a8ae5b14958..
--- a/media-gfx/darktable/darktable-4.2.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-   DOC_PV=$(ver_cut 1-2)
-   MY_PV="${PV/_/}"
-   MY_P="${P/_/.}"
-
-   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? (
-   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
-   l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
-   )"
-
-   KEYWORDS="~amd64 ~arm64 -x86"
-   LANGS=" de es fi fr hu it ja nl pl pt-BR ru sl sq tr uk zh-TW"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto 
lua midi nls opencl openmp openexr test tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-# It is sometimes requested, by both users and certain devs, to have 
sys-devel/gcc[graphite]
-# in BDEPEND. This has not been done *on purpose*, for the following reason:
-#  - darktable can also be built with sys-devel/clang so we'd have to have 
that, as an alternative,
-#in BDEPEND too
-#  - there are at least two darktable dependencies (media-libs/mesa and 
virtual/rust) which
-#by default pull in sys-devel/clang
-#  - as a result of the above, for most gcc users adding the above to BDEPEND 
is a no-op
-#(and curiously enough, empirical observations suggest current versions of 
Portage are
-#more likely to pull in Clang to build darktable with than to request 
enabling USE=graphite
-#on GCC; that might be a bug though)
-BDEPEND="dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-   test? ( >=dev-python/jsonschema-3.2.0 )"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/

2023-02-28 Thread Marek Szuba
commit: 05e28cce9d058d40e7d2001c1202b315b8a6742d
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Feb 28 12:07:15 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Feb 28 13:12:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e28cce

media-gfx/darktable: fix rawspeed CPU-property detection on musl

For page-cache size, the sys-libs/musl version currently in the tree
does support the relevant syscall so just make sure the test program
recognises this correctly.

For cache-line length, it does not presently seem to be possible to
look this up on a musl system so have CMake fall back to the hard-coded
default. It can already do so when in "build binary package" mode so it
has been a simple matter of extending one condition to check for the
ebuild-specified "am I linking against musl?" option.

Closes: https://bugs.gentoo.org/832027
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-4.2.1.ebuild |  2 ++
 .../files/darktable-4.2.1_cmake-musl.patch | 22 ++
 2 files changed, 24 insertions(+)

diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild 
b/media-gfx/darktable/darktable-4.2.1.ebuild
index c9c57caa2f1f..aba89cc810c2 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+   "${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
@@ -140,6 +141,7 @@ src_configure() {
-DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
-DRAWSPEED_ENABLE_WERROR=OFF
+   -DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl)
-DTESTBUILD_OPENCL_PROGRAMS=OFF
-DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)

diff --git a/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch 
b/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch
new file mode 100644
index ..33ad7f647752
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-4.2.1_cmake-musl.patch
@@ -0,0 +1,22 @@
+--- a/src/external/rawspeed/cmake/Modules/cpu-cache-line-size.cmake
 b/src/external/rawspeed/cmake/Modules/cpu-cache-line-size.cmake
+@@ -2,7 +2,7 @@
+ 
+ unset(RAWSPEED_CACHELINESIZE)
+ 
+-if(BINARY_PACKAGE_BUILD)
++if(BINARY_PACKAGE_BUILD OR RAWSPEED_MUSL_SYSTEM)
+   message(STATUS "Performing binary package build, using hardcoded value.")
+ else()
+   try_run(RAWSPEED_CACHELINESIZE_EXITCODE RAWSPEED_CACHELINESIZE_COMPILED
+--- a/src/external/rawspeed/cmake/Modules/cpu-page-size.cpp
 b/src/external/rawspeed/cmake/Modules/cpu-page-size.cpp
+@@ -4,7 +4,7 @@
+ #include  // for _POSIX_C_SOURCE, sysconf, _SC_PAGESIZE
+ #endif
+ 
+-#if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 1) || defined(__APPLE__)
++#if defined(_SC_PAGESIZE)
+ 
+ int main() {
+   long val = ::sysconf(_SC_PAGESIZE);



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-02-28 Thread Marek Szuba
commit: a756e1d067399e45d2096f1e97c38ebedf13b1a4
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Feb 28 09:56:44 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Feb 28 10:42:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a756e1d0

media-gfx/darktable: squash -Werror in rawspeed

Darktable as a whole only enables -Werror by default while building in a
Git working tree, rawspeed however has a separate option to control this
which is on by default.

Closes: https://bugs.gentoo.org/886265
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-4.2.1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild 
b/media-gfx/darktable/darktable-4.2.1.ebuild
index 20656cde0bbd..c9c57caa2f1f 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -25,7 +25,10 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? (

https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
-   l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
+   l10n_uk? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
+   -> ${PN}-usermanual-${DOC_PV}.uk.pdf
+   )
)"
 
KEYWORDS="~amd64 ~arm64 -x86"
@@ -136,6 +139,7 @@ src_configure() {
-DCUSTOM_CFLAGS=ON
-DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
+   -DRAWSPEED_ENABLE_WERROR=OFF
-DTESTBUILD_OPENCL_PROGRAMS=OFF
-DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-02-26 Thread Markus Meier
commit: 13ce4267aa6b3bbbfa07084d1ad84dd441b47106
Author: Markus Meier  gentoo  org>
AuthorDate: Sun Feb 26 12:44:21 2023 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sun Feb 26 12:44:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ce4267

media-gfx/darktable: version bump

Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest   |   1 +
 media-gfx/darktable/darktable-4.2.1.ebuild | 187 +
 2 files changed, 188 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 29de8ad79d88..c5c5033cf47f 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,6 @@
 DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 
677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3
 SHA512 
f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
 DIST darktable-4.2.0.tar.xz 5862080 BLAKE2B 
eb1c6ab821587cd9d79628d2be24659db6e698a52ee7a7f830b386dd409c96b243a017644a09cf38fcc366c9d7563d057200904aed3ac6f17d4a07fc2758f466
 SHA512 
17f3e1a97f0af8928b6a7936e1f8923e164344c6adb8393c7aaabce6e62541f2d941929b331283d4f73c477081850c98d694d01f9a002add71c0a41e2272289f
+DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B 
bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752
 SHA512 
05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
 DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 
85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618
 SHA512 
789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
 DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 
6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c
 SHA512 
e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 
144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88
 SHA512 
a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531

diff --git a/media-gfx/darktable/darktable-4.2.1.ebuild 
b/media-gfx/darktable/darktable-4.2.1.ebuild
new file mode 100644
index ..20656cde0bbd
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV=$(ver_cut 1-2)
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
+   l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
+   )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" cs de es fi fr he hu it ja nl pl pt-BR ru sl sq tr uk zh-CN 
zh-TW"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto 
lua midi nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+# It is sometimes requested, by both users and certain devs, to have 
sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with sys-devel/clang so we'd have to have 
that, as an alternative,
+#in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and 
virtual/rust) which
+#by default pull in sys-devel/clang
+#  - as a result of the above, for most gcc users adding the above to BDEPEND 
is a no-op
+#(and curiously enough, 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2023-01-08 Thread Marek Szuba
commit: bc46d412b7721848c2c7604cefa705ec4b59cac7
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Jan  8 22:07:37 2023 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Jan  8 22:07:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc46d412

media-gfx/darktable: update Manifest

User-manual PDFs for the 4.2 branch have been modified upstream.

Closes: https://bugs.gentoo.org/888125
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 6f92b7d531c2..29de8ad79d88 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,5 +2,5 @@ DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 
677ee85d8b353e9e4fa015226e7383b98b90
 DIST darktable-4.2.0.tar.xz 5862080 BLAKE2B 
eb1c6ab821587cd9d79628d2be24659db6e698a52ee7a7f830b386dd409c96b243a017644a09cf38fcc366c9d7563d057200904aed3ac6f17d4a07fc2758f466
 SHA512 
17f3e1a97f0af8928b6a7936e1f8923e164344c6adb8393c7aaabce6e62541f2d941929b331283d4f73c477081850c98d694d01f9a002add71c0a41e2272289f
 DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 
85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618
 SHA512 
789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
 DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 
6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c
 SHA512 
e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846
-DIST darktable-usermanual-4.2.en.pdf 26552260 BLAKE2B 
a090e6e9a3b714d04c2c65ae0c77afa74b2a26c5130731e83b9f5bfe25935391c3dbc21d408f13776975e8c2e794d232a54a54d6a932f0389cb2fc993c2fa159
 SHA512 
49ff878c4a82d91b88f1f9a28986616f382dc5b40d0a47e3a8cfb27efd79fdd7d8bf3c416d659fdb61ac505d75ed003587e51555389aaec5f9e35bb770f18eac
-DIST darktable-usermanual-4.2.uk.pdf 26472343 BLAKE2B 
d5d8446dead97693be168f4a426a56ce215bb6c3e2d931be19b515abbbe75265fbd17fa433fb3f14630d74323efcd40683694d7af6d3b4456888ec9965aba1ff
 SHA512 
d348ce8edf1847cac6d20744dedd85351ff77b51ac717fe173ef28c9588dcddba06584aef8741661b2ba9652229b9a97ba2220764c957a0a9e645a9b8809f913
+DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 
144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88
 SHA512 
a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
+DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B 
e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b
 SHA512 
ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/, media-gfx/darktable/files/

2022-12-23 Thread Markus Meier
commit: 32c316079e114941cd09aef01026931cc5586e6b
Author: Markus Meier  gentoo  org>
AuthorDate: Fri Dec 23 18:07:10 2022 +
Commit: Markus Meier  gentoo  org>
CommitDate: Fri Dec 23 18:07:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c31607

media-gfx/darktable: version bump

Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest   |   3 +
 media-gfx/darktable/darktable-4.2.0.ebuild | 189 +
 .../darktable-4.2.0_libs-deps-automagic.patch  |  44 +
 3 files changed, 236 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 7aff2c667aa5..6f92b7d531c2 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,3 +1,6 @@
 DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 
677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3
 SHA512 
f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
+DIST darktable-4.2.0.tar.xz 5862080 BLAKE2B 
eb1c6ab821587cd9d79628d2be24659db6e698a52ee7a7f830b386dd409c96b243a017644a09cf38fcc366c9d7563d057200904aed3ac6f17d4a07fc2758f466
 SHA512 
17f3e1a97f0af8928b6a7936e1f8923e164344c6adb8393c7aaabce6e62541f2d941929b331283d4f73c477081850c98d694d01f9a002add71c0a41e2272289f
 DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 
85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618
 SHA512 
789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
 DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 
6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c
 SHA512 
e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846
+DIST darktable-usermanual-4.2.en.pdf 26552260 BLAKE2B 
a090e6e9a3b714d04c2c65ae0c77afa74b2a26c5130731e83b9f5bfe25935391c3dbc21d408f13776975e8c2e794d232a54a54d6a932f0389cb2fc993c2fa159
 SHA512 
49ff878c4a82d91b88f1f9a28986616f382dc5b40d0a47e3a8cfb27efd79fdd7d8bf3c416d659fdb61ac505d75ed003587e51555389aaec5f9e35bb770f18eac
+DIST darktable-usermanual-4.2.uk.pdf 26472343 BLAKE2B 
d5d8446dead97693be168f4a426a56ce215bb6c3e2d931be19b515abbbe75265fbd17fa433fb3f14630d74323efcd40683694d7af6d3b4456888ec9965aba1ff
 SHA512 
d348ce8edf1847cac6d20744dedd85351ff77b51ac717fe173ef28c9588dcddba06584aef8741661b2ba9652229b9a97ba2220764c957a0a9e645a9b8809f913

diff --git a/media-gfx/darktable/darktable-4.2.0.ebuild 
b/media-gfx/darktable/darktable-4.2.0.ebuild
new file mode 100644
index ..7a8ae5b14958
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.2.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV=$(ver_cut 1-2)
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
+   l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
+   )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" de es fi fr hu it ja nl pl pt-BR ru sl sq tr uk zh-TW"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto 
lua midi nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+# It is sometimes requested, by both users and certain devs, to have 
sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with sys-devel/clang so we'd have to have 
that, as an alternative,
+#in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and 
virtual/rust) which
+#by default pull in sys-devel/clang
+#  - as a result of the above, for most gcc users adding 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-12-05 Thread Marek Szuba
commit: a4a141f6963b818081bc26c20047afe08ac46cae
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Dec  5 12:34:34 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Dec  5 12:51:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a141f6

media-gfx/darktable: comment on why we don't have sys-devel/gcc[graphite] in 
BDEPEND

Yes, I HAVE tested these claims - both on the default amd64 stage3
system and using a configuration explicitly set up to prevent LLVM/Clang
from being pulled in (emerged dev-lang/rust-bin by hand to satisfy
virtual/rust + added */* -llvm VIDEO_CARDS: -* to package.use).

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-4.0.1.ebuild | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/media-gfx/darktable/darktable-4.0.1.ebuild 
b/media-gfx/darktable/darktable-4.0.1.ebuild
index c89e7aa5207f..5fe13ce234b3 100644
--- a/media-gfx/darktable/darktable-4.0.1.ebuild
+++ b/media-gfx/darktable/darktable-4.0.1.ebuild
@@ -39,6 +39,16 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 
+# It is sometimes requested, by both users and certain devs, to have 
sys-devel/gcc[graphite]
+# in BDEPEND. This has not been done *on purpose*, for the following reason:
+#  - darktable can also be built with sys-devel/clang so we'd have to have 
that, as an alternative,
+#in BDEPEND too
+#  - there are at least two darktable dependencies (media-libs/mesa and 
virtual/rust) which
+#by default pull in sys-devel/clang
+#  - as a result of the above, for most gcc users adding the above to BDEPEND 
is a no-op
+#(and curiously enough, empirical observations suggest current versions of 
Portage are
+#more likely to pull in Clang to build darktable with than to request 
enabling USE=graphite
+#on GCC; that might be a bug though)
 BDEPEND="dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-12-02 Thread Marek Szuba
commit: eb2f6f10f1ab0007368510cff1768722d49a2b39
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Dec  2 23:29:54 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Dec  2 23:30:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb2f6f10

media-gfx/darktable: make sys-devel/gcc[-graphite] error message more detailed

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-4.0.1.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-gfx/darktable/darktable-4.0.1.ebuild 
b/media-gfx/darktable/darktable-4.0.1.ebuild
index fcd47002d330..c89e7aa5207f 100644
--- a/media-gfx/darktable/darktable-4.0.1.ebuild
+++ b/media-gfx/darktable/darktable-4.0.1.ebuild
@@ -95,8 +95,11 @@ pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
# Bug #695658
if tc-is-gcc; then
-   test-flags-CC -floop-block &> /dev/null || \
-   die "Please switch to a gcc version built with 
USE=graphite"
+   if ! test-flags-CC -floop-block &> /dev/null; then
+   eerror "Building ${PN} with GCC requires 
Graphite support."
+   eerror "Please switch to a version of 
sys-devel/gcc built with USE=graphite, or use a different compiler."
+   die "Selected compiler is 
sys-devel/gcc[-graphite]"
+   fi
fi
 
use openmp && tc-check-openmp



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/

2022-11-03 Thread Marek Szuba
commit: 92a10d5c7d1626c606500c796110da2d650700e6
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Nov  3 23:11:36 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Nov  3 23:11:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a10d5c

media-gfx/darktable: drop 3.8.0-r3, 4.0.0

Removal of the former drops darktable to ~arm64-only. This is
intentional.

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   |   7 -
 media-gfx/darktable/darktable-3.8.0-r3.ebuild  | 178 -
 media-gfx/darktable/darktable-4.0.0.ebuild | 177 
 .../darktable/files/darktable-3.6.1_openexr.patch  |  65 
 .../darktable-3.8.0_libs-deps-automagic.patch  |  37 -
 5 files changed, 464 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index b670e7d532eb..7aff2c667aa5 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,10 +1,3 @@
-DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B 
a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531
 SHA512 
ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
-DIST darktable-4.0.0.tar.xz 5829684 BLAKE2B 
91198a47c4dab3368c934815425f430ae5b23e35f585a6c2b70322932cfd7fff19db76bd5f1dd50da81be1b8c9b82b12cb2c6c349e4808432f2ed195a015ecc2
 SHA512 
16b1cce589bdcd9c47685c9bd4705d35a739cfbad35ec7f414ce38848decc2e156bcbc7fe40f15026851927171072219ee0435e7cc64ca6fd763e479be5b5156
 DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 
677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3
 SHA512 
f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
-DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B 
f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5
 SHA512 
ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
-DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 
90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67
 SHA512 
b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a
-DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 
988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743
 SHA512 
1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc
-DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B 
afb6d3c1ea6b709e535e10ae2a491fb6a87c84dcfe17823a518931bda0cd8595cda72905cffc01698e60c3df991451a5cccbfcdea82966a506b2d29d61298f09
 SHA512 
8734a9e6c57ba37f32966873b85584c50968c1c895fa4e9d953e129bb5834f254ca46e20741d5664429ef7d6379e5a35e59f8ecb517ca88ff536b49a8216b603
-DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B 
abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39
 SHA512 
e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a
 DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 
85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618
 SHA512 
789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
 DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 
6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c
 SHA512 
e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846

diff --git a/media-gfx/darktable/darktable-3.8.0-r3.ebuild 
b/media-gfx/darktable/darktable-3.8.0-r3.ebuild
deleted file mode 100644
index 5ab72df97f6d..
--- a/media-gfx/darktable/darktable-3.8.0-r3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-11-03 Thread Marek Szuba
commit: f8937e2ee7127cc098227701a29d3adef29dd1e9
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Nov  3 23:10:27 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Nov  3 23:10:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8937e2e

media-gfx/darktable: stabilize 4.0.1 for amd64

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-4.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-4.0.1.ebuild 
b/media-gfx/darktable/darktable-4.0.1.ebuild
index 34dbd9359da5..fcd47002d330 100644
--- a/media-gfx/darktable/darktable-4.0.1.ebuild
+++ b/media-gfx/darktable/darktable-4.0.1.ebuild
@@ -28,7 +28,7 @@ else
l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
)"
 
-   KEYWORDS="~amd64 ~arm64 -x86"
+   KEYWORDS="amd64 ~arm64 -x86"
LANGS=" cs de eo es fi fr he hu it ja nl pt-BR ru sl tr uk zh-CN"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-09-25 Thread Marek Szuba
commit: 1dfff0bff91c4a320b2bc4ec3113eb6a9f9c9131
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Sep 26 00:54:17 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Sep 26 01:01:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfff0bf

media-gfx/darktable: drop 3.8.1-r1

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest  |   1 -
 media-gfx/darktable/darktable-3.8.1-r1.ebuild | 179 --
 2 files changed, 180 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 570f3b076365..b670e7d532eb 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,4 @@
 DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B 
a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531
 SHA512 
ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
-DIST darktable-3.8.1.tar.xz 5514756 BLAKE2B 
e17bf4cc8f8d3f3fd6649c66c56777aa1e946a91cec1bc3b4c59ba1285aa16c608f725f549622b740417a8040a7bb5d63b2378997a05c2095f1b6814c05815de
 SHA512 
8b1b0c9e1a0bd9b327d34d28fe33dd1a2c7255864f6fa0c15af364a029aaa3cff5e039ff6461e48d3b4327b7656efe70ad9da12245d3a01d7566545d191448ba
 DIST darktable-4.0.0.tar.xz 5829684 BLAKE2B 
91198a47c4dab3368c934815425f430ae5b23e35f585a6c2b70322932cfd7fff19db76bd5f1dd50da81be1b8c9b82b12cb2c6c349e4808432f2ed195a015ecc2
 SHA512 
16b1cce589bdcd9c47685c9bd4705d35a739cfbad35ec7f414ce38848decc2e156bcbc7fe40f15026851927171072219ee0435e7cc64ca6fd763e479be5b5156
 DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 
677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3
 SHA512 
f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
 DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B 
f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5
 SHA512 
ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3

diff --git a/media-gfx/darktable/darktable-3.8.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.8.1-r1.ebuild
deleted file mode 100644
index bd7a6924df88..
--- a/media-gfx/darktable/darktable-3.8.1-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-   DOC_PV=$(ver_cut 1-2)
-   MY_PV="${PV/_/}"
-   MY_P="${P/_/.}"
-
-   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? (
-   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
-   l10n_de? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/de/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.de.pdf )
-   l10n_fr? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/fr/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.fr.pdf )
-   l10n_pt-BR? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/pt_br/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pt_br.pdf )
-   l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
-   )"
-
-   KEYWORDS="amd64 ~arm64 -x86"
-   LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua 
midi nls opencl openmp openexr test tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-   test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
-   dev-libs/icu:=
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   >=dev-libs/pugixml-1.8:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libjpeg-turbo:=
-  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/, media-gfx/darktable/files/

2022-09-20 Thread Marek Szuba
commit: 4a2d1f4f56fd80ae2093e993b3c7a78ded7ae7a1
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Sep 20 08:50:20 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Sep 20 08:51:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2d1f4f

media-gfx/darktable: add 4.0.1

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   |   1 +
 media-gfx/darktable/darktable-4.0.1.ebuild | 176 +
 .../darktable-4.0.1_libs-deps-automagic.patch  |  37 +
 3 files changed, 214 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 8921b8aec839..570f3b076365 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,6 +1,7 @@
 DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B 
a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531
 SHA512 
ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
 DIST darktable-3.8.1.tar.xz 5514756 BLAKE2B 
e17bf4cc8f8d3f3fd6649c66c56777aa1e946a91cec1bc3b4c59ba1285aa16c608f725f549622b740417a8040a7bb5d63b2378997a05c2095f1b6814c05815de
 SHA512 
8b1b0c9e1a0bd9b327d34d28fe33dd1a2c7255864f6fa0c15af364a029aaa3cff5e039ff6461e48d3b4327b7656efe70ad9da12245d3a01d7566545d191448ba
 DIST darktable-4.0.0.tar.xz 5829684 BLAKE2B 
91198a47c4dab3368c934815425f430ae5b23e35f585a6c2b70322932cfd7fff19db76bd5f1dd50da81be1b8c9b82b12cb2c6c349e4808432f2ed195a015ecc2
 SHA512 
16b1cce589bdcd9c47685c9bd4705d35a739cfbad35ec7f414ce38848decc2e156bcbc7fe40f15026851927171072219ee0435e7cc64ca6fd763e479be5b5156
+DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 
677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3
 SHA512 
f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
 DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B 
f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5
 SHA512 
ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
 DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 
90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67
 SHA512 
b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a
 DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 
988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743
 SHA512 
1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc

diff --git a/media-gfx/darktable/darktable-4.0.1.ebuild 
b/media-gfx/darktable/darktable-4.0.1.ebuild
new file mode 100644
index ..34dbd9359da5
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.0.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV=$(ver_cut 1-2)
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
+   l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
+   )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" cs de eo es fi fr he hu it ja nl pt-BR ru sl tr uk zh-CN"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k kwallet lto 
lua midi nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+   dev-libs/icu:=
+  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-08-15 Thread Sam James
commit: fa002d7368e7fac296c608ef4e148a9c251f03bf
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 15 22:29:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 15 22:29:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa002d73

media-gfx/darktable: Stabilize 4.0.0 amd64, #865225

Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-4.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-4.0.0.ebuild 
b/media-gfx/darktable/darktable-4.0.0.ebuild
index 53e08e8e3c52..3168063913fb 100644
--- a/media-gfx/darktable/darktable-4.0.0.ebuild
+++ b/media-gfx/darktable/darktable-4.0.0.ebuild
@@ -28,7 +28,7 @@ else
l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
)"
 
-   KEYWORDS="~amd64 ~arm64 -x86"
+   KEYWORDS="amd64 ~arm64 -x86"
LANGS=" cs de eo es fi fr he hu it ja nl pt-BR ru sl tr uk zh-CN"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-07-12 Thread Marek Szuba
commit: 40c9a0af3dbaba84a299bd7aacaac15dc0a47837
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 12 15:12:08 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 12 15:39:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c9a0af

media-gfx/darktable: add 4.0.0

Closes: https://bugs.gentoo.org/857030
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   |   3 +
 media-gfx/darktable/darktable-4.0.0.ebuild | 177 +
 media-gfx/darktable/metadata.xml   |   1 +
 3 files changed, 181 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index b6fabb228637..8921b8aec839 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,7 +1,10 @@
 DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B 
a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531
 SHA512 
ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
 DIST darktable-3.8.1.tar.xz 5514756 BLAKE2B 
e17bf4cc8f8d3f3fd6649c66c56777aa1e946a91cec1bc3b4c59ba1285aa16c608f725f549622b740417a8040a7bb5d63b2378997a05c2095f1b6814c05815de
 SHA512 
8b1b0c9e1a0bd9b327d34d28fe33dd1a2c7255864f6fa0c15af364a029aaa3cff5e039ff6461e48d3b4327b7656efe70ad9da12245d3a01d7566545d191448ba
+DIST darktable-4.0.0.tar.xz 5829684 BLAKE2B 
91198a47c4dab3368c934815425f430ae5b23e35f585a6c2b70322932cfd7fff19db76bd5f1dd50da81be1b8c9b82b12cb2c6c349e4808432f2ed195a015ecc2
 SHA512 
16b1cce589bdcd9c47685c9bd4705d35a739cfbad35ec7f414ce38848decc2e156bcbc7fe40f15026851927171072219ee0435e7cc64ca6fd763e479be5b5156
 DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B 
f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5
 SHA512 
ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
 DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 
90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67
 SHA512 
b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a
 DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 
988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743
 SHA512 
1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc
 DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B 
afb6d3c1ea6b709e535e10ae2a491fb6a87c84dcfe17823a518931bda0cd8595cda72905cffc01698e60c3df991451a5cccbfcdea82966a506b2d29d61298f09
 SHA512 
8734a9e6c57ba37f32966873b85584c50968c1c895fa4e9d953e129bb5834f254ca46e20741d5664429ef7d6379e5a35e59f8ecb517ca88ff536b49a8216b603
 DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B 
abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39
 SHA512 
e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a
+DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 
85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618
 SHA512 
789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
+DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 
6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c
 SHA512 
e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846

diff --git a/media-gfx/darktable/darktable-4.0.0.ebuild 
b/media-gfx/darktable/darktable-4.0.0.ebuild
new file mode 100644
index ..53e08e8e3c52
--- /dev/null
+++ b/media-gfx/darktable/darktable-4.0.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV=$(ver_cut 1-2)
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-06-03 Thread Sam James
commit: 6072ffe65140af46bae199eb28b93b5bb7036307
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  4 03:58:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  4 03:59:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6072ffe6

Revert "media-gfx/darktable: BDEPEND on an OpenMP capable compiler"

This reverts commit 431cfc22854d19925a332a12bef9f673dfbb35a9.

Whoops -- this one isn't just for openmp. But we do need to fix the rest
of these.

Bug: https://bugs.gentoo.org/695658
Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-3.8.1-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.8.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.8.1-r1.ebuild
index 7a8d3396c07c..bd7a6924df88 100644
--- a/media-gfx/darktable/darktable-3.8.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.1-r1.ebuild
@@ -44,7 +44,6 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="dev-util/intltool
virtual/pkgconfig
-   openmp? ( || ( sys-devel/gcc:*[openmp] 
sys-devel/clang-runtime:*[openmp] ) )
nls? ( sys-devel/gettext )
test? ( >=dev-python/jsonschema-3.2.0 )"
 DEPEND="dev-db/sqlite:3



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-06-03 Thread Sam James
commit: 431cfc22854d19925a332a12bef9f673dfbb35a9
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  4 03:55:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  4 03:55:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431cfc22

media-gfx/darktable: BDEPEND on an OpenMP capable compiler

BDEPEND is necessary but not sufficient (hence the pkg_* check).

Closes: https://bugs.gentoo.org/695658
Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-3.8.1-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/darktable/darktable-3.8.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.8.1-r1.ebuild
index bd7a6924df88..7a8d3396c07c 100644
--- a/media-gfx/darktable/darktable-3.8.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.1-r1.ebuild
@@ -44,6 +44,7 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="dev-util/intltool
virtual/pkgconfig
+   openmp? ( || ( sys-devel/gcc:*[openmp] 
sys-devel/clang-runtime:*[openmp] ) )
nls? ( sys-devel/gettext )
test? ( >=dev-python/jsonschema-3.2.0 )"
 DEPEND="dev-db/sqlite:3



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-05-16 Thread David Seifert
commit: f6172de78e35e7dfb00ee6a8ded7cc4879efd622
Author: David Seifert  gentoo  org>
AuthorDate: Mon May 16 08:12:10 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon May 16 08:12:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6172de7

media-gfx/darktable: [QA] use tc-check-openmp correctly

Signed-off-by: David Seifert  gentoo.org>

 .../darktable/{darktable-3.8.0-r2.ebuild => darktable-3.8.0-r3.ebuild} | 3 ++-
 .../darktable/{darktable-3.8.1.ebuild => darktable-3.8.1-r1.ebuild}| 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.8.0-r2.ebuild 
b/media-gfx/darktable/darktable-3.8.0-r3.ebuild
similarity index 98%
rename from media-gfx/darktable/darktable-3.8.0-r2.ebuild
rename to media-gfx/darktable/darktable-3.8.0-r3.ebuild
index ffa6efdf9844..5ab72df97f6d 100644
--- a/media-gfx/darktable/darktable-3.8.0-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r3.ebuild
@@ -54,12 +54,12 @@ DEPEND="dev-db/sqlite:3
>=media-gfx/exiv2-0.25-r2:0=[xmp]
media-libs/lcms:2
>=media-libs/lensfun-0.2.3:0=
+   media-libs/libjpeg-turbo:=
media-libs/libpng:0=
media-libs/tiff:0
net-libs/libsoup:2.4
net-misc/curl
sys-libs/zlib:=
-   virtual/jpeg:0
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
x11-libs/pango
@@ -106,6 +106,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
use lua && lua-single_pkg_setup
 }
 

diff --git a/media-gfx/darktable/darktable-3.8.1.ebuild 
b/media-gfx/darktable/darktable-3.8.1-r1.ebuild
similarity index 98%
rename from media-gfx/darktable/darktable-3.8.1.ebuild
rename to media-gfx/darktable/darktable-3.8.1-r1.ebuild
index 74c68cfeb38d..bd7a6924df88 100644
--- a/media-gfx/darktable/darktable-3.8.1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.1-r1.ebuild
@@ -55,12 +55,12 @@ DEPEND="dev-db/sqlite:3
>=media-gfx/exiv2-0.25-r2:0=[xmp]
media-libs/lcms:2
>=media-libs/lensfun-0.2.3:0=
+   media-libs/libjpeg-turbo:=
media-libs/libpng:0=
media-libs/tiff:0
net-libs/libsoup:2.4
net-misc/curl
sys-libs/zlib:=
-   virtual/jpeg:0
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
x11-libs/pango
@@ -107,6 +107,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
use lua && lua-single_pkg_setup
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-04-27 Thread Arthur Zamarin
commit: 659d31d2273fac1ff66b488678678df24c1a0d63
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Apr 27 18:05:55 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Apr 27 18:05:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659d31d2

media-gfx/darktable: Stabilize 3.8.0-r2 arm64, #833975

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/darktable/darktable-3.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.8.0-r2.ebuild 
b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
index 1b30a127d1b2..ffa6efdf9844 100644
--- a/media-gfx/darktable/darktable-3.8.0-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
@@ -31,7 +31,7 @@ else
l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
)"
 
-   KEYWORDS="amd64 ~arm64 -x86"
+   KEYWORDS="amd64 arm64 -x86"
LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-04-10 Thread Marek Szuba
commit: b8db6b16bd23d2910a32c28b1424982e857ceccf
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Apr 10 22:18:43 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Apr 10 22:18:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8db6b16

media-gfx/darktable: depend on dev-libs/icu

Closes: https://bugs.gentoo.org/837698
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.8.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/darktable/darktable-3.8.1.ebuild 
b/media-gfx/darktable/darktable-3.8.1.ebuild
index 1b30a127d1b2..74c68cfeb38d 100644
--- a/media-gfx/darktable/darktable-3.8.1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.1.ebuild
@@ -47,6 +47,7 @@ BDEPEND="dev-util/intltool
nls? ( sys-devel/gettext )
test? ( >=dev-python/jsonschema-3.2.0 )"
 DEPEND="dev-db/sqlite:3
+   dev-libs/icu:=
dev-libs/json-glib
dev-libs/libxml2:2
>=dev-libs/pugixml-1.8:0=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-04-09 Thread Marek Szuba
commit: c13a34753df07f0fc3043a5d51ff4df2f3b3c7e8
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Apr  9 23:31:14 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Apr  9 23:35:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13a3475

media-gfx/darktable: drop 3.6.1-r2

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest  |   2 -
 media-gfx/darktable/darktable-3.6.1-r2.ebuild | 166 --
 2 files changed, 168 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 0dd1e8bc6c75..b6fabb228637 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,7 +1,5 @@
-DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 
8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965
 SHA512 
d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B 
a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531
 SHA512 
ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
 DIST darktable-3.8.1.tar.xz 5514756 BLAKE2B 
e17bf4cc8f8d3f3fd6649c66c56777aa1e946a91cec1bc3b4c59ba1285aa16c608f725f549622b740417a8040a7bb5d63b2378997a05c2095f1b6814c05815de
 SHA512 
8b1b0c9e1a0bd9b327d34d28fe33dd1a2c7255864f6fa0c15af364a029aaa3cff5e039ff6461e48d3b4327b7656efe70ad9da12245d3a01d7566545d191448ba
-DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 
407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829
 SHA512 
62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd3842eacba26278510abaab1e0cc335
 DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B 
f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5
 SHA512 
ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
 DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 
90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67
 SHA512 
b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a
 DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 
988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743
 SHA512 
1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc

diff --git a/media-gfx/darktable/darktable-3.6.1-r2.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
deleted file mode 100644
index 1ade290e81bc..
--- a/media-gfx/darktable/darktable-3.6.1-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-   DOC_PV="3.6"
-   MY_PV="${PV/_/}"
-   MY_P="${P/_/.}"
-
-   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
-
-   KEYWORDS="amd64 arm64 -x86"
-   LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
-fi
-
-IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr test tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-   test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   >=dev-libs/pugixml-1.8:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   net-libs/libsoup:2.4
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-04-09 Thread Marek Szuba
commit: c6afc97d253f0339b9598581f7a79c063eb9d165
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Apr  9 23:30:11 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Apr  9 23:35:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6afc97d

media-gfx/darktable: stabilize 3.8.1 for amd64

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.8.1.ebuild 
b/media-gfx/darktable/darktable-3.8.1.ebuild
index 67728867df09..1b30a127d1b2 100644
--- a/media-gfx/darktable/darktable-3.8.1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.1.ebuild
@@ -31,7 +31,7 @@ else
l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
)"
 
-   KEYWORDS="~amd64 ~arm64 -x86"
+   KEYWORDS="amd64 ~arm64 -x86"
LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-03-01 Thread Marek Szuba
commit: 9367cd9e957b97510f4e6056c6eed112a5487b2d
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Mar  1 14:29:44 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Mar  1 14:29:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9367cd9e

media-gfx/darktable: do not set CMAKE_BUILD_TYPE

This was a holdover from older EAPIs, come EAPI-8 cmake.eclass already
defaults to RelWithDebInfo.

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.6.1-r2.ebuild | 3 +--
 media-gfx/darktable/darktable-3.8.0-r2.ebuild | 1 -
 media-gfx/darktable/darktable-3.8.1.ebuild| 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.6.1-r2.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
index ff087a4c98dc..1ade290e81bc 100644
--- a/media-gfx/darktable/darktable-3.6.1-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -136,7 +136,6 @@ src_configure() {
-DUSE_WEBP=$(usex webp)
-DWANT_JSON_VALIDATION=$(usex test)
)
-   CMAKE_BUILD_TYPE="RELWITHDEBINFO"
cmake_src_configure
 }
 

diff --git a/media-gfx/darktable/darktable-3.8.0-r2.ebuild 
b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
index e98ee3305dae..1b30a127d1b2 100644
--- a/media-gfx/darktable/darktable-3.8.0-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
@@ -147,7 +147,6 @@ src_configure() {
-DUSE_WEBP=$(usex webp)
-DWANT_JSON_VALIDATION=$(usex test)
)
-   CMAKE_BUILD_TYPE="RELWITHDEBINFO"
cmake_src_configure
 }
 

diff --git a/media-gfx/darktable/darktable-3.8.1.ebuild 
b/media-gfx/darktable/darktable-3.8.1.ebuild
index b972b07d4be7..67728867df09 100644
--- a/media-gfx/darktable/darktable-3.8.1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.1.ebuild
@@ -147,7 +147,6 @@ src_configure() {
-DUSE_WEBP=$(usex webp)
-DWANT_JSON_VALIDATION=$(usex test)
)
-   CMAKE_BUILD_TYPE="RELWITHDEBINFO"
cmake_src_configure
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-02-24 Thread Sam James
commit: 5b423f382a29ff164973ed31f3e2610a1643ac9c
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 24 14:03:41 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Feb 24 14:03:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b423f38

media-gfx/darktable: Stabilize 3.8.0-r2 amd64, #833975

Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-3.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.8.0-r2.ebuild 
b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
index b972b07d4be7..e98ee3305dae 100644
--- a/media-gfx/darktable/darktable-3.8.0-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
@@ -31,7 +31,7 @@ else
l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
)"
 
-   KEYWORDS="~amd64 ~arm64 -x86"
+   KEYWORDS="amd64 ~arm64 -x86"
LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-02-12 Thread Markus Meier
commit: 9402d3d461b516d03b932d98bb90ef84b5d0bc2d
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Feb 12 21:02:24 2022 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Feb 12 21:02:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9402d3d4

media-gfx/darktable: version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest   |   1 +
 media-gfx/darktable/darktable-3.8.1.ebuild | 178 +
 2 files changed, 179 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 43f47612d831..0dd1e8bc6c75 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,6 @@
 DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 
8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965
 SHA512 
d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B 
a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531
 SHA512 
ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
+DIST darktable-3.8.1.tar.xz 5514756 BLAKE2B 
e17bf4cc8f8d3f3fd6649c66c56777aa1e946a91cec1bc3b4c59ba1285aa16c608f725f549622b740417a8040a7bb5d63b2378997a05c2095f1b6814c05815de
 SHA512 
8b1b0c9e1a0bd9b327d34d28fe33dd1a2c7255864f6fa0c15af364a029aaa3cff5e039ff6461e48d3b4327b7656efe70ad9da12245d3a01d7566545d191448ba
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 
407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829
 SHA512 
62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd3842eacba26278510abaab1e0cc335
 DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B 
f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5
 SHA512 
ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
 DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 
90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67
 SHA512 
b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a

diff --git a/media-gfx/darktable/darktable-3.8.1.ebuild 
b/media-gfx/darktable/darktable-3.8.1.ebuild
new file mode 100644
index ..b972b07d4be7
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.8.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV=$(ver_cut 1-2)
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
+   l10n_de? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/de/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.de.pdf )
+   l10n_fr? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/fr/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.fr.pdf )
+   l10n_pt-BR? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/pt_br/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pt_br.pdf )
+   l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
+   )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua 
midi nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-util/intltool
+   virtual/pkgconfig
+   nls? ( 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2022-01-28 Thread Marek Szuba
commit: e41cfc2b86b2d7b449da92bc6aea0faeec561dbc
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Jan 28 14:43:54 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Jan 28 14:45:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41cfc2b

media-gfx/darktable: drop 3.6.1-r3

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.6.1-r3.ebuild | 176 --
 1 file changed, 176 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.6.1-r3.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
deleted file mode 100644
index 12c0099cc5d1..
--- a/media-gfx/darktable/darktable-3.6.1-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-   DOC_PV="3.6"
-   MY_PV="${PV/_/}"
-   MY_P="${P/_/.}"
-
-   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
-
-   KEYWORDS="~amd64 ~arm64 -x86"
-   LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr 
geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr test tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-   test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   >=dev-libs/pugixml-1.8:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   net-libs/libsoup:2.4
-   net-misc/curl
-   sys-libs/zlib:=
-   virtual/jpeg:0
-   x11-libs/cairo
-   >=x11-libs/gtk+-3.22:3
-   x11-libs/pango
-   avif? ( >=media-libs/libavif-0.8.2:= )
-   colord? ( x11-libs/colord-gtk:0= )
-   cups? ( net-print/cups )
-   flickr? ( media-libs/flickcurl )
-   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-   gmic? ( media-gfx/gmic )
-   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-   gphoto2? ( media-libs/libgphoto2:= )
-   graphicsmagick? ( media-gfx/graphicsmagick )
-   jpeg2k? ( media-libs/openjpeg:2= )
-   lua? ( ${LUA_DEPS} )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:= )
-   webp? ( media-libs/libwebp:0= )"
-RDEPEND="${DEPEND}
-   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-3.0.0_find-opencl-header.patch
-   "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-   "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
-   "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
-   "${FILESDIR}"/${PN}-3.6.1_openexr.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   # Bug #695658
-   if tc-is-gcc; then
-   test-flags-CC -floop-block &> /dev/null || \
-   die "Please switch to a gcc version built with 
USE=graphite"
-   fi
-
-   use openmp && tc-check-openmp
-   fi
-}
-
-pkg_setup() {
-   use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-   if use cpu_flags_x86_avx; then
-   append-flags -mavx
-   # Bug #828992. clang does not support this flag so users 
building darktable
-   # with it will have to live with this bug (assuming they have 
suffered
-   # from it in the first place, as it might be specific to 
gcc-11) - this
-   # has already been fixed upstream and it looks like we won't 
have to wait
-   # much longer for 3.8.0.
-   tc-is-gcc && append-flags -mprefer-avx128
-   fi
-   use cpu_flags_x86_sse3 && append-flags -msse3
-
-   sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_CURVE_TOOLS=$(usex tools)
-   -DBUILD_NOISE_TOOLS=$(usex tools)
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/, media-gfx/darktable/files/

2022-01-12 Thread Marek Szuba
commit: 49c92a7901348324311adeadc254a0e5c41574b1
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jan 12 14:45:43 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jan 12 21:52:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c92a79

media-gfx/darktable: support gamepad and MIDI input devices

Closes: https://bugs.gentoo.org/830635
Signed-off-by: Marek Szuba  gentoo.org>

 ...e-3.8.0-r1.ebuild => darktable-3.8.0-r2.ebuild} | 10 --
 .../darktable-3.8.0_libs-deps-automagic.patch  | 37 ++
 media-gfx/darktable/metadata.xml   |  2 ++
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.8.0-r1.ebuild 
b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
similarity index 93%
rename from media-gfx/darktable/darktable-3.8.0-r1.ebuild
rename to media-gfx/darktable/darktable-3.8.0-r2.ebuild
index b2adbe18b7ed..b972b07d4be7 100644
--- a/media-gfx/darktable/darktable-3.8.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,8 +35,7 @@ else
LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
 fi
 
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr 
geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr test tools webp
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad 
geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua 
midi nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -68,6 +67,7 @@ DEPEND="dev-db/sqlite:3
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
+   gamepad? ( media-libs/libsdl2 )
geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
gmic? ( media-gfx/gmic )
gnome-keyring? ( >=app-crypt/libsecret-0.18 )
@@ -75,6 +75,7 @@ DEPEND="dev-db/sqlite:3
graphicsmagick? ( media-gfx/graphicsmagick )
jpeg2k? ( media-libs/openjpeg:2= )
lua? ( ${LUA_DEPS} )
+   midi? ( media-libs/portmidi )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:= )
webp? ( media-libs/libwebp:0= )"
@@ -87,6 +88,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
"${FILESDIR}"/${PN}-3.6.1_openexr.patch
+   "${FILESDIR}"/${PN}-3.8.0_libs-deps-automagic.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
@@ -140,6 +142,8 @@ src_configure() {
-DUSE_OPENEXR=$(usex openexr)
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_OPENMP=$(usex openmp)
+   -DUSE_PORTMIDI=$(usex midi)
+   -DUSE_SDL2=$(usex gamepad)
-DUSE_WEBP=$(usex webp)
-DWANT_JSON_VALIDATION=$(usex test)
)

diff --git 
a/media-gfx/darktable/files/darktable-3.8.0_libs-deps-automagic.patch 
b/media-gfx/darktable/files/darktable-3.8.0_libs-deps-automagic.patch
new file mode 100644
index ..25b89731a7c8
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.8.0_libs-deps-automagic.patch
@@ -0,0 +1,37 @@
+--- a/src/libs/CMakeLists.txt
 b/src/libs/CMakeLists.txt
+@@ -83,11 +83,14 @@
+ add_library(timeline MODULE "tools/timeline.c")
+ add_library(image_infos MODULE "tools/image_infos.c")
+ 
++if (USE_PORTMIDI)
+ find_path(PORTMIDI_INCLUDE_DIR NAMES portmidi.h
+   DOC "The Portmidi include directory"
++  REQUIRED
+ )
+ find_library(PORTMIDI_LIBRARY NAMES portmidi
+   DOC "The Portmidi library"
++  REQUIRED
+ )
+ if(PORTMIDI_INCLUDE_DIR)
+   add_definitions("-DHAVE_PORTMIDI")
+@@ -96,8 +99,10 @@
+   add_library(midi MODULE "tools/midi.c")
+   target_link_libraries (midi ${PORTMIDI_LIBRARY})
+ endif()
++endif()
+ 
+-find_package(SDL2)
++if (USE_SDL2)
++find_package(SDL2 REQUIRED)
+ if(SDL2_INCLUDE_DIRS)
+   add_definitions("-DHAVE_SDL")
+   include_directories(${SDL2_INCLUDE_DIRS})
+@@ -105,6 +110,7 @@
+   add_library(gamepad MODULE "tools/gamepad.c")
+   target_link_libraries(gamepad ${SDL2_LIBRARIES})
+ endif()
++endif()
+ 
+ if(BUILD_BATTERY_INDICATOR)
+   add_library(battery_indicator MODULE "tools/battery_indicator.c")

diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 7fa51feb6f79..c20058315b0b 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -12,10 +12,12 @@

Support importing and exporting AVIF 
images
Add support for uploading photos to 
flickr
+   Support using game controllers as input 
devices
Enable geotagging support
Use the 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-12-28 Thread Marek Szuba
commit: 23868a498f9f6447b590b0ed26a26709dd835314
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Dec 28 23:33:05 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Dec 28 23:33:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23868a49

media-gfx/darktable: update USE=doc handling

Bump DOC_PV from 3.6, support installation of translations in addition
to the English text.

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest  |  5 +
 media-gfx/darktable/darktable-3.8.0-r1.ebuild | 12 +---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 98c88e56879d..43f47612d831 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,3 +1,8 @@
 DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 
8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965
 SHA512 
d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B 
a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531
 SHA512 
ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 
407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829
 SHA512 
62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd3842eacba26278510abaab1e0cc335
+DIST darktable-usermanual-3.8.de.pdf 32795040 BLAKE2B 
f8669e1982be19bc739add60d125a5818894a7a4a6414ba15aae5e5df41ec6729c99f907e3008c42acbd6f60bc4a5d33e20d7180621d135f9fd342e6190ae6a5
 SHA512 
ff77afcc9a20fec36891d4487d167e40d30a1deef6418dc6bb73c94d8171b42e5edc5420457c96e08ab8581175e691f8adf91ef5259367edba55f1441d4a86d3
+DIST darktable-usermanual-3.8.en.pdf 33484632 BLAKE2B 
90a4e1021917f5fad7a5a9a58e2fec95af14119ca4b48325f3e5b55e96b89f9d82b8aaa676268a255fa97cf834a109b410004a549d16742a1b33db880c46fb67
 SHA512 
b21683f200daca3d0ed7c3364d0c6703d976fd800d1d2ffe51df1c6cfcf2188de681cdddbf92962629a3866e18014377a58ea0e54a9fa727b663972b7f1de79a
+DIST darktable-usermanual-3.8.fr.pdf 33479509 BLAKE2B 
988824b60277ea0264fec61a1157a1de048cd512a172bc86276a043c06da3a684e971cef04c31122a78b3e7305157331e6cb86cfce7a4dc4dd9dc8697eddf743
 SHA512 
1383bb54face948bbbad895be2470c1b13ece71c325edf40402b3416a5d9653d2e1f8c4dbfa30edd10f02c1df8b8243c9e86948c5da8d2033e28ee3c6e04bbcc
+DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B 
afb6d3c1ea6b709e535e10ae2a491fb6a87c84dcfe17823a518931bda0cd8595cda72905cffc01698e60c3df991451a5cccbfcdea82966a506b2d29d61298f09
 SHA512 
8734a9e6c57ba37f32966873b85584c50968c1c895fa4e9d953e129bb5834f254ca46e20741d5664429ef7d6379e5a35e59f8ecb517ca88ff536b49a8216b603
+DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B 
abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39
 SHA512 
e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a

diff --git a/media-gfx/darktable/darktable-3.8.0-r1.ebuild 
b/media-gfx/darktable/darktable-3.8.0-r1.ebuild
index a25427d85fa9..b2adbe18b7ed 100644
--- a/media-gfx/darktable/darktable-3.8.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r1.ebuild
@@ -18,12 +18,18 @@ if [[ ${PV} == * ]]; then
 
LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
 else
-   DOC_PV="3.6"
+   DOC_PV=$(ver_cut 1-2)
MY_PV="${PV/_/}"
MY_P="${P/_/.}"
 

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
+   doc? (
+   
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.en.pdf
+   l10n_de? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/de/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.de.pdf )
+   l10n_fr? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/fr/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.fr.pdf )
+   l10n_pt-BR? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/pt_br/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pt_br.pdf )
+   l10n_uk? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.uk.pdf )
+   )"
 
KEYWORDS="~amd64 ~arm64 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-12-28 Thread Marek Szuba
commit: 39f3c1d5f193e0a18f92ba14de879e2f3e93db92
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Dec 28 23:35:28 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Dec 28 23:35:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f3c1d5

media-gfx/darktable-3.6.0: update documentation URI

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.6.1-r2.ebuild | 2 +-
 media-gfx/darktable/darktable-3.6.1-r3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.6.1-r2.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
index 68737e363aca..ff087a4c98dc 100644
--- a/media-gfx/darktable/darktable-3.6.1-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
@@ -23,7 +23,7 @@ else
MY_P="${P/_/.}"
 

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
+   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
 
KEYWORDS="amd64 arm64 -x86"
LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"

diff --git a/media-gfx/darktable/darktable-3.6.1-r3.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
index 746a8b4aaf9b..12c0099cc5d1 100644
--- a/media-gfx/darktable/darktable-3.6.1-r3.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
@@ -23,7 +23,7 @@ else
MY_P="${P/_/.}"
 

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
+   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
 
KEYWORDS="~amd64 ~arm64 -x86"
LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-12-28 Thread Marek Szuba
commit: e115c5ac5ccef5bd51692f9c7eb144202f514220
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Dec 28 23:20:51 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Dec 28 23:21:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e115c5ac

media-gfx/darktable-3.8.0: restore cpu_flags_x86_avx support

Signed-off-by: Marek Szuba  gentoo.org>

 .../darktable/{darktable-3.8.0.ebuild => darktable-3.8.0-r1.ebuild}| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.8.0.ebuild 
b/media-gfx/darktable/darktable-3.8.0-r1.ebuild
similarity index 95%
rename from media-gfx/darktable/darktable-3.8.0.ebuild
rename to media-gfx/darktable/darktable-3.8.0-r1.ebuild
index 40c02a22666f..9de446864ad9 100644
--- a/media-gfx/darktable/darktable-3.8.0.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r1.ebuild
@@ -29,7 +29,7 @@ else
LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
 fi
 
-IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr 
geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
lto lua nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
 
@@ -102,6 +102,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+   use cpu_flags_x86_avx && append-flags -mavx
use cpu_flags_x86_sse3 && append-flags -msse3
 
sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-12-28 Thread Marek Szuba
commit: 97691ac153bf744b0298b1a889a5dabb5c3217b1
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Dec 28 23:24:09 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Dec 28 23:24:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97691ac1

media-gfx/darktable-3.8.0: fix LUA_COMPAT

Starting with 3.8.0 Darktable requires lua-5.4.

Closes: https://bugs.gentoo.org/830171
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.8.0-r1.ebuild 
b/media-gfx/darktable/darktable-3.8.0-r1.ebuild
index 9de446864ad9..a25427d85fa9 100644
--- a/media-gfx/darktable/darktable-3.8.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 )
 
 inherit cmake flag-o-matic lua-single toolchain-funcs xdg
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-12-25 Thread Markus Meier
commit: cf307ef7dc81e1bb6943af875d5a52de7b811230
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Dec 25 10:34:03 2021 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Dec 25 10:34:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf307ef7

media-gfx/darktable: version bump

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest   |   1 +
 media-gfx/darktable/darktable-3.8.0.ebuild | 167 +
 2 files changed, 168 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index f710ac921913..98c88e56879d 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,2 +1,3 @@
 DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 
8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965
 SHA512 
d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
+DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B 
a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531
 SHA512 
ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 
407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829
 SHA512 
62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd3842eacba26278510abaab1e0cc335

diff --git a/media-gfx/darktable/darktable-3.8.0.ebuild 
b/media-gfx/darktable/darktable-3.8.0.ebuild
new file mode 100644
index ..40c02a22666f
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.8.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV="3.6"
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+   lto lua nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+   dev-libs/json-glib
+   dev-libs/libxml2:2
+   >=dev-libs/pugixml-1.8:0=
+   gnome-base/librsvg:2
+   >=media-gfx/exiv2-0.25-r2:0=[xmp]
+   media-libs/lcms:2
+   >=media-libs/lensfun-0.2.3:0=
+   media-libs/libpng:0=
+   media-libs/tiff:0
+   net-libs/libsoup:2.4
+   net-misc/curl
+   sys-libs/zlib:=
+   virtual/jpeg:0
+   x11-libs/cairo
+   >=x11-libs/gtk+-3.22:3
+   x11-libs/pango
+   avif? ( >=media-libs/libavif-0.8.2:= )
+   colord? ( x11-libs/colord-gtk:0= )
+   cups? ( net-print/cups )
+   flickr? ( media-libs/flickcurl )
+   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+   gmic? ( media-gfx/gmic )
+   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+   gphoto2? ( media-libs/libgphoto2:= )
+   graphicsmagick? ( media-gfx/graphicsmagick )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   lua? ( ${LUA_DEPS} )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:= )
+   webp? ( media-libs/libwebp:0= )"
+RDEPEND="${DEPEND}
+   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0_find-opencl-header.patch
+   "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+   "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+   "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+   "${FILESDIR}"/${PN}-3.6.1_openexr.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   # Bug #695658
+ 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-12-14 Thread Marek Szuba
commit: de8cacd724566ceb8c32a72e8d44005f26d136ab
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Dec 14 12:57:06 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Dec 14 13:11:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8cacd7

media-gfx/darktable: support cpu_flags_x86_avx, with workaround for gcc-11 
alignment issues

Darktable determines which instruction sets are available by parsing the
CPU ID so while it would be non-trivial to actually prevent it from
using SSE3 or AVX, at least we can make sure compiler/linker flags match
what darktable has detected - as long as CPU_FLAGS_x86 is up to date,
naturally.

The second change will no longer be needed come next upstream release.

Closes: https://bugs.gentoo.org/828992
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.6.1-r3.ebuild | 176 ++
 1 file changed, 176 insertions(+)

diff --git a/media-gfx/darktable/darktable-3.6.1-r3.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
new file mode 100644
index ..746a8b4aaf9b
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.6.1-r3.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV="3.6"
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
+fi
+
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr 
geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+   lto lua nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+   dev-libs/json-glib
+   dev-libs/libxml2:2
+   >=dev-libs/pugixml-1.8:0=
+   gnome-base/librsvg:2
+   >=media-gfx/exiv2-0.25-r2:0=[xmp]
+   media-libs/lcms:2
+   >=media-libs/lensfun-0.2.3:0=
+   media-libs/libpng:0=
+   media-libs/tiff:0
+   net-libs/libsoup:2.4
+   net-misc/curl
+   sys-libs/zlib:=
+   virtual/jpeg:0
+   x11-libs/cairo
+   >=x11-libs/gtk+-3.22:3
+   x11-libs/pango
+   avif? ( >=media-libs/libavif-0.8.2:= )
+   colord? ( x11-libs/colord-gtk:0= )
+   cups? ( net-print/cups )
+   flickr? ( media-libs/flickcurl )
+   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+   gmic? ( media-gfx/gmic )
+   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+   gphoto2? ( media-libs/libgphoto2:= )
+   graphicsmagick? ( media-gfx/graphicsmagick )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   lua? ( ${LUA_DEPS} )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:= )
+   webp? ( media-libs/libwebp:0= )"
+RDEPEND="${DEPEND}
+   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.0_find-opencl-header.patch
+   "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+   "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+   "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+   "${FILESDIR}"/${PN}-3.6.1_openexr.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   # Bug #695658
+   if tc-is-gcc; then
+   test-flags-CC -floop-block &> /dev/null || \
+   die "Please switch to a gcc version built with 
USE=graphite"
+   fi
+
+   use openmp && tc-check-openmp
+   fi
+}
+
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+   if use cpu_flags_x86_avx; then
+   append-flags -mavx
+   # Bug #828992. clang does not support this flag so users 
building darktable
+   # with it will have to live with this bug (assuming they have 
suffered
+   # from it in the first place, as it might be specific to 
gcc-11) - this
+   # has already been fixed upstream and it looks 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-11-27 Thread Marek Szuba
commit: 81ff0685a8c452e3d035b3e8fbafc2fb83af3e72
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 27 16:15:11 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 27 21:53:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ff0685

media-gfx/darktable: switch to tc-check-openmp for OpenMP checks

As described in the toolchain-funcs.eclass documentation, this is
recommended over tc-has-openmp + custom message because it presents
an uniform interface to the users.

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.6.1-r2.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.6.1-r2.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
index e948c750f0cb..68737e363aca 100644
--- a/media-gfx/darktable/darktable-3.6.1-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
@@ -93,9 +93,7 @@ pkg_pretend() {
die "Please switch to a gcc version built with 
USE=graphite"
fi
 
-   if use openmp ; then
-   tc-has-openmp || die "Please switch to an openmp 
compatible compiler"
-   fi
+   use openmp && tc-check-openmp
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-11-20 Thread Marek Szuba
commit: 6dc57bcc26c48a82034e7345c9eeb23e48a91e8e
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 20 10:32:48 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 20 10:36:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc57bcc

media-gfx/darktable: drop 3.4.1-r1, 3.6.0-r1

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest  |   3 -
 media-gfx/darktable/darktable-3.4.1-r1.ebuild | 168 --
 media-gfx/darktable/darktable-3.6.0-r1.ebuild | 168 --
 3 files changed, 339 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index e2410d8e2afc..f710ac921913 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,2 @@
-DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 
7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68
 SHA512 
3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
-DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B 
ecbb6b4b4aba1f499f8d459304f174f348c19304c0efb898260d3037bfb9c82ea51a92e3dd98c8b0d2dc525276a91419b41b3c610f4a18b905cda7ccd1bfc554
 SHA512 
8e458406c3004a52cde096039358eb044d370e8b9d5cb70a6457fc1ad165f062af073b3f0c8da92b463db5a4df37e7a4ee32eb5ce9dfbfeec3e0c13c70ec5f8a
 DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 
8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965
 SHA512 
d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
-DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B 
d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56
 SHA512 
fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 
407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829
 SHA512 
62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd3842eacba26278510abaab1e0cc335

diff --git a/media-gfx/darktable/darktable-3.4.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.4.1-r1.ebuild
deleted file mode 100644
index 26f9c784538d..
--- a/media-gfx/darktable/darktable-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-   DOC_PV="3.4.0"
-   MY_PV="${PV/_/}"
-   MY_P="${P/_/.}"
-
-   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-   KEYWORDS="amd64 arm64 -x86"
-   LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
-fi
-
-IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr test tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-   test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   >=dev-libs/pugixml-1.8:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   net-libs/libsoup:2.4
-   net-misc/curl
-   sys-libs/zlib:=
-   virtual/jpeg:0
-   x11-libs/cairo
-   >=x11-libs/gtk+-3.22:3
-   x11-libs/pango
-   avif? ( >=media-libs/libavif-0.8.2:= )
-   colord? ( x11-libs/colord-gtk:0= )
-   cups? ( net-print/cups )
-   flickr? ( media-libs/flickcurl )
-   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-   gmic? ( media-gfx/gmic )
-   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-   gphoto2? ( media-libs/libgphoto2:= )
-   graphicsmagick? ( 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/

2021-11-20 Thread Marek Szuba
commit: d21a265913b0051a86dbeef0ab3f8034ebc7c3c1
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 20 10:34:15 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 20 10:36:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d21a2659

media-gfx/darktable: make all patches follow same naming convention

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.6.1-r2.ebuild   | 2 +-
 ...ind-opencl-header.patch => darktable-3.0.0_find-opencl-header.patch} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.6.1-r2.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
index ff7b589d8512..e948c750f0cb 100644
--- a/media-gfx/darktable/darktable-3.6.1-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
@@ -76,7 +76,7 @@ RDEPEND="${DEPEND}
kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-find-opencl-header.patch
+   "${FILESDIR}"/${PN}-3.0.0_find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch

diff --git a/media-gfx/darktable/files/darktable-find-opencl-header.patch 
b/media-gfx/darktable/files/darktable-3.0.0_find-opencl-header.patch
similarity index 100%
rename from media-gfx/darktable/files/darktable-find-opencl-header.patch
rename to media-gfx/darktable/files/darktable-3.0.0_find-opencl-header.patch



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-11-19 Thread Arthur Zamarin
commit: 52b9f19ea052ddacc06c4bc3a373e1a1b778e044
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Nov 20 07:01:58 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Nov 20 07:02:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52b9f19e

media-gfx/darktable: Stabilize 3.6.1-r2 arm64, #822363

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/darktable/darktable-3.6.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.6.1-r2.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
index c57339dc3581..ff7b589d8512 100644
--- a/media-gfx/darktable/darktable-3.6.1-r2.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
@@ -25,7 +25,7 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
 
-   KEYWORDS="amd64 ~arm64 -x86"
+   KEYWORDS="amd64 arm64 -x86"
LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-11-17 Thread Marek Szuba
commit: 0b924a8a0bb22f5c79d64db67b1a5d6ede798ebe
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Nov 17 11:59:33 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Nov 17 12:02:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b924a8a

media-gfx/darktable-3.6.1: fix media-libs/openexr depstring

Works with both 2 and 3 now, prefers the latter if both are present.

Signed-off-by: Marek Szuba  gentoo.org>

 .../darktable/{darktable-3.6.1-r1.ebuild => darktable-3.6.1-r2.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.6.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
similarity index 99%
rename from media-gfx/darktable/darktable-3.6.1-r1.ebuild
rename to media-gfx/darktable/darktable-3.6.1-r2.ebuild
index 001daea6f773..c57339dc3581 100644
--- a/media-gfx/darktable/darktable-3.6.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r2.ebuild
@@ -70,7 +70,7 @@ DEPEND="dev-db/sqlite:3
jpeg2k? ( media-libs/openjpeg:2= )
lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
-   openexr? ( 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-11-17 Thread Marek Szuba
commit: ca31e541458f5f1ccb8163403bb2d9a4eaec74b6
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Nov 17 11:55:24 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Nov 17 11:55:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca31e541

media-gfx/darktable: stabilize 3.6.1-r1 for amd64

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.6.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.6.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r1.ebuild
index ffafc552eddb..001daea6f773 100644
--- a/media-gfx/darktable/darktable-3.6.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r1.ebuild
@@ -25,7 +25,7 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
 
-   KEYWORDS="~amd64 ~arm64 -x86"
+   KEYWORDS="amd64 ~arm64 -x86"
LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-11-07 Thread Sam James
commit: c2e0103bc98f9fef463fefbaa898d0349ec6cbfc
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  7 22:57:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  7 23:07:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e0103b

media-gfx/darktable: use libavif subslot operator

Signed-off-by: Sam James  gentoo.org>

 .../darktable/{darktable-3.4.1.ebuild => darktable-3.4.1-r1.ebuild} | 2 +-
 .../darktable/{darktable-3.6.0.ebuild => darktable-3.6.0-r1.ebuild} | 2 +-
 .../darktable/{darktable-3.6.1.ebuild => darktable-3.6.1-r1.ebuild} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild 
b/media-gfx/darktable/darktable-3.4.1-r1.ebuild
similarity index 99%
rename from media-gfx/darktable/darktable-3.4.1.ebuild
rename to media-gfx/darktable/darktable-3.4.1-r1.ebuild
index 2f4bd3209de..26f9c784538 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1-r1.ebuild
@@ -58,7 +58,7 @@ DEPEND="dev-db/sqlite:3
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
x11-libs/pango
-   avif? ( >=media-libs/libavif-0.8.2 )
+   avif? ( >=media-libs/libavif-0.8.2:= )
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )

diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild 
b/media-gfx/darktable/darktable-3.6.0-r1.ebuild
similarity index 99%
rename from media-gfx/darktable/darktable-3.6.0.ebuild
rename to media-gfx/darktable/darktable-3.6.0-r1.ebuild
index a92c6759df4..e5f7802a90a 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0-r1.ebuild
@@ -58,7 +58,7 @@ DEPEND="dev-db/sqlite:3
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
x11-libs/pango
-   avif? ( >=media-libs/libavif-0.8.2 )
+   avif? ( >=media-libs/libavif-0.8.2:= )
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )

diff --git a/media-gfx/darktable/darktable-3.6.1.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r1.ebuild
similarity index 99%
rename from media-gfx/darktable/darktable-3.6.1.ebuild
rename to media-gfx/darktable/darktable-3.6.1-r1.ebuild
index da867cb77cc..21955604165 100644
--- a/media-gfx/darktable/darktable-3.6.1.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r1.ebuild
@@ -58,7 +58,7 @@ DEPEND="dev-db/sqlite:3
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
x11-libs/pango
-   avif? ( >=media-libs/libavif-0.8.2 )
+   avif? ( >=media-libs/libavif-0.8.2:= )
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/

2021-11-07 Thread Sam James
commit: 919657df943e49b9a5cdc6f709a06568af54c954
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  7 23:07:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  7 23:07:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919657df

media-gfx/darktable: add openexr build patch

Bug: https://bugs.gentoo.org/820041
Thanks-to: Bernd Feige  gmx.net>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-3.6.1-r1.ebuild  |  1 +
 .../darktable/files/darktable-3.6.1_openexr.patch  | 65 ++
 2 files changed, 66 insertions(+)

diff --git a/media-gfx/darktable/darktable-3.6.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.6.1-r1.ebuild
index 21955604165..ffafc552edd 100644
--- a/media-gfx/darktable/darktable-3.6.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1-r1.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
+   "${FILESDIR}"/${PN}-3.6.1_openexr.patch
 )
 
 S="${WORKDIR}/${P/_/~}"

diff --git a/media-gfx/darktable/files/darktable-3.6.1_openexr.patch 
b/media-gfx/darktable/files/darktable-3.6.1_openexr.patch
new file mode 100644
index 000..a5b1fd173f8
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.6.1_openexr.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/820041
+
+--- a/src/common/imageio_exr.cc
 b/src/common/imageio_exr.cc
+@@ -28,13 +28,13 @@
+ #include 
+ #include 
+ 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
+ 
+ extern "C" {
+ #include "common/colorspaces.h"
+--- a/src/common/imageio_exr.hh
 b/src/common/imageio_exr.hh
+@@ -29,12 +29,12 @@
+ #include 
+ #endif
+ 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
+ 
+ #ifdef OPENEXR_IMF_INTERNAL_NAMESPACE
+ #define IMF_NS OPENEXR_IMF_INTERNAL_NAMESPACE
+--- a/src/imageio/format/exr.cc
 b/src/imageio/format/exr.cc
+@@ -23,11 +23,11 @@
+ #include 
+ #include 
+ 
+-#include 
+-#include 
+-#include 
+-#include 
+-#include 
++#include 
++#include 
++#include 
++#include 
++#include 
+ 
+ extern "C" {
+ #include "bauhaus/bauhaus.h"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-09-16 Thread Marek Szuba
commit: f83445192acc8bc71d6e52e553d7d0fcc2d6074c
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep 16 20:21:50 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Sep 16 20:21:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8344519

media-gfx/darktable: update PDF-documentation URI

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.6.0.ebuild | 2 +-
 media-gfx/darktable/darktable-3.6.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild 
b/media-gfx/darktable/darktable-3.6.0.ebuild
index 08c0e892bb9..a92c6759df4 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -23,7 +23,7 @@ else
MY_P="${P/_/.}"
 

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://www.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
+   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
 
KEYWORDS="amd64 arm64 -x86"
LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"

diff --git a/media-gfx/darktable/darktable-3.6.1.ebuild 
b/media-gfx/darktable/darktable-3.6.1.ebuild
index 5cd40924c89..da867cb77cc 100644
--- a/media-gfx/darktable/darktable-3.6.1.ebuild
+++ b/media-gfx/darktable/darktable-3.6.1.ebuild
@@ -23,7 +23,7 @@ else
MY_P="${P/_/.}"
 

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
+   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
 
KEYWORDS="~amd64 ~arm64 -x86"
LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-09-16 Thread Marek Szuba
commit: d28f11405242477b310280b92e4fdff8744b0c1e
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep 16 20:18:29 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Sep 16 20:19:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d28f1140

media-gfx/darktable: add 3.6.1

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   |   1 +
 media-gfx/darktable/darktable-3.6.1.ebuild | 168 +
 2 files changed, 169 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 95d84f120fb..e2410d8e2af 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,4 +1,5 @@
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 
7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68
 SHA512 
3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B 
ecbb6b4b4aba1f499f8d459304f174f348c19304c0efb898260d3037bfb9c82ea51a92e3dd98c8b0d2dc525276a91419b41b3c610f4a18b905cda7ccd1bfc554
 SHA512 
8e458406c3004a52cde096039358eb044d370e8b9d5cb70a6457fc1ad165f062af073b3f0c8da92b463db5a4df37e7a4ee32eb5ce9dfbfeec3e0c13c70ec5f8a
+DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 
8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965
 SHA512 
d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B 
d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56
 SHA512 
fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 
407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829
 SHA512 
62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd3842eacba26278510abaab1e0cc335

diff --git a/media-gfx/darktable/darktable-3.6.1.ebuild 
b/media-gfx/darktable/darktable-3.6.1.ebuild
new file mode 100644
index 000..5cd40924c89
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.6.1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV="3.6"
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+   lto lua nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+   dev-libs/json-glib
+   dev-libs/libxml2:2
+   >=dev-libs/pugixml-1.8:0=
+   gnome-base/librsvg:2
+   >=media-gfx/exiv2-0.25-r2:0=[xmp]
+   media-libs/lcms:2
+   >=media-libs/lensfun-0.2.3:0=
+   media-libs/libpng:0=
+   media-libs/tiff:0
+   net-libs/libsoup:2.4
+   net-misc/curl
+   sys-libs/zlib:=
+   virtual/jpeg:0
+   x11-libs/cairo
+   >=x11-libs/gtk+-3.22:3
+   x11-libs/pango
+   avif? ( >=media-libs/libavif-0.8.2 )
+   colord? ( x11-libs/colord-gtk:0= )
+   cups? ( net-print/cups )
+   flickr? ( media-libs/flickcurl )
+   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+   gmic? ( media-gfx/gmic )
+   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+   gphoto2? ( media-libs/libgphoto2:= )
+   graphicsmagick? ( media-gfx/graphicsmagick )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   lua? ( ${LUA_DEPS} )
+   opencl? ( virtual/opencl )
+   openexr? ( 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-08-22 Thread Sam James
commit: 32cc54200d7a525693e5909731f093d2b4f78b27
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 23 05:34:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 23 05:35:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32cc5420

media-gfx/darktable: Stabilize 3.6.0 amd64, #809236

Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-3.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild 
b/media-gfx/darktable/darktable-3.6.0.ebuild
index ad4c79e2d6e..383ae12c1b1 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -25,7 +25,7 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? ( 
https://www.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
 
-   KEYWORDS="~amd64 ~arm64 -x86"
+   KEYWORDS="amd64 ~arm64 -x86"
LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-07-27 Thread Marek Szuba
commit: 56c5395fd97ec0739190a505cb4802cd3730407b
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 27 21:49:03 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 27 21:54:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56c5395f

media-gfx/darktable: drop 

Having discussed the matter with maekke, neither of us is particularly
interested in maintaining a live ebuild of Darktable.

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-.ebuild | 168 --
 1 file changed, 168 deletions(-)

diff --git a/media-gfx/darktable/darktable-.ebuild 
b/media-gfx/darktable/darktable-.ebuild
deleted file mode 100644
index ad27dd2a772..000
--- a/media-gfx/darktable/darktable-.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-   DOC_PV="3.4.0"
-   MY_PV="${PV/_/}"
-   MY_P="${P/_/.}"
-
-   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-   KEYWORDS="~amd64 ~arm64 -x86"
-   LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
-fi
-
-IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr test tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-   test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   >=dev-libs/pugixml-1.8:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   net-libs/libsoup:2.4
-   net-misc/curl
-   sys-libs/zlib:=
-   virtual/jpeg:0
-   x11-libs/cairo
-   >=x11-libs/gtk+-3.22:3
-   x11-libs/pango
-   avif? ( >=media-libs/libavif-0.8.2 )
-   colord? ( x11-libs/colord-gtk:0= )
-   cups? ( net-print/cups )
-   flickr? ( media-libs/flickcurl )
-   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-   gmic? ( media-gfx/gmic )
-   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-   gphoto2? ( media-libs/libgphoto2:= )
-   graphicsmagick? ( media-gfx/graphicsmagick )
-   jpeg2k? ( media-libs/openjpeg:2= )
-   lua? ( ${LUA_DEPS} )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
-   webp? ( media-libs/libwebp:0= )"
-RDEPEND="${DEPEND}
-   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-find-opencl-header.patch
-   "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-   "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
-   "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   # Bug #695658
-   if tc-is-gcc; then
-   test-flags-CC -floop-block &> /dev/null || \
-   die "Please switch to a gcc version built with 
USE=graphite"
-   fi
-
-   if use openmp ; then
-   tc-has-openmp || die "Please switch to an openmp 
compatible compiler"
-   fi
-   fi
-}
-
-pkg_setup() {
-   use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-   use cpu_flags_x86_sse3 && append-flags -msse3
-
-   sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_CURVE_TOOLS=$(usex tools)
-   -DBUILD_NOISE_TOOLS=$(usex tools)
-   -DBUILD_PRINT=$(usex cups)
-   -DCUSTOM_CFLAGS=ON
-   -DDONT_USE_INTERNAL_LUA=ON
-   -DRAWSPEED_ENABLE_LTO=$(usex lto)
-   -DTESTBUILD_OPENCL_PROGRAMS=OFF
-   -DUSE_AVIF=$(usex avif)
-   -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-   -DUSE_COLORD=$(usex colord)
-   -DUSE_FLICKR=$(usex 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-07-27 Thread Marek Szuba
commit: baa4d9e6e3a4db03d40b6dffbaecba58371b092d
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 27 13:48:02 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 27 13:48:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa4d9e6

media-gfx/darktable: propagate Bug #803053 fix to the live ebuild

Closes: https://bugs.gentoo.org/804639
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/darktable/darktable-.ebuild 
b/media-gfx/darktable/darktable-.ebuild
index 696f97a42ff..ad27dd2a772 100644
--- a/media-gfx/darktable/darktable-.ebuild
+++ b/media-gfx/darktable/darktable-.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+   "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
 )
 
 S="${WORKDIR}/${P/_/~}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/

2021-07-21 Thread Marek Szuba
commit: 10f3f7f638cbe55958959df5d83597c090ba5f25
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jul 21 19:37:08 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jul 21 19:45:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f3f7f6

media-gfx/darktable: strip down compilation of bundled libxcf

Needed to make cmake-3.21/ninja stop trying to pass LDFLAGS to ar.
Since stripping src/external/libxcf/CMakeLists.txt to the bare minimum
results in a patch about the same size as the file itself, just inject
the necessary lines to src/external/CMakeLists.txt and ignore the one in
libxcf.

Tested on both 3.4.1 and 3.6.0, with cmake versions 3.18.5 and 3.21.0;
all combinations seem to build fine.

Closes: https://bugs.gentoo.org/803053
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.4.1.ebuild   |  1 +
 media-gfx/darktable/darktable-3.6.0.ebuild   |  1 +
 .../files/darktable-3.4.1_libxcf-cmake.patch | 20 
 3 files changed, 22 insertions(+)

diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild 
b/media-gfx/darktable/darktable-3.4.1.ebuild
index 54b4518a454..2f4bd3209de 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+   "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
 )
 
 S="${WORKDIR}/${P/_/~}"

diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild 
b/media-gfx/darktable/darktable-3.6.0.ebuild
index f73844b3854..ad4c79e2d6e 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+   "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
 )
 
 S="${WORKDIR}/${P/_/~}"

diff --git a/media-gfx/darktable/files/darktable-3.4.1_libxcf-cmake.patch 
b/media-gfx/darktable/files/darktable-3.4.1_libxcf-cmake.patch
new file mode 100644
index 000..72ab5aa91ad
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.4.1_libxcf-cmake.patch
@@ -0,0 +1,20 @@
+--- a/src/external/CMakeLists.txt
 b/src/external/CMakeLists.txt
+@@ -1,5 +1,16 @@
+ if(USE_XCF)
+-  add_subdirectory(libxcf)
++#  find_package(ZLIB REQUIRED)
++  add_library(xcf STATIC
++"${CMAKE_CURRENT_SOURCE_DIR}/libxcf/xcf.c"
++"${CMAKE_CURRENT_SOURCE_DIR}/libxcf/xcf.h"
++"${CMAKE_CURRENT_SOURCE_DIR}/libxcf/xcf_names.c"
++"${CMAKE_CURRENT_SOURCE_DIR}/libxcf/xcf_names.h"
++  )
++  set_property(TARGET xcf PROPERTY C_STANDARD 99)
++  target_compile_definitions(xcf PRIVATE _DEFAULT_SOURCE) # needed for 
htobe*()
++  target_include_directories(xcf PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/libxcf")
++#  target_link_libraries(xcf PUBLIC ZLIB::ZLIB)
++#  target_link_libraries(xcf PUBLIC m)
+ endif()
+ 
+ add_library(whereami STATIC 
"${CMAKE_CURRENT_SOURCE_DIR}/whereami/src/whereami.c")



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-07-16 Thread Marek Szuba
commit: 1ecdc49d8155d7d6ac907b38538597c3884b5d5c
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Jul 16 12:28:42 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Jul 16 13:59:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ecdc49d

media-gfx/darktable: update usermanual URI

Will continue to set DOC_PV to a literal for now, this is the first
release using the manual generated from
https://github.com/darktable-org/dtdocs.git and hosted on darktable.org
so no idea how upstream intends to version updates yet.

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   | 1 +
 media-gfx/darktable/darktable-3.6.0.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 19d881e5e16..95d84f120fb 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,3 +1,4 @@
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 
7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68
 SHA512 
3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B 
ecbb6b4b4aba1f499f8d459304f174f348c19304c0efb898260d3037bfb9c82ea51a92e3dd98c8b0d2dc525276a91419b41b3c610f4a18b905cda7ccd1bfc554
 SHA512 
8e458406c3004a52cde096039358eb044d370e8b9d5cb70a6457fc1ad165f062af073b3f0c8da92b463db5a4df37e7a4ee32eb5ce9dfbfeec3e0c13c70ec5f8a
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B 
d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56
 SHA512 
fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
+DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 
407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829
 SHA512 
62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd3842eacba26278510abaab1e0cc335

diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild 
b/media-gfx/darktable/darktable-3.6.0.ebuild
index 5f7bb83e38d..f73844b3854 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -18,12 +18,12 @@ if [[ ${PV} == * ]]; then
 
LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
 else
-   DOC_PV="3.4.0"
+   DOC_PV="3.6"
MY_PV="${PV/_/}"
MY_P="${P/_/.}"
 

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
+   doc? ( 
https://www.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> 
${PN}-usermanual-${DOC_PV}.pdf )"
 
KEYWORDS="~amd64 ~arm64 -x86"
LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-07-06 Thread Markus Meier
commit: e17af360e7b17604656c3f4710eb6293ddb5c15b
Author: Markus Meier  gentoo  org>
AuthorDate: Tue Jul  6 20:22:52 2021 +
Commit: Markus Meier  gentoo  org>
CommitDate: Tue Jul  6 20:22:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17af360

media-gfx/darktable: version bump

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest   |   1 +
 media-gfx/darktable/darktable-3.6.0.ebuild | 167 +
 2 files changed, 168 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 303a17befc2..19d881e5e16 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,2 +1,3 @@
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 
7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68
 SHA512 
3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
+DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B 
ecbb6b4b4aba1f499f8d459304f174f348c19304c0efb898260d3037bfb9c82ea51a92e3dd98c8b0d2dc525276a91419b41b3c610f4a18b905cda7ccd1bfc554
 SHA512 
8e458406c3004a52cde096039358eb044d370e8b9d5cb70a6457fc1ad165f062af073b3f0c8da92b463db5a4df37e7a4ee32eb5ce9dfbfeec3e0c13c70ec5f8a
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B 
d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56
 SHA512 
fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e

diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild 
b/media-gfx/darktable/darktable-3.6.0.ebuild
new file mode 100644
index 000..5f7bb83e38d
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV="3.4.0"
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+   KEYWORDS="~amd64 ~arm64 -x86"
+   LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+   lto lua nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+   dev-libs/json-glib
+   dev-libs/libxml2:2
+   >=dev-libs/pugixml-1.8:0=
+   gnome-base/librsvg:2
+   >=media-gfx/exiv2-0.25-r2:0=[xmp]
+   media-libs/lcms:2
+   >=media-libs/lensfun-0.2.3:0=
+   media-libs/libpng:0=
+   media-libs/tiff:0
+   net-libs/libsoup:2.4
+   net-misc/curl
+   sys-libs/zlib:=
+   virtual/jpeg:0
+   x11-libs/cairo
+   >=x11-libs/gtk+-3.22:3
+   x11-libs/pango
+   avif? ( >=media-libs/libavif-0.8.2 )
+   colord? ( x11-libs/colord-gtk:0= )
+   cups? ( net-print/cups )
+   flickr? ( media-libs/flickcurl )
+   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+   gmic? ( media-gfx/gmic )
+   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+   gphoto2? ( media-libs/libgphoto2:= )
+   graphicsmagick? ( media-gfx/graphicsmagick )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   lua? ( ${LUA_DEPS} )
+   opencl? ( virtual/opencl )
+   openexr? (  /dev/null || \
+   die "Please switch to a gcc version built with 
USE=graphite"
+   fi
+
+   if use openmp ; then
+   tc-has-openmp || die "Please switch to an openmp 
compatible compiler"
+   fi
+   fi
+}
+
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+   use cpu_flags_x86_sse3 && append-flags -msse3
+
+   sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+ 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/, media-gfx/darktable/files/

2021-06-15 Thread Marek Szuba
commit: e61b005977552a3f741d0a218f34c6b78ba35918
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jun 15 10:49:59 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jun 15 10:50:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61b0059

media-gfx/darktable: drop 2.6.2

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   |   3 -
 media-gfx/darktable/darktable-2.6.2.ebuild | 132 -
 .../files/darktable-2.6.2-exiv2-0.27.patch |  21 
 3 files changed, 156 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 03c42c1dac1..303a17befc2 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,2 @@
-DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 
857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0
 SHA512 
29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
-DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B 
ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6
 SHA512 
e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 
7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68
 SHA512 
3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
-DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B 
a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce
 SHA512 
e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B 
d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56
 SHA512 
fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e

diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild 
b/media-gfx/darktable/darktable-2.6.2.ebuild
deleted file mode 100644
index dbca73f7b5f..000
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs xdg
-
-DOC_PV="2.6.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   https://dev.gentoo.org/~asturm/distfiles/${P}-gcc9.patch.tar.xz
-   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-LANGS=" ca cs de es fi fr hu ja nb nl pl pt-BR ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr webp
-${LANGS// / l10n_}"
-
-BDEPEND="
-   dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-   dev-db/sqlite:3
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   dev-libs/pugixml:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   net-libs/libsoup:2.4
-   net-misc/curl
-   sys-libs/zlib:=
-   virtual/jpeg:0
-   x11-libs/cairo
-   >=x11-libs/gtk+-3.14:3
-   x11-libs/pango
-   colord? ( x11-libs/colord-gtk:0= )
-   cups? ( net-print/cups )
-   flickr? ( media-libs/flickcurl )
-   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-   gphoto2? ( media-libs/libgphoto2:= )
-   graphicsmagick? ( media-gfx/graphicsmagick )
-   jpeg2k? ( media-libs/openjpeg:2= )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
-   webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-   "${FILESDIR}"/"${PN}"-find-opencl-header.patch
-   "${WORKDIR}"/"${P}"-gcc9.patch
-   "${FILESDIR}"/"${P}"-exiv2-0.27.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-05-23 Thread Marek Szuba
commit: c2dcd5faefc3f0b0b365fc5c37404fb9ff56a924
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun May 23 13:24:20 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun May 23 15:00:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2dcd5fa

media-gfx/darktable: do not depend on LLVM+Clang

Darktable only needs LLVM+Clang if one want to test-build its OpenCL
kernels during installation. This is useful for developers working
on said kernels but feels unnecessary for users, especially given
it involves such a heavyweight dependency. Therefore, disable the
test-building of OpenCL kernels and remove the sys-devel/{llvm,clang}
dependencies.

Closes: https://bugs.gentoo.org/791448
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-2.6.2.ebuild | 10 +++---
 media-gfx/darktable/darktable-3.4.1.ebuild | 26 --
 media-gfx/darktable/darktable-.ebuild  | 28 +---
 3 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild 
b/media-gfx/darktable/darktable-2.6.2.ebuild
index 394e2f5295a..dbca73f7b5f 100644
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,12 +59,7 @@ COMMON_DEPEND="
openexr? ( media-libs/openexr:0= )
webp? ( media-libs/libwebp:0= )
 "
-DEPEND="${COMMON_DEPEND}
-   opencl? (
-   >=sys-devel/clang-4
-   >=sys-devel/llvm-4
-   )
-"
+DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 "
@@ -93,6 +88,7 @@ src_configure() {
local mycmakeargs=(
-DBUILD_PRINT=$(usex cups)
-DCUSTOM_CFLAGS=ON
+   -DTESTBUILD_OPENCL_PROGRAMS=OFF
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-DUSE_FLICKR=$(usex flickr)

diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild 
b/media-gfx/darktable/darktable-3.4.1.ebuild
index d3f39613559..54b4518a454 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -37,14 +37,11 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-   dev-util/intltool
+BDEPEND="dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )
-   test? ( >=dev-python/jsonschema-3.2.0 )
-"
-COMMON_DEPEND="
-   dev-db/sqlite:3
+   test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
dev-libs/json-glib
dev-libs/libxml2:2
>=dev-libs/pugixml-1.8:0=
@@ -74,20 +71,12 @@ COMMON_DEPEND="
lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
openexr? ( =dev-python/jsonschema-3.2.0 )
-"
-COMMON_DEPEND="
-   dev-db/sqlite:3
+   test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
dev-libs/json-glib
dev-libs/libxml2:2
>=dev-libs/pugixml-1.8:0=
@@ -74,20 +71,12 @@ COMMON_DEPEND="
lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
-   webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-   opencl? (
-   >=sys-devel/clang-4
-   >=sys-devel/llvm-4
-   )
-"
-RDEPEND="${COMMON_DEPEND}
-   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
+   webp? ( media-libs/libwebp:0= )"
+RDEPEND="${DEPEND}
+   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
 
 PATCHES=(
-   "${FILESDIR}"/"${PN}"-find-opencl-header.patch
+   "${FILESDIR}"/${PN}-find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
 )
@@ -128,6 +117,7 @@ src_configure() {
-DCUSTOM_CFLAGS=ON
-DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
+   -DTESTBUILD_OPENCL_PROGRAMS=OFF
-DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-05-23 Thread Marek Szuba
commit: 1cf4bcac0493e5e6fa95db7e4f0b964f743fc3bc
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun May 23 13:00:33 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun May 23 14:59:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cf4bcac

media-gfx/darktable-3.4.1: require <=media-libs/openexr-3 for USE=openexr

Already fixed upstream so the next release will no longer need this
restriction.

Closes: https://bugs.gentoo.org/791445
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild 
b/media-gfx/darktable/darktable-3.4.1.ebuild
index 3506e0d8882..d3f39613559 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -73,7 +73,7 @@ COMMON_DEPEND="
jpeg2k? ( media-libs/openjpeg:2= )
lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
+   openexr? ( 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/

2021-05-10 Thread Marek Szuba
commit: 93266b0c9de6e640f77fc5d37f17d7f497cd19b7
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon May 10 15:44:57 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon May 10 16:32:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93266b0c

media-gfx/darktable: remove unused patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20756
Signed-off-by: Marek Szuba  gentoo.org>

 .../files/darktable-3.4.0-xmmintrin-sse-only.patch | 30 --
 1 file changed, 30 deletions(-)

diff --git a/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch 
b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch
deleted file mode 100644
index 2e13ad859c8..000
--- a/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d10c290fb3b47bbc8fd90d6d1d7935b900c1caf6 Mon Sep 17 00:00:00 2001
-From: Pascal Obry 
-Date: Thu, 24 Dec 2020 16:17:19 +0100
-Subject: [PATCH] guided_filter: include xmmintrin.h only if SSE defined.
-
-Fixes #7428.

- src/common/guided_filter.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/common/guided_filter.h b/src/common/guided_filter.h
-index 36be0de04b9..59c8b2af999 100644
 a/src/common/guided_filter.h
-+++ b/src/common/guided_filter.h
-@@ -18,6 +18,7 @@
- 
- #pragma once
- 
-+#if defined(__SSE__)
- #ifdef __PPC64__
- #ifdef NO_WARN_X86_INTRINSICS
- #include 
-@@ -29,6 +30,7 @@
- #else
- #include 
- #endif // __PPC64__
-+#endif
- 
- #include "common/darktable.h"
- #include "common/opencl.h"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-05-07 Thread Marek Szuba
commit: d6f7c7b80612b8c7b82965c2229878ebb8f808e6
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri May  7 11:16:46 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri May  7 12:15:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f7c7b8

media-gfx/darktable: drop 3.4.0-r1

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest  |   1 -
 media-gfx/darktable/darktable-3.4.0-r1.ebuild | 179 --
 2 files changed, 180 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 25b0a41f8d0..03c42c1dac1 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,6 +1,5 @@
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 
857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0
 SHA512 
29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B 
ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6
 SHA512 
e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
-DIST darktable-3.4.0.tar.xz 452 BLAKE2B 
98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc
 SHA512 
b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 
7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68
 SHA512 
3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B 
a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce
 SHA512 
e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B 
d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56
 SHA512 
fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e

diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild 
b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
deleted file mode 100644
index 36695e589e2..000
--- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
-
-   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-   DOC_PV="3.4.0"
-   MY_PV="${PV/_/}"
-   MY_P="${P/_/.}"
-
-   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-   KEYWORDS="amd64 arm64 -x86"
-   LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
-fi
-
-IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr test tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-   test? ( >=dev-python/jsonschema-3.2.0 )
-"
-COMMON_DEPEND="
-   dev-db/sqlite:3
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   >=dev-libs/pugixml-1.8:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   net-libs/libsoup:2.4
-   net-misc/curl
-   sys-libs/zlib:=
-   virtual/jpeg:0
-   x11-libs/cairo
-   >=x11-libs/gtk+-3.22:3
-   x11-libs/pango
-   avif? ( >=media-libs/libavif-0.8.2 )
-   colord? ( x11-libs/colord-gtk:0= )
-   cups? ( net-print/cups )
-   flickr? 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-05-06 Thread Sam James
commit: 93448866c2c8e46ea0cfee61165cc3ce3aba468b
Author: Sam James  gentoo  org>
AuthorDate: Thu May  6 23:32:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  6 23:32:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93448866

media-gfx/darktable: Stabilize 3.4.1 arm64, #785085

Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild 
b/media-gfx/darktable/darktable-3.4.1.ebuild
index eeb346c65cf..3506e0d8882 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -25,7 +25,7 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-   KEYWORDS="amd64 ~arm64 -x86"
+   KEYWORDS="amd64 arm64 -x86"
LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-04-22 Thread Sam James
commit: c3d9aedf404df67c67afb0e9758914b99287de35
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 22 20:13:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 22 20:13:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d9aedf

media-gfx/darktable: Stabilize 3.4.1 amd64, #785085

Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild 
b/media-gfx/darktable/darktable-3.4.1.ebuild
index f5fe46fb2c5..eeb346c65cf 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -25,7 +25,7 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-   KEYWORDS="~amd64 ~arm64 -x86"
+   KEYWORDS="amd64 ~arm64 -x86"
LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/

2021-02-16 Thread Conrad Kostecki
commit: bdf15e4d4fe6f176e8e0f866bf8cfa565d48c72f
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Feb 16 16:22:23 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Feb 16 17:34:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf15e4d

media-gfx/darktable: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19490
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/darktable-3.0.2_jsonschema-automagic.patch  | 19 ---
 1 file changed, 19 deletions(-)

diff --git 
a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch 
b/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
deleted file mode 100644
index 1aa0aec5163..000
--- a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -319,15 +319,7 @@
-   message(STATUS "Test-compilation of OpenCL programs is disabled.")
- endif()
- 
--# we need jsonschema to check noiseprofiles.json
--find_program(jsonschema_BIN jsonschema)
--if(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
--  message(STATUS "Missing jsonschema, problems in noiseprofiles.json might go 
unnoticed")
--  set(VALIDATE_JSON 0)
--else(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
--  message(STATUS "Found jsonschema")
--  set(VALIDATE_JSON 1)
--endif(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
-+set(VALIDATE_JSON 0)
- 
- # we need an xslt interpreter to generate preferences_gen.h and darktablerc
- find_program(Xsltproc_BIN xsltproc)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-02-16 Thread Conrad Kostecki
commit: 0b7caaee5344021f44ebc6bcd9b37da4d64d4b95
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Feb 16 16:21:56 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Feb 16 17:34:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7caaee

media-gfx/darktable: remove unused USE-description

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-gfx/darktable/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index f4900858d12..b05ca306c75 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -17,7 +17,6 @@
Enable encrypted storage of passwords with 
kde-frameworks/kwallet
Enable link-time optimisations in the RawSpeed 
library
Enable opencl support
-   Use dev-lang/lua instead of 
the bundled liblua
Install tools for generating base curves and 
noise profiles





[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-02-15 Thread Marek Szuba
commit: 94870833081f335e0160f993b2be5f068c8f1615
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Feb 15 13:28:11 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Feb 15 13:28:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94870833

media-gfx/darktable: 3.0.0+ do not work on x86

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.4.0-r1.ebuild | 2 +-
 media-gfx/darktable/darktable-3.4.1.ebuild| 2 +-
 media-gfx/darktable/darktable-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild 
b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
index f5e252af949..36695e589e2 100644
--- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
@@ -25,7 +25,7 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-   KEYWORDS="amd64 arm64"
+   KEYWORDS="amd64 arm64 -x86"
LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 

diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild 
b/media-gfx/darktable/darktable-3.4.1.ebuild
index c66c363f491..f5fe46fb2c5 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -25,7 +25,7 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-   KEYWORDS="~amd64 ~arm64"
+   KEYWORDS="~amd64 ~arm64 -x86"
LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 

diff --git a/media-gfx/darktable/darktable-.ebuild 
b/media-gfx/darktable/darktable-.ebuild
index 8405fd12551..e2dca8478be 100644
--- a/media-gfx/darktable/darktable-.ebuild
+++ b/media-gfx/darktable/darktable-.ebuild
@@ -25,7 +25,7 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-   KEYWORDS="~amd64 ~arm64"
+   KEYWORDS="~amd64 ~arm64 -x86"
LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-02-15 Thread Marek Szuba
commit: a5954a656734592f6a9b2663c5a31e35f1e76a88
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Feb 15 12:28:32 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Feb 15 12:28:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5954a65

media-gfx/darktable: remove Sourceforge upstream from metadata

Still exists but hasn't been updated for almost 7 years, the latest
version available for download there is 1.4.2.

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index a46ea727d4c..f4900858d12 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -22,6 +22,5 @@


darktable-org/darktable
-   darktable

 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-02-15 Thread Marek Szuba
commit: 8c6e12d3dd2017c0990f13275919a0f7d6afba8f
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Feb 15 12:26:06 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Feb 15 12:26:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c6e12d3

media-gfx/darktable: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest  |   2 -
 media-gfx/darktable/darktable-3.2.1-r1.ebuild | 160 --
 2 files changed, 162 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 76cacfea9f2..25b0a41f8d0 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,8 +1,6 @@
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 
857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0
 SHA512 
29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B 
ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6
 SHA512 
e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
-DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 
79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070
 SHA512 
0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
 DIST darktable-3.4.0.tar.xz 452 BLAKE2B 
98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc
 SHA512 
b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 
7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68
 SHA512 
3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B 
a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce
 SHA512 
e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
-DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B 
ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01
 SHA512 
2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B 
d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56
 SHA512 
fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e

diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
deleted file mode 100644
index 05d2a6634f2..000
--- a/media-gfx/darktable/darktable-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DOC_PV="3.0.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-LANGS=" de es fr he it pl pt-BR ru sl"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr system-lua tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
-
-BDEPEND="
-   dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-   dev-db/sqlite:3
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   >=dev-libs/pugixml-1.8:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   net-libs/libsoup:2.4
-   net-misc/curl
-   sys-libs/zlib:=

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-02-14 Thread Sam James
commit: 8a610fa6717ddb01c4816250950f5155f90f82b6
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 15 06:04:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 15 06:04:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a610fa6

media-gfx/darktable: Stabilize 3.4.0-r1 arm64, #768393

Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-3.4.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild 
b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
index 7f946caeaa1..f5e252af949 100644
--- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
@@ -25,7 +25,7 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-   KEYWORDS="amd64 ~arm64"
+   KEYWORDS="amd64 arm64"
LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-02-08 Thread Marek Szuba
commit: cc54b6d6a29c269e0d70b83f91c9e2bade93608c
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Feb  8 13:26:13 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Feb  8 13:47:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc54b6d6

media-gfx/darktable: bump to 3.4.1

Bugfix release.

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/Manifest   |   1 +
 media-gfx/darktable/darktable-3.4.1.ebuild | 177 +
 2 files changed, 178 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 5e5b30e791b..76cacfea9f2 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,6 +2,7 @@ DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 
857803d4c46b47b1e06e962533c
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B 
ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6
 SHA512 
e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 
79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070
 SHA512 
0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
 DIST darktable-3.4.0.tar.xz 452 BLAKE2B 
98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc
 SHA512 
b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
+DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 
7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68
 SHA512 
3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B 
a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce
 SHA512 
e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B 
ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01
 SHA512 
2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B 
d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56
 SHA512 
fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e

diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild 
b/media-gfx/darktable/darktable-3.4.1.ebuild
new file mode 100644
index 000..c66c363f491
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV="3.4.0"
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+   KEYWORDS="~amd64 ~arm64"
+   LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+   lto lua nls opencl openmp openexr test tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( >=dev-python/jsonschema-3.2.0 )
+"
+COMMON_DEPEND="
+   dev-db/sqlite:3
+   dev-libs/json-glib
+   dev-libs/libxml2:2
+   >=dev-libs/pugixml-1.8:0=
+   gnome-base/librsvg:2
+   >=media-gfx/exiv2-0.25-r2:0=[xmp]
+   media-libs/lcms:2
+   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2021-02-02 Thread Sam James
commit: c183a968fc3793c3e8e34cfa1a5575fb6d6fd5be
Author: Sam James  gentoo  org>
AuthorDate: Wed Feb  3 03:12:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Feb  3 03:12:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c183a968

media-gfx/darktable: Stabilize 3.4.0-r1 amd64, #768393

Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-3.4.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild 
b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
index cb8b5d62769..7f946caeaa1 100644
--- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ else

SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-   KEYWORDS="~amd64 ~arm64"
+   KEYWORDS="amd64 ~arm64"
LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/, media-gfx/darktable/files/

2020-12-28 Thread Marek Szuba
commit: 09d92df170e7e302400cee44c131de7fe0f9eb73
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Dec 28 14:33:13 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Dec 28 14:34:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d92df1

media-gfx/darktable-3.4.0: fix build failure on non-SSE systems

Backport of the upstream fix which will be included in the next release.

Closes: https://bugs.gentoo.org/762202
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.4.0-r1.ebuild  |  2 ++
 .../files/darktable-3.4.0-xmmintrin-sse-only.patch | 30 ++
 2 files changed, 32 insertions(+)

diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild 
b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
index 8405fd12551..cb8b5d62769 100644
--- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
@@ -86,10 +86,12 @@ RDEPEND="${COMMON_DEPEND}
kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 "
 
+# the xmmintrin patch will no longer be needed come 3.4.1
 PATCHES=(
"${FILESDIR}"/"${PN}"-find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+   "${FILESDIR}"/${PN}-3.4.0-xmmintrin-sse-only.patch
 )
 
 S="${WORKDIR}/${P/_/~}"

diff --git a/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch 
b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch
new file mode 100644
index 000..2e13ad859c8
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch
@@ -0,0 +1,30 @@
+From d10c290fb3b47bbc8fd90d6d1d7935b900c1caf6 Mon Sep 17 00:00:00 2001
+From: Pascal Obry 
+Date: Thu, 24 Dec 2020 16:17:19 +0100
+Subject: [PATCH] guided_filter: include xmmintrin.h only if SSE defined.
+
+Fixes #7428.
+---
+ src/common/guided_filter.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/guided_filter.h b/src/common/guided_filter.h
+index 36be0de04b9..59c8b2af999 100644
+--- a/src/common/guided_filter.h
 b/src/common/guided_filter.h
+@@ -18,6 +18,7 @@
+ 
+ #pragma once
+ 
++#if defined(__SSE__)
+ #ifdef __PPC64__
+ #ifdef NO_WARN_X86_INTRINSICS
+ #include 
+@@ -29,6 +30,7 @@
+ #else
+ #include 
+ #endif // __PPC64__
++#endif
+ 
+ #include "common/darktable.h"
+ #include "common/opencl.h"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/, media-gfx/darktable/files/

2020-12-26 Thread Marek Szuba
commit: dd47c8a2caa923d5eb2355a8c3101e2124b83ca2
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Dec 25 00:58:28 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Dec 26 23:18:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd47c8a2

media-gfx/darktable: + AVIF support, - bundled liblua, unified release/live 
structure

Signed-off-by: Marek Szuba  gentoo.org>

 ...able-3.4.0.ebuild => darktable-3.4.0-r1.ebuild} | 54 ++
 .../darktable-3.4.0_jsonschema-automagic.patch | 25 ++
 media-gfx/darktable/metadata.xml   |  1 +
 3 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.4.0.ebuild 
b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
similarity index 73%
rename from media-gfx/darktable/darktable-3.4.0.ebuild
rename to media-gfx/darktable/darktable-3.4.0-r1.ebuild
index ffafc687cb4..8405fd12551 100644
--- a/media-gfx/darktable/darktable-3.4.0.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
@@ -7,29 +7,41 @@ LUA_COMPAT=( lua5-3 )
 
 inherit cmake flag-o-matic lua-single toolchain-funcs xdg
 
-DOC_PV="3.4.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
 DESCRIPTION="A virtual lighttable and darkroom for photographers"
 HOMEPAGE="https://www.darktable.org/;
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr system-lua tools webp
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV="3.4.0"
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+   KEYWORDS="~amd64 ~arm64"
+   LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+   lto lua nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
 
-REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
 
 BDEPEND="
dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )
+   test? ( >=dev-python/jsonschema-3.2.0 )
 "
 COMMON_DEPEND="
dev-db/sqlite:3
@@ -49,6 +61,7 @@ COMMON_DEPEND="
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
x11-libs/pango
+   avif? ( >=media-libs/libavif-0.8.2 )
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
@@ -58,9 +71,9 @@ COMMON_DEPEND="
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
jpeg2k? ( media-libs/openjpeg:2= )
+   lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
-   system-lua? ( ${LUA_DEPS} )
webp? ( media-libs/libwebp:0= )
 "
 DEPEND="${COMMON_DEPEND}
@@ -76,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
"${FILESDIR}"/"${PN}"-find-opencl-header.patch
"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-   "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
+   "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
@@ -95,6 +108,10 @@ pkg_pretend() {
fi
 }
 
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
use cpu_flags_x86_sse3 && append-flags -msse3
 
@@ -104,15 +121,14 @@ src_prepare() {
 }
 
 src_configure() {
-   # As of darktable-3.2.1, AVIF support is not compatible with 
>=media-libs/libavif-0.8.0; see Bug #751352.
local mycmakeargs=(
-DBUILD_CURVE_TOOLS=$(usex tools)
-DBUILD_NOISE_TOOLS=$(usex tools)
-DBUILD_PRINT=$(usex cups)
-DCUSTOM_CFLAGS=ON
-   -DDONT_USE_INTERNAL_LUA=$(usex system-lua)
+   -DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
-   -DUSE_AVIF=no
+   -DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-12-26 Thread Marek Szuba
commit: b94a2b6d3df467544fb0b3257e30e2245737049a
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Dec 26 23:14:19 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Dec 26 23:18:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b94a2b6d

media-gfx/darktable: update the live ebuild

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-.ebuild | 68 ++-
 1 file changed, 57 insertions(+), 11 deletions(-)

diff --git a/media-gfx/darktable/darktable-.ebuild 
b/media-gfx/darktable/darktable-.ebuild
index 94d8c657437..8405fd12551 100644
--- a/media-gfx/darktable/darktable-.ebuild
+++ b/media-gfx/darktable/darktable-.ebuild
@@ -3,25 +3,45 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic git-r3 toolchain-funcs xdg
+LUA_COMPAT=( lua5-3 )
 
-EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
 
 DESCRIPTION="A virtual lighttable and darkroom for photographers"
 HOMEPAGE="https://www.darktable.org/;
-
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm64"
-LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru 
sk sl sq sv th uk zh-CN zh-TW"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr tools webp
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+
+   LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT 
ro ru sk sl sq sv th uk zh-CN zh-TW"
+else
+   DOC_PV="3.4.0"
+   MY_PV="${PV/_/}"
+   MY_P="${P/_/.}"
+
+   
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+   KEYWORDS="~amd64 ~arm64"
+   LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic 
gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+   lto lua nls opencl openmp openexr test tools webp
${LANGS// / l10n_}"
 
-BDEPEND=">=dev-python/jsonschema-3.2.0
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )
+   test? ( >=dev-python/jsonschema-3.2.0 )
 "
 COMMON_DEPEND="
dev-db/sqlite:3
@@ -41,14 +61,17 @@ COMMON_DEPEND="
x11-libs/cairo
>=x11-libs/gtk+-3.22:3
x11-libs/pango
+   avif? ( >=media-libs/libavif-0.8.2 )
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+   gmic? ( media-gfx/gmic )
gnome-keyring? ( >=app-crypt/libsecret-0.18 )
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
jpeg2k? ( media-libs/openjpeg:2= )
+   lua? ( ${LUA_DEPS} )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
webp? ( media-libs/libwebp:0= )
@@ -65,8 +88,12 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+   "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+   "${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
 )
 
+S="${WORKDIR}/${P/_/~}"
+
 pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
# Bug #695658
@@ -81,6 +108,10 @@ pkg_pretend() {
fi
 }
 
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
use cpu_flags_x86_sse3 && append-flags -msse3
 
@@ -90,17 +121,18 @@ src_prepare() {
 }
 
 src_configure() {
-   # TODO: switch to system Lua once 5.3 has been unmasked
local mycmakeargs=(
-   -DDONT_USE_INTERNAL_LUA=OFF
-DBUILD_CURVE_TOOLS=$(usex tools)
-DBUILD_NOISE_TOOLS=$(usex tools)
-DBUILD_PRINT=$(usex cups)
-DCUSTOM_CFLAGS=ON
+   -DDONT_USE_INTERNAL_LUA=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
+   -DUSE_AVIF=$(usex avif)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-DUSE_FLICKR=$(usex flickr)
+   -DUSE_GMIC=$(usex gmic)
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-DUSE_KWALLET=$(usex kwallet)
-DUSE_LIBSECRET=$(usex gnome-keyring)
@@ -112,6 +144,7 @@ src_configure() {
-DUSE_OPENJPEG=$(usex jpeg2k)
-DUSE_OPENMP=$(usex openmp)
-DUSE_WEBP=$(usex webp)
+   -DWANT_JSON_VALIDATION=$(usex test)
)

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-12-26 Thread Marek Szuba
commit: 82147828d77a5988247aac5008df80b8d9423e5c
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Dec 26 23:15:49 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Dec 26 23:18:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82147828

media-gfx/darktable: remove 3.2.1-r2

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.2.1-r2.ebuild | 159 --
 1 file changed, 159 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.2.1-r2.ebuild 
b/media-gfx/darktable/darktable-3.2.1-r2.ebuild
deleted file mode 100644
index 03bc356adc6..000
--- a/media-gfx/darktable/darktable-3.2.1-r2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DOC_PV="3.0.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-LANGS=" de es fr he it pl pt-BR ru sl"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr system-lua tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
-
-BDEPEND="
-   dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-   dev-db/sqlite:3
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   >=dev-libs/pugixml-1.8:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   net-libs/libsoup:2.4
-   net-misc/curl
-   sys-libs/zlib:=
-   virtual/jpeg:0
-   x11-libs/cairo
-   >=x11-libs/gtk+-3.22:3
-   x11-libs/pango
-   colord? ( x11-libs/colord-gtk:0= )
-   cups? ( net-print/cups )
-   flickr? ( media-libs/flickcurl )
-   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-   gmic? ( media-gfx/gmic )
-   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-   gphoto2? ( media-libs/libgphoto2:= )
-   graphicsmagick? ( media-gfx/graphicsmagick )
-   jpeg2k? ( media-libs/openjpeg:2= )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
-   system-lua? ( ${LUA_DEPS} )
-   webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-   opencl? (
-   >=sys-devel/clang-4
-   >=sys-devel/llvm-4
-   )
-"
-RDEPEND="${COMMON_DEPEND}
-   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-   "${FILESDIR}"/"${PN}"-find-opencl-header.patch
-   "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-   "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   # Bug #695658
-   if tc-is-gcc; then
-   test-flags-CC -floop-block &> /dev/null || \
-   die "Please switch to a gcc version built with 
USE=graphite"
-   fi
-
-   if use openmp ; then
-   tc-has-openmp || die "Please switch to an openmp 
compatible compiler"
-   fi
-   fi
-}
-
-src_prepare() {
-   use cpu_flags_x86_sse3 && append-flags -msse3
-
-   sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # As of darktable-3.2.1, AVIF support is not compatible with 
>=media-libs/libavif-0.8.0; see Bug #751352.
-   local mycmakeargs=(
-   -DBUILD_CURVE_TOOLS=$(usex tools)
-   -DBUILD_NOISE_TOOLS=$(usex tools)
-   -DBUILD_PRINT=$(usex cups)
-   -DCUSTOM_CFLAGS=ON
-   -DDONT_USE_INTERNAL_LUA=$(usex system-lua)
-   -DRAWSPEED_ENABLE_LTO=$(usex lto)
-   -DUSE_AVIF=no
-   -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-   -DUSE_COLORD=$(usex colord)
-   -DUSE_FLICKR=$(usex flickr)
-   -DUSE_GMIC=$(usex gmic)
-   -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-   -DUSE_KWALLET=$(usex kwallet)
-   -DUSE_LIBSECRET=$(usex gnome-keyring)
-   -DUSE_LUA=$(usex lua)
-   -DUSE_MAP=$(usex geolocation)
-   -DUSE_NLS=$(usex nls)
-   -DUSE_OPENCL=$(usex opencl)
-   -DUSE_OPENEXR=$(usex 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-12-24 Thread Markus Meier
commit: 5eb92e5bd9cd6cb89be2897d8ae8408c661a00cf
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Dec 24 17:39:07 2020 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Dec 24 17:39:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb92e5b

media-gfx/darktable: version bump

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Markus Meier  gentoo.org>

 media-gfx/darktable/Manifest   |   2 +
 media-gfx/darktable/darktable-3.4.0.ebuild | 159 +
 2 files changed, 161 insertions(+)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 38c061a3411..5e5b30e791b 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,5 +1,7 @@
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 
857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0
 SHA512 
29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B 
ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6
 SHA512 
e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
 DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 
79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070
 SHA512 
0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
+DIST darktable-3.4.0.tar.xz 452 BLAKE2B 
98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc
 SHA512 
b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B 
a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce
 SHA512 
e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B 
ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01
 SHA512 
2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
+DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B 
d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56
 SHA512 
fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e

diff --git a/media-gfx/darktable/darktable-3.4.0.ebuild 
b/media-gfx/darktable/darktable-3.4.0.ebuild
new file mode 100644
index 000..ffafc687cb4
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.4.0.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DOC_PV="3.4.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
+   lto lua nls opencl openmp openexr system-lua tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+
+BDEPEND="
+   dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+COMMON_DEPEND="
+   dev-db/sqlite:3
+   dev-libs/json-glib
+   dev-libs/libxml2:2
+   >=dev-libs/pugixml-1.8:0=
+   gnome-base/librsvg:2
+   >=media-gfx/exiv2-0.25-r2:0=[xmp]
+   media-libs/lcms:2
+   >=media-libs/lensfun-0.2.3:0=
+   media-libs/libpng:0=
+   media-libs/tiff:0
+   net-libs/libsoup:2.4
+   net-misc/curl
+   sys-libs/zlib:=
+   virtual/jpeg:0
+   x11-libs/cairo
+   >=x11-libs/gtk+-3.22:3
+   x11-libs/pango
+   colord? ( x11-libs/colord-gtk:0= )
+   cups? ( net-print/cups )
+   flickr? ( media-libs/flickcurl )
+   geolocation? ( 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-12-24 Thread Joonas Niilola
commit: 0fe2094221fdee643d67cfd4dbdd35cfe613b3dd
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Dec 24 13:53:41 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec 24 13:53:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fe20942

media-gfx/darktable: fix manifest

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/darktable/Manifest | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 50c2152b4a6..38c061a3411 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,6 +1,5 @@
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 
857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0
 SHA512 
29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B 
ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6
 SHA512 
e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
-DIST darktable-3.0.2.tar.xz 3931240 BLAKE2B 
5f86579a43e396c8116aba63c43e13d7312e5c3a569f9c242fe9a7882f02c5e0ebd7e4b9bbd34576eb83b3b78298038bf0d87bf4786dd19d0fa73ed30de21f67
 SHA512 
ee2d83f60621586f9e1be958f4b0c3d2214fbf30338837dbd07b901641c32d565cd29f814f5ff75a450495acee2383aa62ba3da3873009077704c925bab501f1
 DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 
79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070
 SHA512 
0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B 
a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce
 SHA512 
e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B 
ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01
 SHA512 
2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/

2020-12-24 Thread Marek Szuba
commit: b071a6819000ebe2b152e62ce7b9e3b091eb9e9a
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Dec 24 13:07:02 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Dec 24 13:07:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b071a681

media-gfx/darktable: remove 3.0.2

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.0.2.ebuild | 149 -
 .../darktable-3.0.2_cmake-opencl-kernel-loop.patch |  28 
 2 files changed, 177 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild 
b/media-gfx/darktable/darktable-3.0.2.ebuild
deleted file mode 100644
index 4fd99f7da34..000
--- a/media-gfx/darktable/darktable-3.0.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs xdg
-
-DOC_PV="3.0.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64"
-LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
-   nls opencl openmp openexr tools webp
-   ${LANGS// / l10n_}"
-
-BDEPEND="
-   dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-   dev-db/sqlite:3
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   >=dev-libs/pugixml-1.8:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   net-libs/libsoup:2.4
-   net-misc/curl
-   sys-libs/zlib:=
-   virtual/jpeg:0
-   x11-libs/cairo
-   >=x11-libs/gtk+-3.22:3
-   x11-libs/pango
-   colord? ( x11-libs/colord-gtk:0= )
-   cups? ( net-print/cups )
-   flickr? ( media-libs/flickcurl )
-   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-   gphoto2? ( media-libs/libgphoto2:= )
-   graphicsmagick? ( media-gfx/graphicsmagick )
-   jpeg2k? ( media-libs/openjpeg:2= )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
-   webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-   opencl? (
-   >=sys-devel/clang-4
-   >=sys-devel/llvm-4
-   )
-"
-RDEPEND="${COMMON_DEPEND}
-   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-   "${FILESDIR}"/"${PN}"-find-opencl-header.patch
-   "${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch
-   "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   # Bug #695658
-   if tc-is-gcc; then
-   test-flags-CC -floop-block &> /dev/null || \
-   die "Please switch to a gcc version built with 
USE=graphite"
-   fi
-
-   if use openmp ; then
-   tc-has-openmp || die "Please switch to an openmp 
compatible compiler"
-   fi
-   fi
-}
-
-src_prepare() {
-   use cpu_flags_x86_sse3 && append-flags -msse3
-
-   sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_CURVE_TOOLS=$(usex tools)
-   -DBUILD_NOISE_TOOLS=$(usex tools)
-   -DBUILD_PRINT=$(usex cups)
-   -DCUSTOM_CFLAGS=ON
-   -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-   -DUSE_COLORD=$(usex colord)
-   -DUSE_FLICKR=$(usex flickr)
-   -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-   -DUSE_KWALLET=$(usex kwallet)
-   -DUSE_LIBSECRET=$(usex gnome-keyring)
-   -DUSE_LUA=OFF
-   -DUSE_MAP=$(usex geolocation)
-   -DUSE_NLS=$(usex nls)
-   -DUSE_OPENCL=$(usex opencl)
-   -DUSE_OPENEXR=$(usex openexr)
-   -DUSE_OPENJPEG=$(usex jpeg2k)
-   -DUSE_OPENMP=$(usex openmp)
-   -DUSE_WEBP=$(usex webp)
-   )
-   CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-   use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-   if use nls ; then
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-12-24 Thread Marek Szuba
commit: 11a24734848f33bf68f73be572452c1252764b60
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Dec 24 13:02:23 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Dec 24 13:04:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a24734

media-gfx/darktable: restore 3.2.1-r1

That one was stable on amd64, my bad.

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.2.1-r1.ebuild | 160 ++
 1 file changed, 160 insertions(+)

diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
new file mode 100644
index 000..05d2a6634f2
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DOC_PV="3.0.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+LANGS=" de es fr he it pl pt-BR ru sl"
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
+   lto lua nls opencl openmp openexr system-lua tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+
+BDEPEND="
+   dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+COMMON_DEPEND="
+   dev-db/sqlite:3
+   dev-libs/json-glib
+   dev-libs/libxml2:2
+   >=dev-libs/pugixml-1.8:0=
+   gnome-base/librsvg:2
+   >=media-gfx/exiv2-0.25-r2:0=[xmp]
+   media-libs/lcms:2
+   >=media-libs/lensfun-0.2.3:0=
+   media-libs/libpng:0=
+   media-libs/tiff:0
+   net-libs/libsoup:2.4
+   net-misc/curl
+   sys-libs/zlib:=
+   virtual/jpeg:0
+   x11-libs/cairo
+   >=x11-libs/gtk+-3.22:3
+   x11-libs/pango
+   colord? ( x11-libs/colord-gtk:0= )
+   cups? ( net-print/cups )
+   flickr? ( media-libs/flickcurl )
+   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+   gphoto2? ( media-libs/libgphoto2:= )
+   graphicsmagick? ( media-gfx/graphicsmagick )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   system-lua? ( ${LUA_DEPS} )
+   webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${COMMON_DEPEND}
+   opencl? (
+   >=sys-devel/clang-4
+   >=sys-devel/llvm-4
+   )
+"
+RDEPEND="${COMMON_DEPEND}
+   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+"
+
+PATCHES=(
+   "${FILESDIR}"/"${PN}"-find-opencl-header.patch
+   "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+   "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   # Bug #695658
+   if tc-is-gcc; then
+   test-flags-CC -floop-block &> /dev/null || \
+   die "Please switch to a gcc version built with 
USE=graphite"
+   fi
+
+   if use openmp ; then
+   tc-has-openmp || die "Please switch to an openmp 
compatible compiler"
+   fi
+   fi
+}
+
+src_prepare() {
+   use cpu_flags_x86_sse3 && append-flags -msse3
+
+   sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # As of darktable-3.2.1, AVIF support is not compatible with 
>=media-libs/libavif-0.8.0; see Bug #751352.
+   # GMIC support mostly works but there are several problems with the 
media-gfx/gmic ebuilds currently
+   # in the tree, and the package itself has got no maintainer.
+   local mycmakeargs=(
+   -DBUILD_CURVE_TOOLS=$(usex tools)
+   -DBUILD_NOISE_TOOLS=$(usex tools)
+   -DBUILD_PRINT=$(usex cups)
+   -DCUSTOM_CFLAGS=ON
+   -DDONT_USE_INTERNAL_LUA=$(usex system-lua)
+   -DRAWSPEED_ENABLE_LTO=$(usex lto)
+   -DUSE_AVIF=no
+   -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+   -DUSE_COLORD=$(usex colord)
+   -DUSE_FLICKR=$(usex flickr)
+   -DUSE_GMIC=no
+   -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+   -DUSE_KWALLET=$(usex kwallet)
+   -DUSE_LIBSECRET=$(usex gnome-keyring)
+   -DUSE_LUA=$(usex 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-12-24 Thread Marek Szuba
commit: 084f6f12215ffaf3d8198eb65ac607c3ace7d0fb
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Dec 24 12:33:29 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Dec 24 12:33:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=084f6f12

media-gfx/darktable: remove old 3.2.1 revisions

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.2.1-r1.ebuild | 160 --
 media-gfx/darktable/darktable-3.2.1.ebuild| 150 
 2 files changed, 310 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
deleted file mode 100644
index 05d2a6634f2..000
--- a/media-gfx/darktable/darktable-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DOC_PV="3.0.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/;
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-LANGS=" de es fr he it pl pt-BR ru sl"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr system-lua tools webp
-   ${LANGS// / l10n_}"
-
-REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
-
-BDEPEND="
-   dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-   dev-db/sqlite:3
-   dev-libs/json-glib
-   dev-libs/libxml2:2
-   >=dev-libs/pugixml-1.8:0=
-   gnome-base/librsvg:2
-   >=media-gfx/exiv2-0.25-r2:0=[xmp]
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.3:0=
-   media-libs/libpng:0=
-   media-libs/tiff:0
-   net-libs/libsoup:2.4
-   net-misc/curl
-   sys-libs/zlib:=
-   virtual/jpeg:0
-   x11-libs/cairo
-   >=x11-libs/gtk+-3.22:3
-   x11-libs/pango
-   colord? ( x11-libs/colord-gtk:0= )
-   cups? ( net-print/cups )
-   flickr? ( media-libs/flickcurl )
-   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-   gphoto2? ( media-libs/libgphoto2:= )
-   graphicsmagick? ( media-gfx/graphicsmagick )
-   jpeg2k? ( media-libs/openjpeg:2= )
-   opencl? ( virtual/opencl )
-   openexr? ( media-libs/openexr:0= )
-   system-lua? ( ${LUA_DEPS} )
-   webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-   opencl? (
-   >=sys-devel/clang-4
-   >=sys-devel/llvm-4
-   )
-"
-RDEPEND="${COMMON_DEPEND}
-   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-   "${FILESDIR}"/"${PN}"-find-opencl-header.patch
-   "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-   "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   # Bug #695658
-   if tc-is-gcc; then
-   test-flags-CC -floop-block &> /dev/null || \
-   die "Please switch to a gcc version built with 
USE=graphite"
-   fi
-
-   if use openmp ; then
-   tc-has-openmp || die "Please switch to an openmp 
compatible compiler"
-   fi
-   fi
-}
-
-src_prepare() {
-   use cpu_flags_x86_sse3 && append-flags -msse3
-
-   sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   # As of darktable-3.2.1, AVIF support is not compatible with 
>=media-libs/libavif-0.8.0; see Bug #751352.
-   # GMIC support mostly works but there are several problems with the 
media-gfx/gmic ebuilds currently
-   # in the tree, and the package itself has got no maintainer.
-   local mycmakeargs=(
-   -DBUILD_CURVE_TOOLS=$(usex tools)
-   -DBUILD_NOISE_TOOLS=$(usex tools)
-   -DBUILD_PRINT=$(usex cups)
-   -DCUSTOM_CFLAGS=ON
-   -DDONT_USE_INTERNAL_LUA=$(usex system-lua)
-   -DRAWSPEED_ENABLE_LTO=$(usex lto)
-   -DUSE_AVIF=no
-   -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-   -DUSE_COLORD=$(usex colord)
-   -DUSE_FLICKR=$(usex flickr)
-   -DUSE_GMIC=no
-   -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-   -DUSE_KWALLET=$(usex kwallet)
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-12-24 Thread Marek Szuba
commit: d2ba05085508435ab5e2dd79df461b3134820e20
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Dec 24 12:27:56 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Dec 24 12:27:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ba0508

media-gfx/darktable: metadata: wrap "dev-lang/lua" in  tag

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index f7f953454f3..5661ac61bfd 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -16,7 +16,7 @@
Enable encrypted storage of passwords with 
kde-frameworks/kwallet
Enable link-time optimisations in the RawSpeed 
library
Enable opencl support
-   Use dev-lang/lua instead of the bundled 
liblua
+   Use dev-lang/lua instead of 
the bundled liblua
Install tools for generating base curves and 
noise profiles





[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-11-14 Thread Sam James
commit: a7884e787c8362fb493e50b8fd07bb9e4d75e182
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 15 05:23:09 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 15 05:23:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7884e78

media-gfx/darktable: Stabilize 3.2.1-r1 amd64, #753188

Signed-off-by: Sam James  gentoo.org>

 media-gfx/darktable/darktable-3.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
index 06f7a8f31b9..05d2a6634f2 100644
--- a/media-gfx/darktable/darktable-3.2.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 LANGS=" de es fr he it pl pt-BR ru sl"
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
lto lua nls opencl openmp openexr system-lua tools webp



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-11-06 Thread Marek Szuba
commit: df0078a47d9a9286649a0b661ee085291410d9f4
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Nov  6 17:38:44 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Nov  6 18:06:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0078a4

media-gfx/darktable: enable optional G'MIC support

Currently only needed to read 3D Colour LUTs compressed using their
multiscale anisotropic diffusion scheme-based compression algorithm,
may or may not serve other purposes in the future.

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.2.1-r2.ebuild | 159 ++
 media-gfx/darktable/metadata.xml  |   1 +
 2 files changed, 160 insertions(+)

diff --git a/media-gfx/darktable/darktable-3.2.1-r2.ebuild 
b/media-gfx/darktable/darktable-3.2.1-r2.ebuild
new file mode 100644
index 000..03bc356adc6
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.2.1-r2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
+
+DOC_PV="3.0.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="https://www.darktable.org/;
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+LANGS=" de es fr he it pl pt-BR ru sl"
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
+   lto lua nls opencl openmp openexr system-lua tools webp
+   ${LANGS// / l10n_}"
+
+REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+
+BDEPEND="
+   dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+COMMON_DEPEND="
+   dev-db/sqlite:3
+   dev-libs/json-glib
+   dev-libs/libxml2:2
+   >=dev-libs/pugixml-1.8:0=
+   gnome-base/librsvg:2
+   >=media-gfx/exiv2-0.25-r2:0=[xmp]
+   media-libs/lcms:2
+   >=media-libs/lensfun-0.2.3:0=
+   media-libs/libpng:0=
+   media-libs/tiff:0
+   net-libs/libsoup:2.4
+   net-misc/curl
+   sys-libs/zlib:=
+   virtual/jpeg:0
+   x11-libs/cairo
+   >=x11-libs/gtk+-3.22:3
+   x11-libs/pango
+   colord? ( x11-libs/colord-gtk:0= )
+   cups? ( net-print/cups )
+   flickr? ( media-libs/flickcurl )
+   geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+   gmic? ( media-gfx/gmic )
+   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+   gphoto2? ( media-libs/libgphoto2:= )
+   graphicsmagick? ( media-gfx/graphicsmagick )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   opencl? ( virtual/opencl )
+   openexr? ( media-libs/openexr:0= )
+   system-lua? ( ${LUA_DEPS} )
+   webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${COMMON_DEPEND}
+   opencl? (
+   >=sys-devel/clang-4
+   >=sys-devel/llvm-4
+   )
+"
+RDEPEND="${COMMON_DEPEND}
+   kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+"
+
+PATCHES=(
+   "${FILESDIR}"/"${PN}"-find-opencl-header.patch
+   "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+   "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   # Bug #695658
+   if tc-is-gcc; then
+   test-flags-CC -floop-block &> /dev/null || \
+   die "Please switch to a gcc version built with 
USE=graphite"
+   fi
+
+   if use openmp ; then
+   tc-has-openmp || die "Please switch to an openmp 
compatible compiler"
+   fi
+   fi
+}
+
+src_prepare() {
+   use cpu_flags_x86_sse3 && append-flags -msse3
+
+   sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   # As of darktable-3.2.1, AVIF support is not compatible with 
>=media-libs/libavif-0.8.0; see Bug #751352.
+   local mycmakeargs=(
+   -DBUILD_CURVE_TOOLS=$(usex tools)
+   -DBUILD_NOISE_TOOLS=$(usex tools)
+   -DBUILD_PRINT=$(usex cups)
+   -DCUSTOM_CFLAGS=ON
+   -DDONT_USE_INTERNAL_LUA=$(usex system-lua)
+   -DRAWSPEED_ENABLE_LTO=$(usex lto)
+   -DUSE_AVIF=no
+   -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+   -DUSE_COLORD=$(usex colord)
+   -DUSE_FLICKR=$(usex flickr)
+   -DUSE_GMIC=$(usex gmic)
+   -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+   -DUSE_KWALLET=$(usex kwallet)
+ 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-11-03 Thread Marek Szuba
commit: e2f2243a766a09957922928f13d3795989a951fb
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Nov  3 10:54:22 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Nov  3 10:54:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f2243a

media-gfx/darktable: fix two automagic dependencies

Closes: https://bugs.gentoo.org/751352
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.2.1-r1.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
index 8c8b4232164..06f7a8f31b9 100644
--- a/media-gfx/darktable/darktable-3.2.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
@@ -103,6 +103,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # As of darktable-3.2.1, AVIF support is not compatible with 
>=media-libs/libavif-0.8.0; see Bug #751352.
+   # GMIC support mostly works but there are several problems with the 
media-gfx/gmic ebuilds currently
+   # in the tree, and the package itself has got no maintainer.
local mycmakeargs=(
-DBUILD_CURVE_TOOLS=$(usex tools)
-DBUILD_NOISE_TOOLS=$(usex tools)
@@ -110,9 +113,11 @@ src_configure() {
-DCUSTOM_CFLAGS=ON
-DDONT_USE_INTERNAL_LUA=$(usex system-lua)
-DRAWSPEED_ENABLE_LTO=$(usex lto)
+   -DUSE_AVIF=no
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)
-DUSE_FLICKR=$(usex flickr)
+   -DUSE_GMIC=no
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-DUSE_KWALLET=$(usex kwallet)
-DUSE_LIBSECRET=$(usex gnome-keyring)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-10-12 Thread Marek Szuba
commit: 2e4000e9e113d8280850e999de6d2dbcff184075
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Oct 12 14:59:58 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Oct 12 15:03:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e4000e9

media-gfx/darktable: migrate to lua-single.eclass

Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.2.1-r1.ebuild | 12 
 media-gfx/darktable/metadata.xml  |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild 
b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
index adbe95a27f1..8c8b4232164 100644
--- a/media-gfx/darktable/darktable-3.2.1-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic toolchain-funcs xdg
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs xdg
 
 DOC_PV="3.0.0"
 MY_PV="${PV/_/}"
@@ -19,9 +21,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 LANGS=" de es fr he it pl pt-BR ru sl"
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
-   lto lua nls opencl openmp openexr tools webp
+   lto lua nls opencl openmp openexr system-lua tools webp
${LANGS// / l10n_}"
 
+REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
+
 BDEPEND="
dev-util/intltool
virtual/pkgconfig
@@ -55,6 +59,7 @@ COMMON_DEPEND="
jpeg2k? ( media-libs/openjpeg:2= )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
+   system-lua? ( ${LUA_DEPS} )
webp? ( media-libs/libwebp:0= )
 "
 DEPEND="${COMMON_DEPEND}
@@ -98,13 +103,12 @@ src_prepare() {
 }
 
 src_configure() {
-   # TODO: switch to system Lua once 5.3 has been unmasked
local mycmakeargs=(
-   -DDONT_USE_INTERNAL_LUA=OFF
-DBUILD_CURVE_TOOLS=$(usex tools)
-DBUILD_NOISE_TOOLS=$(usex tools)
-DBUILD_PRINT=$(usex cups)
-DCUSTOM_CFLAGS=ON
+   -DDONT_USE_INTERNAL_LUA=$(usex system-lua)
-DRAWSPEED_ENABLE_LTO=$(usex lto)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-DUSE_COLORD=$(usex colord)

diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 63e4e905d37..bc5ef345788 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -15,6 +15,7 @@
Enable encrypted storage of passwords with 
kde-frameworks/kwallet
Enable link-time optimisations in the RawSpeed 
library
Enable opencl support
+   Use dev-lang/lua instead of the bundled 
liblua
Install tools for generating base curves and 
noise profiles





[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-09-30 Thread Marek Szuba
commit: 9cb5ef5c3e97c72b45c015fb9bb38d7209e67030
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Sep 30 15:28:00 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Sep 30 15:41:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb5ef5c

media-gfx/darktable: enable Lua support

Looks like it will still take a lot of time before we have lua-5.3
available in the tree, slotted or not. Fortunately it turns out that
recent versions of Darktable come with bundled Lua 5.3 which can
optionally be used instead of system version.

Closes: https://bugs.gentoo.org/618104
Signed-off-by: Marek Szuba  gentoo.org>

 ...table-.ebuild => darktable-3.2.1-r1.ebuild} | 39 +-
 media-gfx/darktable/darktable-.ebuild  |  9 ++---
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/media-gfx/darktable/darktable-.ebuild 
b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
similarity index 74%
copy from media-gfx/darktable/darktable-.ebuild
copy to media-gfx/darktable/darktable-3.2.1-r1.ebuild
index b94745a602b..adbe95a27f1 100644
--- a/media-gfx/darktable/darktable-.ebuild
+++ b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
@@ -3,23 +3,26 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic git-r3 toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
-EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git;
+DOC_PV="3.0.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
 
 DESCRIPTION="A virtual lighttable and darkroom for photographers"
 HOMEPAGE="https://www.darktable.org/;
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+   doc? ( 
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
 -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-#KEYWORDS="~amd64 ~arm64"
-LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru 
sk sl sq sv th uk zh-CN zh-TW"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
+KEYWORDS="~amd64 ~arm64"
+LANGS=" de es fr he it pl pt-BR ru sl"
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
-   lto nls opencl openmp openexr tools webp
+   lto lua nls opencl openmp openexr tools webp
${LANGS// / l10n_}"
 
-BDEPEND=">=dev-python/jsonschema-3.2.0
+BDEPEND="
dev-util/intltool
virtual/pkgconfig
nls? ( sys-devel/gettext )
@@ -66,8 +69,12 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+   "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+   "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
 )
 
+S="${WORKDIR}/${P/_/~}"
+
 pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
# Bug #695658
@@ -91,10 +98,12 @@ src_prepare() {
 }
 
 src_configure() {
+   # TODO: switch to system Lua once 5.3 has been unmasked
local mycmakeargs=(
-   -DBUILD_PRINT=$(usex cups)
+   -DDONT_USE_INTERNAL_LUA=OFF
-DBUILD_CURVE_TOOLS=$(usex tools)
-DBUILD_NOISE_TOOLS=$(usex tools)
+   -DBUILD_PRINT=$(usex cups)
-DCUSTOM_CFLAGS=ON
-DRAWSPEED_ENABLE_LTO=$(usex lto)
-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
@@ -103,7 +112,7 @@ src_configure() {
-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-DUSE_KWALLET=$(usex kwallet)
-DUSE_LIBSECRET=$(usex gnome-keyring)
-   -DUSE_LUA=OFF
+   -DUSE_LUA=$(usex lua)
-DUSE_MAP=$(usex geolocation)
-DUSE_NLS=$(usex nls)
-DUSE_OPENCL=$(usex opencl)
@@ -128,3 +137,15 @@ src_install() {
done
fi
 }
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   elog
+   elog "When updating a major version,"
+   elog "please bear in mind that your edits will be preserved during this 
process,"
+   elog "but it will not be possible to downgrade any more."
+   elog
+   ewarn "It will not be possible to downgrade!"
+   ewarn
+}

diff --git a/media-gfx/darktable/darktable-.ebuild 
b/media-gfx/darktable/darktable-.ebuild
index b94745a602b..94d8c657437 100644
--- a/media-gfx/darktable/darktable-.ebuild
+++ b/media-gfx/darktable/darktable-.ebuild
@@ -14,9 +14,8 @@ LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 #KEYWORDS="~amd64 ~arm64"
 LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru 
sk sl sq sv th uk zh-CN zh-TW"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet
-   lto nls opencl openmp openexr tools webp
+   lto lua nls opencl openmp openexr tools webp
${LANGS// / l10n_}"
 
 BDEPEND=">=dev-python/jsonschema-3.2.0
@@ -91,10 +90,12 @@ src_prepare() 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

2020-08-31 Thread Marek Szuba
commit: ad039b9d1f24f07037c7ad55143fbe309960647e
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 31 13:38:21 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 31 13:46:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad039b9d

media-gfx/darktable: drop KEYWORDS=x86 from 3.0.0+ and live ebuild

Since version 3.0.0 darktable only supports 64-bit little-endian
architectures, or to be precise amd64, arm64 and ppc64; see
src/is_supported_platform.h.

Closes: https://bugs.gentoo.org/739682
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/darktable/darktable-3.0.2-r1.ebuild | 2 +-
 media-gfx/darktable/darktable-3.0.2.ebuild| 2 +-
 media-gfx/darktable/darktable-3.2.1.ebuild| 2 +-
 media-gfx/darktable/darktable-.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/darktable/darktable-3.0.2-r1.ebuild 
b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
index 5b83be05e12..e19cbe97bf8 100644
--- a/media-gfx/darktable/darktable-3.0.2-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64"
 LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet

diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild 
b/media-gfx/darktable/darktable-3.0.2.ebuild
index 482ed841310..4fd99f7da34 100644
--- a/media-gfx/darktable/darktable-3.0.2.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
 LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet

diff --git a/media-gfx/darktable/darktable-3.2.1.ebuild 
b/media-gfx/darktable/darktable-3.2.1.ebuild
index 2ed26c6f2cd..49e44beeb08 100644
--- a/media-gfx/darktable/darktable-3.2.1.ebuild
+++ b/media-gfx/darktable/darktable-3.2.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64"
 LANGS=" de es fr he it pl pt-BR ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet

diff --git a/media-gfx/darktable/darktable-.ebuild 
b/media-gfx/darktable/darktable-.ebuild
index 422d45185bb..b94745a602b 100644
--- a/media-gfx/darktable/darktable-.ebuild
+++ b/media-gfx/darktable/darktable-.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.darktable.org/;
 
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-#KEYWORDS="~amd64 ~x86"
+#KEYWORDS="~amd64 ~arm64"
 LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru 
sk sl sq sv th uk zh-CN zh-TW"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring 
gphoto2 graphicsmagick jpeg2k kwallet



  1   2   3   >