[libsndfile]Fix install file path in linux. (#6455)

* [libsndfile]Fix install file path in linux.

* [libsndfile] Don't install HTML docs

3 files changed, 62 insertions, 10 deletions

diff --git a/ports/libsndfile/CONTROL b/ports/libsndfile/CONTROL
index d448f694c..d8de159b2 100644
--- a/ports/libsndfile/CONTROL
+++ b/ports/libsndfile/CONTROL
@@ -1,5 +1,5 @@
 Source: libsndfile
-Version: 1.0.29-6830c42-5
+Version: 1.0.29-6830c42-6
 Description: Library to read, write and manipulate many soundfile types. Authored by Eric de Castro Lopo
 Default-Features: external-libs
 
diff --git a/ports/libsndfile/fix-install-path.patch b/ports/libsndfile/fix-install-path.patch
new file mode 100644
index 000000000..38c6ff734
--- /dev/null
+++ b/ports/libsndfile/fix-install-path.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc35414..d629adf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -641,12 +641,12 @@ if (ENABLE_PACKAGE_CONFIG)
+ 		LibSndFileConfig.cmake
+ 		INSTALL_DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
+ 
+-	install(EXPORT LibSndFileTargets DESTINATION ${CMAKE_INSTALL_PACKAGEDIR})
++	install(EXPORT LibSndFileTargets DESTINATION share/libsndfile)
+ 	install(FILES
+ 				${CMAKE_CURRENT_BINARY_DIR}/LibSndFileConfig.cmake
+ 				${CMAKE_CURRENT_BINARY_DIR}/LibSndFileConfigVersion.cmake
+ 			DESTINATION
+-				${CMAKE_INSTALL_PACKAGEDIR})
++				share/libsndfile)
+ 
+ elseif (NOT ENABLE_PACKAGE_CONFIG)
+ 
+@@ -698,9 +698,9 @@ set (html_DATA
+ 	doc/embedded_files.html
+ 	doc/octave.html
+ 	doc/tutorial.html)
+-install (FILES ${html_DATA} DESTINATION ${CMAKE_INSTALL_DOCDIR})
++#install (FILES ${html_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/libsndfile)
+ 
+-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/sndfile.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++#install (FILES ${CMAKE_CURRENT_BINARY_DIR}/sndfile.pc DESTINATION share/libsndfile/pkgconfig)
+ 
+ #
+ # Testing
diff --git a/ports/libsndfile/portfile.cmake b/ports/libsndfile/portfile.cmake
index 1ba590fd7..7c103b6a2 100644
--- a/ports/libsndfile/portfile.cmake
+++ b/ports/libsndfile/portfile.cmake
@@ -7,8 +7,9 @@ vcpkg_from_github(
     SHA512 b13c5d7bc27218eff8a8c4ce89a964b4920b1d3946e4843e60be965d77ec205845750a82bf654a7c2c772bf3a24f6ff5706881b24ff12115f2525c8134b6d0b9
     HEAD_REF master
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/uwp-createfile-getfilesize-addendum.patch"
+        uwp-createfile-getfilesize.patch
+        uwp-createfile-getfilesize-addendum.patch
+        fix-install-path.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" CRT_LIB_STATIC)
@@ -25,15 +26,23 @@ endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DBUILD_EXAMPLES=0 -DBUILD_REGTEST=0 -DBUILD_TESTING=0 -DENABLE_STATIC_RUNTIME=${CRT_LIB_STATIC} -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DDISABLE_EXTERNAL_LIBS=${SNDFILE_WITHOUT_EXTERNAL_LIBS}
-    OPTIONS_RELEASE -DBUILD_PROGRAMS=${BUILD_EXECUTABLES}
-    # Setting ENABLE_PACKAGE_CONFIG=0 has no effect
-    OPTIONS_DEBUG -DBUILD_PROGRAMS=0
+    OPTIONS 
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_REGTEST=OFF
+        -DBUILD_TESTING=OFF
+        -DENABLE_BOW_DOCS=OFF
+        -DENABLE_STATIC_RUNTIME=${CRT_LIB_STATIC}
+        -DBUILD_STATIC_LIBS=${BUILD_STATIC}
+        -DDISABLE_EXTERNAL_LIBS=${SNDFILE_WITHOUT_EXTERNAL_LIBS}
+    OPTIONS_RELEASE
+        -DBUILD_PROGRAMS=${BUILD_EXECUTABLES}
+    OPTIONS_DEBUG
+        -DBUILD_PROGRAMS=0
 )
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/libsndfile)
 
 # Fix applied for 6830c421899e32f8d413a903a21a9b6cf384d369
 file(READ "${CURRENT_PACKAGES_DIR}/share/libsndfile/LibSndFileTargets.cmake" _contents)
@@ -44,11 +53,23 @@ vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc/libsndfile ${CURRENT_PACKAGES_DIR}/share/${PORT}/doc)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc)
 
+if(CMAKE_HOST_WIN32)
+    set(EXECUTABLE_SUFFIX ".exe")
+    set(SHARED_LIB_SUFFIX ".dll")
+else()
+    set(EXECUTABLE_SUFFIX)
+    set(SHARED_LIB_SUFFIX)
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/libsndfile-1${SHARED_LIB_SUFFIX})
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/libnsdfile-1${SHARED_LIB_SUFFIX})
+endif()
+
 if(BUILD_EXECUTABLES)
-    file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+    file(GLOB TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${EXECUTABLE_SUFFIX})
     file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
     file(REMOVE ${TOOLS})
     vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})