mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-libs/libaom: drop 3.9.1
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -1,4 +1,2 @@
|
||||
DIST libaom-3.10.0-testdata.tar.xz 426166968 BLAKE2B 1cebddf22a81ea04ea33b94e8e286e3ece97db940850a073bb15dd203414adb9ce89f34fe03d1dea66fef827f33b085772bc5144d182977bcaf545593ca94324 SHA512 a1aae4f8ab6c98ed567a6516d285100af7ef987019ff87294cd1a08d8e74839e652decf85f2a8b5eecab58cb8066684a676716af05fb5f37e6adf2312b996e1a
|
||||
DIST libaom-3.10.0.tar.gz 5445319 BLAKE2B c4ee6980d5223413f09d163782133a5b7e041f646bfae26a0f386672a964e7f5ab1ec38fc19cc332b38f0bff4b4b96405104f87ca162395ce036d18dd86ef9dc SHA512 70ceb4385032bdac5e892ed78f10878ef54faeabdd042d4a3b92f838146a61baa69d4d4e2576dcf8223918f79b6db72485fd95b5c05a20d41634310cc6b44c44
|
||||
DIST libaom-3.9.1-testdata.tar.xz 426413144 BLAKE2B 99fad74bbfabbfd1a7b9a2a3ae72c1c5a4810a70cb6f2df54ad4e29da5afd9278fcc2555f859f51dadab41e1d1829d08ee9efee415ca34d05acd5175caf35205 SHA512 81ce77937264c3a4f6da19dab5cfc4feb559359c154fc00105e6aee6aebb1900e4ecaadd248ba09c5aa266ba0f937451a075338c474ca69a64871d6e6f9c4480
|
||||
DIST libaom-3.9.1.tar.gz 5524048 BLAKE2B 2f983a4a563e16120aa8937e059f4cd267fb60b6d4148f952f1e664a50b84bc0d8ba7629231b60e4263963d97559a819752a4fa0dcf2427c9f94036716221324 SHA512 d134583c9cc17e0c8e0dec17677a5daca6f42636f3cde83e1b0fc5250f7372f190c125afb845540cd947fb28462cc91b111a69ae4fec51946c3730cacf42c36e
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
https://bugs.gentoo.org/937420
|
||||
https://aomedia.issues.chromium.org/issues/357622679
|
||||
https://aomedia-review.googlesource.com/c/aom/+/192404
|
||||
|
||||
From b20dcf3adf51919226b436151734ba38d1123850 Mon Sep 17 00:00:00 2001
|
||||
From: James Zern <jzern@google.com>
|
||||
Date: Tue, 06 Aug 2024 10:38:00 -0700
|
||||
Subject: [PATCH] update libwebm to libwebm-1.0.0.31-10-g3b63004
|
||||
|
||||
This fixes a build error seen in gcc 15:
|
||||
3b63004 mkvparser/mkvparser.cc: add missing <cstdint> include
|
||||
|
||||
Bug: aomedia:357622679
|
||||
Change-Id: I6c4a1795d189f9993d4f2c5c9f0375912bc58f0c
|
||||
(cherry picked from commit e448dcd13a9f534c7291903e9ab18dfc4fea54ad)
|
||||
--- a/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
|
||||
+++ b/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
|
||||
@@ -8,9 +8,9 @@
|
||||
#ifndef MKVMUXER_MKVMUXERUTIL_H_
|
||||
#define MKVMUXER_MKVMUXERUTIL_H_
|
||||
|
||||
-#include "mkvmuxertypes.h"
|
||||
+#include <stdint.h>
|
||||
|
||||
-#include "stdint.h"
|
||||
+#include "mkvmuxertypes.h"
|
||||
|
||||
namespace mkvmuxer {
|
||||
class Cluster;
|
||||
--- a/third_party/libwebm/mkvparser/mkvparser.cc
|
||||
+++ b/third_party/libwebm/mkvparser/mkvparser.cc
|
||||
@@ -16,6 +16,7 @@
|
||||
#include <cfloat>
|
||||
#include <climits>
|
||||
#include <cmath>
|
||||
+#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <memory>
|
||||
#include <new>
|
||||
@@ -1,147 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
inherit cmake-multilib flag-o-matic multiprocessing python-any-r1
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
|
||||
else
|
||||
# To update test data tarball,
|
||||
# chromium-tools.git/generate-libaom-test-tarball.sh
|
||||
SRC_URI="
|
||||
https://storage.googleapis.com/aom-releases/${P}.tar.gz
|
||||
test? ( https://deps.gentoo.zip/${CATEGORY}/${P}-testdata.tar.xz )
|
||||
"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~loong ppc64 ~riscv x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
|
||||
HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0/3"
|
||||
IUSE="big-endian debug doc +examples test"
|
||||
IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
|
||||
IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
|
||||
IUSE="${IUSE} cpu_flags_arm_crc32 cpu_flags_arm_neon cpu_flags_ppc_vsx"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
REQUIRED_USE="
|
||||
cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
|
||||
cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
|
||||
"
|
||||
|
||||
BDEPEND="${PYTHON_DEPS}
|
||||
dev-lang/perl
|
||||
abi_x86_32? ( dev-lang/yasm )
|
||||
abi_x86_64? ( dev-lang/yasm )
|
||||
abi_x86_x32? ( dev-lang/yasm )
|
||||
doc? ( app-text/doxygen )
|
||||
"
|
||||
|
||||
# The PATENTS file is required to be distributed with this package, bug #682214
|
||||
DOCS=( PATENTS )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch
|
||||
"${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch
|
||||
"${FILESDIR}"/${PN}-3.8.1-tests-parallel.patch
|
||||
"${FILESDIR}"/${PN}-3.9.1-gcc15-cstdint.patch
|
||||
)
|
||||
|
||||
multilib_src_configure() {
|
||||
# Follow upstream recommendations in README (bug #921438) and avoid
|
||||
# asserts during common use (bug #914614).
|
||||
append-cppflags $(usex debug '-UNDEBUG' '-DNDEBUG')
|
||||
|
||||
local mycmakeargs=(
|
||||
-DENABLE_CCACHE=OFF
|
||||
-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
|
||||
-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
|
||||
-DENABLE_NASM=OFF
|
||||
-DENABLE_TESTS=$(usex test)
|
||||
-DENABLE_TOOLS=ON
|
||||
-DENABLE_WERROR=OFF
|
||||
# https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 shows
|
||||
# that big endian detection doesn't really work otherwise.
|
||||
-DCONFIG_BIG_ENDIAN=$(usex big-endian 1 0)
|
||||
|
||||
# Needs libjxl, currently unpackaged.
|
||||
-DCONFIG_TUNE_BUTTERAUGLI=0
|
||||
|
||||
# arm
|
||||
-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
|
||||
-DENABLE_ARM_CRC32=$(usex cpu_flags_arm_crc32 ON OFF)
|
||||
# bug #917277
|
||||
-DENABLE_NEON_DOTPROD=OFF
|
||||
# bug #917278
|
||||
-DENABLE_NEON_I8MM=OFF
|
||||
# bug #920474
|
||||
-DENABLE_SVE=OFF
|
||||
|
||||
# mips
|
||||
# ENABLE_DSPR2 / ENABLE_MSA for mips
|
||||
|
||||
# amd64
|
||||
-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
|
||||
-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
|
||||
-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
|
||||
-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
|
||||
-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
|
||||
-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
|
||||
-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
|
||||
-DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
|
||||
-DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
|
||||
|
||||
# ppc
|
||||
-DENABLE_VSX=$(usex cpu_flags_ppc_vsx ON OFF)
|
||||
)
|
||||
|
||||
# For 32-bit multilib builds, force some intrinsics on to work around
|
||||
# bug #816027. libaom seems to do runtime detection for some targets
|
||||
# at least, so this isn't an issue.
|
||||
if ! multilib_is_native_abi && use amd64 ; then
|
||||
mycmakeargs+=(
|
||||
-DENABLE_SSE3=ON
|
||||
-DENABLE_SSSE3=ON
|
||||
)
|
||||
fi
|
||||
|
||||
# On ARM32-on-ARM64, things end up failing if NEON is off, bug #835456
|
||||
# Just force generic, given it's a niche situation.
|
||||
# TODO: could try forcing armv7 or similar?
|
||||
if use arm && ! use cpu_flags_arm_neon && [[ $(uname -p) == "aarch64" ]] ; then
|
||||
ewarn "Forcing generic for arm32-on-arm64 build (bug #835456)"
|
||||
mycmakeargs+=(
|
||||
-DAOM_TARGET_CPU=generic
|
||||
)
|
||||
fi
|
||||
|
||||
# LIBAOM_TEST_PROCS is added by our tests-parallel.patch
|
||||
export LIBAOM_TEST_PROCS="$(makeopts_jobs)"
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
einfo "Running quiet tests which take hours."
|
||||
# We use ninja rather than test_libaom directly so we can run it in parallel
|
||||
# with sharding, see https://aomedia.googlesource.com/aom/#sharded-testing.
|
||||
LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" eninja -C "${BUILD_DIR}" runtests
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
if multilib_is_native_abi && use doc ; then
|
||||
local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
|
||||
fi
|
||||
|
||||
cmake_src_install
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
|
||||
}
|
||||
Reference in New Issue
Block a user