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

xorg: update stuff #34593

Merged
merged 27 commits into from
Feb 7, 2022
Merged

xorg: update stuff #34593

merged 27 commits into from
Feb 7, 2022

Conversation

dkwo
Copy link
Contributor

@dkwo dkwo commented Dec 17, 2021

  • xorgproto: update to 2021.5.
  • New package: libxcvt-0.1.1
  • xorg-server: update to 21.1.2
  • libX11: revbump for protocols

taken from #33812
built and tested on x86_64-musl

@leahneukirchen
Copy link
Member

What about XInput2.4?

@slotThe
Copy link
Contributor

slotThe commented Dec 20, 2021

What about XInput2.4?

This should be integrated in xorg-server 21.1.2. XInput is not the xinput package, if that's what you're thinking (that one's still at the version we're currently packaging)

@dkwo
Copy link
Contributor Author

dkwo commented Dec 23, 2021

indeed:

This is the first release candidate of Xorg 21.1.0 release.
Notable changes since 1.20 include:

  • The meson support is now fully mature. While autotools support will still be
    kept for this release series, it will be dropped afterwards.

  • Glamor support for Xvfb.

  • Variable refresh rate support in the modesetting driver.

  • XInput 2.4 support which adds touchpad gestures.

  • DMX DDX has been removed.

  • X server now correctly reports display DPI in more cases which may affect
    rendering of client applications on hi-DPI screens.

A large number of small features and various bug fixes.

Note that since 21.1 series XWayland is released separately and thus this
release does not include it.

@dkwo
Copy link
Contributor Author

dkwo commented Dec 23, 2021

Rebased and pushed a couple more updates, as in https://who-t.blogspot.com/2021/09/whats-new-in-xi-24-touchpad-gestures.html

@dkwo
Copy link
Contributor Author

dkwo commented Dec 23, 2021

I'm confused, it all builds fine locally using update-bulk.

@dkwo
Copy link
Contributor Author

dkwo commented Dec 24, 2021

It fails on ci with
Dependency inputproto found: NO found 2.3.2 but need: '>= 2.3.99.1'
while here I get correctly
Run-time dependency inputproto found: YES 2.3.99.2
which is provided by xorgproto.

@dkwo
Copy link
Contributor Author

dkwo commented Dec 25, 2021

Now it mysteriously builds again in ci.

@dkwo dkwo changed the title xorg: update to 21.1.2 xorg: update stuff Dec 25, 2021
@abenson
Copy link
Contributor

abenson commented Dec 27, 2021

I think xf86 drivers will need to be revbumped for this.

@dkwo
Copy link
Contributor Author

dkwo commented Dec 27, 2021

Do you mean xf86-input* and xf86-video* ?

@dkwo dkwo force-pushed the xorg-server21 branch 2 times, most recently from 8122204 to dd65033 Compare December 27, 2021 21:37
@dkwo
Copy link
Contributor Author

dkwo commented Dec 27, 2021

Revbumped all, added a couple of patches stolen from arch/alpine.
It seems to work fine on my system.

@dkwo dkwo force-pushed the xorg-server21 branch 2 times, most recently from e2ca640 to 46c54d2 Compare December 28, 2021 12:22
@dkwo
Copy link
Contributor Author

dkwo commented Dec 28, 2021

Patches were taken from upstream: either pull requests, or already merged into master.
Only exception is xf86-video-fbturbo*, which has not seen changes since 2015 and unsurprinsingly fails to build with recent xorg.
There's an issue on its github ssvb/xf86-video-fbturbo#66 I'm not sure what to do with this.

@dkwo
Copy link
Contributor Author

dkwo commented Dec 28, 2021

Also, in some cases I took only patches that allow to build, but judging from the commits' titles more patches may be needed for using the pkgs.

@dkwo
Copy link
Contributor Author

dkwo commented Jan 2, 2022

The package xf86-video-fbturbo* not only is obsolete, but it also seems not very usefull/not working in present condition,
see e.g. https://new.reddit.com/r/voidlinux/comments/rtkdhd/display_server_on_rpi4_using_aarch64/
@Piraty Shall I just remove it?

@dkwo dkwo force-pushed the xorg-server21 branch 4 times, most recently from 6ca72b5 to 2fc2fac Compare January 4, 2022 09:55
@dkwo
Copy link
Contributor Author

dkwo commented Jan 4, 2022

Updated to a new xorg version and rebased onto master.
This is ready for review.

@abenson
Copy link
Contributor

abenson commented Jan 4, 2022

nvidia and nvidia390 are likely blockers until they're updated for the ABI bump.

It looks like they should, I'm double checking.

@dkwo
Copy link
Contributor Author

dkwo commented Feb 7, 2022

Done. It should be fine now.

@slotThe
Copy link
Contributor

slotThe commented Feb 7, 2022

Now installs like a charm, thanks!

Can confirm that this works for me (on xmonad). Further, I was also able to build the Emacs master branch with the --with-xinput2 flag just fine, to make use of new modes that need XInput 2.4 features

@leahneukirchen leahneukirchen merged commit 460beb4 into void-linux:master Feb 7, 2022
@dkwo dkwo deleted the xorg-server21 branch February 13, 2023 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants