From nobody Thu Oct 12 10:31:20 2023 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 4S5mBw6vglz4njXh; Thu, 12 Oct 2023 10:31:20 +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 4S5mBw6QL5z3XwS; Thu, 12 Oct 2023 10:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697106680; 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=LNAkTMBAgE+CoCVsQs1E9Z7FJniQxB0BrEO9eQnAxYQ=; b=fwmlwzMAQCV5qeC/xXL6IRpg5bnL+iCHv65H6J3clQwqph5szXyuoYur1xX7tZW2jtXGsh wBEWFjS862wo19JU03GreDvHiJ5/hrnqWvHx15r/8mQgqaKgezWhKpwvJGQ/rUfB8rTLcM s8bpUq3Xq80+wcc5Fp0tykn9eJPnYNJzAyHuQeHjh+DdXhrN0QnusCeWnEbwcdKR3MpFx/ bONlD+R2bpO8c1ttTPZllHVS+bVeBmTPbtb6CkkIyCWC72dl0GsPyoRQOTTMt1K0Zy5cZy ZAqzJRBNWAVZ6iwjbfXDOmlm3QJgGE9Wwy8sk/ZT/xtQRrYF0pUi3YRf66mmsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697106680; a=rsa-sha256; cv=none; b=ojfIC9A8QiEncrcen+wQIiEKg5WIrm/ah476k8J9XvFz6oRiAcE5M6iEKZPD+0nzeNH31+ yf/fjpbP+DQD6cyGWop8yRjeRbeJ3KHaIJhS4EMdAGrzPq5q6Lj3QSuwyOUjbDTP5Zmdmd 4+M//FMDi0GjecVP/WRai2cgQSwsvzziOn10bg8bJc1GZtkHvrsBfCJQwe/VwxB81GTD0D xlJH5XY4H7idWY3kc6UUOOh/rFQ9hWKNQYvhEqv8itcdKSFbR8VPrLX5lHonmA9K4owi4o mTmj5Mi9DQ7s3RwztLy5huSWf1jChkhVXa7vRAOrc935AF57kv8eA/WxNwX9Nw== 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=1697106680; 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=LNAkTMBAgE+CoCVsQs1E9Z7FJniQxB0BrEO9eQnAxYQ=; b=jQJBta9DpWKDjbeFOMXHTDLmRGhLLpEA/0wNI2WbiSpHtl/Jlu3Ia71zEyWcwAxgVcl70E 2CNM94ykgbYrcBKpD29X0W4iA3BPUWrm27BtCV6+B0XiGfKwKyTunnIjwZk0410ueHaWGg /B7rYHfKod1bJsE/cA0X7O65pRb0spxgkRPS7BYadzvvMOyUa29LI5tSG6hC8loPRME99V ztzQEdmRyxoDaox4J9fMplpn3zX/5IRPOCKiGSGcaigCVWYxxwJjzjyilo89wFtc5yzwLP lNM9BHsxqxycEa7hNW6fPfoOOQRWeCo3RGKXRLF68+QrZAIPifnSSEUw6N0taw== 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 4S5mBw5Tjgz111q; Thu, 12 Oct 2023 10:31:20 +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 39CAVKBn002656; Thu, 12 Oct 2023 10:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39CAVKZl002653; Thu, 12 Oct 2023 10:31:20 GMT (envelope-from git) Date: Thu, 12 Oct 2023 10:31:20 GMT Message-Id: <202310121031.39CAVKZl002653@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 4918ddd08653 - main - comms/gqrx: add flavors for Qt5 and Qt6 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: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4918ddd0865348af03c481751b97988cf2a7a1d3 Auto-Submitted: auto-generated The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=4918ddd0865348af03c481751b97988cf2a7a1d3 commit 4918ddd0865348af03c481751b97988cf2a7a1d3 Author: Ganael LAPLANCHE AuthorDate: 2023-10-12 10:30:21 +0000 Commit: Ganael LAPLANCHE CommitDate: 2023-10-12 10:30:21 +0000 comms/gqrx: add flavors for Qt5 and Qt6 --- comms/gqrx/Makefile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile index bb9f5e3c03fb..cc981feef948 100644 --- a/comms/gqrx/Makefile +++ b/comms/gqrx/Makefile @@ -1,8 +1,10 @@ PORTNAME= gqrx PORTVERSION= 2.17.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= comms hamradio +PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= martymac@FreeBSD.org COMMENT= Software defined radio receiver powered by GNU Radio and Qt @@ -31,16 +33,24 @@ LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \ libjack.so:audio/jack \ libportaudio.so:audio/portaudio -USES= cmake compiler:c++11-lang gl pkgconfig qt:6 +FLAVORS= qt5 qt6 +FLAVOR?= qt6 + +USES= cmake compiler:c++11-lang gl pkgconfig qt:${FLAVOR:S/qt//} USE_GITHUB= yes GH_ACCOUNT= gqrx-sdr USE_GL= gl -USE_QT= base svg +_USE_QT_qt5= core gui network svg widgets +_USE_QT_qt6= base svg +USE_QT= ${_USE_QT_${FLAVOR}} + +CONFLICTS_INSTALL= gqrx ${FLAVORS:N${FLAVOR}:S/^/${PORTNAME}-/} # XXX Use Portaudio as Gqrx is invariably linked to it # (auto-detected and used through Gnuradio CMake files) -CMAKE_ARGS+= -DLINUX_AUDIO_BACKEND:STRING="Portaudio" +CMAKE_ARGS+= -DLINUX_AUDIO_BACKEND:STRING="Portaudio" \ + -DFORCE_QT${FLAVOR:S/qt//}:BOOL=ON # XXX Work around Gnuradio 3.8 headers (gnuradio/rpcserver_aggregator.h) still # using std::unary_function (removed with C++17). This breaks when building