From 162737ed946f9fe07d357bcaf1a2415a64654f32 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 4 Jul 2021 07:33:12 +0200
Subject: [PATCH] - rediffed

---
 avidemux-ffmpeg-make.patch |  8 ++++----
 avidemux-x32.patch         | 16 ++++++++++++----
 build.patch                | 10 +++++-----
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/avidemux-ffmpeg-make.patch b/avidemux-ffmpeg-make.patch
index a955eac..b18f873 100644
--- a/avidemux-ffmpeg-make.patch
+++ b/avidemux-ffmpeg-make.patch
@@ -1,7 +1,7 @@
---- avidemux_2.7.0/cmake/admFFmpegBuild_helpers.cmake.orig	2017-12-25 10:11:38.555601657 +0100
-+++ avidemux_2.7.0/cmake/admFFmpegBuild_helpers.cmake	2017-12-25 14:01:39.232110743 +0100
-@@ -304,7 +304,7 @@
-        SET(PARRALLEL "-j4") 
+--- avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake.orig	2021-07-04 06:51:39.736302112 +0200
++++ avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake	2021-07-04 06:52:57.587005044 +0200
+@@ -324,7 +324,7 @@ MACRO(ADM_FF_ADD_DUMMY_TARGET)
+        endif(NOT NPROC EQUAL 0)
      endif(NOT MSVC)
      add_custom_target(         libavutil_dummy ALL
 -                                       COMMAND ${CMAKE_BUILD_TOOL}  ${PARRALLEL} # We assume make or gnumake when host is unix
diff --git a/avidemux-x32.patch b/avidemux-x32.patch
index abf2a48..8bca04c 100644
--- a/avidemux-x32.patch
+++ b/avidemux-x32.patch
@@ -1,14 +1,22 @@
---- avidemux_2.6.10/cmake/admFFmpegBuild_helpers.cmake.orig	2015-10-19 20:07:00.923333350 +0200
-+++ avidemux_2.6.10/cmake/admFFmpegBuild_helpers.cmake	2015-10-19 20:34:06.114456242 +0200
-@@ -259,7 +259,7 @@
+--- avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake.orig	2021-07-04 06:48:04.541811758 +0200
++++ avidemux_2.7.8/cmake/admFFmpegBuild_helpers.cmake	2021-07-04 06:50:47.746939993 +0200
+@@ -286,14 +286,14 @@ MACRO(ADM_FF_BUILD_UNIX_STYLE)
  
      MESSAGE(STATUS "Configuring done, processing")
  
 -    if (ADM_CPU_X86)
 +    if (ADM_CPU_X86_X32 OR (ADM_CPU_X86_64 AND ADM_CPU_64BIT))
          file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H)
-         string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
+         string(REGEX MATCH "#define[ ]+HAVE_X86ASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
  
+         if (NOT FF_YASM)
+             message(FATAL_ERROR "Yasm was not found.")
+         endif (NOT FF_YASM)
+-    endif (ADM_CPU_X86)
++    endif ()
+ 
+     execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "libavutil"
+                     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/config")
 --- avidemux_2.6.10/cmake/admInstallDir.cmake.orig	2015-10-19 20:34:26.862201138 +0200
 +++ avidemux_2.6.10/cmake/admInstallDir.cmake	2015-10-19 21:15:45.397657233 +0200
 @@ -20,6 +20,8 @@
diff --git a/build.patch b/build.patch
index c5802fc..d2b5309 100644
--- a/build.patch
+++ b/build.patch
@@ -1,11 +1,11 @@
---- avidemux_2.6.4/bootStrap.bash~	2013-05-09 13:10:35.000000000 +0200
-+++ avidemux_2.6.4/bootStrap.bash	2013-08-29 11:56:46.570506339 +0200
-@@ -34,7 +34,7 @@
-         mkdir $BUILDDIR || fail mkdir
+--- avidemux_2.7.8/bootStrap.bash.orig	2021-07-04 06:43:32.054350981 +0200
++++ avidemux_2.7.8/bootStrap.bash	2021-07-04 06:47:47.764275240 +0200
+@@ -66,7 +66,7 @@ Process()
+         fi
          cd $BUILDDIR 
          cmake $COMPILER $PKG $FAKEROOT $QT_FLAVOR -DCMAKE_EDIT_COMMAND=vim $INSTALL_PREFIX $EXTRA $BUILD_QUIRKS $ASAN $DEBUG -G "$BUILDER" $SOURCEDIR || fail cmakeZ
 -        make  $PARAL >& /tmp/log$BUILDDIR || fail "make, result in /tmp/log$BUILDDIR"
-+        make  $PARAL || fail "make, result in /tmp/log$BUILDDIR"
++        make  $PARAL || fail "make"
  	if  [ "x$PKG" != "x" ] ; then
            $FAKEROOT_COMMAND make package DESTDIR=$FAKEROOT_DIR/tmp || fail package
  	fi
-- 
2.44.0