From 6d57946e8f20a2294b96eca2e379d3e8e1c93384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Oct 2023 08:44:28 +0100 Subject: gentoo auto-resync : 25:10:2023 - 08:44:27 --- media-libs/libaom/Manifest | 5 +- .../files/libaom-3.7.0-big-endian-tests.patch | 43 +++++++ .../libaom/files/libaom-3.7.0-big-endian.patch | 130 ++++++++++++++++++++ media-libs/libaom/libaom-3.7.0-r2.ebuild | 133 +++++++++++++++++++++ media-libs/libaom/libaom-9999.ebuild | 6 +- 5 files changed, 315 insertions(+), 2 deletions(-) create mode 100644 media-libs/libaom/files/libaom-3.7.0-big-endian-tests.patch create mode 100644 media-libs/libaom/files/libaom-3.7.0-big-endian.patch create mode 100644 media-libs/libaom/libaom-3.7.0-r2.ebuild (limited to 'media-libs/libaom') diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest index b6a72b943d9b..3b53fd60d78e 100644 --- a/media-libs/libaom/Manifest +++ b/media-libs/libaom/Manifest @@ -1,5 +1,7 @@ AUX libaom-3.4.0-posix-c-source-ftello.patch 429 BLAKE2B 3e6ff2b95dbf39d2d90a46c9189abf160d3460e247446db4ad0e534bde7f382aeaa4e1457c0a4ddb7cf3c9666fd173efa1955a22fc4d3708a93dcd6b7c160f07 SHA512 30cc17c38219e81f92f1f034786d5d4096a0e657c86dfe581f84d18fc201a0e34bd331e98271f92c07e5dc49740e164a983b3316fc57599b98aea2615f7cf107 AUX libaom-3.7.0-allow-fortify-source.patch 467 BLAKE2B 405f87a6467daae59823eedc9fd7cac959909d5c07df6b4930b55af129750bfd0ed2749b41c6a4fbdb2a8dd49a6881e9de0af526972d27c8c731ce29ab34d1af SHA512 ab69882b8652cb61bdfa14b5fbf5e5cef3344df3aee852f42192af1e935299be1029947a3cb80527362b2db57c93197b889fb45dc562123353b7a3871feaa811 +AUX libaom-3.7.0-big-endian-tests.patch 1611 BLAKE2B 9c0ab0a6a5788fdbc87f30ef5f2a6524521dcf1ec1911544827acb912551c08fcf370c369abfde1567d691a8b814ec897d90819431d7ad091dc247dc7e7396e0 SHA512 299f511b45ba9f1511ab508159f7341ff6ca433118feefd66e96266131588203fc651b4b88be79487b1cbb688c7946dddeeba1b07d88c471da95465e6782fb87 +AUX libaom-3.7.0-big-endian.patch 4168 BLAKE2B 6c9a9ac0933b29b3ee8111d8068dfff144385ae68ebf693a335672c3138cc31ef346486af44b0b0fff9bad58ad72d2335962b78bc82e40b1a7f4a4c9b5d3ca28 SHA512 aebd3f9d16f0cc6a6a0b7a240d5d8cb55d28fc8fe4a00444b26c4b54fed0536ff3577aab5aa624cd9900858770dfdad50f9429d91ee0638058d4be34873e8be6 DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478 DIST libaom-3.5.0.tar.gz 5206715 BLAKE2B d47ddb864c909c972f692667177417daef0350124a096547eacc83ab3630227fe7a23e95f3988a2109c580f9a87ba30a58bcc58be1a2e24fe694eb01655a4861 SHA512 370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4 DIST libaom-3.6.0-testdata.tar.gz 498554450 BLAKE2B bbc84e9d3fd91272fa6e30a19f625fb5b71b1ff6c622982202c298e45c7a331338ed316942d7c0ab00f5ef37d442e1a45a62a30be70f8c1315caac9e7742903e SHA512 a86303a2486fca9a85cdb9275c1715a3862df92021967a5a0d97f8aa6862dd6cad1d65e1377fbee3f1b21d73c770e10ece4041a13bf57e6f2a1bb39357b00316 @@ -13,6 +15,7 @@ EBUILD libaom-3.5.0.ebuild 3314 BLAKE2B 60443b958e7edf5345af61c71bfff8c8614ae51e EBUILD libaom-3.6.0.ebuild 4001 BLAKE2B 0f6af46ea95f891dc9ae55fb2fd276c304977dd9d0ce51ed72a3ba11ccec51e6f815e0f3466a10289e102b161a41440c71c0f3b78e4253ede4f7f17b3aa07147 SHA512 80c392f5721c6f913d7fc403f83354eb067f3d8d753b76d1905f82aee6fa430a87a0875070ffae7c6edda3e2529413c6577c8c0144ff38e98cc1973d1df44886 EBUILD libaom-3.6.1.ebuild 4018 BLAKE2B d58bb60d356880b9f0f6d9d9262a05de51a4fe0ac563f92219219c0554d2de1d61fc24eba5fd55cc5fb7fc1a2d003a72ae375be4494964013bcacf865fe6edcc SHA512 ceb6ca17366b1b14c6b6cfa9d5caa0eb229c19bf43aca9c23c8637d1d156a286891ef851b00a1d0208680d240bb2ca1cbd9fcd1743ab9384c1ea09f4f12fabbb EBUILD libaom-3.7.0-r1.ebuild 4077 BLAKE2B 90d69ac4b74320819a390734af21bd1118455028aa300b92e42a524714f7be00f1561e694dfb62070c819974ae166387d111ba0eb4756cb6f70ac5e1c045759d SHA512 354d28904c1a4fe1ee70bfd8a48266556ac654dbe14c0fff1d72c81281246f94bf27957bf9c2481e9fcede85447626dd87e44f1be6bb4972a03162fe44e2132f +EBUILD libaom-3.7.0-r2.ebuild 4343 BLAKE2B 20a64538bddaa926e9f54139a6f47f61fa29d6d05a6910d0527980621357560f5e57eb0c8598b8fe10086e956a9616563bd9b137e9b193f5764bd8b5e8640c8f SHA512 8fc026560907dfe488115f9ffa2465f98afa2bbcf86edb9b75e6b835da73140839b71a3db6cf299ff7713bcb21e54186112ddcbe19fd9327733be14efed02a44 EBUILD libaom-3.7.0.ebuild 4023 BLAKE2B aea1f5e374ba3075baa8e72e135fecf063743909f5aa972a1a9b1503be1868e0dad9ae10809a7905f87151f6cd3634104b4493fddf86ddc174b0581d5c971218 SHA512 9d8f6e81729c4c875b4d7d7b986547c68f1024ad01e21d2b16e95572b146c159b4f32196c9e5c8008f64079d03d8216e393c70ffefd9f2a121e918e1c39dd996 -EBUILD libaom-9999.ebuild 4023 BLAKE2B aea1f5e374ba3075baa8e72e135fecf063743909f5aa972a1a9b1503be1868e0dad9ae10809a7905f87151f6cd3634104b4493fddf86ddc174b0581d5c971218 SHA512 9d8f6e81729c4c875b4d7d7b986547c68f1024ad01e21d2b16e95572b146c159b4f32196c9e5c8008f64079d03d8216e393c70ffefd9f2a121e918e1c39dd996 +EBUILD libaom-9999.ebuild 4262 BLAKE2B ff64524d8c291c8e8671be54748c6a3e82d7354631fc4cb6b0effb219da06d2c595345707016f09e50d362966923419fc7978ec4bcaa35a0be8c4874af2fb17c SHA512 f188a326fb4d4e5ae28c0c626896024c2765d8e93e0cb40cf95fd73605a1021f463b8f66268b58ccbeca00c8361312cf6f696d6dd64c250af78d6b89df2b0975 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8 diff --git a/media-libs/libaom/files/libaom-3.7.0-big-endian-tests.patch b/media-libs/libaom/files/libaom-3.7.0-big-endian-tests.patch new file mode 100644 index 000000000000..38559c564726 --- /dev/null +++ b/media-libs/libaom/files/libaom-3.7.0-big-endian-tests.patch @@ -0,0 +1,43 @@ +https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 +https://aomedia.googlesource.com/aom/+/7029529477e1473e6eb7417538cea18edc5e3bd0 + +From 7029529477e1473e6eb7417538cea18edc5e3bd0 Mon Sep 17 00:00:00 2001 +From: Wan-Teh Chang +Date: Wed, 13 Sep 2023 10:55:05 -0700 +Subject: [PATCH] Fix big-endian bugs in CodingPathSync tests + +Change Serialize() to read uint16_t samples correctly. Although only the +least significant byte of each sample is nonzero, we cannot assume the +least significant byte of the c-th sample in `row` is row[c * 2]. That +is correct only on little-endian systems. + +Bug: aomedia:3487 +Change-Id: I9919ce6e3c877608ca7488fe4cc6957bcfe8c4cc +--- + test/coding_path_sync.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/test/coding_path_sync.cc b/test/coding_path_sync.cc +index c3e51fd565..31bc2d56b0 100644 +--- a/test/coding_path_sync.cc ++++ b/test/coding_path_sync.cc +@@ -130,11 +130,13 @@ std::vector Serialize(const aom_image_t *img) { + + for (int r = 0; r < h; ++r) { + for (int c = 0; c < w; ++c) { +- unsigned char *row = img->planes[plane] + r * img->stride[plane]; +- if (img->fmt & AOM_IMG_FMT_HIGHBITDEPTH) +- bytes.push_back(row[c * 2]); +- else ++ const unsigned char *row = img->planes[plane] + r * img->stride[plane]; ++ if (img->fmt & AOM_IMG_FMT_HIGHBITDEPTH) { ++ const uint16_t *row16 = reinterpret_cast(row); ++ bytes.push_back(row16[c]); ++ } else { + bytes.push_back(row[c]); ++ } + } + } + } +-- +2.42.0 diff --git a/media-libs/libaom/files/libaom-3.7.0-big-endian.patch b/media-libs/libaom/files/libaom-3.7.0-big-endian.patch new file mode 100644 index 000000000000..907e5fd1110e --- /dev/null +++ b/media-libs/libaom/files/libaom-3.7.0-big-endian.patch @@ -0,0 +1,130 @@ +https://bugs.chromium.org/p/aomedia/issues/detail?id=3487 +https://aomedia.googlesource.com/aom/+/8b65d76f2f95b1bfdc82b8f135246cb367d444e6%5E%21/ + +From 8b65d76f2f95b1bfdc82b8f135246cb367d444e6 Mon Sep 17 00:00:00 2001 +From: Wan-Teh Chang +Date: Tue, 12 Sep 2023 16:38:47 -0700 +Subject: [PATCH] Fix byte order issue in write_enc_data_to_out_buf + +Fix the byte order issue for big-endian systems introduced in +https://aomedia-review.googlesource.com/c/aom/+/167581. + +Use the existing HToBE64 macro defined in aom_util/endian_inl.h and +delete the new get_byteswap64 function from aom_ports/bitops.h. + +Based on the patch in bug aomedia:3487. + +Bug: aomedia:3487 +Change-Id: I56183e062a9f2b18c4c6158fd8e47c5062de85ee +--- + aom_dsp/entenc.h | 7 ++++--- + aom_ports/bitops.h | 35 +---------------------------------- + 2 files changed, 5 insertions(+), 37 deletions(-) + +diff --git a/aom_dsp/entenc.h b/aom_dsp/entenc.h +index 467e47bf56..d26f027ed0 100644 +--- a/aom_dsp/entenc.h ++++ b/aom_dsp/entenc.h +@@ -13,7 +13,7 @@ + #define AOM_AOM_DSP_ENTENC_H_ + #include + #include "aom_dsp/entcode.h" +-#include "aom_ports/bitops.h" ++#include "aom_util/endian_inl.h" + + #ifdef __cplusplus + extern "C" { +@@ -87,13 +87,14 @@ static AOM_INLINE void propagate_carry_bwd(unsigned char *buf, uint32_t offs) { + } while (carry); + } + +-// Reverse byte order and write data to buffer adding the carry-bit ++// Convert to big-endian byte order and write data to buffer adding the ++// carry-bit + static AOM_INLINE void write_enc_data_to_out_buf(unsigned char *out, + uint32_t offs, uint64_t output, + uint64_t carry, + uint32_t *enc_offs, + uint8_t num_bytes_ready) { +- const uint64_t reg = get_byteswap64(output) >> ((8 - num_bytes_ready) << 3); ++ const uint64_t reg = HToBE64(output << ((8 - num_bytes_ready) << 3)); + memcpy(&out[offs], ®, 8); + // Propagate carry backwards if exists + if (carry) { +diff --git a/aom_ports/bitops.h b/aom_ports/bitops.h +index 3c5b992bde..7f4c165f5a 100644 +--- a/aom_ports/bitops.h ++++ b/aom_ports/bitops.h +@@ -13,7 +13,6 @@ + #define AOM_AOM_PORTS_BITOPS_H_ + + #include +-#include + + #include "aom_ports/msvc.h" + #include "config/aom_config.h" +@@ -34,12 +33,8 @@ extern "C" { + // These versions of get_msb() are only valid when n != 0 because all + // of the optimized versions are undefined when n == 0: + +-// get_byteswap64: +-// Returns the number (uint64_t) with byte-positions reversed +-// e.g. input 0x123456789ABCDEF0 returns 0xF0DEBC9A78563412 +- + // GCC compiler: https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html +-// MSVC: https://learn.microsoft.com/en-us/cpp/c-runtime-library/ ++// MSVC: https://learn.microsoft.com/en-us/cpp/intrinsics/compiler-intrinsics + + // use GNU builtins where available. + #if defined(__GNUC__) && \ +@@ -48,10 +43,6 @@ static INLINE int get_msb(unsigned int n) { + assert(n != 0); + return 31 ^ __builtin_clz(n); + } +- +-static INLINE uint64_t get_byteswap64(uint64_t num) { +- return __builtin_bswap64(num); +-} + #elif defined(USE_MSC_INTRINSICS) + #pragma intrinsic(_BitScanReverse) + +@@ -61,10 +52,6 @@ static INLINE int get_msb(unsigned int n) { + _BitScanReverse(&first_set_bit, n); + return first_set_bit; + } +- +-static INLINE uint64_t get_byteswap64(uint64_t num) { +- return _byteswap_uint64(num); +-} + #undef USE_MSC_INTRINSICS + #else + static INLINE int get_msb(unsigned int n) { +@@ -82,26 +69,6 @@ static INLINE int get_msb(unsigned int n) { + } + return log; + } +- +-static INLINE uint64_t get_byteswap64(uint64_t num) { +- uint64_t out = 0x00; +- uint64_t mask = 0xFF00000000000000; +- int bit_shift = 56; // 7 bytes +- // 4 ms bytes +- do { +- out |= (num & mask) >> bit_shift; +- mask >>= 8; +- bit_shift -= 16; +- } while (bit_shift >= 0); +- // 4 ls bytes +- bit_shift = 8; // 1 byte +- do { +- out |= (num & mask) << bit_shift; +- mask >>= 8; +- bit_shift += 16; +- } while (bit_shift <= 56); +- return out; +-} + #endif + + #ifdef __cplusplus +-- +2.42.0 diff --git a/media-libs/libaom/libaom-3.7.0-r2.ebuild b/media-libs/libaom/libaom-3.7.0-r2.ebuild new file mode 100644 index 000000000000..3fbef9beb31c --- /dev/null +++ b/media-libs/libaom/libaom-3.7.0-r2.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +inherit cmake-multilib python-any-r1 + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://aomedia.googlesource.com/aom" +else + # To update test data tarball, follow these steps: + # 1. Clone the upstream repo and check out the relevant tag, + # or download the release tarball + # 2. Regular cmake configure (options don't matter here): + # cd build && cmake .. + # 3. Set LIBAOM_TEST_DATA_PATH to the directory you want and + # run the "make testdata" target: + # LIBAOM_TEST_DATA_PATH=../libaom-3.7.0-testdata make testdata + # This will download the test data from the internet. + # 4. Create a tarball out of that directory. + # cd .. && tar cvaf libaom-3.7.0-testdata.tar.xz libaom-3.7.0-testdata + SRC_URI=" + https://storage.googleapis.com/aom-releases/${P}.tar.gz + test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-testdata.tar.xz ) + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~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 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_neon" +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-doc/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}"/${P}-big-endian.patch + "${FILESDIR}"/${P}-big-endian-tests.patch +) + +multilib_src_configure() { + 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 + + # neon support is assumed to be always enabled on arm64 + -DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF)) + # ENABLE_DSPR2 / ENABLE_MSA for mips + -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) + ) + + # 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 + + cmake_src_configure +} + +multilib_src_test() { + LIBAOM_TEST_DATA_PATH="${WORKDIR}/${P}-testdata" "${BUILD_DIR}"/test_libaom || die +} + +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 +} diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild index 76a2b4d37365..80b545dbde32 100644 --- a/media-libs/libaom/libaom-9999.ebuild +++ b/media-libs/libaom/libaom-9999.ebuild @@ -33,7 +33,7 @@ HOMEPAGE="https://aomedia.org https://aomedia.googlesource.com/aom/" LICENSE="BSD-2" SLOT="0/3" -IUSE="doc +examples test" +IUSE="big-endian 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_neon" @@ -57,6 +57,7 @@ DOCS=( PATENTS ) PATCHES=( "${FILESDIR}"/${PN}-3.4.0-posix-c-source-ftello.patch + "${FILESDIR}"/${PN}-3.7.0-allow-fortify-source.patch ) multilib_src_configure() { @@ -68,6 +69,9 @@ multilib_src_configure() { -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 -- cgit v1.2.3