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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2017-12-31 14:05 Patrice Clement
  0 siblings, 0 replies; 12+ messages in thread
From: Patrice Clement @ 2017-12-31 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     79d8464037d18e1d870fafc94423cd136cfd031b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 17:48:42 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 14:05:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d84640

media-gfx/darktable : add hints to find opencl header file.

Closes: https://github.com/gentoo/gentoo/pull/6633

 media-gfx/darktable/darktable-2.4.0.ebuild                   |  2 ++
 media-gfx/darktable/files/darktable-find-opencl-header.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild
index 3f0453270d4..c32deff305a 100644
--- a/media-gfx/darktable/darktable-2.4.0.ebuild
+++ b/media-gfx/darktable/darktable-2.4.0.ebuild
@@ -69,6 +69,8 @@ DEPEND="${CDEPEND}
 		>=sys-devel/llvm-4
 	)"
 
+PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
+
 S="${WORKDIR}/${P/_/~}"
 
 pkg_pretend() {

diff --git a/media-gfx/darktable/files/darktable-find-opencl-header.patch b/media-gfx/darktable/files/darktable-find-opencl-header.patch
new file mode 100644
index 00000000000..0a692f9341e
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-find-opencl-header.patch
@@ -0,0 +1,12 @@
+diff -Nur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-12-24 09:09:10.000000000 +0000
++++ b/CMakeLists.txt	2017-12-25 20:42:40.998693994 +0000
+@@ -355,7 +355,7 @@
+       message(STATUS "Found clang compiler - ${CLANG_OPENCL_COMPILER}")
+ 
+       find_path(CLANG_OPENCL_INCLUDE_DIR opencl-c.h
+-        HINTS ${LLVM_INSTALL_PREFIX}/lib/clang ${LLVM_INSTALL_PREFIX}/lib64/clang
++        HINTS ${LLVM_INSTALL_PREFIX}/lib/clang ${LLVM_INSTALL_PREFIX}/lib64/clang /usr/lib/clang /usr/lib64/clang
+         PATH_SUFFIXES include ${LLVM_PACKAGE_VERSION}/include
+         NO_DEFAULT_PATH
+       )


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2019-09-15 23:06 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2019-09-15 23:06 UTC (permalink / raw
  To: gentoo-commits

commit:     2f9cc903bb3b2a9a5404a26c60064ad7fd56f0a6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 23:04:26 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 23:05:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9cc903

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

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/darktable/darktable-2.6.2.ebuild          |  1 +
 .../files/darktable-2.6.2-exiv2-0.27.patch          | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
index e9bf1a97e40..c098e19ec25 100644
--- a/media-gfx/darktable/darktable-2.6.2.ebuild
+++ b/media-gfx/darktable/darktable-2.6.2.ebuild
@@ -72,6 +72,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
 	"${WORKDIR}"/"${P}"-gcc9.patch
+	"${FILESDIR}"/"${P}"-exiv2-0.27.patch
 )
 
 S="${WORKDIR}/${P/_/~}"

diff --git a/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch b/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch
new file mode 100644
index 00000000000..c0eb59bc639
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-2.6.2-exiv2-0.27.patch
@@ -0,0 +1,21 @@
+From 556887d7a973bdf0611fcc57231e107b503d9949 Mon Sep 17 00:00:00 2001
+From: Bertrand Antoine <nexus6b@gmail.com>
+Date: Wed, 22 May 2019 21:49:59 +0200
+Subject: [PATCH] Fix build with exif2 >= 0.27
+
+---
+ tools/basecurve/exif-wrapper.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp
+index 72550721f6..f4d4d46e12 100644
+--- a/tools/basecurve/exif-wrapper.cpp
++++ b/tools/basecurve/exif-wrapper.cpp
+@@ -17,6 +17,7 @@
+ */
+ 
+ #include <exiv2/exif.hpp>
++#include <exiv2/error.hpp>
+ #include <exiv2/image.hpp>
+ 
+ #include <cstdio>
\ No newline at end of file


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2020-06-18 12:36 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2020-06-18 12:36 UTC (permalink / raw
  To: gentoo-commits

commit:     b575407bab33bc18c0a521c4fb193cdde6830409
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 12:33:18 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 12:36:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b575407b

media-gfx/darktable: patch CMake error in OpenCL testing

Backported the upstream fix from master, i.e. the next release should
already include it.

Closes: https://bugs.gentoo.org/716358
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/darktable/darktable-3.0.2.ebuild         |  1 +
 .../darktable-3.0.2_cmake-opencl-kernel-loop.patch | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild
index 2c9eb9a00a3..a34bc47503e 100644
--- a/media-gfx/darktable/darktable-3.0.2.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2.ebuild
@@ -71,6 +71,7 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch
 )
 
 S="${WORKDIR}/${P/_/~}"

diff --git a/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch b/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
new file mode 100644
index 00000000000..c1fd701fb9a
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
@@ -0,0 +1,28 @@
+From 767d48e0f60e7f858e8b31a88dd8cc1258e7ee9e Mon Sep 17 00:00:00 2001
+From: Marcus Haehnel <marcus@mh-development.info>
+Date: Sat, 21 Mar 2020 09:14:45 +0100
+Subject: [PATCH] Fix invalid CMake syntax
+
+The syntax of the foreach statement in data/kernels/CMakeLists.txt
+was invalid. This lead to errors when running cmake.
+
+Use correct syntax to make the build work.
+---
+ data/kernels/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/kernels/CMakeLists.txt b/data/kernels/CMakeLists.txt
+index ce947bef9c..f605c18b7e 100644
+--- a/data/kernels/CMakeLists.txt
++++ b/data/kernels/CMakeLists.txt
+@@ -31,8 +31,8 @@ macro (testcompile_opencl_kernel IN)
+ endmacro (testcompile_opencl_kernel)
+ 
+ if (TESTBUILD_OPENCL_PROGRAMS)
+-  foreach(IN ${DT_OPENCL_KERNELS})
+-    testcompile_opencl_kernel(${IN})
++  foreach(KERNEL IN ITEMS ${DT_OPENCL_KERNELS})
++    testcompile_opencl_kernel(${KERNEL})
+   endforeach()
+ endif()
+ 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2020-12-24 13:10 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2020-12-24 13:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b071a6819000ebe2b152e62ce7b9e3b091eb9e9a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 13:07:02 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 13:07:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b071a681

media-gfx/darktable: remove 3.0.2

Signed-off-by: Marek Szuba <marecki <AT> 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..00000000000
--- 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
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		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/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch b/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
deleted file mode 100644
index c1fd701fb9a..00000000000
--- a/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 767d48e0f60e7f858e8b31a88dd8cc1258e7ee9e Mon Sep 17 00:00:00 2001
-From: Marcus Haehnel <marcus@mh-development.info>
-Date: Sat, 21 Mar 2020 09:14:45 +0100
-Subject: [PATCH] Fix invalid CMake syntax
-
-The syntax of the foreach statement in data/kernels/CMakeLists.txt
-was invalid. This lead to errors when running cmake.
-
-Use correct syntax to make the build work.
----
- data/kernels/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/kernels/CMakeLists.txt b/data/kernels/CMakeLists.txt
-index ce947bef9c..f605c18b7e 100644
---- a/data/kernels/CMakeLists.txt
-+++ b/data/kernels/CMakeLists.txt
-@@ -31,8 +31,8 @@ macro (testcompile_opencl_kernel IN)
- endmacro (testcompile_opencl_kernel)
- 
- if (TESTBUILD_OPENCL_PROGRAMS)
--  foreach(IN ${DT_OPENCL_KERNELS})
--    testcompile_opencl_kernel(${IN})
-+  foreach(KERNEL IN ITEMS ${DT_OPENCL_KERNELS})
-+    testcompile_opencl_kernel(${KERNEL})
-   endforeach()
- endif()
- 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2021-07-21 19:45 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2021-07-21 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     10f3f7f638cbe55958959df5d83597c090ba5f25
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 21 19:37:08 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 21 19:45:05 2021 +0000
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 <marecki <AT> 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 00000000000..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")


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2021-11-07 23:08 Sam James
  0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2021-11-07 23:08 UTC (permalink / raw
  To: gentoo-commits

commit:     919657df943e49b9a5cdc6f709a06568af54c954
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  7 23:07:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov  7 23:07:52 2021 +0000
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 <Bernd.Feige <AT> gmx.net>
Signed-off-by: Sam James <sam <AT> 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 00000000000..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 <stdio.h>
+ #include <string.h>
+ 
+-#include <OpenEXR/ImfChannelList.h>
+-#include <OpenEXR/ImfFrameBuffer.h>
+-#include <OpenEXR/ImfInputFile.h>
+-#include <OpenEXR/ImfStandardAttributes.h>
+-#include <OpenEXR/ImfTestFile.h>
+-#include <OpenEXR/ImfThreading.h>
+-#include <OpenEXR/ImfTiledInputFile.h>
++#include <ImfChannelList.h>
++#include <ImfFrameBuffer.h>
++#include <ImfInputFile.h>
++#include <ImfStandardAttributes.h>
++#include <ImfTestFile.h>
++#include <ImfThreading.h>
++#include <ImfTiledInputFile.h>
+ 
+ extern "C" {
+ #include "common/colorspaces.h"
+--- a/src/common/imageio_exr.hh
++++ b/src/common/imageio_exr.hh
+@@ -29,12 +29,12 @@
+ #include <tr1/memory>
+ #endif
+ 
+-#include <OpenEXR/ImfChannelList.h>
+-#include <OpenEXR/ImfFrameBuffer.h>
+-#include <OpenEXR/ImfInputFile.h>
+-#include <OpenEXR/ImfStandardAttributes.h>
+-#include <OpenEXR/ImfTestFile.h>
+-#include <OpenEXR/ImfTiledInputFile.h>
++#include <ImfChannelList.h>
++#include <ImfFrameBuffer.h>
++#include <ImfInputFile.h>
++#include <ImfStandardAttributes.h>
++#include <ImfTestFile.h>
++#include <ImfTiledInputFile.h>
+ 
+ #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 <cstdlib>
+ #include <memory>
+ 
+-#include <OpenEXR/ImfChannelList.h>
+-#include <OpenEXR/ImfFrameBuffer.h>
+-#include <OpenEXR/ImfStandardAttributes.h>
+-#include <OpenEXR/ImfThreading.h>
+-#include <OpenEXR/ImfTiledOutputFile.h>
++#include <ImfChannelList.h>
++#include <ImfFrameBuffer.h>
++#include <ImfStandardAttributes.h>
++#include <ImfThreading.h>
++#include <ImfTiledOutputFile.h>
+ 
+ extern "C" {
+ #include "bauhaus/bauhaus.h"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2021-11-20 10:37 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2021-11-20 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     d21a265913b0051a86dbeef0ab3f8034ebc7c3c1
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 10:34:15 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 10:36:54 2021 +0000
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 <marecki <AT> 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


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2022-11-03 23:12 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2022-11-03 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     92a10d5c7d1626c606500c796110da2d650700e6
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 23:11:36 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 23:11:59 2022 +0000
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 <marecki <AT> 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..000000000000
--- 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} == *9999 ]]; 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/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:=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	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 )
-	gamepad? ( media-libs/libsdl2 )
-	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} )
-	midi? ( media-libs/portmidi )
-	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
-	"${FILESDIR}"/${PN}-3.8.0_libs-deps-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
-
-		use openmp && tc-check-openmp
-	fi
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use lua && lua-single_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
-
-	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 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 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)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# This USE flag is masked for -9999
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf
-
-	if use nls; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		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-4.0.0.ebuild b/media-gfx/darktable/darktable-4.0.0.ebuild
deleted file mode 100644
index 3168063913fb..000000000000
--- a/media-gfx/darktable/darktable-4.0.0.ebuild
+++ /dev/null
@@ -1,177 +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} == *9999 ]]; 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:=
-	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:=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	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 )
-	gamepad? ( media-libs/libsdl2 )
-	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 )
-	heif? ( media-libs/libheif:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lua? ( ${LUA_DEPS} )
-	midi? ( media-libs/portmidi )
-	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.8.0_libs-deps-automagic.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() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use lua && lua-single_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
-
-	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 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 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)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# This USE flag is masked for -9999
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf
-
-	if use nls; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		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/files/darktable-3.6.1_openexr.patch b/media-gfx/darktable/files/darktable-3.6.1_openexr.patch
deleted file mode 100644
index a5b1fd173f84..000000000000
--- a/media-gfx/darktable/files/darktable-3.6.1_openexr.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://bugs.gentoo.org/820041
-
---- a/src/common/imageio_exr.cc
-+++ b/src/common/imageio_exr.cc
-@@ -28,13 +28,13 @@
- #include <stdio.h>
- #include <string.h>
- 
--#include <OpenEXR/ImfChannelList.h>
--#include <OpenEXR/ImfFrameBuffer.h>
--#include <OpenEXR/ImfInputFile.h>
--#include <OpenEXR/ImfStandardAttributes.h>
--#include <OpenEXR/ImfTestFile.h>
--#include <OpenEXR/ImfThreading.h>
--#include <OpenEXR/ImfTiledInputFile.h>
-+#include <ImfChannelList.h>
-+#include <ImfFrameBuffer.h>
-+#include <ImfInputFile.h>
-+#include <ImfStandardAttributes.h>
-+#include <ImfTestFile.h>
-+#include <ImfThreading.h>
-+#include <ImfTiledInputFile.h>
- 
- extern "C" {
- #include "common/colorspaces.h"
---- a/src/common/imageio_exr.hh
-+++ b/src/common/imageio_exr.hh
-@@ -29,12 +29,12 @@
- #include <tr1/memory>
- #endif
- 
--#include <OpenEXR/ImfChannelList.h>
--#include <OpenEXR/ImfFrameBuffer.h>
--#include <OpenEXR/ImfInputFile.h>
--#include <OpenEXR/ImfStandardAttributes.h>
--#include <OpenEXR/ImfTestFile.h>
--#include <OpenEXR/ImfTiledInputFile.h>
-+#include <ImfChannelList.h>
-+#include <ImfFrameBuffer.h>
-+#include <ImfInputFile.h>
-+#include <ImfStandardAttributes.h>
-+#include <ImfTestFile.h>
-+#include <ImfTiledInputFile.h>
- 
- #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 <cstdlib>
- #include <memory>
- 
--#include <OpenEXR/ImfChannelList.h>
--#include <OpenEXR/ImfFrameBuffer.h>
--#include <OpenEXR/ImfStandardAttributes.h>
--#include <OpenEXR/ImfThreading.h>
--#include <OpenEXR/ImfTiledOutputFile.h>
-+#include <ImfChannelList.h>
-+#include <ImfFrameBuffer.h>
-+#include <ImfStandardAttributes.h>
-+#include <ImfThreading.h>
-+#include <ImfTiledOutputFile.h>
- 
- extern "C" {
- #include "bauhaus/bauhaus.h"

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
deleted file mode 100644
index 25b89731a7c8..000000000000
--- a/media-gfx/darktable/files/darktable-3.8.0_libs-deps-automagic.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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")


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2023-02-28 13:12 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-02-28 13:12 UTC (permalink / raw
  To: gentoo-commits

commit:     05e28cce9d058d40e7d2001c1202b315b8a6742d
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 12:07:15 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 13:12:40 2023 +0000
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 <marecki <AT> 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 000000000000..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 <unistd.h> // 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);


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2023-03-30 11:49 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-03-30 11:49 UTC (permalink / raw
  To: gentoo-commits

commit:     f0451f8a7dc1ff9898ee51aae65a51c9b7ebc842
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 11:48:59 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 11:48:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0451f8a

media-gfx/darktable: drop 4.0.1-r1

Signed-off-by: Marek Szuba <marecki <AT> 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..000000000000
--- 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} == *9999 ]]; 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 (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 )"
-DEPEND="dev-db/sqlite:3
-	dev-libs/icu:=
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	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 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	heif? ( media-libs/libheif:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lua? ( ${LUA_DEPS} )
-	midi? ( media-libs/portmidi )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:= )
-	webp? ( media-libs/libwebp:= )"
-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}-4.0.1_libs-deps-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug #695658
-		if tc-is-gcc; then
-			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
-	fi
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use lua && lua-single_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
-
-	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 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 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)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# This USE flag is masked for -9999
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf
-
-	if use nls; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		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/files/darktable-3.0.0_find-opencl-header.patch b/media-gfx/darktable/files/darktable-3.0.0_find-opencl-header.patch
deleted file mode 100644
index 0a692f9341e1..000000000000
--- a/media-gfx/darktable/files/darktable-3.0.0_find-opencl-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-12-24 09:09:10.000000000 +0000
-+++ b/CMakeLists.txt	2017-12-25 20:42:40.998693994 +0000
-@@ -355,7 +355,7 @@
-       message(STATUS "Found clang compiler - ${CLANG_OPENCL_COMPILER}")
- 
-       find_path(CLANG_OPENCL_INCLUDE_DIR opencl-c.h
--        HINTS ${LLVM_INSTALL_PREFIX}/lib/clang ${LLVM_INSTALL_PREFIX}/lib64/clang
-+        HINTS ${LLVM_INSTALL_PREFIX}/lib/clang ${LLVM_INSTALL_PREFIX}/lib64/clang /usr/lib/clang /usr/lib64/clang
-         PATH_SUFFIXES include ${LLVM_PACKAGE_VERSION}/include
-         NO_DEFAULT_PATH
-       )

diff --git a/media-gfx/darktable/files/darktable-4.0.1_libs-deps-automagic.patch b/media-gfx/darktable/files/darktable-4.0.1_libs-deps-automagic.patch
deleted file mode 100644
index 1ea06241f8d7..000000000000
--- a/media-gfx/darktable/files/darktable-4.0.1_libs-deps-automagic.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/libs/CMakeLists.txt
-+++ b/src/libs/CMakeLists.txt
-@@ -84,11 +84,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")
-@@ -97,8 +100,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_FOUND)
-   add_definitions("-DHAVE_SDL")
-   set(MODULES ${MODULES} gamepad)
-@@ -110,6 +115,7 @@
-     target_link_libraries(gamepad ${SDL2_LIBRARIES})
-   endif()
- endif()
-+endif()
- 
- if(BUILD_BATTERY_INDICATOR)
-   add_library(battery_indicator MODULE "tools/battery_indicator.c")

diff --git a/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch b/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch
deleted file mode 100644
index f6985f609fbd..000000000000
--- a/media-gfx/darktable/files/darktable-4.2.0_libs-deps-automagic.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Binary files darktable-4.2.0.orig/.DefineOptions.cmake.swp and darktable-4.2.0/.DefineOptions.cmake.swp differ
-diff -ru darktable-4.2.0.orig/DefineOptions.cmake darktable-4.2.0/DefineOptions.cmake
---- darktable-4.2.0.orig/DefineOptions.cmake	2022-12-21 20:32:43.490671000 +0100
-+++ darktable-4.2.0/DefineOptions.cmake	2022-12-21 20:33:13.413673557 +0100
-@@ -41,6 +41,7 @@
- option(USE_ICU "Use ICU - International Components for Unicode." ON)
- option(USE_GAME "Build 1st April easter egg game" ON)
- option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." OFF)
-+option(USE_SDL2 "Enable SDL2 support" ON)
- 
- if (USE_OPENCL)
-     option(TESTBUILD_OPENCL_PROGRAMS "Test-compile opencl programs (needs llvm and clang 3.9+)" ON)
-Only in darktable-4.2.0/src/libs: .CMakeLists.txt.swp
-diff -ru darktable-4.2.0.orig/src/libs/CMakeLists.txt darktable-4.2.0/src/libs/CMakeLists.txt
---- darktable-4.2.0.orig/src/libs/CMakeLists.txt	2022-12-21 20:32:43.485670999 +0100
-+++ darktable-4.2.0/src/libs/CMakeLists.txt	2022-12-21 20:34:59.240682599 +0100
-@@ -84,6 +84,7 @@
- add_library(timeline MODULE "tools/timeline.c")
- add_library(image_infos MODULE "tools/image_infos.c")
- 
-+if (USE_PORTMIDI)
- if(PortMidi_FOUND)
-   add_definitions("-DHAVE_PORTMIDI")
-   include_directories(${PortMidi_INCLUDE_DIR})
-@@ -91,8 +92,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_FOUND)
-   add_definitions("-DHAVE_SDL")
-   set(MODULES ${MODULES} gamepad)
-@@ -104,6 +107,7 @@
-     target_link_libraries(gamepad ${SDL2_LIBRARIES})
-   endif()
- endif()
-+endif()
- 
- if(BUILD_BATTERY_INDICATOR)
-   add_library(battery_indicator MODULE "tools/battery_indicator.c")


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2023-06-08 14:05 Andreas Sturmlechner
  0 siblings, 0 replies; 12+ messages in thread
From: Andreas Sturmlechner @ 2023-06-08 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     db72a304c8b761ee3254ea42867d5e5e802770d3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  8 13:47:19 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 14:05:03 2023 +0000
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 <asturm <AT> 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 000000000000..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 &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(),
+                                                    &current_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 &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(),
+                                                            &current_entry->blendop_params_len);
+       }
+     }
+@@ -2858,35 +2863,35 @@ static GList *read_masks_v3(Exiv2::XmpData &xmpData, const char *filename, const
+       // go on reading things into current_entry
+       if(g_str_has_prefix(key_iter, "darktable:mask_num"))
+       {
+-        current_entry->mask_num = history->value().toLong();
++        current_entry->mask_num = history->toLong();
+       }
+       else if(g_str_has_prefix(key_iter, "darktable:mask_id"))
+       {
+-        current_entry->mask_id = history->value().toLong();
++        current_entry->mask_id = history->toLong();
+       }
+       else if(g_str_has_prefix(key_iter, "darktable:mask_type"))
+       {
+-        current_entry->mask_type = history->value().toLong();
++        current_entry->mask_type = history->toLong();
+       }
+       else if(g_str_has_prefix(key_iter, "darktable:mask_name"))
+       {
+-        current_entry->mask_name = g_strdup(history->value().toString().c_str());
++        current_entry->mask_name = g_strdup(history->toString().c_str());
+       }
+       else if(g_str_has_prefix(key_iter, "darktable:mask_version"))
+       {
+-        current_entry->mask_version = history->value().toLong();
++        current_entry->mask_version = history->toLong();
+       }
+       else if(g_str_has_prefix(key_iter, "darktable:mask_points"))
+       {
+-        current_entry->mask_points = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), &current_entry->mask_points_len);
++        current_entry->mask_points = dt_exif_xmp_decode(history->toString().c_str(), history->size(), &current_entry->mask_points_len);
+       }
+       else if(g_str_has_prefix(key_iter, "darktable:mask_nb"))
+       {
+-        current_entry->mask_nb = history->value().toLong();
++        current_entry->mask_nb = history->toLong();
+       }
+       else if(g_str_has_prefix(key_iter, "darktable:mask_src"))
+       {
+-        current_entry->mask_src = dt_exif_xmp_decode(history->value().toString().c_str(), history->value().size(), &current_entry->mask_src_len);
++        current_entry->mask_src = dt_exif_xmp_decode(history->toString().c_str(), history->size(), &current_entry->mask_src_len);
+       }
+ 
+     }
+@@ -4060,7 +4065,11 @@ char *dt_exif_xmp_read_string(const int imgid)
+       std::string xmpPacket;
+ 
+       Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
++#if EXIV2_TEST_VERSION(0,28,0)
++      xmpPacket.assign(buf.c_str(), buf.size());
++#else
+       xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
++#endif
+       Exiv2::XmpParser::decode(xmpData, xmpPacket);
+       // because XmpSeq or XmpBag are added to the list, we first have
+       // to remove these so that we don't end up with a string of duplicates
+@@ -4076,7 +4085,11 @@ char *dt_exif_xmp_read_string(const int imgid)
+       std::string xmpPacket;
+ 
+       Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
++#if EXIV2_TEST_VERSION(0,28,0)
++      xmpPacket.assign(buf.c_str(), buf.size());
++#else
+       xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
++#endif
+       Exiv2::XmpParser::decode(sidecarXmpData, xmpPacket);
+ 
+       for(Exiv2::XmpData::const_iterator it = sidecarXmpData.begin(); it != sidecarXmpData.end(); ++it)
+@@ -4204,7 +4217,11 @@ int dt_exif_xmp_attach_export(const int imgid, const char *filename, void *metad
+       std::string xmpPacket;
+ 
+       Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(input_filename));
++#if EXIV2_TEST_VERSION(0,28,0)
++      xmpPacket.assign(buf.c_str(), buf.size());
++#else
+       xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
++#endif
+       Exiv2::XmpParser::decode(sidecarXmpData, xmpPacket);
+ 
+       for(Exiv2::XmpData::const_iterator it = sidecarXmpData.begin(); it != sidecarXmpData.end(); ++it)
+@@ -4371,7 +4388,7 @@ int dt_exif_xmp_attach_export(const int imgid, const char *filename, void *metad
+     catch(Exiv2::AnyError &e)
+     {
+ #if EXIV2_TEST_VERSION(0,27,0)
+-      if(e.code() == Exiv2::kerTooLargeJpegSegment)
++      if(e.code() == Exiv2::ErrorCode::kerTooLargeJpegSegment)
+ #else
+       if(e.code() == 37)
+ #endif
+@@ -4437,7 +4454,11 @@ int dt_exif_xmp_write(const int imgid, const char *filename)
+       }
+ 
+       Exiv2::DataBuf buf = Exiv2::readFile(WIDEN(filename));
++#if EXIV2_TEST_VERSION(0,28,0)
++      xmpPacket.assign(buf.c_str(), buf.size());
++#else
+       xmpPacket.assign(reinterpret_cast<char *>(buf.pData_), buf.size_);
++#endif
+       Exiv2::XmpParser::decode(xmpData, xmpPacket);
+       // because XmpSeq or XmpBag are added to the list, we first have
+       // to remove these so that we don't end up with a string of duplicates
+diff --git a/tools/basecurve/exif-wrapper.cpp b/tools/basecurve/exif-wrapper.cpp
+index f4d4d46e12..41bb021012 100644
+--- a/tools/basecurve/exif-wrapper.cpp
++++ b/tools/basecurve/exif-wrapper.cpp
+@@ -19,6 +19,7 @@
+ #include <exiv2/exif.hpp>
+ #include <exiv2/error.hpp>
+ #include <exiv2/image.hpp>
++#include <exiv2/version.hpp>
+ 
+ #include <cstdio>
+ #include <cassert>
+@@ -36,13 +37,21 @@ exif_get_ascii_datafield(
+ 
+   try
+   {
++#if EXIV2_TEST_VERSION(0,28,0)
++    Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
++#else
+     Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
++#endif
+     assert(image.get() != 0);
+     image->readMetadata();
+ 
+     Exiv2::ExifData &exifData = image->exifData();
+ 
++#if EXIV2_TEST_VERSION(0,28,0)
++    Exiv2::Value::UniquePtr val = exifData[key].getValue();
++#else
+     Exiv2::Value::AutoPtr val = exifData[key].getValue();
++#endif
+ 
+     if (val->typeId() != Exiv2::asciiString)
+     {


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
@ 2023-10-22 11:03 Marek Szuba
  0 siblings, 0 replies; 12+ messages in thread
From: Marek Szuba @ 2023-10-22 11:03 UTC (permalink / raw
  To: gentoo-commits

commit:     3b2025ac27d01c123701173faec2bd429fd7fb57
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 10:53:24 2023 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 11:03:36 2023 +0000
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 <marecki <AT> 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 000000000000..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__)


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2023-10-22 11:03 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-18 12:36 [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2023-10-22 11:03 Marek Szuba
2023-06-08 14:05 Andreas Sturmlechner
2023-03-30 11:49 Marek Szuba
2023-02-28 13:12 Marek Szuba
2022-11-03 23:12 Marek Szuba
2021-11-20 10:37 Marek Szuba
2021-11-07 23:08 Sam James
2021-07-21 19:45 Marek Szuba
2020-12-24 13:10 Marek Szuba
2019-09-15 23:06 Andreas Sturmlechner
2017-12-31 14:05 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox