Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/files/, media-gfx/darktable/
Date: Thu, 24 Dec 2020 13:10:41
Message-Id: 1608815222.b071a6819000ebe2b152e62ce7b9e3b091eb9e9a.marecki@gentoo
1 commit: b071a6819000ebe2b152e62ce7b9e3b091eb9e9a
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 24 13:07:02 2020 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 24 13:07:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b071a681
7
8 media-gfx/darktable: remove 3.0.2
9
10 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
11
12 media-gfx/darktable/darktable-3.0.2.ebuild | 149 ---------------------
13 .../darktable-3.0.2_cmake-opencl-kernel-loop.patch | 28 ----
14 2 files changed, 177 deletions(-)
15
16 diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild
17 deleted file mode 100644
18 index 4fd99f7da34..00000000000
19 --- a/media-gfx/darktable/darktable-3.0.2.ebuild
20 +++ /dev/null
21 @@ -1,149 +0,0 @@
22 -# Copyright 1999-2020 Gentoo Authors
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=7
26 -
27 -inherit cmake flag-o-matic toolchain-funcs xdg
28 -
29 -DOC_PV="3.0.0"
30 -MY_PV="${PV/_/}"
31 -MY_P="${P/_/.}"
32 -
33 -DESCRIPTION="A virtual lighttable and darkroom for photographers"
34 -HOMEPAGE="https://www.darktable.org/"
35 -SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
36 - doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
37 -
38 -LICENSE="GPL-3 CC-BY-3.0"
39 -SLOT="0"
40 -KEYWORDS="amd64"
41 -LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
42 -# TODO add lua once dev-lang/lua-5.2 is unmasked
43 -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
44 - nls opencl openmp openexr tools webp
45 - ${LANGS// / l10n_}"
46 -
47 -BDEPEND="
48 - dev-util/intltool
49 - virtual/pkgconfig
50 - nls? ( sys-devel/gettext )
51 -"
52 -COMMON_DEPEND="
53 - dev-db/sqlite:3
54 - dev-libs/json-glib
55 - dev-libs/libxml2:2
56 - >=dev-libs/pugixml-1.8:0=
57 - gnome-base/librsvg:2
58 - >=media-gfx/exiv2-0.25-r2:0=[xmp]
59 - media-libs/lcms:2
60 - >=media-libs/lensfun-0.2.3:0=
61 - media-libs/libpng:0=
62 - media-libs/tiff:0
63 - net-libs/libsoup:2.4
64 - net-misc/curl
65 - sys-libs/zlib:=
66 - virtual/jpeg:0
67 - x11-libs/cairo
68 - >=x11-libs/gtk+-3.22:3
69 - x11-libs/pango
70 - colord? ( x11-libs/colord-gtk:0= )
71 - cups? ( net-print/cups )
72 - flickr? ( media-libs/flickcurl )
73 - geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
74 - gnome-keyring? ( >=app-crypt/libsecret-0.18 )
75 - gphoto2? ( media-libs/libgphoto2:= )
76 - graphicsmagick? ( media-gfx/graphicsmagick )
77 - jpeg2k? ( media-libs/openjpeg:2= )
78 - opencl? ( virtual/opencl )
79 - openexr? ( media-libs/openexr:0= )
80 - webp? ( media-libs/libwebp:0= )
81 -"
82 -DEPEND="${COMMON_DEPEND}
83 - opencl? (
84 - >=sys-devel/clang-4
85 - >=sys-devel/llvm-4
86 - )
87 -"
88 -RDEPEND="${COMMON_DEPEND}
89 - kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
90 -"
91 -
92 -PATCHES=(
93 - "${FILESDIR}"/"${PN}"-find-opencl-header.patch
94 - "${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch
95 - "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
96 -)
97 -
98 -S="${WORKDIR}/${P/_/~}"
99 -
100 -pkg_pretend() {
101 - if [[ ${MERGE_TYPE} != binary ]]; then
102 - # Bug #695658
103 - if tc-is-gcc; then
104 - test-flags-CC -floop-block &> /dev/null || \
105 - die "Please switch to a gcc version built with USE=graphite"
106 - fi
107 -
108 - if use openmp ; then
109 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
110 - fi
111 - fi
112 -}
113 -
114 -src_prepare() {
115 - use cpu_flags_x86_sse3 && append-flags -msse3
116 -
117 - sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
118 -
119 - cmake_src_prepare
120 -}
121 -
122 -src_configure() {
123 - local mycmakeargs=(
124 - -DBUILD_CURVE_TOOLS=$(usex tools)
125 - -DBUILD_NOISE_TOOLS=$(usex tools)
126 - -DBUILD_PRINT=$(usex cups)
127 - -DCUSTOM_CFLAGS=ON
128 - -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
129 - -DUSE_COLORD=$(usex colord)
130 - -DUSE_FLICKR=$(usex flickr)
131 - -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
132 - -DUSE_KWALLET=$(usex kwallet)
133 - -DUSE_LIBSECRET=$(usex gnome-keyring)
134 - -DUSE_LUA=OFF
135 - -DUSE_MAP=$(usex geolocation)
136 - -DUSE_NLS=$(usex nls)
137 - -DUSE_OPENCL=$(usex opencl)
138 - -DUSE_OPENEXR=$(usex openexr)
139 - -DUSE_OPENJPEG=$(usex jpeg2k)
140 - -DUSE_OPENMP=$(usex openmp)
141 - -DUSE_WEBP=$(usex webp)
142 - )
143 - CMAKE_BUILD_TYPE="RELWITHDEBINFO"
144 - cmake_src_configure
145 -}
146 -
147 -src_install() {
148 - cmake_src_install
149 - use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
150 -
151 - if use nls ; then
152 - for lang in ${LANGS} ; do
153 - if ! use l10n_${lang}; then
154 - rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
155 - fi
156 - done
157 - fi
158 -}
159 -
160 -pkg_postinst() {
161 - xdg_pkg_postinst
162 -
163 - elog
164 - elog "When updating a major version,"
165 - elog "please bear in mind that your edits will be preserved during this process,"
166 - elog "but it will not be possible to downgrade any more."
167 - elog
168 - ewarn "It will not be possible to downgrade!"
169 - ewarn
170 -}
171
172 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
173 deleted file mode 100644
174 index c1fd701fb9a..00000000000
175 --- a/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
176 +++ /dev/null
177 @@ -1,28 +0,0 @@
178 -From 767d48e0f60e7f858e8b31a88dd8cc1258e7ee9e Mon Sep 17 00:00:00 2001
179 -From: Marcus Haehnel <marcus@××××××××××××××.info>
180 -Date: Sat, 21 Mar 2020 09:14:45 +0100
181 -Subject: [PATCH] Fix invalid CMake syntax
182 -
183 -The syntax of the foreach statement in data/kernels/CMakeLists.txt
184 -was invalid. This lead to errors when running cmake.
185 -
186 -Use correct syntax to make the build work.
187 ----
188 - data/kernels/CMakeLists.txt | 4 ++--
189 - 1 file changed, 2 insertions(+), 2 deletions(-)
190 -
191 -diff --git a/data/kernels/CMakeLists.txt b/data/kernels/CMakeLists.txt
192 -index ce947bef9c..f605c18b7e 100644
193 ---- a/data/kernels/CMakeLists.txt
194 -+++ b/data/kernels/CMakeLists.txt
195 -@@ -31,8 +31,8 @@ macro (testcompile_opencl_kernel IN)
196 - endmacro (testcompile_opencl_kernel)
197 -
198 - if (TESTBUILD_OPENCL_PROGRAMS)
199 -- foreach(IN ${DT_OPENCL_KERNELS})
200 -- testcompile_opencl_kernel(${IN})
201 -+ foreach(KERNEL IN ITEMS ${DT_OPENCL_KERNELS})
202 -+ testcompile_opencl_kernel(${KERNEL})
203 - endforeach()
204 - endif()
205 -