Page MenuHomeFreeBSD
Files F152736254

D55821.id173596.diff
No OneTemporary
Actions

D55821.id173596.diff
View Options

diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile
--- a/multimedia/pipewire/Makefile
+++ b/multimedia/pipewire/Makefile
@@ -1,11 +1,22 @@
PORTNAME= pipewire
-DISTVERSION= 1.4.10
+DISTVERSION= 1.6.1
CATEGORIES= multimedia
MAINTAINER= arrowd@FreeBSD.org
COMMENT= Server and user space API to deal with multimedia pipelines
WWW= https://pipewire.org/
+PATCH_SITES= https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/
+PATCHFILES= 2737.patch:-p1 \
+ 2738.patch:-p1 \
+ 2739.patch:-p1 \
+ 2740.patch:-p1 \
+ 2741.patch:-p1 \
+ 2742.patch:-p1 \
+ 2743.patch:-p1 \
+ 2744.patch:-p1 \
+ 2745.patch:-p1
+
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -31,7 +42,7 @@
SHEBANG_FILES= doc/*.py
PORTDOCS= *
-OPTIONS_DEFINE= ALSA AVAHI DOCS DOXYGEN EBUR GSTREAMER JACK LV2 PULSEAUDIO \
+OPTIONS_DEFINE= ALSA AVAHI DOCS DOXYGEN EBUR GSTREAMER JACK LV2 ONNX PULSEAUDIO \
VULKAN X11_BELL
OPTIONS_DEFAULT= EBUR GSTREAMER JACK
OPTIONS_SUB= yes
@@ -64,6 +75,10 @@
LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv
LV2_MESON_ENABLED= lv2
+ONNX_DESC= ONNX filter-graph plugin
+ONNX_LIB_DEPENDS= libonnxruntime.so:misc/onnxruntime
+ONNX_MESON_ENABLED= onnxruntime
+
PULSEAUDIO_DESC= Enable PulseAudio emulation
PULSEAUDIO_MESON_ENABLED= libpulse
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
@@ -92,7 +107,8 @@
-D roc=disabled \
-D sdl2=disabled \
-D selinux=disabled \
- -D systemd=disabled \
+ -D libsystemd=disabled \
+ -D systemd-user-service=disabled \
-D logind=disabled \
-D pipewire-v4l2=disabled \
-D libmysofa=disabled \
@@ -103,12 +119,6 @@
PORTDOCS= *
-# Fake pkg-config support before https://cgit.freebsd.org/src/commit/?id=396851c20aeb
-# but only if devel/ncurses isn't installed
-.if !exists(/usr/libdata/pkgconfig/ncursesw.pc)
-CONFIGURE_ENV+= ${ncurses_ARGS:Mbase:C/.+/PKG_CONFIG_PATH="${FILESDIR}"/}
-.endif
-
post-patch:
${REINPLACE_CMD} -e "s|find_installation('python3'|find_installation('python${PYTHON_VER}'|" \
${WRKSRC}/meson.build
diff --git a/multimedia/pipewire/distinfo b/multimedia/pipewire/distinfo
--- a/multimedia/pipewire/distinfo
+++ b/multimedia/pipewire/distinfo
@@ -1,3 +1,21 @@
-TIMESTAMP = 1769575478
-SHA256 (pipewire-1.4.10.tar.bz2) = 3be5159b4fa09027f0f24fca153ced87a5619acc2e52c065200e7f51144d9f1e
-SIZE (pipewire-1.4.10.tar.bz2) = 1944899
+TIMESTAMP = 1773278916
+SHA256 (pipewire-1.6.1.tar.bz2) = 0d28d6598b525feebe48fe209d39c8f75f33f1e5c90e1d4ec1fa2f0dbfcf2876
+SIZE (pipewire-1.6.1.tar.bz2) = 2060839
+SHA256 (2737.patch) = 3b568c23889bbb4d64391f66d1806709ddc31069b14394df11064a2fbcc65841
+SIZE (2737.patch) = 4321
+SHA256 (2738.patch) = 7a6cfd4dfb103f4e8cd7f2f415d11c718966a5e13561889d4d08c31c3f5972d9
+SIZE (2738.patch) = 1415
+SHA256 (2739.patch) = 016d6ec931d7705e09616574c19bae165b48b79067b6c4fcc1bfff5a74f9af2d
+SIZE (2739.patch) = 1262
+SHA256 (2740.patch) = 9d0e4db990d2581fd7dec2076b230d716d1b75f22697103f6c906de928ba5b61
+SIZE (2740.patch) = 1126
+SHA256 (2741.patch) = 3e15d601dd8ac09f3cf18997a9fe7fd19532204c84c3be3b07634a2187abaa15
+SIZE (2741.patch) = 776
+SHA256 (2742.patch) = 7fceb565de84a4f12f7090c7d30106d670bcccc757610d76d0f7eef660ffcbe3
+SIZE (2742.patch) = 610
+SHA256 (2743.patch) = d03a5a592238d1cbf7c88c7643dbc15675ffb8f139a6890362774f8542a20588
+SIZE (2743.patch) = 872
+SHA256 (2744.patch) = 5dbe545c6758b9fc48b6d71ce72792026ece66c06851240fbcaeb708514bdbc7
+SIZE (2744.patch) = 783
+SHA256 (2745.patch) = c27fdf3534710e260bf88b591c4b74098e2c4183438275f2e619378d95271a1a
+SIZE (2745.patch) = 2284
diff --git a/multimedia/pipewire/files/ncursesw.pc b/multimedia/pipewire/files/ncursesw.pc
deleted file mode 100644
--- a/multimedia/pipewire/files/ncursesw.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=/usr/lib
-includedir=/usr/include
-
-Name: ncursesw
-Description: ncurses 5.9 library (wide-char/UTF-8 flavor)
-Version: 5.9.20140222
-URL: https://invisible-island.net/ncurses
-Libs: -lncursesw
diff --git a/multimedia/pipewire/files/patch-spa_include_spa_utils_endian.h b/multimedia/pipewire/files/patch-spa_include_spa_utils_endian.h
deleted file mode 100644
--- a/multimedia/pipewire/files/patch-spa_include_spa_utils_endian.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- spa/include/spa/utils/endian.h.orig 2025-03-14 10:07:06 UTC
-+++ spa/include/spa/utils/endian.h
-@@ -5,7 +5,7 @@
- #ifndef SPA_ENDIAN_H
- #define SPA_ENDIAN_H
-
--#if defined(__FreeBSD__) || defined(__MidnightBSD__)
-+#if defined(__MidnightBSD__)
- #include <sys/endian.h>
- #define bswap_16 bswap16
- #define bswap_32 bswap32
diff --git a/multimedia/pipewire/files/patch-spa_plugins_alsa_acp-tool.c b/multimedia/pipewire/files/patch-spa_plugins_alsa_acp-tool.c
deleted file mode 100644
--- a/multimedia/pipewire/files/patch-spa_plugins_alsa_acp-tool.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- spa/plugins/alsa/acp-tool.c.orig 2025-03-14 10:07:06 UTC
-+++ spa/plugins/alsa/acp-tool.c
-@@ -10,7 +10,6 @@
- #include <time.h>
- #include <stdbool.h>
- #include <getopt.h>
--#include <alloca.h>
-
- #include <spa/debug/context.h>
- #include <spa/utils/string.h>
diff --git a/multimedia/pipewire/files/patch-spa_plugins_filter-graph_filter-graph.c b/multimedia/pipewire/files/patch-spa_plugins_filter-graph_filter-graph.c
deleted file mode 100644
--- a/multimedia/pipewire/files/patch-spa_plugins_filter-graph_filter-graph.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- spa/plugins/filter-graph/filter-graph.c.orig 2025-03-14 10:07:06 UTC
-+++ spa/plugins/filter-graph/filter-graph.c
-@@ -34,6 +34,16 @@
- #include "audio-plugin.h"
- #include "audio-dsp-impl.h"
-
-+#if !defined(strdupa)
-+# define strdupa(s) \
-+ ({ \
-+ const char *__old = (s); \
-+ size_t __len = strlen(__old) + 1; \
-+ char *__new = (char *) alloca(__len); \
-+ (char *) memcpy(__new, __old, __len); \
-+ })
-+#endif
-+
- #undef SPA_LOG_TOPIC_DEFAULT
- #define SPA_LOG_TOPIC_DEFAULT &log_topic
- SPA_LOG_TOPIC_DEFINE_STATIC(log_topic, "spa.filter-graph");
diff --git a/multimedia/pipewire/files/patch-spa_plugins_meson.build b/multimedia/pipewire/files/patch-spa_plugins_meson.build
deleted file mode 100644
--- a/multimedia/pipewire/files/patch-spa_plugins_meson.build
+++ /dev/null
@@ -1,8 +0,0 @@
---- spa/plugins/meson.build.orig 2023-10-06 09:37:06 UTC
-+++ spa/plugins/meson.build
-@@ -1,4 +1,4 @@
--if alsa_dep.found() and host_machine.system() == 'linux'
-+if alsa_dep.found()
- subdir('alsa')
- endif
- if get_option('avb').require(host_machine.system() == 'linux', error_message: 'AVB support is only available on Linux').allowed()
diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist
--- a/multimedia/pipewire/pkg-plist
+++ b/multimedia/pipewire/pkg-plist
@@ -15,6 +15,8 @@
bin/pw-link
bin/pw-loopback
bin/pw-metadata
+bin/pw-midi2play
+bin/pw-midi2record
bin/pw-mididump
bin/pw-midiplay
bin/pw-midirecord
@@ -23,6 +25,7 @@
bin/pw-profiler
bin/pw-record
bin/pw-reserve
+bin/pw-sysex
bin/pw-top
%%ALSA%%bin/spa-acp-tool
bin/spa-inspect
@@ -32,6 +35,7 @@
etc/security/limits.d/25-pw-rlimits.conf
include/pipewire-0.3/pipewire/array.h
include/pipewire-0.3/pipewire/buffers.h
+include/pipewire-0.3/pipewire/capabilities.h
include/pipewire-0.3/pipewire/client.h
include/pipewire-0.3/pipewire/conf.h
include/pipewire-0.3/pipewire/context.h
@@ -122,6 +126,8 @@
include/spa-0.2/spa/param/audio/aac-types.h
include/spa-0.2/spa/param/audio/aac-utils.h
include/spa-0.2/spa/param/audio/aac.h
+include/spa-0.2/spa/param/audio/ac3-utils.h
+include/spa-0.2/spa/param/audio/ac3.h
include/spa-0.2/spa/param/audio/alac-utils.h
include/spa-0.2/spa/param/audio/alac.h
include/spa-0.2/spa/param/audio/amr-types.h
@@ -134,6 +140,11 @@
include/spa-0.2/spa/param/audio/dsd.h
include/spa-0.2/spa/param/audio/dsp-utils.h
include/spa-0.2/spa/param/audio/dsp.h
+include/spa-0.2/spa/param/audio/dts-types.h
+include/spa-0.2/spa/param/audio/dts-utils.h
+include/spa-0.2/spa/param/audio/dts.h
+include/spa-0.2/spa/param/audio/eac3-utils.h
+include/spa-0.2/spa/param/audio/eac3.h
include/spa-0.2/spa/param/audio/flac-utils.h
include/spa-0.2/spa/param/audio/flac.h
include/spa-0.2/spa/param/audio/format-utils.h
@@ -141,10 +152,13 @@
include/spa-0.2/spa/param/audio/iec958-types.h
include/spa-0.2/spa/param/audio/iec958-utils.h
include/spa-0.2/spa/param/audio/iec958.h
+include/spa-0.2/spa/param/audio/layout-types.h
include/spa-0.2/spa/param/audio/layout.h
include/spa-0.2/spa/param/audio/mp3-types.h
include/spa-0.2/spa/param/audio/mp3-utils.h
include/spa-0.2/spa/param/audio/mp3.h
+include/spa-0.2/spa/param/audio/mpegh-utils.h
+include/spa-0.2/spa/param/audio/mpegh.h
include/spa-0.2/spa/param/audio/opus.h
include/spa-0.2/spa/param/audio/ra-utils.h
include/spa-0.2/spa/param/audio/ra.h
@@ -152,6 +166,8 @@
include/spa-0.2/spa/param/audio/raw-types.h
include/spa-0.2/spa/param/audio/raw-utils.h
include/spa-0.2/spa/param/audio/raw.h
+include/spa-0.2/spa/param/audio/truehd-utils.h
+include/spa-0.2/spa/param/audio/truehd.h
include/spa-0.2/spa/param/audio/type-info.h
include/spa-0.2/spa/param/audio/vorbis-utils.h
include/spa-0.2/spa/param/audio/vorbis.h
@@ -162,6 +178,9 @@
include/spa-0.2/spa/param/bluetooth/type-info.h
include/spa-0.2/spa/param/buffers-types.h
include/spa-0.2/spa/param/buffers.h
+include/spa-0.2/spa/param/dict-types.h
+include/spa-0.2/spa/param/dict-utils.h
+include/spa-0.2/spa/param/dict.h
include/spa-0.2/spa/param/format-types.h
include/spa-0.2/spa/param/format-utils.h
include/spa-0.2/spa/param/format.h
@@ -170,6 +189,9 @@
include/spa-0.2/spa/param/latency.h
include/spa-0.2/spa/param/param-types.h
include/spa-0.2/spa/param/param.h
+include/spa-0.2/spa/param/peer-types.h
+include/spa-0.2/spa/param/peer-utils.h
+include/spa-0.2/spa/param/peer.h
include/spa-0.2/spa/param/port-config-types.h
include/spa-0.2/spa/param/port-config.h
include/spa-0.2/spa/param/profile-types.h
@@ -185,6 +207,7 @@
include/spa-0.2/spa/param/tag.h
include/spa-0.2/spa/param/type-info.h
include/spa-0.2/spa/param/video/chroma.h
+include/spa-0.2/spa/param/video/color-types.h
include/spa-0.2/spa/param/video/color.h
include/spa-0.2/spa/param/video/dsp-utils.h
include/spa-0.2/spa/param/video/dsp.h
@@ -193,6 +216,8 @@
include/spa-0.2/spa/param/video/format.h
include/spa-0.2/spa/param/video/h264-utils.h
include/spa-0.2/spa/param/video/h264.h
+include/spa-0.2/spa/param/video/h265-utils.h
+include/spa-0.2/spa/param/video/h265.h
include/spa-0.2/spa/param/video/mjpg-utils.h
include/spa-0.2/spa/param/video/mjpg.h
include/spa-0.2/spa/param/video/multiview.h
@@ -200,6 +225,7 @@
include/spa-0.2/spa/param/video/raw-utils.h
include/spa-0.2/spa/param/video/raw.h
include/spa-0.2/spa/param/video/type-info.h
+include/spa-0.2/spa/pod/body.h
include/spa-0.2/spa/pod/builder.h
include/spa-0.2/spa/pod/command.h
include/spa-0.2/spa/pod/compare.h
@@ -209,6 +235,7 @@
include/spa-0.2/spa/pod/iter.h
include/spa-0.2/spa/pod/parser.h
include/spa-0.2/spa/pod/pod.h
+include/spa-0.2/spa/pod/simplify.h
include/spa-0.2/spa/pod/vararg.h
include/spa-0.2/spa/support/cpu.h
include/spa-0.2/spa/support/dbus.h
@@ -246,16 +273,16 @@
%%GSTREAMER%%lib/gstreamer-1.0/libgstpipewire.so
lib/libpipewire-0.3.so
lib/libpipewire-0.3.so.0
-lib/libpipewire-0.3.so.0.1410.0
+lib/libpipewire-0.3.so.0.1601.0
%%JACK%%lib/pipewire-0.3/jack/libjack.so
%%JACK%%lib/pipewire-0.3/jack/libjack.so.0
-%%JACK%%lib/pipewire-0.3/jack/libjack.so.0.3.1410
+%%JACK%%lib/pipewire-0.3/jack/libjack.so.0.3.1601
%%JACK%%lib/pipewire-0.3/jack/libjacknet.so
%%JACK%%lib/pipewire-0.3/jack/libjacknet.so.0
-%%JACK%%lib/pipewire-0.3/jack/libjacknet.so.0.3.1410
+%%JACK%%lib/pipewire-0.3/jack/libjacknet.so.0.3.1601
%%JACK%%lib/pipewire-0.3/jack/libjackserver.so
%%JACK%%lib/pipewire-0.3/jack/libjackserver.so.0
-%%JACK%%lib/pipewire-0.3/jack/libjackserver.so.0.3.1410
+%%JACK%%lib/pipewire-0.3/jack/libjackserver.so.0.3.1601
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
@@ -361,6 +388,7 @@
%%ALSA%%share/alsa-card-profile/mixer/paths/hdmi-output-9.conf
%%ALSA%%share/alsa-card-profile/mixer/paths/iec958-stereo-input.conf
%%ALSA%%share/alsa-card-profile/mixer/paths/iec958-stereo-output.conf
+%%ALSA%%share/alsa-card-profile/mixer/paths/logi407-iec958-stereo-output.conf
%%ALSA%%share/alsa-card-profile/mixer/paths/steelseries-arctis-output-chat-common.conf
%%ALSA%%share/alsa-card-profile/mixer/paths/steelseries-arctis-output-game-common.conf
%%ALSA%%share/alsa-card-profile/mixer/paths/usb-gaming-headset-input.conf
@@ -380,6 +408,7 @@
%%ALSA%%share/alsa-card-profile/mixer/profile-sets/hp-tbt-dock-120w-g2.conf
%%ALSA%%share/alsa-card-profile/mixer/profile-sets/hp-tbt-dock-audio-module.conf
%%ALSA%%share/alsa-card-profile/mixer/profile-sets/kinect-audio.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/logi407.conf
%%ALSA%%share/alsa-card-profile/mixer/profile-sets/maudio-fasttrack-pro.conf
%%ALSA%%share/alsa-card-profile/mixer/profile-sets/native-instruments-audio4dj.conf
%%ALSA%%share/alsa-card-profile/mixer/profile-sets/native-instruments-audio8dj.conf
@@ -394,10 +423,12 @@
%%ALSA%%share/alsa-card-profile/mixer/profile-sets/simple-headphones-mic.conf
%%ALSA%%share/alsa-card-profile/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf
%%ALSA%%share/alsa-card-profile/mixer/profile-sets/texas-instruments-pcm2902.conf
+%%ALSA%%share/alsa-card-profile/mixer/profile-sets/usb-gaming-headset-gamefirst.conf
%%ALSA%%share/alsa-card-profile/mixer/profile-sets/usb-gaming-headset.conf
%%ALSA%%share/alsa/alsa.conf.d/50-pipewire.conf
%%ALSA%%share/alsa/alsa.conf.d/99-pipewire-default.conf
share/locale/af/LC_MESSAGES/pipewire.mo
+share/locale/ar/LC_MESSAGES/pipewire.mo
share/locale/as/LC_MESSAGES/pipewire.mo
share/locale/be/LC_MESSAGES/pipewire.mo
share/locale/bg/LC_MESSAGES/pipewire.mo
@@ -455,6 +486,7 @@
%%DATADIR%%/client.conf.avail/20-upmix.conf
%%DATADIR%%/filter-chain.conf
%%DATADIR%%/filter-chain/demonic.conf
+%%DATADIR%%/filter-chain/sink-dolby-pro-logic-ii.conf
%%DATADIR%%/filter-chain/sink-dolby-surround.conf
%%DATADIR%%/filter-chain/sink-eq6.conf
%%DATADIR%%/filter-chain/sink-make-LFE.conf

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 17, 7:25 PM (9 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31676309
Default Alt Text
D55821.id173596.diff (13 KB)

Event Timeline