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 D8C3E13835A for ; Thu, 24 Dec 2020 13:10:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8F11E0D19; Thu, 24 Dec 2020 13:10:40 +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 ADC80E0D19 for ; Thu, 24 Dec 2020 13:10:40 +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 2A187341BA9 for ; Thu, 24 Dec 2020 13:10:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A02B0465 for ; Thu, 24 Dec 2020 13:10:37 +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: <1608815222.b071a6819000ebe2b152e62ce7b9e3b091eb9e9a.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/darktable/darktable-3.0.2.ebuild media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch X-VCS-Directories: media-gfx/darktable/files/ media-gfx/darktable/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: b071a6819000ebe2b152e62ce7b9e3b091eb9e9a X-VCS-Branch: master Date: Thu, 24 Dec 2020 13:10:37 +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: 2b20b8bc-ffe5-44b9-bcd5-13ff784fc280 X-Archives-Hash: 899f369e2528a845da1e55981eab4ef9 commit: b071a6819000ebe2b152e62ce7b9e3b091eb9e9a Author: Marek Szuba gentoo org> AuthorDate: Thu Dec 24 13:07:02 2020 +0000 Commit: Marek Szuba gentoo 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 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 -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() -