Skip to content

Comments

wayland: 1.19.0 -> 1.20.0#148588

Merged
primeos merged 3 commits intoNixOS:stagingfrom
primeos:wayland
Dec 11, 2021
Merged

wayland: 1.19.0 -> 1.20.0#148588
primeos merged 3 commits intoNixOS:stagingfrom
primeos:wayland

Conversation

@primeos
Copy link
Member

@primeos primeos commented Dec 4, 2021 •
edited
Loading

Motivation for this change

Announcements:

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@primeos
Copy link
Member Author

primeos commented Dec 4, 2021

I haven't investigated this yet but it looks like a regression:

  LTLINK build/libSDL2.la
/nix/store/js66s0xwjnzg0ggi2lq9bcvlk6x2za13-binutils-2.35.2/bin/ld: build/.libs/SDL_waylanddatamanager.o: in function `wl_data_source_destroy':
/build/SDL2-2.0.14/gen/wayland-client-protocol.h:2353: undefined reference to `wl_proxy_marshal_flags'
/nix/store/js66s0xwjnzg0ggi2lq9bcvlk6x2za13-binutils-2.35.2/bin/ld: build/.libs/SDL_waylanddatamanager.o: in function `wl_data_offer_receive':
/build/SDL2-2.0.14/gen/wayland-client-protocol.h:2040: undefined reference to `wl_proxy_marshal_flags'
/nix/store/js66s0xwjnzg0ggi2lq9bcvlk6x2za13-binutils-2.35.2/bin/ld: build/.libs/SDL_waylanddatamanager.o: in function `wl_data_offer_destroy':
/build/SDL2-2.0.14/gen/wayland-client-protocol.h:2052: undefined reference to `wl_proxy_marshal_flags'
/nix/store/js66s0xwjnzg0ggi2lq9bcvlk6x2za13-binutils-2.35.2/bin/ld: build/.libs/SDL_waylanddatamanager.o: in function `wl_data_device_set_selection':
/build/SDL2-2.0.14/gen/wayland-client-protocol.h:2624: undefined reference to `wl_proxy_marshal_flags'
/nix/store/js66s0xwjnzg0ggi2lq9bcvlk6x2za13-binutils-2.35.2/bin/ld: build/.libs/SDL_waylanddatamanager.o: in function `wl_data_source_offer':
/build/SDL2-2.0.14/gen/wayland-client-protocol.h:2341: undefined reference to `wl_proxy_marshal_flags'
/nix/store/js66s0xwjnzg0ggi2lq9bcvlk6x2za13-binutils-2.35.2/bin/ld: build/.libs/SDL_waylanddatamanager.o:/build/SDL2-2.0.14/gen/wayland-client-protocol.h:2341: more undefined references to `wl_proxy_marshal_flags' follow
collect2: error: ld returned 1 exit status
make: *** [Makefile:154: build/libSDL2.la] Error 1

@ofborg ofborg bot requested review from alyssais and codyopel December 4, 2021 15:18
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Dec 4, 2021
@primeos
SDL2: Fix the build with wayland 1.20.0
62ace06 
Source of the patch:
libsdl-org/SDL@e2ade2b

I needed to manually backport it to SDL2 2.0.14.
@ofborg ofborg bot requested a review from cpages December 10, 2021 22:29
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. labels Dec 10, 2021
@primeos primeos marked this pull request as ready for review December 11, 2021 13:32
@primeos
Copy link
Member Author

primeos commented Dec 11, 2021

@ofborg test sway

The Sway test passes now but there might be a few additional regressions (that we'll likely have to catch and fix later as this causes too many rebuilds to test - feel free to ping me if you notice some).

@primeos
Copy link
Member Author

primeos commented Dec 11, 2021

Ok, let's give this a try. I'm not aware of any other regressions. I've confirmed the Firefox fix by building firefox and firefox-esr as well as running nixosTests.firefox.

@primeos primeos merged commit 8fc77f9 into NixOS:staging Dec 11, 2021
This was referenced Dec 14, 2021
Closed
Merged
@primeos primeos mentioned this pull request Mar 24, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@codyopel codyopel Awaiting requested review from codyopel

@alyssais alyssais Awaiting requested review from alyssais

@cpages cpages Awaiting requested review from cpages

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@mweinelt mweinelt Awaiting requested review from mweinelt

@vcunat vcunat Awaiting requested review from vcunat

@nbp nbp Awaiting requested review from nbp

@edolstra edolstra Awaiting requested review from edolstra

Assignees

No one assigned

Labels

10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@primeos