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 638AC1382C5 for ; Thu, 18 Jun 2020 12:36:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 911EBE0886; Thu, 18 Jun 2020 12:36:46 +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 79E22E0886 for ; Thu, 18 Jun 2020 12:36:46 +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 4920334EF9F for ; Thu, 18 Jun 2020 12:36:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2263286 for ; Thu, 18 Jun 2020 12:36:43 +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: <1592483790.b575407bab33bc18c0a521c4fb193cdde6830409.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: b575407bab33bc18c0a521c4fb193cdde6830409 X-VCS-Branch: master Date: Thu, 18 Jun 2020 12:36:43 +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: 30fb3ff2-3049-4d30-8e0c-a880c414efd5 X-Archives-Hash: 0426830189cdbf9e5d18a017979b6164 commit: b575407bab33bc18c0a521c4fb193cdde6830409 Author: Marek Szuba gentoo org> AuthorDate: Thu Jun 18 12:33:18 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Thu Jun 18 12:36:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b575407b media-gfx/darktable: patch CMake error in OpenCL testing Backported the upstream fix from master, i.e. the next release should already include it. Closes: https://bugs.gentoo.org/716358 Signed-off-by: Marek Szuba gentoo.org> media-gfx/darktable/darktable-3.0.2.ebuild | 1 + .../darktable-3.0.2_cmake-opencl-kernel-loop.patch | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild index 2c9eb9a00a3..a34bc47503e 100644 --- a/media-gfx/darktable/darktable-3.0.2.ebuild +++ b/media-gfx/darktable/darktable-3.0.2.ebuild @@ -71,6 +71,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch + "${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch ) S="${WORKDIR}/${P/_/~}" 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 new file mode 100644 index 00000000000..c1fd701fb9a --- /dev/null +++ b/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch @@ -0,0 +1,28 @@ +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() +