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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BAB1C158041 for ; Tue, 12 Mar 2024 06:00:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E733E2A04; Tue, 12 Mar 2024 06:00:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E27D9E2A04 for ; Tue, 12 Mar 2024 06:00:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 132AE34069F for ; Tue, 12 Mar 2024 06:00:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63B3F13DE for ; Tue, 12 Mar 2024 06:00:14 +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: <1710223047.23089728efe0ee0250c47dcb2165df58a1347ad9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/intel-mediasdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/intel-mediasdk/intel-mediasdk-23.2.2.ebuild media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild X-VCS-Directories: media-libs/intel-mediasdk/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 23089728efe0ee0250c47dcb2165df58a1347ad9 X-VCS-Branch: master Date: Tue, 12 Mar 2024 06:00:14 +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: 4654ec25-c62b-4e58-af5d-a6933a74cfed X-Archives-Hash: b8917cc6a8839da463156d5c475ac4f6 commit: 23089728efe0ee0250c47dcb2165df58a1347ad9 Author: Sam James gentoo org> AuthorDate: Tue Mar 12 05:57:27 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 12 05:57:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23089728 media-libs/intel-mediasdk: filter LTO ODR violation. Archived upstream. Closes: https://bugs.gentoo.org/924366 Signed-off-by: Sam James gentoo.org> media-libs/intel-mediasdk/intel-mediasdk-23.2.2.ebuild | 11 +++++++++-- media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/media-libs/intel-mediasdk/intel-mediasdk-23.2.2.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-23.2.2.ebuild index a0674e307b13..b1ee6951b88c 100644 --- a/media-libs/intel-mediasdk/intel-mediasdk-23.2.2.ebuild +++ b/media-libs/intel-mediasdk/intel-mediasdk-23.2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake-multilib optfeature +inherit cmake-multilib flag-o-matic optfeature if [[ ${PV} == *9999 ]] ; then : ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"} @@ -65,6 +65,13 @@ PATCHES=( "${FILESDIR}/${PN}-23.2.0-gcc13.patch" ) +src_configure() { + # ODR violation (bug #924366) + filter-lto + + cmake-multilib_src_configure +} + multilib_src_configure() { local mycmakeargs=( # OpenCL only has an effect if we build kernels diff --git a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild index 61173b80745c..c746c1eed9c7 100644 --- a/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild +++ b/media-libs/intel-mediasdk/intel-mediasdk-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake-multilib optfeature +inherit cmake-multilib flag-o-matic optfeature if [[ ${PV} == *9999 ]] ; then : ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"} @@ -60,6 +60,13 @@ BDEPEND=" ) " +src_configure() { + # ODR violation (bug #924366) + filter-lto + + cmake-multilib_src_configure +} + multilib_src_configure() { local mycmakeargs=( # OpenCL only has an effect if we build kernels