From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B8A5A13835A for ; Thu, 18 Jun 2020 16:30:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4AB1E08F3; Thu, 18 Jun 2020 16:30:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C46AE08F4 for ; Thu, 18 Jun 2020 16:30:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 434C234EFAF for ; Thu, 18 Jun 2020 16:30:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87724175 for ; Thu, 18 Jun 2020 16:30:49 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1592497744.3d0a1fedd1fc7d02a81179718903c097f7403887.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/darktable/darktable-3.0.2-r1.ebuild media-gfx/darktable/darktable-9999.ebuild media-gfx/darktable/metadata.xml X-VCS-Directories: media-gfx/darktable/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 3d0a1fedd1fc7d02a81179718903c097f7403887 X-VCS-Branch: master Date: Thu, 18 Jun 2020 16:30:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f55a652f-c33c-48eb-945f-7676874d6cfb X-Archives-Hash: 740c65ff025aeca0a7a64aafe98e26b7 commit: 3d0a1fedd1fc7d02a81179718903c097f7403887 Author: Marek Szuba gentoo org> AuthorDate: Thu Jun 18 13:26:54 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Thu Jun 18 16:29:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0a1fed media-gfx/darktable: allow enabling LTO in RawSpeed via USE=lto Recommended by upstream but for now very much experimental on the Gentoo side and will almost certainly fall over for some compiler/linker combinations. Do let us know if that happens! Closes: https://bugs.gentoo.org/674762 Signed-off-by: Marek Szuba gentoo.org> ...table-9999.ebuild => darktable-3.0.2-r1.ebuild} | 28 ++++++++++++++++++---- media-gfx/darktable/darktable-9999.ebuild | 3 ++- media-gfx/darktable/metadata.xml | 1 + 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-3.0.2-r1.ebuild similarity index 78% copy from media-gfx/darktable/darktable-9999.ebuild copy to media-gfx/darktable/darktable-3.0.2-r1.ebuild index 20617da3c0a..0d3a07d8b76 100644 --- a/media-gfx/darktable/darktable-9999.ebuild +++ b/media-gfx/darktable/darktable-3.0.2-r1.ebuild @@ -3,20 +3,24 @@ EAPI=7 -inherit cmake flag-o-matic git-r3 pax-utils toolchain-funcs xdg +inherit cmake flag-o-matic pax-utils toolchain-funcs xdg -EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git" +DOC_PV="3.0.0" +MY_PV="${PV/_/}" +MY_P="${P/_/.}" DESCRIPTION="A virtual lighttable and darkroom for photographers" HOMEPAGE="https://www.darktable.org/" +SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz + doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" LICENSE="GPL-3 CC-BY-3.0" SLOT="0" -#KEYWORDS="~amd64 ~x86" -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" +KEYWORDS="~amd64 ~x86" +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 pax_kernel webp +lto nls opencl openmp openexr pax_kernel webp ${LANGS// / l10n_}" BDEPEND=" @@ -67,8 +71,11 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch + "${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch ) +S="${WORKDIR}/${P/_/~}" + pkg_pretend() { if use openmp ; then tc-has-openmp || die "Please switch to an openmp compatible compiler" @@ -87,6 +94,7 @@ src_configure() { local mycmakeargs=( -DBUILD_PRINT=$(usex cups) -DCUSTOM_CFLAGS=ON + -DRAWSPEED_ENABLE_LTO=$(usex lto) -DUSE_CAMERA_SUPPORT=$(usex gphoto2) -DUSE_COLORD=$(usex colord) -DUSE_FLICKR=$(usex flickr) @@ -127,3 +135,13 @@ src_install() { eqawarn "please open a bug." fi } + +pkg_postinst() { + xdg_pkg_postinst + + 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." + echo + ewarn "It will not be possible to downgrade!" +} diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild index 20617da3c0a..6236b05ef1d 100644 --- a/media-gfx/darktable/darktable-9999.ebuild +++ b/media-gfx/darktable/darktable-9999.ebuild @@ -16,7 +16,7 @@ SLOT="0" LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW" # TODO add lua once dev-lang/lua-5.2 is unmasked IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet -nls opencl openmp openexr pax_kernel webp +lto nls opencl openmp openexr pax_kernel webp ${LANGS// / l10n_}" BDEPEND=" @@ -87,6 +87,7 @@ src_configure() { local mycmakeargs=( -DBUILD_PRINT=$(usex cups) -DCUSTOM_CFLAGS=ON + -DRAWSPEED_ENABLE_LTO=$(usex lto) -DUSE_CAMERA_SUPPORT=$(usex gphoto2) -DUSE_COLORD=$(usex colord) -DUSE_FLICKR=$(usex flickr) diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml index 7144702bb77..85970342832 100644 --- a/media-gfx/darktable/metadata.xml +++ b/media-gfx/darktable/metadata.xml @@ -9,6 +9,7 @@ Add support for uploading photos to flickr Enable geotagging support Enable encrypted storage of passwords with kde-frameworks/kwallet + Enable link-time optimisations in the RawSpeed library Enable opencl support Triggers paxmarking of main darktable binary