From 598233d72ebb3b899c9f3efd3c4cf79ea50a1ced Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sat, 26 Sep 2015 10:45:38 -0400
Subject: [PATCH] Restore nasm support for ffmpeg building.

---
 .travis.yml                  |  5 +++++
 CMake/Modules/Findnasm.cmake | 13 +++++++++++++
 StepmaniaCore.cmake          |  8 +++++---
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 CMake/Modules/Findnasm.cmake

diff --git a/.travis.yml b/.travis.yml
index d8bf599a8f..3db259496e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,11 @@ matrix:
                         - libxrandr-dev
                         - libglew-dev
 
+        -
+            env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=ON
+            compiler: clang
+            addons: *clang36
+
         -
             env: CXX_COMPILER=g++-5 CC_COMPILER=gcc-5 BUILD_TYPE=Release WITH_FFMPEG=OFF
             compiler: gcc
diff --git a/CMake/Modules/Findnasm.cmake b/CMake/Modules/Findnasm.cmake
new file mode 100644
index 0000000000..ae7271b060
--- /dev/null
+++ b/CMake/Modules/Findnasm.cmake
@@ -0,0 +1,13 @@
+# Try to find the nasm assembly program.
+
+include(FindPackageHandleStandardArgs)
+
+find_program(NASM_EXECUTABLE nasm
+  HINTS $ENV{NASM_ROOT} ${NASM_ROOT}
+  PATH_SUFFIXES bin
+)
+
+find_package_handle_standard_args(nasm DEFAULT_MSG NASM_EXECUTABLE)
+
+mark_as_advanced(NASM_EXECUTABLE)
+
diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake
index 863c2107eb..1d729e0ce7 100644
--- a/StepmaniaCore.cmake
+++ b/StepmaniaCore.cmake
@@ -212,6 +212,9 @@ if(WITH_OGG)
   endif()
 endif()
 
+find_package(nasm)
+find_package(yasm)
+
 if(WIN32)
   set(SYSTEM_PCRE_FOUND FALSE)
   find_package(DirectX REQUIRED)
@@ -367,9 +370,8 @@ elseif(LINUX)
     set(HAS_PTHREAD FALSE)
   endif()
 
-  find_package(yasm)
-  if (WITH_FFMPEG AND NOT YASM_FOUND)
-    message("YASM was not found. Please install if you wish for ffmpeg support.")
+  if (WITH_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.")
     set(WITH_FFMPEG OFF)
   endif()