* [gentoo-commits] repo/gentoo:master commit in: media-libs/svt-av1/, media-libs/svt-av1/files/
@ 2021-01-21 23:23 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2021-01-21 23:23 UTC (permalink / raw
To: gentoo-commits
commit: c5dc2daa953104e4718ac6a344e38fc8629b779f
Author: Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Tue Jan 19 21:41:09 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 23:22:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5dc2daa
media-libs/svt-av1: fix arm build
Closes: https://bugs.gentoo.org/766156
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/19132
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/svt-av1-0.8.6-fix-c-only-build.patch | 120 +++++++++++++++++++++
media-libs/svt-av1/svt-av1-0.8.6.ebuild | 2 +
2 files changed, 122 insertions(+)
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
new file mode 100644
index 00000000000..045bfe0160a
--- /dev/null
+++ b/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch
@@ -0,0 +1,120 @@
+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/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
index 340c2c175bc..5a346c61374 100644
--- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild
+++ b/media-libs/svt-av1/svt-av1-0.8.6.ebuild
@@ -21,6 +21,8 @@ fi
LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT"
SLOT="0"
+PATCHES=( "${FILESDIR}"/${P}-fix-c-only-build.patch )
+
src_configure() {
append-ldflags -Wl,-z,noexecstack
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/svt-av1/, media-libs/svt-av1/files/
@ 2023-05-31 7:00 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-05-31 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 5f298acb0c9958b158914fd9ce4fce8692a16f23
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 06:25:09 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 31 06:56:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f298acb
media-libs/svt-av1: add 1.5.0
Closes: https://bugs.gentoo.org/890280
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/svt-av1/Manifest | 1 +
.../files/svt-av1-1.5.0-fortify-no-override.patch | 37 ++++++++++++++++++++++
.../{svt-av1-9999.ebuild => svt-av1-1.5.0.ebuild} | 4 +++
media-libs/svt-av1/svt-av1-9999.ebuild | 4 +++
4 files changed, 46 insertions(+)
diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest
index 4e790f1a3ed4..8dcec676d2f6 100644
--- a/media-libs/svt-av1/Manifest
+++ b/media-libs/svt-av1/Manifest
@@ -1,2 +1,3 @@
DIST SVT-AV1-v1.4.1.tar.bz2 9440077 BLAKE2B ed79d566afaa22fdfb1925bf6a75e8e55abdec1f76333a0cfedc92f9ca524b36b622b5c40af5d4846a51a3cd9aa951eb617bf6007513d83b7f172c4f9bb0de27 SHA512 8297ef131ff8e7e6cbb0d19d2ba98904455d2953cde3fb0cbae714d050980a558e4cbed911968b5075d7aca758ca939a5091b68df557903387e3f22ac4bda1a1
+DIST SVT-AV1-v1.5.0.tar.bz2 9490521 BLAKE2B 6f54c1706ed65b8248bc434411cfdea5869765c42682100f5aa6b72d08626bd896f6a9a8067ac8af3c89c72bd324e74942b0f424ff33cc2f6ff54d9204ef7581 SHA512 d5aa7679aeaa1e19f21906a36a7214c72cdaee77e1b5c1946ded43f8381ec2d705e671130589207b65b920a4fcaa9ca1d0037f88ef8d2303125d7f7aa54e3a2e
DIST svt-av1-1.1.0.tar.gz 9882945 BLAKE2B 2673fdbe17b36607e581cc540ca181672d16b3fbc0dd9c1a8b100ebea6b7a6872d6fa55976cb19c1c8afd50c5c09b67fbec1bcc892007ccd41e7f7ad68027d83 SHA512 87d661183de33554d228c2fa72deb9a945f2550083eb25688b4dc0676be384373a6a52af235066d85ce963ffbc7751c8afb46a2bc1c09e00f81ea0db5a232522
diff --git a/media-libs/svt-av1/files/svt-av1-1.5.0-fortify-no-override.patch b/media-libs/svt-av1/files/svt-av1-1.5.0-fortify-no-override.patch
new file mode 100644
index 000000000000..d0db0f0d3afc
--- /dev/null
+++ b/media-libs/svt-av1/files/svt-av1-1.5.0-fortify-no-override.patch
@@ -0,0 +1,37 @@
+Don't override our toolchain defaults, which may be F_S=3 on some profiles, and
+F_S=2 otherwise.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -325,10 +325,6 @@ else()
+ check_both_flags_add(-mno-avx)
+ endif()
+
+-if(CMAKE_C_FLAGS MATCHES "-O" AND NOT CMAKE_C_FLAGS MATCHES "-O0" AND NOT MINGW)
+- add_definitions(-D_FORTIFY_SOURCE=2)
+-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")
+--- a/gstreamer-plugin/CMakeLists.txt
++++ b/gstreamer-plugin/CMakeLists.txt
+@@ -30,8 +30,7 @@ set(flags_to_test
+ -fstack-protector-strong
+ -fPIE
+ -fPIC
+- -flto
+- -D_FORTIFY_SOURCE=2)
++ -flto)
+ if(NOT MSVC)
+ list(INSERT flags_to_test 0 -Wall)
+ else()
+--- a/gstreamer-plugin/meson.build
++++ b/gstreamer-plugin/meson.build
+@@ -20,7 +20,6 @@ svtav1enc_dep = dependency('SvtAv1Enc')
+ cc = meson.get_compiler('c')
+ cc_flags = [
+ '-O2',
+- '-D_FORTIFY_SOURCE=2',
+ '-Wformat',
+ '-Wformat-security',
+ '-fPIE',
diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-1.5.0.ebuild
similarity index 95%
copy from media-libs/svt-av1/svt-av1-9999.ebuild
copy to media-libs/svt-av1/svt-av1-1.5.0.ebuild
index 03e68027a60a..01c83e30f392 100644
--- a/media-libs/svt-av1/svt-av1-9999.ebuild
+++ b/media-libs/svt-av1/svt-av1-1.5.0.ebuild
@@ -23,6 +23,10 @@ SLOT="0"
BDEPEND="amd64? ( dev-lang/yasm )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.0-fortify-no-override.patch
+)
+
multilib_src_configure() {
append-ldflags -Wl,-z,noexecstack
diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-9999.ebuild
index 03e68027a60a..01c83e30f392 100644
--- a/media-libs/svt-av1/svt-av1-9999.ebuild
+++ b/media-libs/svt-av1/svt-av1-9999.ebuild
@@ -23,6 +23,10 @@ SLOT="0"
BDEPEND="amd64? ( dev-lang/yasm )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.0-fortify-no-override.patch
+)
+
multilib_src_configure() {
append-ldflags -Wl,-z,noexecstack
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-31 7:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-21 23:23 [gentoo-commits] repo/gentoo:master commit in: media-libs/svt-av1/, media-libs/svt-av1/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-05-31 7:00 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox