commit b780c90a987bc3c8bd7acc3ff424b2f78798594c Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net&gt; Date: Wed Nov 27 10:52:29 2019 +0100 fix build on non-x86 (without nasm) HandBrake-no-nasm.patch | 12 ++++++++++++ HandBrake.spec | 4 ++++ 2 files changed, 16 insertions(+) --- diff --git a/HandBrake-no-nasm.patch b/HandBrake-no-nasm.patch new file mode 100644 index 0000000..41cbc21 --- /dev/null +++ b/HandBrake-no-nasm.patch @@ -0,0 +1,12 @@ +diff -up HandBrake-1.3.0/make/configure.py.orig HandBrake-1.3.0/make/configure.py +--- HandBrake-1.3.0/make/configure.py.orig 2019-11-09 21:44:32.000000000 +0100 ++++ HandBrake-1.3.0/make/configure.py 2019-11-27 10:47:07.605968329 +0100 +@@ -1609,7 +1609,7 @@ try: + pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkgconfig', 'pkg-config', abort=True, minversion=[0,29,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 (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 1916a9d..bd9aa54 100644 --- a/HandBrake.spec +++ b/HandBrake.spec @@ -45,6 +45,8 @@ Patch3: %{name}-nostrip.patch Patch4: %{name}-no-libva.patch # Fix QSV with unpatched system FFmpeg Patch5: %{name}-qsv.patch +# Fix build on non-x86 (without nasm) +Patch6: %{name}-no-nasm.patch BuildRequires: a52dec-devel >= 0.7.4 BuildRequires: cmake3 @@ -146,6 +148,7 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0} %else %patch5 -p1 %endif +%patch6 -p1 mkdir -p download %{?_without_ffmpeg:cp -p %{SOURCE10} download} @@ -250,6 +253,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - New dependencies: libdav1d, libdrm, libva, numactl - dropped dependencies: yasm - fixes rfbz#5426 +- fix build on non-x86 (without nasm) * Fri Nov 15 2019 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net&gt; - 1.2.2-7 - rebuild for libdvdread ABI bump