From 32fd74ff390f063b2ddce45547feae776c3bb647 Mon Sep 17 00:00:00 2001 From: Gil Date: Sat, 18 Jan 2025 20:47:46 -0600 Subject: [PATCH] Feat (multimedia arches): i686 builds for FFMPEG deps (#3037) * Fix (multimedia arches): Commit this and pray it works because my local repo is cursed * Update anda.hcl Signed-off-by: Gil * Update anda.hcl Signed-off-by: Gil * Fix?: Try this Signed-off-by: Gil * Fix?: Export flags for arch Signed-off-by: Gil * Revert that, didn't help Signed-off-by: Gil * Trying something Signed-off-by: Gil * Not sure why %else failed but let's try this because it's better anyway Signed-off-by: Gil * I guess get rid of %else for now? Signed-off-by: Gil * It was %autosetup Signed-off-by: Gil * Macros are agony? Signed-off-by: Gil * That just broke patching and didn't help so don't do that!! Signed-off-by: Gil * Fix: Patch to not try to include AVX2 files for x86 * Fix (davs2): Disable NASM for i686 Signed-off-by: Gil * Fix: I've had it --------- Signed-off-by: Gil --- anda/lib/davs2/anda.hcl | 4 ++++ anda/lib/davs2/davs2.spec | 2 +- anda/lib/xavs/anda.hcl | 4 ++++ anda/lib/xavs/xavs.spec | 8 ++++---- anda/multimedia/kvazaar/anda.hcl | 4 ++++ anda/multimedia/uavs3d/anda.hcl | 5 ++++- anda/multimedia/uavs3d/i686-build-fix.patch | 14 ++++++++++++++ anda/multimedia/uavs3d/uavs3d.spec | 11 ++++++++--- anda/multimedia/vvenc/anda.hcl | 4 ++++ 9 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 anda/multimedia/uavs3d/i686-build-fix.patch diff --git a/anda/lib/davs2/anda.hcl b/anda/lib/davs2/anda.hcl index bcf66e55a0..6f70ad753d 100644 --- a/anda/lib/davs2/anda.hcl +++ b/anda/lib/davs2/anda.hcl @@ -1,5 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "davs2.spec" } + labels { + mock = 1 + } } diff --git a/anda/lib/davs2/davs2.spec b/anda/lib/davs2/davs2.spec index 8d91711d40..381a723a2f 100644 --- a/anda/lib/davs2/davs2.spec +++ b/anda/lib/davs2/davs2.spec @@ -55,7 +55,7 @@ cd build/linux %configure \ --bit-depth='8' \ --chroma-format='all' \ -%ifarch aarch64 +%ifarch aarch64 %ix86 --disable-asm \ %endif --disable-static \ diff --git a/anda/lib/xavs/anda.hcl b/anda/lib/xavs/anda.hcl index b360cf80c0..4a5ac3f4c3 100644 --- a/anda/lib/xavs/anda.hcl +++ b/anda/lib/xavs/anda.hcl @@ -1,5 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "xavs.spec" } + labels { + mock = 1 + } } diff --git a/anda/lib/xavs/xavs.spec b/anda/lib/xavs/xavs.spec index 74d860bafd..749d0f0b3a 100644 --- a/anda/lib/xavs/xavs.spec +++ b/anda/lib/xavs/xavs.spec @@ -4,14 +4,12 @@ Release: 1%{?dist} Summary: AVS1 (First-generation AVS Standards) library License: GPLv2 URL: http://xavs.sourceforge.net/ - -Source0: https://sourceforge.net/code-snapshots/svn/x/xa/xavs/code/xavs-code-r55-trunk.zip Patch0: %{name}-cflags.patch - BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc BuildRequires: libtool +BuildRequires: subversion #BuildRequires: yasm %description @@ -37,7 +35,9 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -p1 -n xavs-code-r55-trunk +svn co https://svn.code.sf.net/p/xavs/code/trunk %{name} +%setup -T -D -n %{name} +%autopatch -p1 %build %configure \ diff --git a/anda/multimedia/kvazaar/anda.hcl b/anda/multimedia/kvazaar/anda.hcl index a7bf5ac872..9001334d1b 100644 --- a/anda/multimedia/kvazaar/anda.hcl +++ b/anda/multimedia/kvazaar/anda.hcl @@ -1,5 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "kvazaar.spec" } + labels { + mock =1 + } } diff --git a/anda/multimedia/uavs3d/anda.hcl b/anda/multimedia/uavs3d/anda.hcl index d7beecea19..e74e92e8fc 100644 --- a/anda/multimedia/uavs3d/anda.hcl +++ b/anda/multimedia/uavs3d/anda.hcl @@ -1,6 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "uavs3d.spec" } - + labels { + mock =1 + } } diff --git a/anda/multimedia/uavs3d/i686-build-fix.patch b/anda/multimedia/uavs3d/i686-build-fix.patch new file mode 100644 index 0000000000..db49368886 --- /dev/null +++ b/anda/multimedia/uavs3d/i686-build-fix.patch @@ -0,0 +1,14 @@ +--- a/source/decoder/uavs3d.c ++++ b/source/decoder/uavs3d.c +@@ -1083,11 +1083,6 @@ + uavs3d_funs_init_arm64(); + #elif defined(ENABLE_FUNCTION_ARM32) + uavs3d_funs_init_armv7(); +-#elif defined(ENABLE_FUNCTION_X86) +- uavs3d_funs_init_sse(); +- if (uavs3d_simd_avx_level(NULL) >= 2) { +- uavs3d_funs_init_avx2(); +- } + #endif + + ctx->dec_cfg.frm_threads = COM_CLIP3(1, 32, ctx->dec_cfg.frm_threads); diff --git a/anda/multimedia/uavs3d/uavs3d.spec b/anda/multimedia/uavs3d/uavs3d.spec index 354e886acf..d392187261 100644 --- a/anda/multimedia/uavs3d/uavs3d.spec +++ b/anda/multimedia/uavs3d/uavs3d.spec @@ -11,6 +11,9 @@ URL: https://github.com/uavs3/uavs3d Source0: https://github.com/uavs3/uavs3d/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz Patch0: %{name}-soname.patch +%ifarch %ix86 +Patch1: i686-build-fix.patch +%endif BuildRequires: cmake >= 3.5 BuildRequires: gcc-c++ @@ -36,8 +39,10 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -p1 -n %{name}-%{commit0} -sed -i '/libdir/ s/"lib"/"%{_lib}"/' source/CMakeLists.txt +%autosetup -n %{name}-%{commit0} -p1 +%ifnarch %ix86 + sed -i '/libdir/ s/"lib"/"%{_lib}"/' source/CMakeLists.txt +%endif %build %cmake \ @@ -66,4 +71,4 @@ install -p -m 755 -D %{__cmake_builddir}/uavs3dec %{buildroot}%{_bindir}/uavs3de %{_libdir}/pkgconfig/%{name}.pc %changelog -%autochangelog \ No newline at end of file +%autochangelog diff --git a/anda/multimedia/vvenc/anda.hcl b/anda/multimedia/vvenc/anda.hcl index fc6364ebc2..ccbfbd4469 100644 --- a/anda/multimedia/vvenc/anda.hcl +++ b/anda/multimedia/vvenc/anda.hcl @@ -1,5 +1,9 @@ project pkg { + arches = ["x86_64", "aarch64", "i386"] rpm { spec = "vvenc.spec" } + labels { + mock = 1 + } }