From nobody Thu Apr 18 22:40:09 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VLCQd5TZyz5HDmK; Thu, 18 Apr 2024 22:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VLCQd508Lz4fWd; Thu, 18 Apr 2024 22:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713480009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m7jageXAv0WrAaAYJ2z4hZJhiLYdERKMbP0+OZjqpB4=; b=O5BDcYYuRwkAwmuvq8/jXPHIjdP6vktdj0gJ8HANRgnD6ZIQtfxgV2wf4xU5f+8PVirgx7 vvJ72w1QFVwXjyE2qDFvDRMuPk9B9klODKSA5Ry9NrUIZMs7GHXUbK9HEVaKay3EOk7KNA SvfzW/oY0y20mSyqyT7ojilWuvLvnmGUXCLqWuRxVvouT0kfMTvG+BxJinnj9jfjdFyTSt LqYeiDTeWX7WC6O1AD9/oYFMTKw2mp44vxP/NXa/TXEk4W5l3nNNobhKSCFAW4ssGSSEHL kfGymWmKBJGxIxWZa0mH9Y+mp2LQWkkc1PWEd/AvunFlCAhUW8TNhpUVOdbEXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713480009; a=rsa-sha256; cv=none; b=LIGNCPmdov1JW4ZG4TtzDsraa8LHSum+sIhPZfWCM4OipE37WYN6H9p6Qw3g7rkTn32Qqu 8L8EkckgAjoQLU02nTtkSm3iXhmsG8R9X+vanu3hcBKJIn0KGoWl+MtPwqangNXlpx1yBZ ackCzOUPn8Xcqv2bGpjAcwr5MoDurwP01NkZyLki5FMYljO0MXospKYMHssaTzHWMJ6NmX mfqntd2iRSclj3eCUR4vr7XIOQheT8ry160rNgcOw9tiV3SeRziGDytnozOWDDGsEcY3Lk lNb4vPIXvlCvxGuxAUSrT8Uomcc6v74GSIRD0xdSfu8/4/YbGt7Dtjtu9e3sMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713480009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m7jageXAv0WrAaAYJ2z4hZJhiLYdERKMbP0+OZjqpB4=; b=q766i0ssgn3ZsxFvchq5sDXagwuMhkrRJw+slIbIb/L8KaPHDXU4IM2kFqhf1azSt8hdKE BBXVY4uKhPnNiQR1RncxC3Ab3lOtEHYhtEvlBF4KxGMom5BABQwJvIprLQChdprn90wJHp 9pGBgUuFG2nHKwU2Y1OJ54PRhCckJZ4sgH4mu8/5yV2C8H+X7ZgRA/8SrR362D966i1bjG GqFuHuRUSp11Iwv185RhUcbmQCS4oDeeKgzSuWmNTZYZqRdFwpIB8/luGS8oanCE8AoF38 doIxWQPDJR9u3bM20bxHbVw1kGyXMHTsyZUqtuQmHcm/Se2OyKWcj5T0CaWZgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VLCQd4cDNzSW7; Thu, 18 Apr 2024 22:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43IMe9wn064956; Thu, 18 Apr 2024 22:40:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IMe9tU064948; Thu, 18 Apr 2024 22:40:09 GMT (envelope-from git) Date: Thu, 18 Apr 2024 22:40:09 GMT Message-Id: <202404182240.43IMe9tU064948@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 911d705637c1 - main - audio/liblscp: Fix reported version and pathfix List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 911d705637c1980bf4c30485fa3468fcf45a4b94 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=911d705637c1980bf4c30485fa3468fcf45a4b94 commit 911d705637c1980bf4c30485fa3468fcf45a4b94 Author: Daniel Engberg AuthorDate: 2024-04-18 22:36:39 +0000 Commit: Daniel Engberg CommitDate: 2024-04-18 22:40:00 +0000 audio/liblscp: Fix reported version and pathfix 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 --- audio/liblscp/Makefile | 3 ++- audio/liblscp/files/patch-CMakeLists.txt | 20 ++++++++++++++++++++ audio/liblscp/files/patch-src_CMakeLists.txt | 10 ++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/audio/liblscp/Makefile b/audio/liblscp/Makefile index 147c19fe0666..c013455054c8 100644 --- a/audio/liblscp/Makefile +++ b/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/ @@ -11,7 +12,7 @@ WWW= https://www.linuxsampler.org/ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake pathfix +USES= cmake USE_LDCONFIG= yes .include diff --git a/audio/liblscp/files/patch-CMakeLists.txt b/audio/liblscp/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..013410fa5e95 --- /dev/null +++ b/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}") diff --git a/audio/liblscp/files/patch-src_CMakeLists.txt b/audio/liblscp/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..c4d182f40363 --- /dev/null +++ b/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) + +