summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-11-26 19:57:48 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2021-11-26 20:37:32 +0100
commitad21e71688d89d1b2f663b38bb9856a8df291614 (patch)
tree335fb2d5ec9a04b4d866b40a5e96b6130c2a2411 /media-video
parentprofile/base: Update ceph system-boost mask (diff)
downloadgentoo-ad21e71688d89d1b2f663b38bb9856a8df291614.tar.gz
gentoo-ad21e71688d89d1b2f663b38bb9856a8df291614.tar.bz2
gentoo-ad21e71688d89d1b2f663b38bb9856a8df291614.zip
media-video/pipewire: Drop 0.3.39-r4
Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-video')
-rw-r--r--media-video/pipewire/Manifest1
-rw-r--r--media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch112
-rw-r--r--media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch35
-rw-r--r--media-video/pipewire/pipewire-0.3.39-r4.ebuild296
4 files changed, 0 insertions, 444 deletions
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 5d065d2f1818..e94a104be026 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,5 +1,4 @@
DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3
DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14
DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e SHA512 c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6
-DIST pipewire-0.3.39.tar.gz 1671751 BLAKE2B 6ed56d43a45244c29a29f714eba1dbf911997f91d3e3df2cc1547051d52a2853f4d4c745aaf866ae18b63668f3fb9b7d3338deaad90d229c5fab1641482c6761 SHA512 75ed35177577efe7559341394605777be21d0f3952b9379a23c8d4c71d35ed88ec45c3e9ad58832099c8f370753d8b47a5767f47453a599c4f4a4b641b2b0d9d
DIST pipewire-0.3.40.tar.gz 1675384 BLAKE2B b7df4f1ca363b764a5230099d32dd5ba5dceaadc8ca2d4ce55f42810a91628b4e32891757b22fd5eb7a7f497163936c63b86330ab2d5efa261a82d450660c371 SHA512 63109b87d50be160a6cde632470849564d4743f4cb469f5e3713bb1cbefc08f80416210ddedc09439555b702193c0266a1b9724e366a3b850bdf1a346c5e80cb
diff --git a/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch b/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
deleted file mode 100644
index 2687299b235d..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.39-endian-test-fix.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5dfc3494dc4635918e74b9f3d717a39a74b28554.patch
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c07f0ccb71a9d95944ce3e4d7e453cb50a26b0a2.patch
-
-From 5dfc3494dc4635918e74b9f3d717a39a74b28554 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Mon, 25 Oct 2021 16:15:17 +0200
-Subject: [PATCH] map: use uintptr_t for the next pointer
-
-This aligns the low bits of the next field with the low bits of the
-pointer on big endian cpus.
-
-Fixes #1747
----
- src/pipewire/map.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pipewire/map.h b/src/pipewire/map.h
-index f47dfa6b3..1867fa4d3 100644
---- a/src/pipewire/map.h
-+++ b/src/pipewire/map.h
-@@ -74,7 +74,7 @@ extern "C" {
- * first item to get re-used on the next insert.
- */
- union pw_map_item {
-- uint32_t next; /* next free index */
-+ uintptr_t next; /* next free index */
- void *data; /* data of this item, must be an even address */
- };
-
---
-GitLab
-
-From c07f0ccb71a9d95944ce3e4d7e453cb50a26b0a2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Mon, 25 Oct 2021 16:11:56 +0200
-Subject: [PATCH] map: make _insert_at() fail on a removed item
-
-You are only supposed to use _insert_new()/_remove() or _insert_at()
-on the map, If we detect a _insert_at() to a removed item,
-return an error because else we might corrupt the free list.
-
-Update unit test accordingly.
----
- src/pipewire/map.h | 15 ++-------------
- test/test-map.c | 17 +----------------
- 2 files changed, 3 insertions(+), 29 deletions(-)
-
-diff --git a/src/pipewire/map.h b/src/pipewire/map.h
-index fd57f7f7c..f47dfa6b3 100644
---- a/src/pipewire/map.h
-+++ b/src/pipewire/map.h
-@@ -182,20 +182,9 @@ static inline int pw_map_insert_at(struct pw_map *map, uint32_t id, void *data)
- if (item == NULL)
- return -errno;
- } else {
-- if (pw_map_id_is_free(map, id)) {
-- uint32_t *current = &map->free_list;
-- while (*current != SPA_ID_INVALID) {
-- uint32_t current_id = (*current) >> 1;
-- uint32_t *next = &pw_map_get_item(map, current_id)->next;
--
-- if (current_id == id) {
-- *current = *next;
-- break;
-- }
-- current = next;
-- }
-- }
- item = pw_map_get_item(map, id);
-+ if (pw_map_item_is_free(item))
-+ return -EINVAL;
- }
- item->data = data;
- return 0;
-diff --git a/test/test-map.c b/test/test-map.c
-index dd1df77a8..b6d7681ce 100644
---- a/test/test-map.c
-+++ b/test/test-map.c
-@@ -188,7 +188,6 @@ PWTEST(map_insert_at_free)
- int data[3] = {1, 2, 3};
- int new_data = 4;
- int *ptr[3] = {&data[0], &data[1], &data[3]};
-- int *new_ptr = &new_data;
- int idx[3];
- int rc;
-
-@@ -225,21 +224,7 @@ PWTEST(map_insert_at_free)
- }
-
- rc = pw_map_insert_at(&map, item_idx, &new_data);
-- pwtest_neg_errno_ok(rc);
-- pwtest_ptr_eq(new_ptr, pw_map_lookup(&map, item_idx));
--
-- if (before_idx != SKIP && before_idx != item_idx) {
-- rc = pw_map_insert_at(&map, before_idx, &ptr[before_idx]);
-- pwtest_neg_errno_ok(rc);
-- pwtest_ptr_eq(&ptr[before_idx], pw_map_lookup(&map, before_idx));
-- }
--
-- if (after_idx != SKIP && after_idx != item_idx) {
-- rc = pw_map_insert_at(&map, after_idx, &ptr[after_idx]);
-- pwtest_neg_errno_ok(rc);
-- pwtest_ptr_eq(&ptr[after_idx], pw_map_lookup(&map, after_idx));
-- }
--
-+ pwtest_neg_errno(rc, -EINVAL);
- pw_map_clear(&map);
-
- return PWTEST_PASS;
---
-GitLab
-
diff --git a/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch b/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch
deleted file mode 100644
index fe5392e29a3a..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.39-fix-build-some-arches.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/651f0decea5f83730c271e9bed03cdd0048fcd49.patch
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/2cddd4a775c145570f4a8a30d28b57f551d43206.patch
-
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Thu, 21 Oct 2021 11:09:48 +0200
-Subject: [PATCH] cpu: fix compilation on some architectures
-
---- a/spa/plugins/support/cpu.c
-+++ b/spa/plugins/support/cpu.c
-@@ -270,7 +270,7 @@ impl_init(const struct spa_handle_factory *factory,
- if ((str = spa_dict_lookup(info, SPA_KEY_CPU_VM_TYPE)) != NULL)
- this->vm_type = atoi(str);
- if ((str = spa_dict_lookup(info, SPA_KEY_CPU_ZERO_DENORMALS)) != NULL)
-- impl_cpu_zero_denormals(this, spa_atob(str));
-+ spa_cpu_zero_denormals(&this->cpu, spa_atob(str));
- }
-
- spa_log_debug(this->log, "%p: count:%d align:%d flags:%08x",
-
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Mon, 25 Oct 2021 16:32:16 +0200
-Subject: [PATCH] cpu: disable VFP asm when not available
-
-Fixes #1746
---- a/spa/plugins/support/cpu-arm.c
-+++ b/spa/plugins/support/cpu-arm.c
-@@ -143,7 +143,7 @@ static int arm_zero_denormals(void *object, bool enable)
- "msr fpcr, %0 \n"
- "isb \n"
- : "=r"(cw)::"memory");
--#else
-+#elif (defined(__VFP_FP__) && !defined(__SOFTFP__))
- uint32_t cw;
- if (enable)
- __asm__ __volatile__(
diff --git a/media-video/pipewire/pipewire-0.3.39-r4.ebuild b/media-video/pipewire/pipewire-0.3.39-r4.ebuild
deleted file mode 100644
index 96a68064f996..000000000000
--- a/media-video/pipewire/pipewire-0.3.39-r4.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-SLOT="0/0.3"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="jack-sdk? ( !jack-client )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- >=dev-util/meson-0.59
- virtual/pkgconfig
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
-"
-RDEPEND="
- acct-group/audio
- media-libs/alsa-lib
- sys-apps/dbus[${MULTILIB_USEDEP}]
- sys-libs/readline:=
- sys-libs/ncurses:=[unicode(+)]
- virtual/libintl[${MULTILIB_USEDEP}]
- virtual/libudev[${MULTILIB_USEDEP}]
- bluetooth? (
- media-libs/fdk-aac
- media-libs/libldac
- media-libs/libfreeaptx
- media-libs/sbc
- >=net-wireless/bluez-4.101:=
- )
- echo-cancel? ( media-libs/webrtc-audio-processing:0 )
- extra? (
- >=media-libs/libsndfile-1.0.20
- )
- gstreamer? (
- >=dev-libs/glib-2.32.0:2
- >=media-libs/gstreamer-1.10.0:1.0
- media-libs/gst-plugins-base:1.0
- )
- jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
- jack-sdk? (
- !media-sound/jack-audio-connection-kit
- !media-sound/jack2
- )
- pipewire-alsa? (
- >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
- !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio]
- )
- !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
- systemd? ( sys-apps/systemd )
- v4l? ( media-libs/libv4l )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND="media-video/wireplumber"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-# media-video/ffmpeg:=
-# media-libs/libsdl2
-# >=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-# >=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
- # Upstream
- "${FILESDIR}"/${P}-fix-build-some-arches.patch
- "${FILESDIR}"/${P}-endian-test-fix.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
- has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- einfo "Generating ${limitsdfile}"
- cat > ${limitsdfile} <<- EOF || die
- # Start of ${limitsdfile} from ${P}
-
- @audio - memlock 256
-
- # End of ${limitsdfile} from ${P}
- EOF
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
- $(meson_native_use_feature doc docs)
- $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
- $(meson_native_enabled man)
- $(meson_feature test tests)
- -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
- $(meson_native_use_feature gstreamer)
- $(meson_native_use_feature gstreamer gstreamer-device-provider)
- $(meson_native_use_feature systemd)
- -Dsystemd-system-service=disabled # Matches upstream
- $(meson_native_use_feature systemd systemd-user-service)
- $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
- -Dspa-plugins=enabled
- -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
- -Daudiomixer=enabled # Matches upstream
- -Daudioconvert=enabled # Matches upstream
- $(meson_native_use_feature bluetooth bluez5)
- $(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
- $(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
- $(meson_native_use_feature bluetooth bluez5-backend-ofono)
- $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
- $(meson_native_use_feature bluetooth bluez5-codec-aac)
- $(meson_native_use_feature bluetooth bluez5-codec-aptx)
- $(meson_native_use_feature bluetooth bluez5-codec-ldac)
- $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
- -Dcontrol=enabled # Matches upstream
- -Daudiotestsrc=enabled # Matches upstream
- -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
- -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
- $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
- $(meson_use jack-sdk jack-devel)
- $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
- -Dsupport=enabled # Miscellaneous/common plugins, such as null sink
- -Devl=disabled # Matches upstream
- -Dtest=disabled # fakesink and fakesource plugins
- $(meson_native_use_feature v4l v4l2)
- -Dlibcamera=disabled # libcamera is not in Portage tree
- -Dvideoconvert=enabled # Matches upstream
- -Dvideotestsrc=enabled # Matches upstream
- -Dvolume=enabled # Matches upstream
- -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
- $(meson_native_use_feature extra pw-cat)
- -Dudev=enabled
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
- -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
- $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
- -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
- )
-
- meson_src_configure
-}
-
-multilib_src_install() {
- # Our custom DOCS do not exist in multilib source directory
- DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- insinto /etc/security/limits.d
- doins ${limitsdfile}
-
- if use pipewire-alsa; then
- dodir /etc/alsa/conf.d
- # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
- # And the current dosym8 -r implementation is likely affected by the same issue, too.
- dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
- dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
- fi
-
- if ! use systemd; then
- insinto /etc/xdg/autostart
- newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
- exeinto /usr/bin
- newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
- eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
- fi
-}
-
-pkg_postinst() {
- elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
- elog "using PipeWire. Do it either manually or add yourself"
- elog "to the 'audio' group:"
- elog
- elog " usermod -aG audio <youruser>"
- elog
-
- if ! use jack-sdk; then
- elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
- elog "alternative libraries have been installed to a non-default location."
- elog "To use them, put pw-jack <application> before every JACK application."
- elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
- elog "provider is still needed to compile the JACK applications themselves."
- elog
- fi
-
- if use systemd; then
- elog "To use PipeWire for audio, the user units must be manually enabled"
- elog "by running this command as each user you use for desktop activities:"
- elog
- elog " systemctl --user enable --now pipewire.socket pipewire-pulse.socket"
- elog
- elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:"
- elog
- elog " systemctl --user disable --now pulseaudio.service pulseaudio.socket"
- elog
- elog "A reboot is recommended to avoid interferences from still running"
- elog "PulseAudio daemon."
- elog
- elog "Both, new users and those upgrading, need to enable WirePlumber"
- elog "for relevant users:"
- elog
- elog " systemctl --user enable --now wireplumber.service"
- elog
- else
- ewarn "PipeWire daemon startup has been moved to a launcher script!"
- ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
- ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
- ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
- ewarn
- ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
- ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
- ewarn "advised that a D-Bus user session is set up before starting the script."
- ewarn
- if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
- elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
- elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable"
- elog "autospawning of the original daemon by setting:"
- elog
- elog " autospawn = no"
- elog
- elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
- elog
- elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
- elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
- elog "command:"
- elog
- elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
- elog
- fi
- elog "NOTE:"
- elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
- elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
- elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
- elog "and just override the sections you want to change."
- fi
-
- elog "For latest tips and tricks, troubleshooting information and documentation"
- elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
- elog
-
- optfeature_header "The following can be installed for optional runtime features:"
- optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
- if has_version 'net-misc/ofono' ; then
- ewarn "Native backend has become default. Please disable oFono via:"
- if systemd_is_booted ; then
- ewarn "systemctl disable --now ofono"
- else
- ewarn "rc-update delete ofono"
- fi
- ewarn
- fi
-}