From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1664539-garchives=archives.gentoo.org@lists.gentoo.org>
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 D6EA01581FB
for <garchives@archives.gentoo.org>; Mon, 26 Aug 2024 07:15:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 281C2E2A7D;
Mon, 26 Aug 2024 07:15:05 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id D83CDE2A7D
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Aug 2024 07:15:04 +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 CAB32335D0F
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Aug 2024 07:15:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 332A91EC4
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Aug 2024 07:15:02 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1724656481.8c507834fcdb184870bfc49d0c441b75bf254bf8.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/x265/x265-3.5-r5.ebuild media-libs/x265/x265-3.6.ebuild media-libs/x265/x265-9999.ebuild
X-VCS-Directories: media-libs/x265/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 8c507834fcdb184870bfc49d0c441b75bf254bf8
X-VCS-Branch: master
Date: Mon, 26 Aug 2024 07:15:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e7641f28-a0ba-49fd-ba4b-9237e81b4f2a
X-Archives-Hash: 2f103c0f3ffa99453b20b6d0886c3028
commit: 8c507834fcdb184870bfc49d0c441b75bf254bf8
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Aug 25 20:20:44 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 07:14:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c507834
media-libs/x265: fix ABI_X86_32 build
Closes: https://bugs.gentoo.org/938510
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/x265/x265-3.5-r5.ebuild | 5 ++---
media-libs/x265/x265-3.6.ebuild | 5 ++---
media-libs/x265/x265-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/media-libs/x265/x265-3.5-r5.ebuild b/media-libs/x265/x265-3.5-r5.ebuild
index 47245cb0ed6a..ad78f487735a 100644
--- a/media-libs/x265/x265-3.5-r5.ebuild
+++ b/media-libs/x265/x265-3.5-r5.ebuild
@@ -102,7 +102,6 @@ multilib_src_configure() {
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_PIC=ON
-DENABLE_LIBNUMA="$(usex numa)"
- -DENABLE_MULTIVIEW="yes"
-DENABLE_SVT_HEVC="no" # missing
-DENABLE_VTUNE="no" # missing
-DGIT_ARCHETYPE=1 #814116
@@ -140,13 +139,13 @@ multilib_src_configure() {
local liblist="" v=
for v in "${MULTIBUILD_VARIANTS[@]}" ; do
- ln -sf "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR%-*}/libx265_${v}.a" || die
+ ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die
liblist+="libx265_${v}.a;"
done
mycmakeargs+=(
-DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS="-L${BUILD_DIR%-*}"
+ -DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
-DLINKED_10BIT"=$(usex 10bit)"
-DLINKED_12BIT="$(usex 12bit)"
)
diff --git a/media-libs/x265/x265-3.6.ebuild b/media-libs/x265/x265-3.6.ebuild
index 55b794f17e42..064bd95be46a 100644
--- a/media-libs/x265/x265-3.6.ebuild
+++ b/media-libs/x265/x265-3.6.ebuild
@@ -102,7 +102,6 @@ multilib_src_configure() {
$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-DENABLE_PIC=ON
-DENABLE_LIBNUMA="$(usex numa)"
- -DENABLE_MULTIVIEW="yes"
-DENABLE_SVT_HEVC="no" # missing
-DENABLE_VTUNE="no" # missing
-DGIT_ARCHETYPE=1 #814116
@@ -140,13 +139,13 @@ multilib_src_configure() {
local liblist="" v=
for v in "${MULTIBUILD_VARIANTS[@]}" ; do
- ln -sf "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR%-*}/libx265_${v}.a" || die
+ ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die
liblist+="libx265_${v}.a;"
done
mycmakeargs+=(
-DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS="-L${BUILD_DIR%-*}"
+ -DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
-DLINKED_10BIT"=$(usex 10bit)"
-DLINKED_12BIT="$(usex 12bit)"
)
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index e9c94f79c127..9e4c71595c06 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -139,13 +139,13 @@ multilib_src_configure() {
local liblist="" v=
for v in "${MULTIBUILD_VARIANTS[@]}" ; do
- ln -sf "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR%-*}/libx265_${v}.a" || die
+ ln -s "${BUILD_DIR}-${v}/libx265.a" "${BUILD_DIR}/libx265_${v}.a" || die
liblist+="libx265_${v}.a;"
done
mycmakeargs+=(
-DEXTRA_LIB="${liblist}"
- -DEXTRA_LINK_FLAGS="-L${BUILD_DIR%-*}"
+ -DEXTRA_LINK_FLAGS="-L${BUILD_DIR}"
-DLINKED_10BIT"=$(usex 10bit)"
-DLINKED_12BIT="$(usex 12bit)"
)