diff options
author | 2024-02-18 19:54:50 +0100 | |
---|---|---|
committer | 2024-02-18 19:54:50 +0100 | |
commit | 9d7b18aa810d768d642dc2502d151f7d1eb87790 (patch) | |
tree | f8ae07c5f1009dbe4f9b83a146bb0484b80b5623 | |
parent | media-gfx/darktable: version bump (diff) | |
download | maekke-9d7b18aa810d768d642dc2502d151f7d1eb87790.tar.gz maekke-9d7b18aa810d768d642dc2502d151f7d1eb87790.tar.bz2 maekke-9d7b18aa810d768d642dc2502d151f7d1eb87790.zip |
media-gfx/darktable: version bump and sync with main tree
Signed-off-by: Markus Meier <maekke@gentoo.org>
-rw-r--r-- | media-gfx/darktable/Manifest | 8 | ||||
-rw-r--r-- | media-gfx/darktable/darktable-4.4.2.ebuild | 2 | ||||
-rw-r--r-- | media-gfx/darktable/darktable-4.6.0.ebuild | 4 | ||||
-rw-r--r-- | media-gfx/darktable/darktable-4.6.1.ebuild | 194 |
4 files changed, 203 insertions, 5 deletions
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 6aef4fd..5f1e5c9 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -7,11 +7,15 @@ AUX darktable-4.4.2_fix-has-attribute-musl.patch 779 BLAKE2B d22e3cc6a28f9b0df57 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 170d874f6a35c4fe5a5555f308bc541885968b8b5535402f8087ad4d47ee93f3d22a78c633f9b3e14584d1925a7dd682a5f3e2bd187ef2f58d0dc2a407b9bb27 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 EBUILD darktable-4.2.1.ebuild 5827 BLAKE2B 13b91efc05e94b94d962cee63b9993aa637bdd924f331d335bf52940d1b46e78c004e09f7222f82033621749b5e07dbe2a9f589e8d5d3c705b6c576f6e2abc11 SHA512 25afc0ab2e26515257796d488a0193586b13e065095911a102a244f92de65bafbadcb8b0acb550deb932f503acc2d6d2bd1a811f9044654efcc3317edecc679c -EBUILD darktable-4.4.2.ebuild 5731 BLAKE2B 42c28509ba2f060513191c3120227a9a703ac89ee49516157714dabc7f480ecddb2736ec83db39ec56557c6aaa6df1d446a1103d0d15180361a2ec11da4b729c SHA512 77f28a5cd692b5593a7be9597ab8b1745e14d74eb84463bad4e343b4491eab1a659e6c9ca3acad1a682997ba66f629b0d3e36b2489a6af9d95ceab97f0cd6819 -EBUILD darktable-4.6.0.ebuild 5758 BLAKE2B 9728792c20cc6d1da802e3216f6473f8412eff0d8a9e711100181f1f696a889d3f36e5d9dc2ecc9b1261af8b97495601a75ef065422c0a3931838dd414ddd89a SHA512 4f2a710b2ff50b81e73cab5dcbe97bf2228830565fe0cb00715bb2751e770f07e39bfb8ac18a8284440efa42a15fa34a082e1c8dc9e22a993376ab10357c7a93 +EBUILD darktable-4.4.2.ebuild 5730 BLAKE2B 951428e55d10a6f6244840ee690cd260daf1d6c4622c7884e3dd294779644920bc922505331d319bb02d16994fb3bebd5c2c4ecc1a7055df9f28ce6e1a2ae517 SHA512 3a82913d3fc226adcdd027ef90cdb7e40dac5575b6af04cf57436d5596db513e72d8525edd522777185dbd534768a22c9d3ffbe28e60f956116114ce461dc7b1 +EBUILD darktable-4.6.0.ebuild 5757 BLAKE2B d095734af35fb8118b7d38d4293a8e4c71924a9a2123f3f2c35f216d02e11d7ab04aca077fa44f1fe53e4ab518f3bb84fe530efae676845d7f3f4d5c94776dd4 SHA512 823b793b78c31f9a2fdacd1dbdb638fd5cd7ac04a4a3123b0e769fda2976dc35509fad6693c1b6be4e50c06284c8e7fb3a98b17de45f2612f9d8f961cbc1950d +EBUILD darktable-4.6.1.ebuild 5788 BLAKE2B 557e91979b47e3b6052a2abcec089e150a6876956889e4a9f629987b4648dd3e6f6bfb2b301ca301d076490ec28742deac67b77c15ed59137f884143f7f9dd43 SHA512 d127122d76aecbfd83181ee941beca0d0648c4621914b880253e2bf2e93558dc22c780192042e46975e11f8029a1301eb80180ec072e2f73bc6ef81557d32edf MISC metadata.xml 1089 BLAKE2B 7717ab9ae276127fe89b3acf00e228131cccccadf15ee7d93ad59b4e033c09d0290799c1f9f0dc258eb8e62dae3c8100ad6b1b4d31c3f6413100450dfb4c4582 SHA512 af2c24a32b287e2ace34e4dc96733ab986217ff7306ef4d21ee4930d21b14b2e9649f42ec8fae2ab7a3b60e65852c834ff540bd09f9fa855dc899c992ad2a6e4 diff --git a/media-gfx/darktable/darktable-4.4.2.ebuild b/media-gfx/darktable/darktable-4.4.2.ebuild index 59cff9b..6257b2f 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 diff --git a/media-gfx/darktable/darktable-4.6.0.ebuild b/media-gfx/darktable/darktable-4.6.0.ebuild index 4da9397..437afc9 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 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 0000000..f972948 --- /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} == *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) + 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 + 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 tr 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 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 ) + gamepad? ( media-libs/libsdl2 ) + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + keyring? ( >=app-crypt/libsecret-0.18 ) + gphoto2? ( media-libs/libgphoto2:= ) + 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 ) + openexr? ( media-libs/openexr:= ) + webp? ( media-libs/libwebp:= )" +RDEPEND="${DEPEND} + kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" + +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/_/~}" + +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) + -DRAWSPEED_ENABLE_WERROR=OFF + -DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl) + -DTESTBUILD_OPENCL_PROGRAMS=OFF + -DUSE_AVIF=$(usex avif) + -DUSE_CAMERA_SUPPORT=$(usex gphoto2) + -DUSE_COLORD=$(usex colord) + -DUSE_GMIC=OFF + -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) + -DUSE_JXL=$(usex jpegxl) + -DUSE_KWALLET=$(usex kwallet) + -DUSE_LIBSECRET=$(usex 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 +} |