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 A9DA515808D for ; Fri, 10 Sep 2021 05:23:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9263E08C4; Fri, 10 Sep 2021 05:23:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 40EB2E08C4 for ; Fri, 10 Sep 2021 05:23:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 DFE463408A6 for ; Fri, 10 Sep 2021 05:23:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0533655 for ; Fri, 10 Sep 2021 05:23:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1631251406.b0ca3df14e110dba28d75a7023b423c79346b58b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vigra/vigra-1.11.1-r3.ebuild media-libs/vigra/vigra-9999.ebuild X-VCS-Directories: media-libs/vigra/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b0ca3df14e110dba28d75a7023b423c79346b58b X-VCS-Branch: master Date: Fri, 10 Sep 2021 05:23:35 +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: 6e404a02-09f7-4ac7-b792-85147d128d07 X-Archives-Hash: 25a8bcb5c3ba9107b80f98373fa5afdf commit: b0ca3df14e110dba28d75a7023b423c79346b58b Author: Sam James gentoo org> AuthorDate: Fri Sep 10 05:22:31 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 10 05:23:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ca3df1 media-libs/vigra: add -DH5_USE_110_API workaround Bug: https://bugs.gentoo.org/808731 Signed-off-by: Sam James gentoo.org> media-libs/vigra/vigra-1.11.1-r3.ebuild | 6 +++++- media-libs/vigra/vigra-9999.ebuild | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/media-libs/vigra/vigra-1.11.1-r3.ebuild b/media-libs/vigra/vigra-1.11.1-r3.ebuild index 714a95b192e..65fd07b618a 100644 --- a/media-libs/vigra/vigra-1.11.1-r3.ebuild +++ b/media-libs/vigra/vigra-1.11.1-r3.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="threads(+),xml" -inherit cmake python-r1 +inherit cmake flag-o-matic python-r1 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" HOMEPAGE="https://ukoethe.github.io/vigra/" @@ -102,6 +102,10 @@ src_prepare() { } src_configure() { + # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12) + # bug #808731 + use hdf5 && append-cppflags -DH5_USE_110_API + vigra_configure() { local mycmakeargs=( -DAUTOEXEC_TESTS=OFF diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild index 9ffac6b73b0..171eedd560f 100644 --- a/media-libs/vigra/vigra-9999.ebuild +++ b/media-libs/vigra/vigra-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="threads(+),xml" -inherit cmake python-r1 +inherit cmake flag-o-matic python-r1 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" HOMEPAGE="https://ukoethe.github.io/vigra/" @@ -106,6 +106,10 @@ src_prepare() { } src_configure() { + # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12) + # bug #808731 + use hdf5 && append-cppflags -DH5_USE_110_API + vigra_configure() { local mycmakeargs=( -DAUTOEXEC_TESTS=OFF