Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pipewire: update to 0.3.6 #20413

Merged
merged 4 commits into from
Jun 16, 2020
Merged

pipewire: update to 0.3.6 #20413

merged 4 commits into from
Jun 16, 2020

Conversation

sirn
Copy link
Contributor

@sirn sirn commented Mar 28, 2020

This PR updates pipewire to 0.3.6 and also updating/patching all packages that depends on it.

  • xdg-desktop-portal includes a patch backported from 1.7.0 to allow 1.6.0 to build against pipewire-0.3 (1.7.x is prerelease)
  • xdg-desktop-portal-kde requires pkg-config to detect pipewire-0.3 because of include dir version suffix.
  • mutter includes a patch backported from 3.35 to allow 3.34 to build against pipewire-0.3 (upgrading to >=3.35 also requires upgrading GNOME).

@sirn sirn force-pushed the pipewire-update branch 4 times, most recently from 3e4b14f to 4ed3c81 Compare March 28, 2020 09:38
@Duncaen
Copy link
Member

Duncaen commented Mar 28, 2020

The xdg-desktop-portal update is a pre releases and conditional patches are big no go.

@sirn
Copy link
Contributor Author

sirn commented Mar 28, 2020

Oh, I didn't realized it was a pre-release. I'll try to upstream the patch (given that glibc has O_SYNC aliased to O_FSYNC). Should I close this for the time being? (e.g. until xdg-desktop-portal has a pipewire-0.3 compatible release)

@Piraty
Copy link
Member

Piraty commented Mar 30, 2020

@sirn you can prefix the PR's title with WIP: (preferred), or NOMERGE or mark it as draft

@sirn sirn changed the title pipewire: update to 0.3.2 WIP: pipewire: update to 0.3.2 Mar 30, 2020
@sirn
Copy link
Contributor Author

sirn commented Apr 5, 2020

I've bumped xdg-desktop-portal to 1.7.2 which include a fix for building under musl so conditional patch is no longer needed. It's still prerelease though, but I'll keep this PR updated until 1.8.0(?) is released. 🙇‍♂️

@mnabid
Copy link
Contributor

mnabid commented Apr 29, 2020

@sirn
I rebuilt xdg-desktop-portal 1.6.0 with this patch and that seems to be built fine.

God knows when 1.8.0 will be released ! mutter-3.36 needs libpipewire-0.3, so all gnome 3.36 updates will be stuck if pipewire can't be updated. Could you just revbump xdg-desktop-portal for now? I've modified the template a bit.

@sirn
Copy link
Contributor Author

sirn commented Apr 29, 2020

@mnabid I've cherry-pick pipewire xdg-desktop-portal from your branch. Thank you!

@sirn sirn changed the title WIP: pipewire: update to 0.3.2 pipewire: update to 0.3.2 Apr 29, 2020
@sirn
Copy link
Contributor Author

sirn commented Apr 29, 2020

@Duncaen since this PR is now building xdg-desktop-portal 1.6.0 with pipewire 0.3 patch, and it seems to build in all systems (& also confirmed working locally on x86_64-musl), is it possible to re-review? Thank you! 🙇

Sorry for the noise. Back to WIP again because of Mutter.

@mnabid
Copy link
Contributor

mnabid commented Apr 29, 2020

Now that I think about it...
mutter-3.34 is still in the repo and needs libpipewire-0.2, so that'll create unresolvable shlib issue. I'm working on gnome 3.36 updates (#21382).

@sirn
Copy link
Contributor Author

sirn commented Apr 29, 2020

Looks like so far only mutter hasn't been updated:

$ xbps-query -RX libpipewire
gstreamer1-pipewire-0.2.7_1
mutter-3.34.1_2
pipewire-0.2.7_1
pipewire-devel-0.2.7_1
xdg-desktop-portal-1.6.0_1
xdg-desktop-portal-kde-5.18.4.1_1

Is it possible to version bump just Mutter, or that requires the rest of GNOME 3.36 as well? In the latter case I guess it makes more sense that I'll close this PR and let #21382 incorporate pipewire-0.3?

@mnabid
Copy link
Contributor

mnabid commented Apr 29, 2020

Looks like so far only mutter hasn't been updated:

$ xbps-query -RX libpipewire
gstreamer1-pipewire-0.2.7_1
mutter-3.34.1_2
pipewire-0.2.7_1
pipewire-devel-0.2.7_1
xdg-desktop-portal-1.6.0_1
xdg-desktop-portal-kde-5.18.4.1_1

Is it possible to version bump just Mutter, or that requires the rest of GNOME 3.36 as well? In the latter case I guess it makes more sense that I'll close this PR and let #21382 incorporate pipewire-0.3?

Yeah, rest of 3.36.
I tried to revbump mutter, didn't work.

@sirn
Copy link
Contributor Author

sirn commented Apr 29, 2020

A patch at https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1062 does seems to get mutter to built against pipewire 0.3. I'm not sure if I need to revbump something else. @mnabid do you mind testing if screencast under this patched mutter-3.34 works?

@sirn sirn changed the title pipewire: update to 0.3.2 [WIP] pipewire: update to 0.3.2 Apr 29, 2020
@mnabid
Copy link
Contributor

mnabid commented Apr 30, 2020

@sirn Yeah, works fine. Thanks !

Maybe edit the PR description to match the current state of this PR.

@sirn sirn changed the title [WIP] pipewire: update to 0.3.2 pipewire: update to 0.3.2 Apr 30, 2020
srcpkgs/pipewire/template Outdated Show resolved Hide resolved
@sirn sirn force-pushed the pipewire-update branch 2 times, most recently from e7495d1 to 57525f5 Compare April 30, 2020 20:52
@sirn sirn changed the title pipewire: update to 0.3.2 pipewire: update to 0.3.4 Apr 30, 2020
@sirn
Copy link
Contributor Author

sirn commented May 30, 2020

Updated to include a patch from @mnabid & split libspa into its own package per @ifreund.

@sirn sirn force-pushed the pipewire-update branch 2 times, most recently from 47acc1f to 07c341d Compare May 30, 2020 04:28
@not-chicken
Copy link
Contributor

I don't know anything about arm, neon, etc but unless the detection fails due to something void specific maybe it's worth reopening https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/235
In the meantime, I think it's fine to roll with the patch.

@sirn
Copy link
Contributor Author

sirn commented May 30, 2020

Now failing due to ICU... probably because of recent ICU update missing some revbump?

@not-chicken
Copy link
Contributor

Now failing due to ICU... probably because of recent ICU update missing some revbump?

Builders are still busy rebuilding stuff for ICU 67.1 https://build.voidlinux.org/waterfall
We gotta wait till they are finished to get a clean CI run.

@mnabid
Copy link
Contributor

mnabid commented May 31, 2020

@sirn Travis should run fine now.

No, I take that back. I'm still getting the same error in Travis. Sorry for bothering.

@sirn
Copy link
Contributor Author

sirn commented Jun 6, 2020

All greens!

@mnabid
Copy link
Contributor

mnabid commented Jun 6, 2020

Seems like everything is awesome !
Pinging @Piraty for a review.

Copy link
Member

@Piraty Piraty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for trusting in my review capabilities.
looks good for me, but i won't test this.

@ifreund
Copy link
Contributor

ifreund commented Jun 6, 2020

Is it really preferable to patch e.g. xdg-desktop-portal rather than package a pre-release? Also a little confused by the versioning of xdg-desktop-portal, it is true that 1.6.0 is marked as a release while all the others are marked as pre-releases on their github page but I see no mention of this fact in their changelog or anywhere else in the repo. Based off the version numbers and content of the repository itself it would seem to me that 1.7.0 is a normal release.

@sirn sirn changed the title pipewire: update to 0.3.5 pipewire: update to 0.3.6 Jun 10, 2020
@sirn
Copy link
Contributor Author

sirn commented Jun 10, 2020

Bumped to 0.3.6 and address @Piraty's review (the patch is not a complete revert, just removing NEON from armv6l/armv7l check). Pipewire is now marked as required in xdg-desktop-portal-kde and requires pkg-config to properly detect pipewire include path (due to -0.3 suffix in pipewire include dir).

@ifreund Also a little confused by the versioning of xdg-desktop-portal, it is true that 1.6.0 is marked as a release while all the others are marked as pre-releases on their github page

I believe they're following odd-unstable/even-stable release pattern.

@Piraty Piraty merged commit 3b2f6c2 into void-linux:master Jun 16, 2020
@sirn sirn deleted the pipewire-update branch June 17, 2020 07:31
@bobertlo
Copy link
Contributor

bobertlo commented Jun 22, 2020

There is a conflict now on mutter. is anyone working on this?

mutter-3.34.1_3: broken, unresolvable shlib `libpipewire-0.2.so.1'

many moons ago i was looking into upgrading mutter but this was the conflict. i could look into this again if it is not being pursued.

also graphene iirc. just seeing if anyone is watching this before i might work on it at another time.

@sirn
Copy link
Contributor Author

sirn commented Jun 22, 2020

Weird, there's already a patch to fix this at 3b2f6c2

@Piraty
Copy link
Member

Piraty commented Jun 22, 2020

@bobertlo are you sure? i hit sth similar as well due to my version of mutter being manually built from testing a gnome update PR

○ xi mutter
[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/x86_64-repodata' ...
[*] Updating repository `https://alpha.de.repo.voidlinux.org/current/multilib/x86_64-repodata' ...

Name          Action    Version           New version            Download size
zenity        install   -                 3.32.0_1               4152KB 
gnome-desktop install   -                 3.34.1_1               435KB 
libcanberra   install   -                 0.30_11                - 
libpipewire   install   -                 0.3.6_1                374KB 
mutter        install   -                 3.34.1_3               2285KB

@mnabid
Copy link
Contributor

mnabid commented Jun 22, 2020

I installed mutter, libpipewire and graphene from the repos and faced no shlib conflict.

[nafis@Neptune ~]$ for pkg in mutter graphene libpipewire; do xbps-query $pkg -p pkgver,repository; done
mutter-3.34.1_3
https://alpha.de.repo.voidlinux.org/current
graphene-1.8.2_2
https://alpha.de.repo.voidlinux.org/current
libpipewire-0.3.6_1
https://alpha.de.repo.voidlinux.org/current

@bobertlo
Copy link
Contributor

Oh wow I forgot I patched mutter for a bug. I had a backport PR then decided to wait for 3.36. sorry lol

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 4, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants