diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-08-30 16:29:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 16:29:26 -0700 |
| commit | 7272e81460c5121b87093967af4d6466ad5f490d (patch) | |
| tree | d0ea1ef1486f2040c4786e4cb26a5cb04f41c2e3 | |
| parent | a51b482c895f022aa92d91ed2fd3c38b84e2f062 (diff) | |
| parent | 059e1e487f5e3b31a0a445484545a78300425d4c (diff) | |
| download | vcpkg-7272e81460c5121b87093967af4d6466ad5f490d.tar.gz vcpkg-7272e81460c5121b87093967af4d6466ad5f490d.zip | |
Merge pull request #1736 from madebr/libmad_fix
Libmad: fix header include + no inline assembly
| -rw-r--r-- | ports/libmad/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/libmad/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/libmad/use_fpm_default.patch | 16 |
3 files changed, 22 insertions, 1 deletions
diff --git a/ports/libmad/CMakeLists.txt b/ports/libmad/CMakeLists.txt index 8e15017c0..522c0fbea 100644 --- a/ports/libmad/CMakeLists.txt +++ b/ports/libmad/CMakeLists.txt @@ -53,5 +53,5 @@ install( install( FILES mad.h - DESTINATION include/mad + DESTINATION include ) diff --git a/ports/libmad/portfile.cmake b/ports/libmad/portfile.cmake index d9e20ecb5..65b926d55 100644 --- a/ports/libmad/portfile.cmake +++ b/ports/libmad/portfile.cmake @@ -7,6 +7,11 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/use_fpm_default.patch" +) + #The archive only contains a Visual Studio 6.0 era DSP project file, so use a custom CMakeLists.txt file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/libmad/use_fpm_default.patch b/ports/libmad/use_fpm_default.patch new file mode 100644 index 000000000..f20c8265e --- /dev/null +++ b/ports/libmad/use_fpm_default.patch @@ -0,0 +1,16 @@ +--- mad.h 2004-01-23 10:36:03.000000000 +0100 ++++ mad.h 2017-08-12 16:03:38.060392600 +0200 +@@ -24,7 +24,7 @@ + extern "C" { + # endif + +-# define FPM_INTEL ++# define FPM_DEFAULT +--- msvc++/mad.h 2017-08-12 16:04:30.678146600 +0200 ++++ msvc++/mad.h 2017-08-12 16:04:00.779378000 +0200 +@@ -24,7 +24,7 @@ + extern "C" { + # endif + +-# define FPM_INTEL ++# define FPM_DEFAULT |