[gentoo-commits] repo/gentoo:master commit in: media-libs/x264/

["Sam James" <sam@gentoo.org>]

commit:     1c5afef162837b40b0c2099eb5d3f8cb68d3d8ed
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 08:06:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 ; } \