From nobody Thu Dec 16 18:56:52 2021 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 A34B418E8D82; Thu, 16 Dec 2021 18:56:52 +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 4JFLv822gwz4ZjX; Thu, 16 Dec 2021 18:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 260E056BA; Thu, 16 Dec 2021 18:56:52 +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 1BGIuqUN035406; Thu, 16 Dec 2021 18:56:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BGIuqg0035405; Thu, 16 Dec 2021 18:56:52 GMT (envelope-from git) Date: Thu, 16 Dec 2021 18:56:52 GMT Message-Id: <202112161856.1BGIuqg0035405@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 76649584d335 - main - multimedia/pipewire: Fix build on FreeBSD 13- 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76649584d335b4c1b4bda9ad3653bff6416c256d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639681012; 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=Qqgb+vC3M1eFyQ30PGlZxTjBIBN/BrlVMEVNWYOFczQ=; b=wnL//80CcMoHTgNkqmAY11ylxDShOrWKKqHOq49wvEBsTkqqG7vmjv63aupsbXsNIFQmva U/vlUzO7CGKqpI9ZjKJZsgI4IK85BZE3aVogb5hbRTWqoZpYHzv5RZYBM/amD2vEq85Qck mYMnQoqU8AeeCVBsU8QhUy6URc+GIWM6JrDmdbuNQIBwfL7D8xpTyTqtzfDFyHSw4KDMw3 AM8TWMSEeMzanLmkkKRX44XcfYA2pNkrR2+KEIYk5FCx6T6XxW10Yrx6tLxi2L/+nwTAHm UeNoRjYuMjzeDY8l87NuQds3AmXlq2iPzYmkzNWFjPTBxsAgEg9+hfdeeTtS6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639681012; a=rsa-sha256; cv=none; b=uXW/2FcwS0XtF+caS/9T0PRfrGOGlKAFLyEqiy61z3iHBMzLQdPaTzIZN9Xg0LFtEb2rY6 VWtZPxBhrBSyrQGByn4hGcEq22XKUPlIZGgyOsKsxGHN3UlZIakJcaSfzIbtRafwgkstcu lfOk269IEyimwPtvS3afeqd0uDMiW2u0aVV9P0n2jtezj1RnsU0eIc9SsIxvFMDjlJ5r0d SHVBa/iaEzWG0dgPzem5HZxGu5Jstfle16iM6mpS09z1nct0mg0kKxtjy2cOBT1YKb+C6y rkLbzNmbflmUNDWBjsDmT5Abct7S8USZiZUlPAx+HHDXVJJpUJ6OasqcYwCWbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=76649584d335b4c1b4bda9ad3653bff6416c256d commit 76649584d335b4c1b4bda9ad3653bff6416c256d Author: Gleb Popov AuthorDate: 2021-12-16 18:54:37 +0000 Commit: Gleb Popov CommitDate: 2021-12-16 18:56:30 +0000 multimedia/pipewire: Fix build on FreeBSD 13- PR: 260473 Reported by: jbeich --- multimedia/pipewire/Makefile | 10 +++++++++- multimedia/pipewire/pkg-plist | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index 82193f89e995..25399def9389 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -65,6 +65,14 @@ MESON_ARGS= -D pw-cat=enabled \ -D pipewire-v4l2=disabled \ -D udevrulesdir="${LOCALBASE}/lib/udev/rules.d" +.include + +.if ${OSVERSION} < 1400000 +PLIST_SUB+= FREEBSD14="@comment " +.else +PLIST_SUB+= FREEBSD14="" +.endif + post-extract: ${LN} -s ${WRKDIR}/media-session-${MEDIA_SESSION_VERSION} ${WRKSRC}/subprojects/media-session @@ -76,4 +84,4 @@ post-patch-MEDIASESSION-on: @${REINPLACE_CMD} '/manager_args/ s/@sm_comment@//g' \ ${WRKSRC}/src/daemon/pipewire.conf.in -.include +.include diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index 99fc41673348..b8540c66bf5a 100644 --- a/multimedia/pipewire/pkg-plist +++ b/multimedia/pipewire/pkg-plist @@ -17,7 +17,7 @@ bin/pw-play bin/pw-profiler bin/pw-record bin/pw-reserve -bin/pw-top +%%FREEBSD14%%bin/pw-top %%MEDIASESSION%%bin/spa-acp-tool bin/spa-inspect bin/spa-json-dump