summarylogtreecommitdiffstats
path: root/0001-Don-t-require-assembler-for-system-FFmpeg.patch
blob: 5db433e3c8ba99417d18878599ac753393e78e46 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
From b5ba7e1986a8dd921a5f65ce9408157cffe71a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <mkroening@posteo.net>
Date: Sun, 14 Jun 2020 14:03:37 +0200
Subject: [PATCH 1/2] Don't require assembler for system FFmpeg

---
 StepmaniaCore.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake
index dcab93cef0..fdccda5172 100644
--- a/StepmaniaCore.cmake
+++ b/StepmaniaCore.cmake
@@ -443,7 +443,7 @@ elseif(LINUX)
       )
   endif()
 
-  if(WITH_FFMPEG AND NOT YASM_FOUND AND NOT NASM_FOUND)
+  if(WITH_FFMPEG AND NOT WITH_SYSTEM_FFMPEG AND NOT YASM_FOUND AND NOT NASM_FOUND)
     message(
       "Neither NASM nor YASM were found. Please install at least one of them if you wish for ffmpeg support."
       )
-- 
2.27.0