Github messages for voidlinux
 help / color / mirror / Atom feed
From: st3r4g <st3r4g@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] pipewire: update to 0.3.25
Date: Thu, 08 Apr 2021 10:46:43 +0200	[thread overview]
Message-ID: <20210408084643.4Sk_HaHuGww1QncRjWLyxFS0Td3NR8VevuF-CJMqQqw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30046@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1909 bytes --]

There is an updated pull request by st3r4g against master on the void-packages repository

https://github.com/st3r4g/void-packages pipewire-0.3.25
https://github.com/void-linux/void-packages/pull/30046

pipewire: update to 0.3.25
* activate bluetooth support only when the bluetooth plugin is installed
* fix README.voidlinux going in pipewire-doc
* disable SDL2 dep, only used in some examples we don't even ship
* rm INSTALL.msg, configs should be stable now (also mark them in xbps)
* ncursesw.patch is now upstream

Fix #29655

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30046.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.25-30046.patch --]
[-- Type: text/x-diff, Size: 5862 bytes --]

From eef2bc71f1866e88c7c7d2822fe216d74088936f Mon Sep 17 00:00:00 2001
From: Stefano Ragni <stefano.ragni@outlook.com>
Date: Tue, 6 Apr 2021 17:25:47 +0200
Subject: [PATCH] pipewire: update to 0.3.25

* activate bluetooth support only when the bluetooth plugin is installed
* fix README.voidlinux going in pipewire-doc
* disable SDL2 dep, only used in some examples we don't even ship
* rm INSTALL.msg, configs should be stable now (also mark them in xbps)
* ncursesw.patch is now upstream
---
 srcpkgs/pipewire/INSTALL.msg                  |  3 ---
 srcpkgs/pipewire/files/README.voidlinux       |  2 ++
 srcpkgs/pipewire/patches/ncursesw.patch       | 11 ----------
 srcpkgs/pipewire/patches/with-bluetooth.patch | 19 ++++++++++++++++++
 srcpkgs/pipewire/template                     | 20 +++++++++++--------
 5 files changed, 33 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/pipewire/INSTALL.msg
 delete mode 100644 srcpkgs/pipewire/patches/ncursesw.patch
 create mode 100644 srcpkgs/pipewire/patches/with-bluetooth.patch

diff --git a/srcpkgs/pipewire/INSTALL.msg b/srcpkgs/pipewire/INSTALL.msg
deleted file mode 100644
index 8475a2465b7b..000000000000
--- a/srcpkgs/pipewire/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-WARNING: pipewire frequently changes the config file format. If
-you edited /etc/pipewire/pipewire.conf you must recreate it from
-/etc/pipewire/pipewire.conf.new-0.3.xx with your changes on top.
diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 7bcb761273b0..0c3d167f0aef 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -5,3 +5,5 @@ Optional dependencies:
 * `libjack-pipewire` for jack replacement
 * `libspa-bluetooth` for bluetooth support
 * `libspa-jack` for running pipewire and jack side-by-side
+* `libspa-v4l2` for video camera support
+* `rtkit` for realtime priority acquisition
diff --git a/srcpkgs/pipewire/patches/ncursesw.patch b/srcpkgs/pipewire/patches/ncursesw.patch
deleted file mode 100644
index 09b8f071c41c..000000000000
--- a/srcpkgs/pipewire/patches/ncursesw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build.orig	2021-02-18 14:35:42.028024846 +0100
-+++ meson.build	2021-02-18 14:39:53.808039159 +0100
-@@ -311,7 +311,7 @@
- pthread_lib = dependency('threads')
- dbus_dep = dependency('dbus-1')
- sdl_dep = dependency('sdl2', required : get_option('sdl2'))
--ncurses_dep = dependency('ncurses', required : false)
-+ncurses_dep = dependency('ncursesw', required : false)
- sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile'))
- 
- if get_option('gstreamer')
diff --git a/srcpkgs/pipewire/patches/with-bluetooth.patch b/srcpkgs/pipewire/patches/with-bluetooth.patch
new file mode 100644
index 000000000000..3f6ef0c02fd2
--- /dev/null
+++ b/srcpkgs/pipewire/patches/with-bluetooth.patch
@@ -0,0 +1,19 @@
+Activate bluetooth support only when the bluetooth plugin is installed.
+--- src/daemon/media-session.d/media-session.conf.orig	2021-04-06 17:05:05.935876278 +0200
++++ src/daemon/media-session.d/media-session.conf	2021-04-06 17:06:16.599878154 +0200
+@@ -94,12 +94,14 @@
+     with-alsa = [
+         with-audio
+     ]
++    with-bluetooth = [
++        bluez5
++    ]
+     with-jack = [
+         with-audio
+     ]
+     with-pulseaudio = [
+         with-audio
+-        bluez5
+         restore-stream
+         streams-follow-default
+     ]
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 9ab2c72fb8f7..0b06592e3c6b 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,15 +1,15 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.24
-revision=2
+version=0.3.25
+revision=1
 build_style=meson
 configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
  -Dbluez5=enabled -Dffmpeg=enabled -Dpipewire-alsa=enabled -Dpipewire-jack=enabled
  -Dvulkan=enabled -Dudevrulesdir=/usr/lib/udev/rules.d"
 hostmakedepends="doxygen graphviz pkg-config xmltoman gettext"
-makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel
- sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel
- libopenaptx-devel fdk-aac-devel"
+makedepends="ffmpeg-devel gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel
+ libva-devel libbluetooth-devel ncurses-devel libopenaptx-devel fdk-aac-devel
+ libsndfile-devel Vulkan-Headers vulkan-loader $(vopt_if sdl2 SDL2-devel)"
 depends="libspa-alsa libspa-audioconvert libspa-audiomixer libspa-control"
 short_desc="Server and user space API to deal with multimedia pipelines"
 maintainer="Kridsada Thanabulpong <sirn@ogsite.net>"
@@ -17,8 +17,10 @@ license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
 distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
-checksum=aeca2b44660c4f36eed29cc9c6ccb093ea2778fd0e4ed7665cdfc40b2a49873f
-conf_files="/etc/pipewire/pipewire.conf"
+checksum=fb6d5a0cbde621659ffd67622f19744dd6c8da8745b060cb1951c3d2045e5166
+conf_files="/etc/pipewire/*.conf /etc/pipewire/media-session.d/*.conf"
+
+build_options="sdl2"
 
 replaces="libpulseaudio-pipewire>=0"
 
@@ -34,6 +36,7 @@ fi
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"
+	touch "${DESTDIR}/etc/pipewire/media-session.d/with-bluetooth"
 }
 
 libpipewire_package() {
@@ -81,6 +84,7 @@ libspa-bluetooth_package() {
 	short_desc+=" - bluetooth plugins"
 	pkg_install() {
 		vmove usr/lib/spa-0.2/bluez5
+		vmove etc/pipewire/media-session.d/with-bluetooth
 	}
 }
 
@@ -154,6 +158,6 @@ libjack-pipewire_package() {
 pipewire-doc_package() {
 	short_desc+=" - documentation"
 	pkg_install() {
-		vmove usr/share/doc
+		vmove usr/share/doc/pipewire/html
 	}
 }

  parent reply	other threads:[~2021-04-08  8:46 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-06 15:52 [PR PATCH] " st3r4g
2021-04-06 15:57 ` [PR PATCH] [Updated] " st3r4g
2021-04-06 16:03 ` st3r4g
2021-04-06 16:07 ` st3r4g
2021-04-06 16:14 ` st3r4g
2021-04-06 16:18 ` [PR PATCH] [Updated] " st3r4g
2021-04-06 16:18 ` st3r4g
2021-04-06 16:50 ` st3r4g
2021-04-06 17:19 ` [PR REVIEW] " ericonr
2021-04-06 17:47 ` st3r4g
2021-04-07 18:10 ` ericonr
2021-04-08  8:46 ` st3r4g [this message]
2021-04-08  8:57 ` [PR PATCH] [Updated] " st3r4g
2021-04-08 23:12 ` [PR REVIEW] " st3r4g
2021-04-09 10:26 ` [PR PATCH] [Updated] [nomerge] " st3r4g
2021-04-09 10:28 ` [PR REVIEW] " st3r4g
2021-04-09 15:05 ` [PR PATCH] [Merged]: " ericonr

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210408084643.4Sk_HaHuGww1QncRjWLyxFS0Td3NR8VevuF-CJMqQqw@z \
    --to=st3r4g@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).