diff options
| author |   Paul Zander <negril.nx+gentoo@gmail.com> | 2024-08-25 22:20:44 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-08-26 08:14:41 +0100 |
| commit | 8c507834fcdb184870bfc49d0c441b75bf254bf8 (patch) | |
| tree | caf0d4deca31556bcc5067511bae065b50af2046 /media-libs/x265 | |
| parent | dev-perl/MIME-Types: keyword 2.240.0 for ~mips (diff) | |
| download | gentoo-8c507834fcdb184870bfc49d0c441b75bf254bf8.tar.gz gentoo-8c507834fcdb184870bfc49d0c441b75bf254bf8.tar.bz2 gentoo-8c507834fcdb184870bfc49d0c441b75bf254bf8.zip | |
media-libs/x265: fix ABI_X86_32 build
Closes: https://bugs.gentoo.org/938510
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/x265')
| -rw-r--r-- | media-libs/x265/x265-3.5-r5.ebuild | 5 | ||||
| -rw-r--r-- | media-libs/x265/x265-3.6.ebuild | 5 | ||||
| -rw-r--r-- | 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)" ) |