From nobody Thu May 26 00:19:01 2022 X-Original-To: dev-commits-ports-all@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 6A2641AE2F89; Thu, 26 May 2022 00:19:02 +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 4L7pT21Q9Wz4kq7; Thu, 26 May 2022 00:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653524342; 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=3n0ylINC33EcSrAYc0pqrbvt0U7MEtiaz6QsTKu7KsA=; b=V8kf08cEQls+z5XC+F+6bDr7wJB0BjpTiqt9MAlikwll4fpEh24pAi7MFu5Pl9CI88NLo5 RbhHJ69n1cj6b6a51QWBdRJOxDPL5xS347AZhqPdFQw6S9lyV2hszRbjkeKoUZnoIlFxgg Sl8ydGFY4oIUINulPLjFnHSxJ057WznOdWEkjiIakq9zPdAp70zj3p8Ts5bCf/wstpdGoG gIRjvLVr60fKBJgLG94eNweWTBP7d0BjAcW8j/SdWrPgrp4sD+x4VQdas/4Mbk7KtnkbmO Pqr81SAmDEa5nEr9jD25HsPeZvkO9YMw1oeeqxOt3rRM506LXDnW6bAi3jiE7g== 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 D56E22369A; Thu, 26 May 2022 00:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24Q0J1H6048105; Thu, 26 May 2022 00:19:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24Q0J1ue048104; Thu, 26 May 2022 00:19:01 GMT (envelope-from git) Date: Thu, 26 May 2022 00:19:01 GMT Message-Id: <202205260019.24Q0J1ue048104@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 6feabdb17d47 - main - audio/lmms: fix pkg-plist on non-{amd64,i386} List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6feabdb17d4737f5b28ce8231b1b64d6d2177988 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653524342; 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=3n0ylINC33EcSrAYc0pqrbvt0U7MEtiaz6QsTKu7KsA=; b=WNGQZH6w51LnqC4+dDKYsRNshyECl0sv3Gp3U8mZGipmeKYbR66OMoyxtgb76iYzYXsVED r1/cQH6/yqaLThWrij2BeEuD/KKSSecjWa92dsPa4I+vTmi2a+p5a4ogWVJ2akW4l9+XRx rpVhNBi3s5yH+U6McR8hlqHOOBmT9DmjcZjo5I9JNbJ1RMRuf7xEuBJxag5V+oNnROhec0 4ENbD4fO/A7TqSACyIMNTXgU9vK0d4sxHSL3lIaBCbnu8igkpKh3iJhvIL/KMuGlgHjZGf cgWUKV/fDtnAX5MH4KK+nvg0bmGJUmvVLeSDhjlCRmHPckaxzZRZ+WauL7N8BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653524342; a=rsa-sha256; cv=none; b=b6GNq0CfgjqkwS3V6X6uMbuVGziIcUbhkVEDRIAJACG8lZs0GDyJwJie3Lz2wiMqW7sn79 W0zfircxFcuHzAHHhww4cuZKBw0zp5aqFtoH6Ei4xrxANzJZP52U0fYgogOD3YliaFEq0C SvWawAo76X5hz99mqdRgLy89CwgJ0tMCkvxDdRWIlFQ3QAMkaBKwPaZZpNVaJ+BsDoANlm b4CMRCyozwszR0eOUzp//F2ckT7TVv27SvPgCEjWB9k/tkOzc5pdn2UcWdu5VVu2A3buzX U9sqq1jQqUlvFlIuzuNX5SzX8uHMEnXaPKUANCZveWmbhuy5itz7rufmcqAXfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=6feabdb17d4737f5b28ce8231b1b64d6d2177988 commit 6feabdb17d4737f5b28ce8231b1b64d6d2177988 Author: Piotr Kubaj AuthorDate: 2022-05-26 00:07:23 +0000 Commit: Piotr Kubaj CommitDate: 2022-05-26 00:07:23 +0000 audio/lmms: fix pkg-plist on non-{amd64,i386} libgigplayer.so depends on audio/carla having LINUXSAMPLER enabled, but LINUXSAMPLER only works on amd64 and i386. --- audio/lmms/Makefile | 8 ++++++++ audio/lmms/pkg-plist | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile index 0c8799aef1fd..104d5b303d89 100644 --- a/audio/lmms/Makefile +++ b/audio/lmms/Makefile @@ -65,6 +65,14 @@ SDL_USE= SDL=sdl SNDIO_CMAKE_BOOL= WANT_SNDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +.include + +.if ${ARCH} == amd64 || ${ARCH} == i386 +PLIST_SUB= LINUXSAMPLER="" +.else +PLIST_SUB= LINUXSAMPLER="@comment " +.endif + post-patch: @${REINPLACE_CMD} 's|/usr|${LOCALBASE}|g' ${WRKSRC}/src/core/ConfigManager.cpp @${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \ diff --git a/audio/lmms/pkg-plist b/audio/lmms/pkg-plist index e7ff5cae7365..647a1d02fe59 100644 --- a/audio/lmms/pkg-plist +++ b/audio/lmms/pkg-plist @@ -246,7 +246,7 @@ lib/lmms/libdualfilter.so lib/lmms/libdynamicsprocessor.so lib/lmms/libeq.so lib/lmms/libflanger.so -lib/lmms/libgigplayer.so +%%LINUXSAMPLER%%lib/lmms/libgigplayer.so lib/lmms/libhydrogenimport.so lib/lmms/libkicker.so lib/lmms/libladspabrowser.so