From 84831eb4258f9b25a3fc1d91c46ba06d1f9278d2 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 19 Apr 2023 13:13:01 +0200 Subject: [PATCH] portsmf, fix installation paths (#8445) --- .../portsmf/patches/portsmf-239.patchset | 22 +++++++++++++++++++ media-libs/portsmf/portsmf-239.recipe | 12 +++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 media-libs/portsmf/patches/portsmf-239.patchset diff --git a/media-libs/portsmf/patches/portsmf-239.patchset b/media-libs/portsmf/patches/portsmf-239.patchset new file mode 100644 index 000000000..6ee21df71 --- /dev/null +++ b/media-libs/portsmf/patches/portsmf-239.patchset @@ -0,0 +1,22 @@ +From 77f3e0e26d322a00ffe06b00f57158810b690d85 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Wed, 19 Apr 2023 13:05:52 +0200 +Subject: Fix PORTSMF_INSTALL_CMAKEDIR + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index defe5f6..463e86e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,7 +64,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packaging/portSMF.pc.in + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/packaging/portSMF.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + + # CMake config +-set(PORTSMF_INSTALL_CMAKEDIR "lib/cmake/PortSMF") ++set(PORTSMF_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/PortSMF") + install( + EXPORT PortSMFTargets + FILE PortSMFTargets.cmake +-- +2.37.3 + diff --git a/media-libs/portsmf/portsmf-239.recipe b/media-libs/portsmf/portsmf-239.recipe index cd07c4ab0..68862234e 100644 --- a/media-libs/portsmf/portsmf-239.recipe +++ b/media-libs/portsmf/portsmf-239.recipe @@ -8,6 +8,7 @@ REVISION="2" SOURCE_URI="https://codeberg.org/tenacityteam/portsmf/archive/$portVersion.tar.gz" CHECKSUM_SHA256="fe7aee61453e398aa360608fe34bc26a6af612bce987cdacbc0fc40b18e01d58" SOURCE_DIR="portsmf" +PATCHES="portsmf-$portVersion.patchset" libVersion="1.0.236" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" @@ -17,7 +18,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" portsmf$secondaryArchSuffix = $portVersion - lib:libportsmf$secondaryArchSuffix = $libVersionCompat + lib:libportSMF$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -25,7 +26,7 @@ REQUIRES=" PROVIDES_devel=" portsmf${secondaryArchSuffix}_devel = $portVersion - devel:libportsmf$secondaryArchSuffix = $libVersionCompat + devel:libportSMF$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" portsmf$secondaryArchSuffix == $portVersion base @@ -54,6 +55,11 @@ BUILD() INSTALL() { cmake --install build + + prepareInstalledDevelLib libportSMF fixPkgconfig - packageEntries devel $developDir + + packageEntries devel \ + $developDir \ + $libDir/cmake }