commit: 23089728efe0ee0250c47dcb2165df58a1347ad9 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Mar 12 05:57:27 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
