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.

Sign up for GitHub

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

Jump to bottom

openttd: 1.10.0 -> 1.10.1 #85245

Merged
merged 1 commit into from Apr 15, 2020
Merged

openttd: 1.10.0 -> 1.10.1 #85245

merged 1 commit into from Apr 15, 2020

Conversation

amaxine
Copy link
Contributor

@amaxine amaxine commented Apr 14, 2020

Motivation for this change

Version bump.
Also switched to SDL2, support was added last major release, and that seems generally preferable.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@amaxine
openttd: 1.10.0 -> 1.10.1
3f63396 
1.10.0 added SDL support
@prusnak
Copy link
Member

prusnak commented Apr 14, 2020

Sound/Music does not work for me after the change.

$ openttd
ALSA lib pulse.c:242:(pulse_connect) PulseAudio: Unable to connect: Connection refused

It works fine (with 0.10.0) before the change to SDL2.

@amaxine
Copy link
Contributor Author

amaxine commented Apr 14, 2020

I can only reproduce that (and that exact warning) when running it from nix-shell --pure -p openttd. Audio works fine for me otherwise.

SDL2 breaking audio seems weird, as it's used as a video driver only as far as I can tell. I can't find anything relevant in the PR for it either OpenTTD/OpenTTD#7086

@prusnak
Copy link
Member

prusnak commented Apr 14, 2020 •
edited

My bad. I tested your PR with --pure and openttd-0.10.0 in master without --pure.

Retested without --pure and everything works just fine!

@marsam marsam merged commit a584339 into NixOS:master Apr 15, 2020
@amaxine amaxine deleted the openttd_1.10.1 branch September 10, 2020 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@prusnak prusnak prusnak approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@amaxine @prusnak @marsam