From ab25d73a3c73b68087af1fd47fdba69541701f10 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Aug 2021 01:20:57 +0100 Subject: app-emulation/steam{,-native-runtime} : version bump --- media-libs/libpipewire/Manifest | 1 + ...pewire-0.3.25-enable-failed-mlock-warning.patch | 12 ++ .../pipewire-0.3.31-non-systemd-integration.patch | 17 +++ ...pewire-0.3.31-revert-openaptx-restriction.patch | 30 ++++ media-libs/libpipewire/libpipewire-0.3.32.ebuild | 160 +++++++++++++++++++++ 5 files changed, 220 insertions(+) create mode 100644 media-libs/libpipewire/Manifest create mode 100644 media-libs/libpipewire/files/pipewire-0.3.25-enable-failed-mlock-warning.patch create mode 100644 media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch create mode 100644 media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch create mode 100644 media-libs/libpipewire/libpipewire-0.3.32.ebuild (limited to 'media-libs') diff --git a/media-libs/libpipewire/Manifest b/media-libs/libpipewire/Manifest new file mode 100644 index 00000000..f9fd7cea --- /dev/null +++ b/media-libs/libpipewire/Manifest @@ -0,0 +1 @@ +DIST pipewire-0.3.32.tar.gz 1604622 BLAKE2B cab83a17a2b27f710e1377a2ad2ad7003053ef3e8b55423362f0b428e22d52c2ce564da00aab71cc93262d4cb21f239fffea195d05937fdf3489dc540b77d58d SHA512 8a7fe26a78071fdd8d4c9e2d9bf3791af8e0cb53b976b45d39dcab4ad08196808f416911fb1b366cc85e3fa80592ec79c4e4556bb3a390f4a10229b4bf9893f7 diff --git a/media-libs/libpipewire/files/pipewire-0.3.25-enable-failed-mlock-warning.patch b/media-libs/libpipewire/files/pipewire-0.3.25-enable-failed-mlock-warning.patch new file mode 100644 index 00000000..bdb43fe5 --- /dev/null +++ b/media-libs/libpipewire/files/pipewire-0.3.25-enable-failed-mlock-warning.patch @@ -0,0 +1,12 @@ +diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in +--- a/src/daemon/pipewire.conf.in ++++ b/src/daemon/pipewire.conf.in +@@ -6,7 +6,7 @@ context.properties = { + #support.dbus = true + #link.max-buffers = 64 + link.max-buffers = 16 # version < 3 clients can't handle more +- #mem.warn-mlock = false ++ mem.warn-mlock = true # Gentoo should have good RLIMITs now + #mem.allow-mlock = true + #mem.mlock-all = false + #clock.power-of-two-quantum = true diff --git a/media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch b/media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch new file mode 100644 index 00000000..ccc89f13 --- /dev/null +++ b/media-libs/libpipewire/files/pipewire-0.3.31-non-systemd-integration.patch @@ -0,0 +1,17 @@ +--- a/src/daemon/pipewire.conf.in 2021-06-30 22:22:09.520402459 +0200 ++++ b/src/daemon/pipewire.conf.in 2021-06-30 22:22:30.620404999 +0200 +@@ -234,12 +234,12 @@ + # but it is better to start it as a systemd service. + # Run the session manager with -h for options. + # +- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } ++ { path = "@session_manager_path@" args = "@session_manager_args@" } + # + # You can optionally start the pulseaudio-server here as well + # but it is better to start it as a systemd service. + # It can be interesting to start another daemon here that listens + # on another address with the -a option (eg. -a tcp:4713). + # +- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } ++ { path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } + ] diff --git a/media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch b/media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch new file mode 100644 index 00000000..d8496bc5 --- /dev/null +++ b/media-libs/libpipewire/files/pipewire-0.3.31-revert-openaptx-restriction.patch @@ -0,0 +1,30 @@ +From 3449214466c4dac866ec9f47ecc573efaf4505bb Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann +Date: Fri, 21 May 2021 10:32:52 +0200 +Subject: [PATCH] Revert "openaptx: Blacklist >= 0.2.1 due to license change" + +This reverts commit d08b6fac6bec0d334ee9fc785d551a67832f95fe. + +Doesn't apply to us. + +Bug: https://bugs.gentoo.org/785634 +--- + spa/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spa/meson.build b/spa/meson.build +index e13802e94..885b25405 100644 +--- a/spa/meson.build ++++ b/spa/meson.build +@@ -28,7 +28,7 @@ if not get_option('spa-plugins').disabled() + summary({'LDAC': ldac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') + ldac_abr_dep = dependency('ldacBT-abr', required : get_option('bluez5-codec-ldac')) + summary({'LDAC ABR': ldac_abr_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') +- aptx_dep = dependency('libopenaptx', version : '< 0.2.1', required : get_option('bluez5-codec-aptx')) ++ aptx_dep = dependency('libopenaptx', required : get_option('bluez5-codec-aptx')) + summary({'aptX': aptx_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') + fdk_aac_dep = dependency('fdk-aac', required : get_option('bluez5-codec-aac')) + summary({'AAC': fdk_aac_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') +-- +2.32.0 + diff --git a/media-libs/libpipewire/libpipewire-0.3.32.ebuild b/media-libs/libpipewire/libpipewire-0.3.32.ebuild new file mode 100644 index 00000000..8c8edaa7 --- /dev/null +++ b/media-libs/libpipewire/libpipewire-0.3.32.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7..10} ) + +inherit meson-multilib optfeature python-any-r1 udev + +MY_PN="pipewire" + +SRC_URI="https://gitlab.freedesktop.org/${MY_PN}/${MY_PN}/-/archive/${PV}/${MY_PN}-${PV}.tar.gz" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +DESCRIPTION="Pipewire client libraries" +HOMEPAGE="https://pipewire.org/" + +LICENSE="MIT LGPL-2.1+ GPL-2" +SLOT="0/0.3" +IUSE="bluetooth doc extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" + +REQUIRED_USE="jack-sdk? ( !jack-client )" + +RESTRICT="!test? ( test )" + +BDEPEND=" + app-doc/xmltoman + virtual/pkgconfig + ${PYTHON_DEPS} + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) +" +RDEPEND=" + media-libs/alsa-lib + sys-apps/dbus[${MULTILIB_USEDEP}] + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + virtual/libudev[${MULTILIB_USEDEP}] + bluetooth? ( + media-libs/fdk-aac + media-libs/libldac + media-libs/libopenaptx + media-libs/sbc + >=net-wireless/bluez-4.101:= + ) + 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[-pulseaudio] + !media-plugins/alsa-plugins + ) + ) + !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) + systemd? ( sys-apps/systemd ) + v4l? ( media-libs/libv4l ) + !!media-video/pipewire +" + +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${MY_PN}-0.3.25-enable-failed-mlock-warning.patch + "${FILESDIR}"/${MY_PN}-0.3.31-revert-openaptx-restriction.patch +) + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + default + + if ! use systemd; then + eapply "${FILESDIR}"/${MY_PN}-0.3.31-non-systemd-integration.patch + fi +} + +multilib_src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + $(meson_native_use_feature doc docs) + $(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session + $(meson_native_enabled media-session) + $(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 (-Dmedia-session depends on this) + -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) + -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_feature 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) + ) + + meson_src_configure +} + +multilib_src_install() { + meson_src_install + + # We only need some libraries, trim out the rest + rm -rvf ${D}/lib + rm -rvf ${D}/usr/bin + rm -rvf ${D}/usr/include + rm -rvf ${D}/usr/lib/alsa-lib + rm -rvf ${D}/usr/lib64/alsa-lib + rm -rvf ${D}/usr/lib/gstreamer-1.0 + rm -rvf ${D}/usr/lib64/gstreamer-1.0 + rm -rvf ${D}/usr/lib/pipewire-0.3/jack + rm -rvf ${D}/usr/lib64/pipewire-0.3/jack + rm -rvf ${D}/usr/lib/pkgconfig + rm -rvf ${D}/usr/lib64/pkgconfig + rm -rvf ${D}/usr/share +} -- cgit v1.2.3