commit 958514824cd0bb2bf74e328cea9c4016a8d97f44
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sun Aug 22 15:33:52 2021 +0200
Fix ARM builds
xpra-codecs-freeworld.spec | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 5e394ec..ce4d717 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -1,6 +1,11 @@
%bcond_without enc_x264
+%ifnarch %{arm}
%bcond_without dec_avcodec2
%bcond_without csc_swscale
+%else
+%bcond_with dec_avcodec2
+%bcond_with csc_swscale
+%endif
# For debugging only
%bcond_with debug
@@ -49,6 +54,7 @@ BuildRequires: xorg-x11-drv-dummy
BuildRequires: xorg-x11-xauth
BuildRequires: xkbcomp, setxkbmap
BuildRequires: pandoc
+BuildRequires: ffmpeg-devel
%if %{with debug}
BuildRequires: libasan
%endif
@@ -56,9 +62,6 @@ BuildRequires: libasan
%if %{with enc_x264}
BuildRequires: x264-devel
%endif
-%if %{with dec_avcodec2} || %{with csc_swscale}
-BuildRequires: ffmpeg-devel
-%endif
Requires: xpra%{?_isa} = %{version}
Requires: gstreamer1-plugins-ugly%{?_isa}
@@ -104,7 +107,10 @@ cp -pr \
%if %{with enc_x264}
enc_x264 \
%endif
- libav_common enc_ffmpeg enc_x265 %{buildroot}%{python3_sitearch}/xpra/codecs/
+%ifnarch %{arm}
+ libav_common \
+%endif
+ enc_ffmpeg enc_x265 %{buildroot}%{python3_sitearch}/xpra/codecs/
popd
#fix shebangs from python3_sitearch
Show replies by date