1:58 p.m.
commit 8f20a1e010905e73b0284d29b1a13fd5a71089b8
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Jan 6 23:55:36 2023 +0100
restore building on non-x86_64 (see
https://bugzilla.redhat.com/show_bug.cgi?id=2158920)
HandBrake-no-nasm.patch | 12 ++++++++++++
HandBrake.spec | 15 +++++++++------
2 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/HandBrake-no-nasm.patch b/HandBrake-no-nasm.patch
new file mode 100644
index 0000000..8e1cac7
--- /dev/null
+++ b/HandBrake-no-nasm.patch
@@ -0,0 +1,12 @@
+diff -up HandBrake-1.6.0/make/configure.py.orig HandBrake-1.6.0/make/configure.py
+--- HandBrake-1.6.0/make/configure.py.orig 2022-12-28 09:43:46.000000000 +0100
++++ HandBrake-1.6.0/make/configure.py 2023-01-06 23:39:40.041593595 +0100
+@@ -1665,7 +1665,7 @@ try:
+ lipo = ToolProbe( 'LIPO.exe', 'lipo',
'lipo', abort=False )
+ pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkgconfig',
'pkg-config', abort=True, minversion=[0,27,0] )
+ meson = ToolProbe( 'MESON.exe', 'meson',
'meson', abort=True, minversion=[0,47,0] )
+- nasm = ToolProbe( 'NASM.exe', 'asm',
'nasm', abort=True, minversion=[2,13,0] )
++ nasm = ToolProbe( 'NASM.exe', 'asm',
'nasm', abort=False, minversion=[2,13,0] )
+ ninja = ToolProbe( 'NINJA.exe', 'ninja',
'ninja-build', 'ninja', abort=True )
+
+ xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild',
'xcodebuild', abort=(True if (not xcode_opts['disabled'] and
(build_tuple.match('*-*-darwin*') and cross is None)) else False),
versionopt='-version', minversion=[10,3,0] )
diff --git a/HandBrake.spec b/HandBrake.spec
index f24dd06..a12929b 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -18,7 +18,7 @@
Name: HandBrake
Version: 1.6.0
-Release: 1%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Release: 2%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: https://handbrake.fr/
@@ -29,6 +29,8 @@ Source1:
https://github.com/%{name}/%{name}/releases/download/%{version}/
# import from https://handbrake.fr/openpgp.php or
https://github.com/HandBrake/HandBrake/wiki/OpenPGP
# gpg2 --export --export-options export-minimal 1629C061B3DDE7EB4AE34B81021DB8B44E4A8645
> gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg
Source2: gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg
+# Fix build on non-x86 (without nasm)
+Patch6: %{name}-no-nasm.patch
BuildRequires: gnupg2
%else
Source0:
https://github.com/%{name}/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{s...
@@ -88,7 +90,9 @@ BuildRequires: libvorbis-devel
BuildRequires: libvpx-devel >= 1.3
BuildRequires: make
BuildRequires: meson
+%if 0%{?_with_asm:1}
BuildRequires: nasm
+%endif
BuildRequires: numactl-devel
BuildRequires: nv-codec-headers
BuildRequires: opus-devel
@@ -107,9 +111,6 @@ Obsoletes: HandBrake-cli < %{version}-%{release}
Provides: HandBrake-cli = %{version}-%{release}
Provides: handbrake = %{version}-%{release}
-# svt-av1 is x86_64 only
-ExclusiveArch: x86_64
-
%description
%{name} is a general-purpose, free, open-source, cross-platform, multithreaded
video transcoder software application. It can process most common multimedia
@@ -144,6 +145,7 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%if 0%{!?_with_vpl}
%patch4 -p1
%endif
+%patch6 -p1
%patch9 -p1
%patch11 -p1
@@ -185,9 +187,7 @@ echo "GCC.args.g.none = " >> custom.defs
--disable-gtk-update-checks \
%{?_with_asm:--enable-asm} \
--enable-x265 \
-%ifarch %{arm}
--disable-numa \
-%endif
%{?_with_fdk:--enable-fdk-aac} \
%{?_with_vpl:--enable-qsv}
@@ -225,6 +225,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/%{desktop_id}.
%{_bindir}/HandBrakeCLI
%changelog
+* Fri Jan 06 2023 Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> -
1.6.0-2
+- restore building on non-x86_64 (see
https://bugzilla.redhat.com/show_bug.cgi?id=2158920)
+
* Thu Jan 05 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.6.0-1
- Updated to version 1.6.0.
- Switched to intel-mediasdk-devel and oneVPL-devel as required by upstream.