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 <rockgrub@protonmail.com>

* Update anda.hcl

Signed-off-by: Gil <rockgrub@protonmail.com>

* Fix?: Try this

Signed-off-by: Gil <rockgrub@protonmail.com>

* Fix?: Export flags for arch

Signed-off-by: Gil <rockgrub@protonmail.com>

* Revert that, didn't help

Signed-off-by: Gil <rockgrub@protonmail.com>

* Trying something

Signed-off-by: Gil <rockgrub@protonmail.com>

* Not sure why %else failed but let's try this because it's better anyway

Signed-off-by: Gil <rockgrub@protonmail.com>

* I guess get rid of %else for now?

Signed-off-by: Gil <rockgrub@protonmail.com>

* It was %autosetup

Signed-off-by: Gil <rockgrub@protonmail.com>

* Macros are agony?

Signed-off-by: Gil <rockgrub@protonmail.com>

* That just broke patching and didn't help so don't do that!!

Signed-off-by: Gil <rockgrub@protonmail.com>

* Fix: Patch to not try to include AVX2 files for x86

* Fix (davs2): Disable NASM for i686

Signed-off-by: Gil <rockgrub@protonmail.com>

* Fix: I've had it

---------

Signed-off-by: Gil <rockgrub@protonmail.com>
This commit is contained in:
Gil
2025-01-18 20:47:46 -06:00
committed by GitHub
parent 53005d54b1
commit 32fd74ff39
9 changed files with 47 additions and 9 deletions
+4
View File
@@ -1,5 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "davs2.spec"
}
labels {
mock = 1
}
}
+1 -1
View File
@@ -55,7 +55,7 @@ cd build/linux
%configure \
--bit-depth='8' \
--chroma-format='all' \
%ifarch aarch64
%ifarch aarch64 %ix86
--disable-asm \
%endif
--disable-static \
+4
View File
@@ -1,5 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "xavs.spec"
}
labels {
mock = 1
}
}
+4 -4
View File
@@ -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 \
+4
View File
@@ -1,5 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "kvazaar.spec"
}
labels {
mock =1
}
}
+4 -1
View File
@@ -1,6 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "uavs3d.spec"
}
labels {
mock =1
}
}
@@ -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);
+8 -3
View File
@@ -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
%autochangelog
+4
View File
@@ -1,5 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "vvenc.spec"
}
labels {
mock = 1
}
}