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 02EBE158015 for ; Thu, 21 Dec 2023 09:57:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28A782BC01B; Thu, 21 Dec 2023 09:57:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 063192BC01B for ; Thu, 21 Dec 2023 09:57:21 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0EBE6342F64 for ; Thu, 21 Dec 2023 09:57:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 828511256 for ; Thu, 21 Dec 2023 09:57:18 +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: <1703152583.1c5afef162837b40b0c2099eb5d3f8cb68d3d8ed.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x264/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/x264/x264-0.0.20231114-r1.ebuild media-libs/x264/x264-9999.ebuild X-VCS-Directories: media-libs/x264/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1c5afef162837b40b0c2099eb5d3f8cb68d3d8ed X-VCS-Branch: master Date: Thu, 21 Dec 2023 09:57:18 +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: ec68c906-dedc-4534-a955-17855a0673d7 X-Archives-Hash: f8490950544f118a43c83af35eef3025 commit: 1c5afef162837b40b0c2099eb5d3f8cb68d3d8ed Author: Sam James gentoo org> AuthorDate: Thu Dec 21 08:06:11 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Dec 21 09:56:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c5afef1 media-libs/x264: always build as PIC Linkers are getting stricter. The SSE part wasn't really used anyway, just as a hack wrt the incompatibility with pic/asm/sse for x86. Closes: https://bugs.gentoo.org/917583 Closes: https://bugs.gentoo.org/918105 Signed-off-by: Sam James gentoo.org> media-libs/x264/{x264-9999.ebuild => x264-0.0.20231114-r1.ebuild} | 4 ++-- media-libs/x264/x264-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-0.0.20231114-r1.ebuild similarity index 92% copy from media-libs/x264/x264-9999.ebuild copy to media-libs/x264/x264-0.0.20231114-r1.ebuild index 7317a87e9e6a..dc042c20d5c5 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-0.0.20231114-r1.ebuild @@ -20,7 +20,7 @@ fi LICENSE="GPL-2" SLOT="0/164" # SONAME -IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads" +IUSE="cpu_flags_ppc_altivec +interlaced opencl static-libs +threads" ASM_DEP=">=dev-lang/nasm-2.13" DEPEND=" @@ -44,7 +44,7 @@ multilib_src_configure() { local asm_conf="" if \ - [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } \ + [[ ${ABI} == x86* ]] \ || [[ ${ABI} == "x32" ]] \ || [[ ${CHOST} == armv5* ]] \ || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; } \ diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild index 7317a87e9e6a..dc042c20d5c5 100644 --- a/media-libs/x264/x264-9999.ebuild +++ b/media-libs/x264/x264-9999.ebuild @@ -20,7 +20,7 @@ fi LICENSE="GPL-2" SLOT="0/164" # SONAME -IUSE="cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads" +IUSE="cpu_flags_ppc_altivec +interlaced opencl static-libs +threads" ASM_DEP=">=dev-lang/nasm-2.13" DEPEND=" @@ -44,7 +44,7 @@ multilib_src_configure() { local asm_conf="" if \ - [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } \ + [[ ${ABI} == x86* ]] \ || [[ ${ABI} == "x32" ]] \ || [[ ${CHOST} == armv5* ]] \ || [[ ${ABI} == ppc* ]] && { use !cpu_flags_ppc_altivec ; } \