* [gentoo-commits] repo/gentoo:master commit in: media-libs/svt-av1/files/, media-libs/svt-av1/
@ 2021-09-07 2:55 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-09-07 2:55 UTC (permalink / raw
To: gentoo-commits
commit: 57f7070d2cb6fc5b55a06cde9fac48821128b90f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 7 02:54:30 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 02:55:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57f7070d
media-libs/svt-av1: fix build on non-amd64
Closes: https://bugs.gentoo.org/785556
Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../svt-av1/files/svt-av1-0.8.6-no-force-avx.patch | 18 ++++++++++++++++++
media-libs/svt-av1/svt-av1-0.8.6.ebuild | 12 ++++++++++++
2 files changed, 30 insertions(+)
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
new file mode 100644
index 00000000000..62f3b9b0c80
--- /dev/null
+++ b/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch
@@ -0,0 +1,18 @@
+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
index d2eed504281..6857b80e363 100644
--- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild
+++ b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
@@ -25,8 +25,20 @@ 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'
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/svt-av1/files/, media-libs/svt-av1/
@ 2022-10-20 10:37 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-10-20 10:37 UTC (permalink / raw
To: gentoo-commits
commit: d94716e4f6bc3a0304f422ae90e0e35ad66b4330
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 10:01:51 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 10:37:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94716e4
media-libs/svt-av1: drop 0.8.6, 0.8.7, 0.9.1
Bug: https://bugs.gentoo.org/877293
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/svt-av1/Manifest | 3 -
.../files/svt-av1-0.8.6-fix-c-only-build.patch | 123 ---------------------
.../svt-av1/files/svt-av1-0.8.6-no-force-avx.patch | 18 ---
media-libs/svt-av1/svt-av1-0.8.6.ebuild | 50 ---------
media-libs/svt-av1/svt-av1-0.8.7.ebuild | 40 -------
media-libs/svt-av1/svt-av1-0.9.1.ebuild | 40 -------
6 files changed, 274 deletions(-)
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index eae9ea822541..4ca54d969a93 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -1,4 +1 @@
-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
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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-20 10:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-07 2:55 [gentoo-commits] repo/gentoo:master commit in: media-libs/svt-av1/files/, media-libs/svt-av1/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-10-20 10:37 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox