Skip to content

Commit

Permalink
audio/liblscp: Fix reported version and pathfix
Browse files Browse the repository at this point in the history
The CMake file runs git to determine versioning data however
since we don't import a git repo it fails to work as intended
While at it fix install path of .pc file as USES= pathfix doesn't
cover the logic used in this project
  • Loading branch information
Daniel Engberg authored and Daniel Engberg committed Apr 18, 2024
1 parent 441dae7 commit 911d705
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
3 changes: 2 additions & 1 deletion audio/liblscp/Makefile
@@ -1,5 +1,6 @@
PORTNAME= liblscp
DISTVERSION= 0.9.12
PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= SF/qsampler/${PORTNAME}/${DISTVERSION} \
http://download.linuxsampler.org/packages/
Expand All @@ -11,7 +12,7 @@ WWW= https://www.linuxsampler.org/
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/LICENSE

USES= cmake pathfix
USES= cmake
USE_LDCONFIG= yes

.include <bsd.port.mk>
20 changes: 20 additions & 0 deletions audio/liblscp/files/patch-CMakeLists.txt
@@ -0,0 +1,20 @@
--- CMakeLists.txt.orig 2024-04-18 22:33:21 UTC
+++ CMakeLists.txt
@@ -9,7 +9,7 @@ set (PROJECT_DOMAIN "linuxsampler.org")
set (PROJECT_COPYRIGHT "Copyright (C) 2004-2024, rncbc aka Rui Nuno Capela. All rights reserved.")
set (PROJECT_DOMAIN "linuxsampler.org")

-execute_process (
+#[[ execute_process (
COMMAND git describe --tags --dirty --abbrev=6
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
@@ -32,7 +32,7 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
set (GIT_VERSION "${GIT_VERSION} [${GIT_REVPARSE_OUTPUT}]")
endif ()
set (PROJECT_VERSION "${GIT_VERSION}")
-endif ()
+endif () ]]


set (CONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}")
10 changes: 10 additions & 0 deletions audio/liblscp/files/patch-src_CMakeLists.txt
@@ -0,0 +1,10 @@
--- src/CMakeLists.txt.orig 2024-04-18 22:33:51 UTC
+++ src/CMakeLists.txt
@@ -62,6 +62,6 @@ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/lscp.pc
DESTINATION ${CONFIG_INCLUDEDIR}/lscp)

install (FILES ${CMAKE_CURRENT_BINARY_DIR}/lscp.pc
- DESTINATION ${CONFIG_LIBDIR}/pkgconfig)
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)


0 comments on commit 911d705

Please sign in to comment.