From nobody Fri Dec 24 18:14:23 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 2D0C718FC793; Fri, 24 Dec 2021 18:14:24 +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 4JLFZR6QtCz3CPS; Fri, 24 Dec 2021 18:14:23 +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 BD4C88B4; Fri, 24 Dec 2021 18:14:23 +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 1BOIENbg091835; Fri, 24 Dec 2021 18:14:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BOIENhK091834; Fri, 24 Dec 2021 18:14:23 GMT (envelope-from git) Date: Fri, 24 Dec 2021 18:14:23 GMT Message-Id: <202112241814.1BOIENhK091834@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: 463583e8beb0 - main - multimedia/pipewire: Teach the port to use OpenSSL. 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: 463583e8beb0757fbfb2eeb360f1f23e7f7791b0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640369663; 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=jQxuw2eaUUZ2Z1Hev46zcB5/430/wezsyYBah3zMdtY=; b=XOrt8okK/1XPGLu/vFDUT24BzeO7ZfwMaENAQZb296t09CxR9SstkmUcnmccV9qBn5y7N0 FRVPwZ54A6V9qREjqKB/8XzoNPuMWXGJBciPwfuXxNe6EVr7iwGe27pAoMcBLevVhczpbD x+/qcCCKxR2m4Hjy7+6GyWc8Er8YBezwCRkmITCIMgaPcM3PtY0SYffwYeVYBRHBdLbrj8 BF7aIK8FMuYR7F6XWgk4eyJCSwdlLcDfvdrRIBhDOH53PQ0uU80j/3pS2QAnNZoZEOOiaY yLnAV7UtVFEoS4dUD7Ur/xPePv8yGWPSF8VIpsdD57P1NH612EUE0L+ojwQdjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640369663; a=rsa-sha256; cv=none; b=MPlFc0ge5yV+sGL7FBZOVSH/J5a/TzzHM4OpF8nnWhe56iu7rwX4hE3qnwKtRBLLJGE6Sh n6U6TrKvWEOMkPsBQHi1qqkOVqk3pUqndUvduz5dOfBN9G4EH4M8b9DRY+Sq+X2DRwzQtM gbjK1xL4rLAZTEvUO+5XtVWumlOS0qzZnpEPnH2CGyOgxgRo1mjhiblZjlCE+YFtXphl7Y yxZ/f83v/XBMYvgolC4h2L+oRdQPNLATHY/WgINLUtJr/Y3xflrki57gaiISX5SsAORdrK XmpcT2djUYOYj1YuhBND/p14dPBeTg2lpM7tNjX8maa2l580lAgP/V1JrrEz7g== 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=463583e8beb0757fbfb2eeb360f1f23e7f7791b0 commit 463583e8beb0757fbfb2eeb360f1f23e7f7791b0 Author: Gleb Popov AuthorDate: 2021-12-24 18:13:01 +0000 Commit: Gleb Popov CommitDate: 2021-12-24 18:14:03 +0000 multimedia/pipewire: Teach the port to use OpenSSL. Enable raop plugin that was previosly disabled. PR: 260646 --- multimedia/pipewire/Makefile | 6 ++++-- multimedia/pipewire/files/patch-meson.build | 20 ++++++++++++++++++++ .../files/patch-src_modules_module-raop-sink.c | 10 ++++++++++ multimedia/pipewire/pkg-plist | 1 + 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index 43d9a002464d..1ccb58dcf004 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,6 +1,6 @@ PORTNAME= pipewire DISTVERSION= 0.3.42 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${MEDIA_SESSION_VERSION}/:media_session DISTFILES= media-session-${MEDIA_SESSION_VERSION}${EXTRACT_SUFX}:media_session @@ -21,7 +21,7 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \ libwebrtc_audio_processing.so:audio/webrtc-audio-processing0 USES= compiler:c11 gettext-tools gnome localbase:ldflags meson \ - ncurses pkgconfig python:3.6+,build readline + ncurses pkgconfig python:3.6+,build readline ssl USE_GNOME= glib20 USE_LDCONFIG= yes @@ -61,6 +61,8 @@ VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader MEDIA_SESSION_VERSION= 0.4.1 MESON_ARGS= -D pw-cat=enabled \ + -D v4l2=enabled \ + -D raop=enabled \ -D bluez5=disabled \ -D jack=disabled -D pipewire-jack=disabled \ -D systemd=disabled \ diff --git a/multimedia/pipewire/files/patch-meson.build b/multimedia/pipewire/files/patch-meson.build new file mode 100644 index 000000000000..aede0d2849bc --- /dev/null +++ b/multimedia/pipewire/files/patch-meson.build @@ -0,0 +1,20 @@ +--- meson.build.orig 2021-12-16 08:17:48 UTC ++++ meson.build +@@ -427,7 +427,16 @@ need_alsa = get_option('pipewire-alsa').enabled() or ' + alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa) + summary({'pipewire-alsa': alsa_dep.found()}, bool_yn: true) + +-openssl_lib = dependency('openssl', required: get_option('raop')) ++if build_machine.system() == 'freebsd' ++ # On FreeBSD the OpenSSL library may come from base or a package. ++ # Check for a package first and fallback to the base library if we can't find it via pkgconfig ++ openssl_lib = dependency('openssl', required: false) ++ if not openssl_lib.found() ++ openssl_lib = declare_dependency(link_args : [ '-lssl', '-lcrypto']) ++ endif ++else ++ openssl_lib = dependency('openssl', required: get_option('raop')) ++endif + summary({'OpenSSL (for raop-sink)': openssl_lib.found()}, bool_yn: true) + + lilv_lib = dependency('lilv-0', required: get_option('lv2')) diff --git a/multimedia/pipewire/files/patch-src_modules_module-raop-sink.c b/multimedia/pipewire/files/patch-src_modules_module-raop-sink.c new file mode 100644 index 000000000000..d6f4bc73a623 --- /dev/null +++ b/multimedia/pipewire/files/patch-src_modules_module-raop-sink.c @@ -0,0 +1,10 @@ +--- src/modules/module-raop-sink.c.orig 2021-12-16 08:17:48 UTC ++++ src/modules/module-raop-sink.c +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index 742b5a9ff7c6..7042e3b01b3f 100644 --- a/multimedia/pipewire/pkg-plist +++ b/multimedia/pipewire/pkg-plist @@ -182,6 +182,7 @@ lib/pipewire-0.3/libpipewire-module-protocol-pulse.so lib/pipewire-0.3/libpipewire-module-protocol-simple.so %%PULSEAUDIO%%lib/pipewire-0.3/libpipewire-module-pulse-tunnel.so %%PULSEAUDIO%%lib/pipewire-0.3/libpipewire-module-raop-discover.so +lib/pipewire-0.3/libpipewire-module-raop-sink.so lib/pipewire-0.3/libpipewire-module-rtkit.so lib/pipewire-0.3/libpipewire-module-session-manager.so lib/pipewire-0.3/libpipewire-module-spa-device-factory.so