From e745e1d281540da525df5eaae0904b62bc27852f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Jun 2023 13:40:31 +0100 Subject: gentoo auto-resync : 29:06:2023 - 13:40:31 --- media-gfx/Manifest.gz | Bin 38005 -> 37999 bytes media-gfx/darktable/Manifest | 2 +- media-gfx/darktable/darktable-4.4.0-r1.ebuild | 190 +++++++++++++++++++++++++ media-gfx/darktable/darktable-4.4.0.ebuild | 192 -------------------------- 4 files changed, 191 insertions(+), 193 deletions(-) create mode 100644 media-gfx/darktable/darktable-4.4.0-r1.ebuild delete mode 100644 media-gfx/darktable/darktable-4.4.0.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index d2230f2cafb0..db6048a6fddc 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 926040acf93e..0d9f9d9917d6 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -10,5 +10,5 @@ DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B e497c87903f85ae7ebb9b96241 DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67 SHA512 90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3 DIST darktable-usermanual-4.4.uk.pdf 33796107 BLAKE2B 060218ec9b7fbcec947506ea9fdf355411d0b1242d41b9ffb7abd8dd991ece29e75c06231251d2ec2701e319e1b1e8134c08603649fe7e933d21b4aef597f7c3 SHA512 f2a6837a05114d4254fade358382be5fabcbd980a3c4fad702b1102176c7e261fd8646aeef1c0328001da8f7cb25d50b06c9f1163a54987985f556c616728bf5 EBUILD darktable-4.2.1.ebuild 5867 BLAKE2B ef5d2906890ce74564a1d7f7968849f6975e3f57e62db9fccbe9825a7daf2982e6ed63a625630f67b56a74fce25f0fb90df41464e7a4d49a78410806a18265a6 SHA512 413b43340abce057c736ee124cc7c4c6344a2db48d2a204669ad3813eb8229f288e8d4c8cd5cf87a35d0024df166643eb417f17514fc7b91f28d04b265dd75f4 -EBUILD darktable-4.4.0.ebuild 5719 BLAKE2B b627d8f99ba2d01862ffdd2b0fcc871aab6cbb130dc8bce46f6c19b3d1c703795613413181c8dbdf90eb3b0f9e358ae23bcad859fe9127753d132daeb0de41ee SHA512 c270771c14c85b84911eab004e44b9197ce0bb1aacdef0a011f0918c472eb46f43d9638763b7ae815279b602f9483eb905dab14d3f0c6a62e51e4988819192e3 +EBUILD darktable-4.4.0-r1.ebuild 5648 BLAKE2B 118564defe98548f162d8b98be733b20b77cccfd9096ebe62157b7a549b5e4a1c4cdd61620bc25b4e09f91b99109b75bd119f067a0a88f8db3ad57c44255273d SHA512 45de7ac4f3df85fb40d5298ad497dfd301a86b7a1befd210a2edde116f787cd8444929171c967aa278a80daa428e845b5117794e8d708b31507e65163aafeac1 MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a diff --git a/media-gfx/darktable/darktable-4.4.0-r1.ebuild b/media-gfx/darktable/darktable-4.4.0-r1.ebuild new file mode 100644 index 000000000000..79cd8fb54c65 --- /dev/null +++ b/media-gfx/darktable/darktable-4.4.0-r1.ebuild @@ -0,0 +1,190 @@ +# 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} == *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=" 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 + ${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 ) + gmic? ( media-gfx/gmic ) + 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.4.0_jsonschema-automagic.patch + "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch + "${FILESDIR}"/${PN}-4.2.1_cmake-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=$(usex gmic) + -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) + -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 +} diff --git a/media-gfx/darktable/darktable-4.4.0.ebuild b/media-gfx/darktable/darktable-4.4.0.ebuild deleted file mode 100644 index 1c21427c289e..000000000000 --- a/media-gfx/darktable/darktable-4.4.0.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} == *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=" 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 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 ) - 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.4.0_jsonschema-automagic.patch - "${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch - "${FILESDIR}"/${PN}-4.2.1_cmake-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_FLICKR=$(usex flickr) - -DUSE_GMIC=$(usex gmic) - -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) - -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 -} -- cgit v1.2.3