From c24afa97a20600048a249eb74184031ee6b6de24 Mon Sep 17 00:00:00 2001
From: codicodi <rob.ceglinski@gmail.com>
Date: Thu, 9 Mar 2017 23:52:45 +0100
Subject: [flac] use nasm

---
 ports/libflac/CMakeLists.txt | 7 +++++++
 ports/libflac/CONTROL        | 2 +-
 ports/libflac/portfile.cmake | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ports/libflac/CMakeLists.txt b/ports/libflac/CMakeLists.txt
index 978de2889..a9f1afc5e 100644
--- a/ports/libflac/CMakeLists.txt
+++ b/ports/libflac/CMakeLists.txt
@@ -24,6 +24,13 @@ endif()
 
 if(LIBFLAC_ARCHITECTURE MATCHES x86)
     add_definitions(-DFLAC__CPU_IA32)
+    add_definitions(-DFLAC__HAS_NASM)
+    enable_language(ASM_NASM)
+    list(APPEND LIBFLAC_SOURCES
+        src/libFLAC/ia32/cpu_asm.nasm
+        src/libFLAC/ia32/fixed_asm.nasm
+        src/libFLAC/ia32/lpc_asm.nasm)
+    set(CMAKE_ASM_NASM_FLAGS "-i${PROJECT_SOURCE_DIR}/src/libFLAC/ia32/ -f win32 -d OBJ_FORMAT_win32")
 elseif(LIBFLAC_ARCHITECTURE MATCHES x64)
     add_definitions(-DFLAC__CPU_X86_64)
     add_definitions(-DENABLE_64_BIT_WORDS)
diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL
index 555cfc492..52878673d 100644
--- a/ports/libflac/CONTROL
+++ b/ports/libflac/CONTROL
@@ -1,4 +1,4 @@
 Source: libflac
-Version: 1.3.2
+Version: 1.3.2-1
 Description: Library for manipulating FLAC files
 Build-Depends: libogg
diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake
index 4bf66bfdf..cbf7d6fd3 100644
--- a/ports/libflac/portfile.cmake
+++ b/ports/libflac/portfile.cmake
@@ -12,6 +12,12 @@ vcpkg_download_distfile(ARCHIVE
 
 vcpkg_extract_source_archive(${ARCHIVE})
 
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+    vcpkg_find_acquire_program(NASM)
+    get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
+    set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}")
+endif()
+
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
-- 
cgit v1.2.3