From nobody Mon Apr 8 19:18:47 2024 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 4VCzQw07VBz5Hb1y; Mon, 8 Apr 2024 19:18:48 +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 4VCzQv6ZDxz4qxg; Mon, 8 Apr 2024 19:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603927; 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=hQjxoL8ogaMZWX/lgZtCrHkH5aJUHHQuu6ZX7pE+QQY=; b=eu7yIEgkdzXajzM9bgKfZHOgRXWe4rxnO+ZtWgYjMLYCu04IWMq6HtdzV8W0Wa0TbazaWE jTxftROue8qg0BAnPT+r++SYmCPZKv1vtvZ6+iXJa+VKGDENYNsR4vaL3KCEFyzfctOASn 5DNEnZDPvxzvXA5Dry2ZYt+B+yl6HESMaiI64R/Ay3NAgfJR7yR3QV6Fq/i7ORe9GVNsFH eZzcNQshfUvIp2NOyFJ7P1cL8BdCdfeV2JRJIcTLtKHVgfULO7tRN2s/TgKbf/M/ZINBuo bhBgzVgSSEfKxzr2p7OU88OCssTc6O0hL8mpjQGuP/jsc70Y+tLj99jm3Web1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712603927; a=rsa-sha256; cv=none; b=om3ulBPYWkfPTvJFbiq9CQUo2VOYxVA/uo6AkYoxVMLkV/HXJDlBxirtjBj2DkUTp+1zSO wgU6UdKK0JZAlwtjpi2kiyG5zaUVjdPgDNUsf0woErl3VWPZkbw7MukhRCeE/yFVR8jSNn dXpLkfwkn1ANkkFmNoQwndI23x8wzqemT/8+E4ISmv+JMLXkSxitSuOminTU35YLepraWF V9J8WO6bd3jyc1JfxfsMgt1Th7EPPaNdVwh6aG0djyktBGRbTAasIh5tUDswPv0aHbDril 9A3wH3CxYOZRhc+vvp3wXm2wO4uBceQNxjavGZykXRGFhgCnIsTefKGHjJ5KEQ== 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=1712603927; 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=hQjxoL8ogaMZWX/lgZtCrHkH5aJUHHQuu6ZX7pE+QQY=; b=jAYWIaZLqjdaved2TlJGftdZoRa6Tw66WnMGJGhP145eHIqUf67aTclXZntaBlPpu7NqQs gqlSVcmf00Vpw7vfdDsKLZrjtci5SIqcejGcljUHjDi/EWdA/Lw5jMWetkQAd+yio82ydv E6r+D7W5pzzn96lTyvAKgwDb/ODQim37+v47xBraQHwyRnzTA2KI+pKRLJc1R89yTW9aU8 CdUwF9pGRJcVwpL29gVdwTJUhq8vdGT7wrqyOKyILdfu6rUSy/RtXq2QQvdgFIDwEOtw4N czWVowuArgvRuBI3RNY/6izWfHlQ21uQqHj8/+NLNwAVqS9sTOjp0QsnLkAMlw== 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 4VCzQv69tczNTX; Mon, 8 Apr 2024 19:18:47 +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 438JIlBY012986; Mon, 8 Apr 2024 19:18:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438JIlZq012983; Mon, 8 Apr 2024 19:18:47 GMT (envelope-from git) Date: Mon, 8 Apr 2024 19:18:47 GMT Message-Id: <202404081918.438JIlZq012983@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: d8f39032884a - main - audio/cardinal: Fix build by adding the LIBLO option 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8f39032884a7b0b7a8c742986bc0c1c060f105c Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8f39032884a7b0b7a8c742986bc0c1c060f105c commit d8f39032884a7b0b7a8c742986bc0c1c060f105c Author: Yuri Victorovich AuthorDate: 2024-04-08 19:09:43 +0000 Commit: Yuri Victorovich CommitDate: 2024-04-08 19:18:42 +0000 audio/cardinal: Fix build by adding the LIBLO option The liblo library support is broken in Cardinal. Reported by: fallout --- audio/cardinal/Makefile | 17 ++++++++++++----- audio/cardinal/files/patch-dpf_Makefile.base.mk | 14 ++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/audio/cardinal/Makefile b/audio/cardinal/Makefile index f8034c508e9a..d28cf75f6ef7 100644 --- a/audio/cardinal/Makefile +++ b/audio/cardinal/Makefile @@ -1,5 +1,6 @@ PORTNAME= cardinal DISTVERSION= 23.10 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= https://github.com/DISTRHO/Cardinal/releases/download/${DISTVERSION}/ @@ -19,7 +20,6 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libdbus-1.so:devel/dbus \ libfftw3f.so:math/fftw3-float \ libjansson.so:devel/jansson \ - liblo.so:audio/liblo \ libpffft.so:math/pffft \ libpulse-simple.so:audio/pulseaudio \ libsamplerate.so:audio/libsamplerate \ @@ -43,12 +43,19 @@ MAKE_ARGS= SYSDEPS=true BINARY_ALIAS= gcc-ar=ar \ python3=${PYTHON_CMD} -OPTIONS_DEFINE= DOCS LTO +OPTIONS_DEFINE= DOCS LIBLO LTO +OPTIONS_DEFAULT= #LIBLO LTO -PORTDOCS= * +PORTDOCS= * -LTO_MAKE_ARGS= WITH_LTO=true -LTO_BROKEN= Fails to build with LTO because it is gcc-centered +LIBLO_DESC= Build with liblo +LIBLO_MAKE_ARGS= WITH_LTO=true +LIBLO_MAKE_ARGS_OFF= WITH_LTO=false +LIBLO_LIB_DEPENDS= liblo.so:audio/liblo +LIBLO_BROKEN= fails to build with liblo, see https://github.com/DISTRHO/Cardinal/issues/641 + +LTO_MAKE_ARGS= WITH_LTO=true +LTO_BROKEN= Fails to build with LTO because it is gcc-centered .include diff --git a/audio/cardinal/files/patch-dpf_Makefile.base.mk b/audio/cardinal/files/patch-dpf_Makefile.base.mk new file mode 100644 index 000000000000..b8394c0e0b20 --- /dev/null +++ b/audio/cardinal/files/patch-dpf_Makefile.base.mk @@ -0,0 +1,14 @@ + +- workaround for https://github.com/DISTRHO/Cardinal/issues/641 + +--- dpf/Makefile.base.mk.orig 2024-04-08 16:00:03 UTC ++++ dpf/Makefile.base.mk +@@ -373,7 +373,7 @@ endif + # --------------------------------------------------------------------------------------------------------------------- + # Check for optional libraries + +-HAVE_LIBLO = $(shell $(PKG_CONFIG) --exists liblo && echo true) ++HAVE_LIBLO = $(shell $(PKG_CONFIG) --exists liblo && echo $(WITH_LIBLO)) + + ifneq ($(SKIP_NATIVE_AUDIO_FALLBACK),true) + ifneq ($(SKIP_RTAUDIO_FALLBACK),true)