From a91030fcefd18eb02d9e6b18087a7fd35bb55c66 Mon Sep 17 00:00:00 2001 From: adam-bloom Date: Mon, 11 Jan 2021 19:43:28 -0700 Subject: [PATCH 1/2] [speexdsp] Configure and install speexdsp.pc --- ports/speexdsp/CMakeLists.txt | 13 +++++++++++++ ports/speexdsp/CONTROL | 2 +- ports/speexdsp/portfile.cmake | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ports/speexdsp/CMakeLists.txt b/ports/speexdsp/CMakeLists.txt index 4f5abea48cf876..6d9658916aa3e8 100644 --- a/ports/speexdsp/CMakeLists.txt +++ b/ports/speexdsp/CMakeLists.txt @@ -101,6 +101,19 @@ set_target_properties(speexdsp PROPERTIES PUBLIC_HEADER "${LIBSPEEXDSP_HEADERS_P set_target_properties(speexdsp PROPERTIES VERSION "${LIBSPEEXDSP_VERSION}") set_target_properties(speexdsp PROPERTIES SOVERSION "${LIBSPEEXDSP_SOVERSION}") +# pkgconfig file +set(prefix "${CMAKE_INSTALL_PREFIX}") +set(exec_prefix \${prefix}) +SET(bindir \${exec_prefix}/${CMAKE_INSTALL_BINDIR}) +SET(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) +SET(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) +if(CMAKE_SYSTEM_NAME MATCHES BSD) + set(PKG_CONFIG_RPATH "-Wl,-R\${libdir}") +endif(CMAKE_SYSTEM_NAME MATCHES BSD) +set(PACKAGE_VERSION "${LIBSPEEXDSP_VERSION}") +configure_file(speexdsp.pc.in speexdsp.pc @ONLY) +install(FILES ${PROJECT_BINARY_DIR}/speexdsp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(TARGETS speexdsp ARCHIVE DESTINATION "lib" RUNTIME DESTINATION "bin" diff --git a/ports/speexdsp/CONTROL b/ports/speexdsp/CONTROL index 59ba0f4c0f8744..6398984b09c247 100644 --- a/ports/speexdsp/CONTROL +++ b/ports/speexdsp/CONTROL @@ -1,6 +1,6 @@ Source: speexdsp Version: 1.2.0 -Port-Version: 4 +Port-Version: 5 Homepage: https://speex.org/ Description: A patent-free, Open Source/Free Software DSP library. Build-Depends: diff --git a/ports/speexdsp/portfile.cmake b/ports/speexdsp/portfile.cmake index 429b2f21398ea4..445bc2aca21804 100644 --- a/ports/speexdsp/portfile.cmake +++ b/ports/speexdsp/portfile.cmake @@ -41,6 +41,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") From 96e659707f66421cbd2a1de3afd4190e6b5fa388 Mon Sep 17 00:00:00 2001 From: adam-bloom Date: Tue, 12 Jan 2021 09:02:45 -0700 Subject: [PATCH 2/2] remove blank 'Build-Depends' field --- ports/speexdsp/CONTROL | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/speexdsp/CONTROL b/ports/speexdsp/CONTROL index 6398984b09c247..89d842c471a7e8 100644 --- a/ports/speexdsp/CONTROL +++ b/ports/speexdsp/CONTROL @@ -3,4 +3,3 @@ Version: 1.2.0 Port-Version: 5 Homepage: https://speex.org/ Description: A patent-free, Open Source/Free Software DSP library. -Build-Depends: