From owner-dev-commits-ports-all@freebsd.org Mon Sep 20 13:27:03 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 437F967E967; Mon, 20 Sep 2021 13:27:03 +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 4HClhl1DtGz4djy; Mon, 20 Sep 2021 13:27:03 +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 0A392115CE; Mon, 20 Sep 2021 13:27:03 +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 18KDR20v060704; Mon, 20 Sep 2021 13:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18KDR2Nx060703; Mon, 20 Sep 2021 13:27:02 GMT (envelope-from git) Date: Mon, 20 Sep 2021 13:27:02 GMT Message-Id: <202109201327.18KDR2Nx060703@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: 884bedb1ffb3 - main - multimedia/pipewire: Update to 0.3.36 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: 884bedb1ffb3f91d85a6d1fdf47fc7693ab74a2e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Sep 2021 13:27:03 -0000 The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=884bedb1ffb3f91d85a6d1fdf47fc7693ab74a2e commit 884bedb1ffb3f91d85a6d1fdf47fc7693ab74a2e Author: Gleb Popov AuthorDate: 2021-09-20 13:25:55 +0000 Commit: Gleb Popov CommitDate: 2021-09-20 13:26:18 +0000 multimedia/pipewire: Update to 0.3.36 --- multimedia/pipewire/Makefile | 27 ++++------------------ multimedia/pipewire/distinfo | 22 +++--------------- .../files/patch-spa_plugins_audioconvert_fmt-ops.h | 16 +++++++++++++ .../files/patch-src_pipewire_thread-loop.c | 19 --------------- multimedia/pipewire/pkg-plist | 9 +++++++- 5 files changed, 31 insertions(+), 62 deletions(-) diff --git a/multimedia/pipewire/Makefile b/multimedia/pipewire/Makefile index a54ec138a9b5..cd1139f1be37 100644 --- a/multimedia/pipewire/Makefile +++ b/multimedia/pipewire/Makefile @@ -1,18 +1,7 @@ PORTNAME= pipewire -DISTVERSION= 0.3.31 -PORTREVISION= 4 +DISTVERSION= 0.3.36 CATEGORIES= multimedia -PATCH_SITES= https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/-/commit/ -PATCHFILES+= 91988acb6b6a.patch:-p1 # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/815 -PATCHFILES+= d51634a2f1a7.patch:-p1 # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/816 -PATCHFILES+= d6bb69f2bd88.patch:-p1 # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/816 -PATCHFILES+= 765bd417decc.patch:-p1 # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/816 -PATCHFILES+= 488150fac6c9.patch:-p1 # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/816 -PATCHFILES+= 2488e87fde51.patch:-p1 # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/852 -PATCHFILES+= e41187d64345.patch:-p1 # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/906 -PATCHFILES+= 40cbcf288775.patch:-p1 # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/906 - MAINTAINER= arrowd@FreeBSD.org COMMENT= Server and user space API to deal with multimedia pipelines @@ -47,7 +36,9 @@ MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils MANPAGES_MESON_ENABLED= man MEDIASESSION_DESC= Session manager support -MEDIASESSION_MESON_ENABLED= alsa pipewire-alsa media-session pw-cat +MEDIASESSION_MESON_ENABLED= alsa pipewire-alsa pw-cat +MEDIASESSION_MESON_ON= -Dsession-managers=media-session +MEDIASESSION_MESON_OFF= -Dsession-managers='' MEDIASESSION_LIB_DEPENDS= libsndfile.so:audio/libsndfile PULSEAUDIO_MESON_ENABLED= libpulse @@ -66,19 +57,9 @@ MESON_ARGS= -D bluez5=disabled \ -D sdl2=disabled \ -D udevrulesdir="${LOCALBASE}/lib/udev/rules.d" -post-extract: -.if defined(PATCHFILES) && ${PATCHFILES:Me41187d64345*} - @${REINPLACE_CMD} -e '/_TAG/s/06-02/07-06/' \ - -e '/which/a'$$'\\\n valgrind' \ - ${WRKSRC}/.gitlab-ci.yml -.endif - 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 -# start media session by default - @${REINPLACE_CMD} '/manager_args/ s/@comment@//g' \ - ${WRKSRC}/src/daemon/pipewire.conf.in .include diff --git a/multimedia/pipewire/distinfo b/multimedia/pipewire/distinfo index 163429d7e1ce..7240d05c78ce 100644 --- a/multimedia/pipewire/distinfo +++ b/multimedia/pipewire/distinfo @@ -1,19 +1,3 @@ -TIMESTAMP = 1625130076 -SHA256 (PipeWire-pipewire-0.3.31_GH0.tar.gz) = 2fec0eb47dbfcad51fb8bb3d59c26fe57e09204d63c9d2776070dbdc08aaaaae -SIZE (PipeWire-pipewire-0.3.31_GH0.tar.gz) = 1594284 -SHA256 (91988acb6b6a.patch) = 517d04240016f3e34042f5c10c57138da93c07440fa74987aff1fb9fb8f1f13e -SIZE (91988acb6b6a.patch) = 2173 -SHA256 (d51634a2f1a7.patch) = 8829127899b7b41073aff54c81485f8cf4267e53cab277c71fa119af6bbf0a00 -SIZE (d51634a2f1a7.patch) = 778 -SHA256 (d6bb69f2bd88.patch) = 4ca4812fddc6fd6e1b9b92864d70c34b63dad01c259209aca4974cf4501e45df -SIZE (d6bb69f2bd88.patch) = 3379 -SHA256 (765bd417decc.patch) = f32f3744aca45923ad44d196bb5388fd19347399ff1f1c0233d68da30e4dea03 -SIZE (765bd417decc.patch) = 1170 -SHA256 (488150fac6c9.patch) = f4d02d041d6fd31ec8cfb33aba91e30ddf5d63132e5812db123e9bb9e2168738 -SIZE (488150fac6c9.patch) = 1974 -SHA256 (2488e87fde51.patch) = e35826b317481d3d7c857cd380aab3eddd761506f8e70c3e48206704a80d157e -SIZE (2488e87fde51.patch) = 1326 -SHA256 (e41187d64345.patch) = b6c8b68f454341a71567f57a45c5bde432bad8e109972c10cc51e910f34d567b -SIZE (e41187d64345.patch) = 57126 -SHA256 (40cbcf288775.patch) = ecfb2905922756dba6ab087e5ffe56336afbf4953ad1ea0739f8866f41bc78b6 -SIZE (40cbcf288775.patch) = 1596 +TIMESTAMP = 1632132267 +SHA256 (PipeWire-pipewire-0.3.36_GH0.tar.gz) = a95e47ee87cd7fce8dae74b911a3060c9f8421b4372e1c8417ff36d42afac797 +SIZE (PipeWire-pipewire-0.3.36_GH0.tar.gz) = 1708209 diff --git a/multimedia/pipewire/files/patch-spa_plugins_audioconvert_fmt-ops.h b/multimedia/pipewire/files/patch-spa_plugins_audioconvert_fmt-ops.h new file mode 100644 index 000000000000..0c8e9470da5b --- /dev/null +++ b/multimedia/pipewire/files/patch-spa_plugins_audioconvert_fmt-ops.h @@ -0,0 +1,16 @@ +--- 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/files/patch-src_pipewire_thread-loop.c b/multimedia/pipewire/files/patch-src_pipewire_thread-loop.c deleted file mode 100644 index 7a18834d6d55..000000000000 --- a/multimedia/pipewire/files/patch-src_pipewire_thread-loop.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/pipewire/thread-loop.c.orig 2021-06-28 13:32:38 UTC -+++ src/pipewire/thread-loop.c -@@ -37,8 +37,14 @@ - #define pw_thread_loop_events_destroy(o) pw_thread_loop_events_emit(o, destroy, 0) - - #ifdef __FreeBSD__ --#include --#define pthread_setname_np pthread_set_name_np -+#include -+#if __FreeBSD_version < 1202000 -+int pthread_setname_np(pthread_t thread, const char *name) -+{ -+ pthread_set_name_np(thread, name); -+ return 0; -+} -+#endif - #endif - - /** \cond */ diff --git a/multimedia/pipewire/pkg-plist b/multimedia/pipewire/pkg-plist index 3e7fd1d0f2f5..1a20e75d4904 100644 --- a/multimedia/pipewire/pkg-plist +++ b/multimedia/pipewire/pkg-plist @@ -71,6 +71,7 @@ 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/type.h include/pipewire-0.3/pipewire/utils.h @@ -103,6 +104,7 @@ include/spa-0.2/spa/node/type-info.h include/spa-0.2/spa/node/utils.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 include/spa-0.2/spa/param/audio/layout.h include/spa-0.2/spa/param/audio/raw.h include/spa-0.2/spa/param/audio/type-info.h @@ -139,7 +141,9 @@ 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/system.h +include/spa-0.2/spa/support/thread.h include/spa-0.2/spa/utils/ansi.h include/spa-0.2/spa/utils/defs.h include/spa-0.2/spa/utils/dict.h @@ -158,7 +162,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.331.0 +lib/libpipewire-0.3.so.0.335.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 @@ -306,6 +310,7 @@ share/locale/ko/LC_MESSAGES/pipewire.mo share/locale/lt/LC_MESSAGES/pipewire.mo share/locale/ml/LC_MESSAGES/pipewire.mo share/locale/mr/LC_MESSAGES/pipewire.mo +share/locale/my/LC_MESSAGES/pipewire.mo share/locale/nl/LC_MESSAGES/pipewire.mo share/locale/nn/LC_MESSAGES/pipewire.mo share/locale/oc/LC_MESSAGES/pipewire.mo @@ -332,6 +337,8 @@ share/locale/zh_TW/LC_MESSAGES/pipewire.mo %%DATADIR%%/filter-chain/sink-dolby-surround.conf %%DATADIR%%/filter-chain/sink-eq6.conf %%DATADIR%%/filter-chain/sink-matrix-spatialiser.conf +%%DATADIR%%/filter-chain/sink-virtual-surround-5.1-kemar.conf +%%DATADIR%%/filter-chain/sink-virtual-surround-7.1-hesuvi.conf %%DATADIR%%/filter-chain/source-rnnoise.conf %%DATADIR%%/jack.conf %%MEDIASESSION%%%%DATADIR%%/media-session.d/alsa-monitor.conf