From 36828f154cd27cae9f48f4d72da4cb30c9341c9f Mon Sep 17 00:00:00 2001 From: Gleb Popov Date: Sat, 13 Nov 2021 11:04:36 +0300 Subject: [PATCH] multimedia/pipewire: Update to 0.3.40 PR: 259166 Reported by: portscout! --- multimedia/pipewire/Makefile | 30 ++++--- multimedia/pipewire/distinfo | 8 +- .../patch-spa_plugins_audioconvert_fmt-ops.h | 16 ---- multimedia/pipewire/pkg-plist | 78 +++++++++++++++---- 4 files changed, 90 insertions(+), 42 deletions(-) delete mode 100644 multimedia/pipewire/files/patch-spa_plugins_audioconvert_fmt-ops.h diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index de71441b82de1..bcfd2e6556bfe 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,7 +1,8 @@ PORTNAME= pipewire -DISTVERSION= 0.3.36 -PORTREVISION= 1 +DISTVERSION= 0.3.40 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 MAINTAINER= arrowd@FreeBSD.org COMMENT= Server and user space API to deal with multimedia pipelines @@ -9,23 +10,23 @@ COMMENT= Server and user space API to deal with multimedia pipelines LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat LIB_DEPENDS= libasound.so:audio/alsa-lib \ libdbus-1.so:devel/dbus \ libinotify.so:devel/libinotify \ libepoll-shim.so:devel/libepoll-shim \ + libsndfile.so:audio/libsndfile \ libudev.so:devel/libudev-devd \ libwebrtc_audio_processing.so:audio/webrtc-audio-processing0 USES= compiler:c11 gettext-tools gnome localbase:ldflags meson \ - pkgconfig python:3.6+,build + pkgconfig python:3.6+,build readline USE_GNOME= glib20 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= PipeWire -OPTIONS_DEFINE= GSTREAMER MANPAGES MEDIASESSION PULSEAUDIO VULKAN +OPTIONS_DEFINE= GSTREAMER MANPAGES MEDIASESSION PULSEAUDIO SDL VULKAN OPTIONS_DEFAULT= GSTREAMER MANPAGES MEDIASESSION OPTIONS_SUB= yes @@ -37,31 +38,40 @@ MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_ENABLED= man MEDIASESSION_DESC= Session manager support -MEDIASESSION_MESON_ENABLED= alsa pipewire-alsa pw-cat +MEDIASESSION_MESON_ENABLED= alsa pipewire-alsa MEDIASESSION_MESON_ON= -Dsession-managers=media-session MEDIASESSION_MESON_OFF= -Dsession-managers='' -MEDIASESSION_LIB_DEPENDS= libsndfile.so:audio/libsndfile PULSEAUDIO_MESON_ENABLED= libpulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio \ libavahi-common.so:net/avahi-app \ libavahi-client.so:net/avahi-app +SDL_MESON_ENABLED= sdl2 +SDL_USES= sdl +SDL_USE= sdl=sdl2 + VULKAN_DESC= Enable Vulkan integration VULKAN_MESON_ENABLED= vulkan VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader -MESON_ARGS= -D bluez5=disabled \ +MEDIA_SESSION_VERSION= 0.4.1 + +MESON_ARGS= -D pw-cat=enabled \ + -D bluez5=disabled \ -D jack=disabled -D pipewire-jack=disabled \ -D systemd=disabled \ - -D sdl2=disabled \ + -D pipewire-v4l2=disabled \ -D udevrulesdir="${LOCALBASE}/lib/udev/rules.d" +post-extract: + ${LN} -s ${WRKDIR}/media-session-${MEDIA_SESSION_VERSION} ${WRKSRC}/subprojects/media-session + post-patch-MEDIASESSION-on: # alsa-seq is not supported & causes SIGSEGV with media session @${REINPLACE_CMD} 's| alsa-seq|\ #alsa-seq|g' \ - ${WRKSRC}/src/daemon/media-session.d/media-session.conf + ${WRKDIR}/media-session-${MEDIA_SESSION_VERSION}/media-session.d/media-session.conf # start media session by default @${REINPLACE_CMD} '/manager_args/ s/@sm_comment@//g' \ ${WRKSRC}/src/daemon/pipewire.conf.in diff --git a/multimedia/pipewire/distinfo b/multimedia/pipewire/distinfo index 7240d05c78ce4..36832eae58afa 100644 --- a/multimedia/pipewire/distinfo +++ b/multimedia/pipewire/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1632132267 -SHA256 (PipeWire-pipewire-0.3.36_GH0.tar.gz) = a95e47ee87cd7fce8dae74b911a3060c9f8421b4372e1c8417ff36d42afac797 -SIZE (PipeWire-pipewire-0.3.36_GH0.tar.gz) = 1708209 +TIMESTAMP = 1636786538 +SHA256 (media-session-0.4.1.tar.gz) = 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975 +SIZE (media-session-0.4.1.tar.gz) = 123224 +SHA256 (PipeWire-pipewire-0.3.40_GH0.tar.gz) = a2c8176d757a2ac6db445c61a50802ff1c26f49f5a28174f5eb0278609a887cf +SIZE (PipeWire-pipewire-0.3.40_GH0.tar.gz) = 1675384 diff --git a/multimedia/pipewire/files/patch-spa_plugins_audioconvert_fmt-ops.h b/multimedia/pipewire/files/patch-spa_plugins_audioconvert_fmt-ops.h deleted file mode 100644 index 0c8e9470da5b8..0000000000000 --- a/multimedia/pipewire/files/patch-spa_plugins_audioconvert_fmt-ops.h +++ /dev/null @@ -1,16 +0,0 @@ ---- spa/plugins/audioconvert/fmt-ops.h.orig 2021-09-16 13:08:56 UTC -+++ spa/plugins/audioconvert/fmt-ops.h -@@ -23,7 +23,13 @@ - */ - - #include -+#ifdef __FreeBSD__ -+#include -+#define bswap_16 bswap16 -+#define bswap_32 bswap32 -+#else - #include -+#endif - - #include - diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index 1a20e75d49040..8f6d9efa45dad 100644 --- a/multimedia/pipewire/pkg-plist +++ b/multimedia/pipewire/pkg-plist @@ -1,26 +1,27 @@ bin/pipewire %%MEDIASESSION%%bin/pipewire-media-session bin/pipewire-pulse -%%MEDIASESSION%%bin/pw-cat +bin/pw-cat bin/pw-cli bin/pw-dot +bin/pw-dsdplay bin/pw-dump bin/pw-link bin/pw-loopback bin/pw-metadata bin/pw-mididump -%%MEDIASESSION%%bin/pw-midiplay -%%MEDIASESSION%%bin/pw-midirecord +bin/pw-midiplay +bin/pw-midirecord bin/pw-mon -%%MEDIASESSION%%bin/pw-play +bin/pw-play bin/pw-profiler -%%MEDIASESSION%%bin/pw-record +bin/pw-record bin/pw-reserve %%MEDIASESSION%%bin/spa-acp-tool bin/spa-inspect bin/spa-json-dump bin/spa-monitor -%%MEDIASESSION%%bin/spa-resample +bin/spa-resample include/pipewire-0.3/pipewire/array.h include/pipewire-0.3/pipewire/buffers.h include/pipewire-0.3/pipewire/client.h @@ -71,8 +72,8 @@ include/pipewire-0.3/pipewire/protocol.h include/pipewire-0.3/pipewire/proxy.h include/pipewire-0.3/pipewire/resource.h include/pipewire-0.3/pipewire/stream.h -include/pipewire-0.3/pipewire/thread.h include/pipewire-0.3/pipewire/thread-loop.h +include/pipewire-0.3/pipewire/thread.h include/pipewire-0.3/pipewire/type.h include/pipewire-0.3/pipewire/utils.h include/pipewire-0.3/pipewire/version.h @@ -102,6 +103,7 @@ include/spa-0.2/spa/node/keys.h include/spa-0.2/spa/node/node.h include/spa-0.2/spa/node/type-info.h include/spa-0.2/spa/node/utils.h +include/spa-0.2/spa/param/audio/dsd.h include/spa-0.2/spa/param/audio/format-utils.h include/spa-0.2/spa/param/audio/format.h include/spa-0.2/spa/param/audio/iec958.h @@ -140,8 +142,8 @@ include/spa-0.2/spa/support/i18n.h include/spa-0.2/spa/support/log-impl.h include/spa-0.2/spa/support/log.h include/spa-0.2/spa/support/loop.h -include/spa-0.2/spa/support/plugin.h include/spa-0.2/spa/support/plugin-loader.h +include/spa-0.2/spa/support/plugin.h include/spa-0.2/spa/support/system.h include/spa-0.2/spa/support/thread.h include/spa-0.2/spa/utils/ansi.h @@ -162,7 +164,7 @@ include/spa-0.2/spa/utils/type.h %%GSTREAMER%%lib/gstreamer-1.0/libgstpipewire.so lib/libpipewire-0.3.so lib/libpipewire-0.3.so.0 -lib/libpipewire-0.3.so.0.335.0 +lib/libpipewire-0.3.so.0.340.0 lib/pipewire-0.3/libpipewire-module-access.so lib/pipewire-0.3/libpipewire-module-adapter.so lib/pipewire-0.3/libpipewire-module-client-device.so @@ -192,14 +194,14 @@ lib/spa-0.2/audiotestsrc/libspa-audiotestsrc.so lib/spa-0.2/control/libspa-control.so lib/spa-0.2/support/libspa-dbus.so lib/spa-0.2/support/libspa-support.so -lib/spa-0.2/v4l2/libspa-v4l2.so lib/spa-0.2/videoconvert/libspa-videoconvert.so lib/spa-0.2/videotestsrc/libspa-videotestsrc.so lib/spa-0.2/volume/libspa-volume.so %%VULKAN%%lib/spa-0.2/vulkan/libspa-vulkan.so -%%MEDIASESSION%%lib/udev/rules.d/90-pipewire-alsa.rules +@comment lib/udev/rules.d/90-pipewire-alsa.rules libdata/pkgconfig/libpipewire-0.3.pc libdata/pkgconfig/libspa-0.2.pc +%%MANPAGES%%%%PULSEAUDIO%%man/man1/pipewire-pulse.1.gz %%MANPAGES%%man/man1/pipewire.1.gz %%MANPAGES%%man/man1/pw-cat.1.gz %%MANPAGES%%man/man1/pw-cli.1.gz @@ -267,6 +269,7 @@ libdata/pkgconfig/libspa-0.2.pc %%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/maudio-fasttrack-pro.conf %%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-audio4dj.conf %%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-audio8dj.conf +%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-komplete-audio6.conf %%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-korecontroller.conf %%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio10.conf %%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-traktor-audio2.conf @@ -276,60 +279,110 @@ libdata/pkgconfig/libspa-0.2.pc %%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/sennheiser-gsx.conf %%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/simple-headphones-mic.conf %%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf -%%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/native-instruments-komplete-audio6.conf %%MEDIASESSION%%share/alsa-card-profile/mixer/profile-sets/usb-gaming-headset.conf %%MEDIASESSION%%share/alsa/alsa.conf.d/50-pipewire.conf %%MEDIASESSION%%share/alsa/alsa.conf.d/99-pipewire-default.conf +%%MEDIASESSION%%share/locale/af/LC_MESSAGES/media-session.mo share/locale/af/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/as/LC_MESSAGES/media-session.mo share/locale/as/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/be/LC_MESSAGES/media-session.mo share/locale/be/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/bg/LC_MESSAGES/media-session.mo share/locale/bg/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/bn_IN/LC_MESSAGES/media-session.mo share/locale/bn_IN/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/ca/LC_MESSAGES/media-session.mo share/locale/ca/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/cs/LC_MESSAGES/media-session.mo share/locale/cs/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/da/LC_MESSAGES/media-session.mo share/locale/da/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/de/LC_MESSAGES/media-session.mo share/locale/de/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/de_CH/LC_MESSAGES/media-session.mo share/locale/de_CH/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/el/LC_MESSAGES/media-session.mo share/locale/el/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/eo/LC_MESSAGES/media-session.mo share/locale/eo/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/es/LC_MESSAGES/media-session.mo share/locale/es/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/fi/LC_MESSAGES/media-session.mo share/locale/fi/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/fr/LC_MESSAGES/media-session.mo share/locale/fr/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/gl/LC_MESSAGES/media-session.mo share/locale/gl/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/gu/LC_MESSAGES/media-session.mo share/locale/gu/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/he/LC_MESSAGES/media-session.mo share/locale/he/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/hi/LC_MESSAGES/media-session.mo share/locale/hi/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/hr/LC_MESSAGES/media-session.mo share/locale/hr/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/hu/LC_MESSAGES/media-session.mo share/locale/hu/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/id/LC_MESSAGES/media-session.mo share/locale/id/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/it/LC_MESSAGES/media-session.mo share/locale/it/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/ja/LC_MESSAGES/media-session.mo share/locale/ja/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/kk/LC_MESSAGES/media-session.mo share/locale/kk/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/kn/LC_MESSAGES/media-session.mo share/locale/kn/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/ko/LC_MESSAGES/media-session.mo share/locale/ko/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/lt/LC_MESSAGES/media-session.mo share/locale/lt/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/ml/LC_MESSAGES/media-session.mo share/locale/ml/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/mr/LC_MESSAGES/media-session.mo share/locale/mr/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/my/LC_MESSAGES/media-session.mo share/locale/my/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/nl/LC_MESSAGES/media-session.mo share/locale/nl/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/nn/LC_MESSAGES/media-session.mo share/locale/nn/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/oc/LC_MESSAGES/media-session.mo share/locale/oc/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/or/LC_MESSAGES/media-session.mo share/locale/or/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/pa/LC_MESSAGES/media-session.mo share/locale/pa/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/pl/LC_MESSAGES/media-session.mo share/locale/pl/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/pt/LC_MESSAGES/media-session.mo share/locale/pt/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/pt_BR/LC_MESSAGES/media-session.mo share/locale/pt_BR/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/ru/LC_MESSAGES/media-session.mo share/locale/ru/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/si/LC_MESSAGES/media-session.mo share/locale/si/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/sk/LC_MESSAGES/media-session.mo share/locale/sk/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/sr/LC_MESSAGES/media-session.mo share/locale/sr/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/sr@latin/LC_MESSAGES/media-session.mo share/locale/sr@latin/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/sv/LC_MESSAGES/media-session.mo share/locale/sv/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/ta/LC_MESSAGES/media-session.mo share/locale/ta/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/te/LC_MESSAGES/media-session.mo share/locale/te/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/tr/LC_MESSAGES/media-session.mo share/locale/tr/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/uk/LC_MESSAGES/media-session.mo share/locale/uk/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/zh_CN/LC_MESSAGES/media-session.mo share/locale/zh_CN/LC_MESSAGES/pipewire.mo +%%MEDIASESSION%%share/locale/zh_TW/LC_MESSAGES/media-session.mo share/locale/zh_TW/LC_MESSAGES/pipewire.mo %%DATADIR%%/client-rt.conf %%DATADIR%%/client.conf @@ -342,7 +395,6 @@ share/locale/zh_TW/LC_MESSAGES/pipewire.mo %%DATADIR%%/filter-chain/source-rnnoise.conf %%DATADIR%%/jack.conf %%MEDIASESSION%%%%DATADIR%%/media-session.d/alsa-monitor.conf -%%MEDIASESSION%%%%DATADIR%%/media-session.d/bluez-hardware.conf %%MEDIASESSION%%%%DATADIR%%/media-session.d/bluez-monitor.conf %%MEDIASESSION%%%%DATADIR%%/media-session.d/media-session.conf %%MEDIASESSION%%%%DATADIR%%/media-session.d/v4l2-monitor.conf