From fe6d09b4427f1429165c2cfaa395e511288597cd Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 14 Jan 2020 23:17:43 +1000
Subject: [PATCH] Avidemux: disable all assembler optimizations

---
 media-video/avidemux/avidemux-2.7.4.recipe    |  2 +-
 .../avidemux/patches/avidemux-2.7.4.patchset  | 74 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/media-video/avidemux/avidemux-2.7.4.recipe b/media-video/avidemux/avidemux-2.7.4.recipe
index 41e6549e0..b8859d999 100644
--- a/media-video/avidemux/avidemux-2.7.4.recipe
+++ b/media-video/avidemux/avidemux-2.7.4.recipe
@@ -6,7 +6,7 @@ can be automated using projects, job queue and powerful scripting capabilities."
 HOMEPAGE="http://fixounet.free.fr/avidemux/"
 COPYRIGHT="2001–2019 Mean"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://sourceforge.net/projects/avidemux/files/avidemux/$portVersion/avidemux_$portVersion.tar.gz"
 CHECKSUM_SHA256="7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9"
 SOURCE_DIR="avidemux_$portVersion"
diff --git a/media-video/avidemux/patches/avidemux-2.7.4.patchset b/media-video/avidemux/patches/avidemux-2.7.4.patchset
index 75d9b6cf4..28b9f5251 100644
--- a/media-video/avidemux/patches/avidemux-2.7.4.patchset
+++ b/media-video/avidemux/patches/avidemux-2.7.4.patchset
@@ -1,4 +1,4 @@
-From ecab6d95f989b236bbc58c2479028228c15a1f72 Mon Sep 17 00:00:00 2001
+From 8f383b7b46dcf51c5adde690d598b074395c9488 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 13 Oct 2019 11:22:36 +1000
 Subject: Fix build for Haiku
@@ -849,5 +849,75 @@ index 00304cf..07077fa 100644
     return 0;
  }
 -- 
-2.23.0
+2.24.1
+
+
+From b98aa78389f1a85395613400481a93ed52f514cd Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Tue, 14 Jan 2020 22:46:29 +1000
+Subject: Disable asm for ffmpeg
+
+
+diff --git a/cmake/admFFmpegBuild.cmake.original b/cmake/admFFmpegBuild.cmake.original
+index 43a135c..99da224 100644
+--- a/cmake/admFFmpegBuild.cmake.original
++++ b/cmake/admFFmpegBuild.cmake.original
+@@ -30,7 +30,7 @@ set(FFMPEG_PARSERS  ac3  h263  h264  hevc  mpeg4video)
+ set(FFMPEG_PROTOCOLS  file)
+ set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc)
+ xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl")
+-xadd("--enable-runtime-cpudetect --disable-network ")
++xadd("--disable-runtime-cpudetect --disable-asm --disable-network")
+ xadd("--enable-swscale --disable-swresample")
+ xadd("--disable-doc --disable-programs")
+ 
+@@ -286,7 +286,7 @@ if (FFMPEG_PERFORM_BUILD)
+ 
+ 	MESSAGE(STATUS "Configuring done, processing")
+ 
+-	if (ADM_CPU_X86)
++	if (ADM_CPU_X86 AND NOT HAIKU)
+ 		file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H)
+ 		string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
+ 
+diff --git a/cmake/admFFmpegBuild_helpers.cmake b/cmake/admFFmpegBuild_helpers.cmake
+index 2c984cb..5851f0f 100644
+--- a/cmake/admFFmpegBuild_helpers.cmake
++++ b/cmake/admFFmpegBuild_helpers.cmake
+@@ -36,7 +36,7 @@ set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc)
+ #
+ MACRO(ADM_FF_SET_DEFAULT)
+     xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl")
+-    xadd("--enable-runtime-cpudetect --disable-network ")
++    xadd("--disable-runtime-cpudetect --disable-asm --disable-network ")
+     xadd("--enable-swscale --disable-swresample")
+     xadd("--disable-doc --disable-programs")
+ 
+@@ -278,7 +278,7 @@ MACRO(ADM_FF_BUILD_UNIX_STYLE)
+ 
+     MESSAGE(STATUS "Configuring done, processing")
+ 
+-    if (ADM_CPU_X86)
++    if (ADM_CPU_X86 AND NOT HAIKU)
+         file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H)
+         string(REGEX MATCH "#define[ ]+HAVE_X86ASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
+ 
+diff --git a/cmake/admFFmpegBuild_native.cmake b/cmake/admFFmpegBuild_native.cmake
+index 77848ca..708bba2 100644
+--- a/cmake/admFFmpegBuild_native.cmake
++++ b/cmake/admFFmpegBuild_native.cmake
+@@ -40,6 +40,11 @@ if (USE_VIDEOTOOLBOX)
+     set(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} h264_videotoolbox)
+ endif (USE_VIDEOTOOLBOX)
+ 
++if (HAIKU)
++	xadd(--disable-runtime-cpudetect)
++	xadd(--disable-asm)
++endif (HAIKU)
++
+ #@@
+ ADM_FF_ADD_OPTIONS()
+ 
+-- 
+2.24.1