diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-10-20 14:00:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-20 14:00:29 +0100 |
commit | 40a480a83a10d1718e26a6f4fc54d271c1f13a95 (patch) | |
tree | bfe08ce789f69c5862fd8e5d1bc17b22f9f21b86 /media-libs/svt-av1 | |
parent | 2eda3a3b8ebdb3fc8552feb6f49e466d3bc8e88c (diff) |
gentoo auto-resync : 20:10:2022 - 14:00:29
Diffstat (limited to 'media-libs/svt-av1')
-rw-r--r-- | media-libs/svt-av1/Manifest | 8 | ||||
-rw-r--r-- | media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch | 123 | ||||
-rw-r--r-- | media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch | 18 | ||||
-rw-r--r-- | media-libs/svt-av1/svt-av1-0.8.6.ebuild | 50 | ||||
-rw-r--r-- | media-libs/svt-av1/svt-av1-0.8.7.ebuild | 40 | ||||
-rw-r--r-- | media-libs/svt-av1/svt-av1-0.9.1.ebuild | 40 |
6 files changed, 0 insertions, 279 deletions
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest index b8a8202d54be..42af4dad3b84 100644 --- a/media-libs/svt-av1/Manifest +++ b/media-libs/svt-av1/Manifest @@ -1,12 +1,4 @@ -AUX svt-av1-0.8.6-fix-c-only-build.patch 5078 BLAKE2B c26a13dba8ac62ec2951d43d1419d6cacebbbb185841636845fb20a6aecb1c6fe4cabc1ab53748c3df0a4b2fcb8e25ff7b63447c486655fc8ec23144ed8388d4 SHA512 41f3c400bc6ff0c8df529cc5db125538367bc36468bc000936e76f58bfaff15d3fbf322ec2705ac20281753273ab834a1691e7852ede6baaec003b1d46285e1f -AUX svt-av1-0.8.6-no-force-avx.patch 506 BLAKE2B 7cb33489a5777b39a5eb041560c1ea5c25c99ad21ceb9f41d419ffb7f40b794ad831432cebe56dd72d1f896550adfb3accffce3624250b5bc0225b32649d36d7 SHA512 36f3e599f93efbf1ffc4382f3b6823ac791804920db23232064452f1327755cd329530310c471078eff705e7eb2156d98341c032354e0bb04945d8dc5d1c8c3d -DIST svt-av1-0.8.6-r1.tar.gz 6416293 BLAKE2B 98a0c5547f63a9d04b5365a242d1a6e7b8f54449547309e53e9907d11d61c853f07ea1d8a5988ec1b67ef94bfd137ff1664f4352d9181cf96b5629f292c97f1c SHA512 535c073e53d99ed55efa0b7577a886dff136ba41f2d92e84ef0463b707136e156b6c4029e3ff7709be8ce54b0a7e7257af833b706b4282d7fd2636635df757d5 -DIST svt-av1-0.8.7.tar.gz 6396358 BLAKE2B 21a0d319078887809d08276b1a11b6dcca1be90a79c6bda19b86749fabb623918b9112de8ae3c7740b14f23d52e4e1c12ec0190f49880b09993525a857f8e334 SHA512 812b794eda930f53dcba6bb02bc5a3f417346705d64f590d7acf2d45df8d10985bd40c313eaaed514601ab699e23c87852059b9eb0b0ff8a717ef9fd80a132f7 -DIST svt-av1-0.9.1.tar.gz 9718171 BLAKE2B b4247e0b060d34df9336b3cb54e116318120b0ca88ee00747b63ff133417ef941fc5953bbfc2d55e0c9836f579b2b6d64e7cd5a82943556d2d648788947ac6ef SHA512 3c4594bf4019de630e0c58bde3cfa71cc4a6b399a8405c8652b2d2ee26d9a4eed03203c12f1fd3837d5d54ed4a22de90d8f21064f8a3db339a80f9c6f8b0fb95 DIST svt-av1-1.1.0.tar.gz 9882945 BLAKE2B 2673fdbe17b36607e581cc540ca181672d16b3fbc0dd9c1a8b100ebea6b7a6872d6fa55976cb19c1c8afd50c5c09b67fbec1bcc892007ccd41e7f7ad68027d83 SHA512 87d661183de33554d228c2fa72deb9a945f2550083eb25688b4dc0676be384373a6a52af235066d85ce963ffbc7751c8afb46a2bc1c09e00f81ea0db5a232522 -EBUILD svt-av1-0.8.6.ebuild 1428 BLAKE2B e9fd41c7982d1ea876f99944e8a3bfb35d784e502ec7ad3450ff122ffcc925b948eeec73b96be8da0d16cccbfecde6e7654abcd82ea58f76d7a5a595823bb84e SHA512 452bce21bfd5740ad9a31f3e6aa044769202885ec0ff3104832dd059854ac8aceb331650a044938772d692c6b00c1d69fea5e83bf85d99dd8fef5e1dcadea7f0 -EBUILD svt-av1-0.8.7.ebuild 1217 BLAKE2B 01818865c8797121cd4430c4f79ca220a51154a60eac43b762b4f1175c5f4ccab2f404c2b69f4eb40b4ff5fa28ca1c323ca8a6744a69325db9b5cfd323ff8ae4 SHA512 9fb2486311e8612616a0da85ec7db2215fbd717c4fe6e58cc1fc420c981f1b3c34315bef30fb0d4df0da69b4ec93412984dcd8c1fedb2cf5c92361aa470091cd -EBUILD svt-av1-0.9.1.ebuild 1231 BLAKE2B 984021b87bf4951d00677c9f8cc34d7b34a93a07e0b939d31214ced02cf65c09a38e3ad35afd41045c42154c18027ff7074664b54c7d7be1ffb29f4f20f5e5cb SHA512 2265a3b0044c031f3d42bf15bb69fc46000c71d97a537703472c28d8087cbdd81d3b65ad5bf96501a91954984637f37c9d9107a7d90064460d5e07a7b2e629e7 EBUILD svt-av1-1.1.0.ebuild 1224 BLAKE2B 81048a92c5584f66abc7af12ac9ba27c3a223a4bba0c40dd3090d8a2d8f18f12eb6ea39dbcc8a1ba3fba802328c2c7ef86fbc9d032277fa8b148f96bc7a8e743 SHA512 75bd15c8263ac2578a5aeeedf1414ed17b201a77944651b6a4842f632bbaf90b957e98ea39a87f3dc405ea08bb55e25545bbda4e722b1b60baaba3d57fd32978 EBUILD svt-av1-9999.ebuild 1231 BLAKE2B 984021b87bf4951d00677c9f8cc34d7b34a93a07e0b939d31214ced02cf65c09a38e3ad35afd41045c42154c18027ff7074664b54c7d7be1ffb29f4f20f5e5cb SHA512 2265a3b0044c031f3d42bf15bb69fc46000c71d97a537703472c28d8087cbdd81d3b65ad5bf96501a91954984637f37c9d9107a7d90064460d5e07a7b2e629e7 MISC metadata.xml 561 BLAKE2B 1effb05644507ea39fe071f9de1fe4c1a4feb30f9bc429985cf464aea9f9bc1f525e0c6f5e75da47d373f0acd60394a2bcec3b71e68bc3ab031334f95717d3b8 SHA512 1042fb94a9c0b93c007843585e0ea075d187cdd6b77bb8eb94d5fcfaa7d083a98916aedcbfccd1fa3da3307ef8bbe7d623efa7e39ccc9714d23973497bec7a89 diff --git a/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch b/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch deleted file mode 100644 index 81c82bb1358f..000000000000 --- a/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch +++ /dev/null @@ -1,123 +0,0 @@ -https://bugs.gentoo.org/766156 -https://github.com/AOMediaCodec/SVT-AV1/commit/09c90e4cfb602b9a247a8a256923bdbddaf2ed9b - -From 09c90e4cfb602b9a247a8a256923bdbddaf2ed9b Mon Sep 17 00:00:00 2001 -From: Slawomir Pawlowski <slawomir.pawlowski@intel.com> -Date: Fri, 18 Dec 2020 16:47:20 +0100 -Subject: [PATCH] Fix C only build - ---- - CMakeLists.txt | 5 ++++- - Source/Lib/Common/Codec/common_dsp_rtcd.c | 5 ++++- - Source/Lib/Common/Codec/common_dsp_rtcd.h | 2 ++ - Source/Lib/Decoder/CMakeLists.txt | 5 ++++- - Source/Lib/Encoder/CMakeLists.txt | 5 ++++- - Source/Lib/Encoder/Codec/firstpass.c | 2 +- - 6 files changed, 19 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8baff740b1..efdd7385fb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -302,6 +302,9 @@ if(BUILD_TESTING) - endif() - - add_subdirectory(third_party/fastfeat) --add_subdirectory(third_party/cpuinfo) -+ -+if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM) -+ add_subdirectory(third_party/cpuinfo) -+endif() - - install(DIRECTORY ${PROJECT_SOURCE_DIR}/Source/API/ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/svt-av1" FILES_MATCHING PATTERN "*.h") -diff --git a/Source/Lib/Common/Codec/common_dsp_rtcd.c b/Source/Lib/Common/Codec/common_dsp_rtcd.c -index e24f99f66b..c09f088b88 100644 ---- a/Source/Lib/Common/Codec/common_dsp_rtcd.c -+++ b/Source/Lib/Common/Codec/common_dsp_rtcd.c -@@ -17,8 +17,10 @@ - #include "EbPackUnPack_C.h" - #include "EbAvcStyleMcp.h" - -+#ifdef ARCH_X86_64 - // for get_cpu_flags - #include "cpuinfo.h" -+#endif - - /* - * DSP deprecated flags -@@ -69,7 +71,7 @@ int64_t svt_av1_block_error_c(const TranLow *coeff, const TranLow *dqcoeff, - /************************************** - * Instruction Set Support - **************************************/ -- -+#ifdef ARCH_X86_64 - CPU_FLAGS get_cpu_flags() { - CPU_FLAGS flags = 0; - -@@ -105,6 +107,7 @@ CPU_FLAGS get_cpu_flags_to_use() { - #endif - return flags; - } -+#endif /*ARCH_X86_64*/ - - #ifdef ARCH_X86_64 - #ifndef NON_AVX512_SUPPORT -diff --git a/Source/Lib/Common/Codec/common_dsp_rtcd.h b/Source/Lib/Common/Codec/common_dsp_rtcd.h -index b76882b003..f67243f3d4 100644 ---- a/Source/Lib/Common/Codec/common_dsp_rtcd.h -+++ b/Source/Lib/Common/Codec/common_dsp_rtcd.h -@@ -67,8 +67,10 @@ extern "C" { - #endif - - // Helper Functions -+#ifdef ARCH_X86_64 - CPU_FLAGS get_cpu_flags(); - CPU_FLAGS get_cpu_flags_to_use(); -+#endif - void setup_common_rtcd_internal(CPU_FLAGS flags); - void svt_aom_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h); - RTCD_EXTERN void(*svt_aom_blend_a64_vmask)(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h); -diff --git a/Source/Lib/Decoder/CMakeLists.txt b/Source/Lib/Decoder/CMakeLists.txt -index c8ffc57657..c71c4da0b8 100644 ---- a/Source/Lib/Decoder/CMakeLists.txt -+++ b/Source/Lib/Decoder/CMakeLists.txt -@@ -99,7 +99,9 @@ set_target_properties(SvtAv1Dec PROPERTI - set_target_properties(SvtAv1Dec PROPERTIES SOVERSION ${DEC_VERSION_MAJOR}) - add_dependencies(SvtAv1Dec EbVersionHeaderGen) - target_link_libraries(SvtAv1Dec PUBLIC ${PLATFORM_LIBS}) --target_link_libraries(SvtAv1Dec PRIVATE cpuinfo_public) -+if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM) -+ target_link_libraries(SvtAv1Dec PRIVATE cpuinfo_public) -+endif() - install(TARGETS SvtAv1Dec DESTINATION "${CMAKE_INSTALL_LIBDIR}") - - configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Dec.pc @ONLY) -diff --git a/Source/Lib/Encoder/CMakeLists.txt b/Source/Lib/Encoder/CMakeLists.txt -index 936592e1ce..ab310dcef1 100644 ---- a/Source/Lib/Encoder/CMakeLists.txt -+++ b/Source/Lib/Encoder/CMakeLists.txt -@@ -130,7 +130,9 @@ endif() - set_target_properties(SvtAv1Enc PROPERTIES VERSION ${ENC_VERSION}) - set_target_properties(SvtAv1Enc PROPERTIES SOVERSION ${ENC_VERSION_MAJOR}) - target_link_libraries(SvtAv1Enc PUBLIC ${PLATFORM_LIBS}) --target_link_libraries(SvtAv1Enc PRIVATE cpuinfo_public) -+if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM) -+ target_link_libraries(SvtAv1Enc PRIVATE cpuinfo_public) -+endif() - install(TARGETS SvtAv1Enc DESTINATION "${CMAKE_INSTALL_LIBDIR}") - - configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Enc.pc @ONLY) -diff --git a/Source/Lib/Encoder/Codec/firstpass.c b/Source/Lib/Encoder/Codec/firstpass.c -index feb7a1fae7..80b7dd05d8 100644 ---- a/Source/Lib/Encoder/Codec/firstpass.c -+++ b/Source/Lib/Encoder/Codec/firstpass.c -@@ -1189,8 +1189,8 @@ static void first_pass_setup_me_context(MotionEstimationContext_t *context_ptr, - // set search method - context_ptr->me_context_ptr->hme_search_method = SUB_SAD_SEARCH; - -- uint8_t *src_ptr = &(input_picture_ptr->buffer_y[buffer_index]); - #ifdef ARCH_X86_64 -+ uint8_t *src_ptr = &(input_picture_ptr->buffer_y[buffer_index]); - //_MM_HINT_T0 //_MM_HINT_T1 //_MM_HINT_T2 //_MM_HINT_NTA - uint32_t i; - for (i = 0; i < sb_height; i++) { diff --git a/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch b/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch deleted file mode 100644 index 62f3b9b0c800..000000000000 --- a/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://bugs.gentoo.org/785556 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -170,14 +170,6 @@ - endif() - endforeach() - --if(CMAKE_C_FLAGS MATCHES ".*-march=native.*") -- string(APPEND CMAKE_C_FLAGS " -mno-avx") --endif() -- --if(CMAKE_CXX_FLAGS MATCHES ".*-march=native.*") -- string(APPEND CMAKE_CXX_FLAGS " -mno-avx") --endif() -- - if(CMAKE_ASM_NASM_OBJECT_FORMAT MATCHES "win") - set(CMAKE_ASM_NASM_FLAGS_DEBUG "${CMAKE_ASM_NASM_FLAGS_DEBUG} -gcv8") - elseif(CMAKE_ASM_NASM_COMPILER MATCHES "nasm") diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild deleted file mode 100644 index f645ecc7f6fa..000000000000 --- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic - -DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)" -HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1" - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -else - SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}-r1.tar.gz" - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231 - S="${WORKDIR}/SVT-AV1-v${PV}" -fi - -# Also see "Alliance for Open Media Patent License 1.0" -LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT" -SLOT="0" - -DEPEND="amd64? ( dev-lang/yasm )" - -PATCHES=( "${FILESDIR}"/${P}-fix-c-only-build.patch ) - -src_prepare() { - if ! use amd64 ; then - # This _should_ be possible on amd64 too, but breaks with -O3 - # without AVX. - # bug #785556 - eapply "${FILESDIR}"/${PN}-0.8.6-no-force-avx.patch - fi - - cmake_src_prepare -} - -src_configure() { - append-ldflags -Wl,-z,noexecstack - - local mycmakeargs=( - # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ? - # undefined reference to `ifd_inspect' - # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0 - -DBUILD_TESTING=OFF - ) - - cmake_src_configure -} diff --git a/media-libs/svt-av1/svt-av1-0.8.7.ebuild b/media-libs/svt-av1/svt-av1-0.8.7.ebuild deleted file mode 100644 index 41d1ae6a1da3..000000000000 --- a/media-libs/svt-av1/svt-av1-0.8.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)" -HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1" - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -else - SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" - S="${WORKDIR}/SVT-AV1-v${PV}" -fi - -# Also see "Alliance for Open Media Patent License 1.0" -LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT" -SLOT="0" - -BDEPEND="amd64? ( dev-lang/yasm )" - -multilib_src_configure() { - append-ldflags -Wl,-z,noexecstack - - local mycmakeargs=( - # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ? - # undefined reference to `ifd_inspect' - # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0 - -DBUILD_TESTING=OFF - -DCMAKE_OUTPUT_DIRECTORY="${BUILD_DIR}" - ) - - [[ ${ABI} != amd64 ]] && mycmakeargs+=( -DCOMPILE_C_ONLY=ON ) - - cmake_src_configure -} diff --git a/media-libs/svt-av1/svt-av1-0.9.1.ebuild b/media-libs/svt-av1/svt-av1-0.9.1.ebuild deleted file mode 100644 index cbcd3fc47133..000000000000 --- a/media-libs/svt-av1/svt-av1-0.9.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)" -HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1" - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -else - SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" - S="${WORKDIR}/SVT-AV1-v${PV}" -fi - -# Also see "Alliance for Open Media Patent License 1.0" -LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT" -SLOT="0" - -BDEPEND="amd64? ( dev-lang/yasm )" - -multilib_src_configure() { - append-ldflags -Wl,-z,noexecstack - - local mycmakeargs=( - # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ? - # undefined reference to `ifd_inspect' - # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0 - -DBUILD_TESTING=OFF - -DCMAKE_OUTPUT_DIRECTORY="${BUILD_DIR}" - ) - - [[ ${ABI} != amd64 ]] && mycmakeargs+=( -DCOMPILE_C_ONLY=ON ) - - cmake_src_configure -} |