gamescope: 3.11.49 -> 3.11.52-beta6 #219548

Scrumplex · 2023-03-04T18:52:16Z

NOTE: This PR will probably be updated a few times until the eventual release of gamescope 3.11.52

openvr: init at 1.23.8:
- SDK for interacting with SteamVR, Project page
- Patches are the same as used by Arch Linux
- Required by gamescope for running as an OpenVR overlay
libliftoff: 0.3.0 -> 0.4.0
- Changelog, Project page
- Bump required by gamescope
gamescope: 3.11.49 -> 3.11.52-beta6
- Project page
- Patches are here to fix the build in its current state. They are probably going to be unneeded for the stable release of 3.11.52

Things done

Scrumplex · 2023-03-04T22:30:58Z

As an aside: I would be interested in co-maintaining gamescope and maybe libliftoff, as I maintained packages for these on the Arch Linux User Repository, before moving to NixOS.

PedroHLC · 2023-03-13T14:15:36Z

@Scrumplex note that I have a few of the same in #215343 if you need something, kindly let me know.

UPDATE: Also, Joshua said he does not want us to put vkroots as global package, since he'll never add a stable API to it, he believes it's better for every package to target a specific commit in the repo. But like you I did it anyway.

UPDATE2: Put us both as co-maintainers of everything here 😄

UPDATE3: Since you're adding the patches manually to a release tag, I could totally rebase my POC in this branch and stop bumping gamescope to untagged refs.

UPDATE4: If possible, please take a look at #187507 -- I wish we could resurrect and merge it.

PedroHLC · 2023-03-13T14:26:59Z

Result of nixpkgs-review pr 219548 run on x86_64-linux 1

6 packages built:

bottles
bottles-unwrapped
gamescope
libliftoff
openvr
vkroots

Scrumplex · 2023-03-13T14:54:16Z

@Scrumplex note that I have a few of the same in #215343 if you need something, kindly let me know.

👍

UPDATE: Also, Joshua said he does not want us to put vkroots as global package, since he'll never add a stable API to it, he believes it's better for every package to target a specific commit in the repo. But like you I did it anyway.

I just added vkroots inline in gamescope to address this. Especially as it's a header-only library it shouldn't really matter too much.

UPDATE2: Put us both as co-maintainers of everything here

done :D

UPDATE3: Since you're adding the patches manually to a release tag, I could totally rebase my POC in this branch and stop bumping gamescope to untagged refs.

sure :D

pkgs/applications/window-managers/gamescope/default.nix

superherointj · 2023-03-13T15:27:37Z

Would be good to fetchpatch from source patch.

pkgs/applications/window-managers/gamescope/default.nix

PedroHLC

I'll test this in my system, just a sec.

pkgs/development/libraries/libliftoff/default.nix

superherointj · 2023-03-13T20:38:36Z

Result of nixpkgs-review pr 219548 run on x86_64-linux 1

3 packages failed to build:

bottles
bottles-unwrapped
gamescope

2 packages built:

libliftoff
openvr

Error logs for:

/nix/store/5ddg3mqi98qwdqpap1d5d0xkabim34qg-gamescope-3.11.52-beta6.drv
- https://termbin.com/w25j0

PedroHLC · 2023-03-13T20:43:35Z

In gamescope:

/nix/store/fhzz4yrdy17czwc9i4swhlpcp445inzb-binutils-2.40/bin/ld: /nix/store/8s3ancq1nkbv1ir7n17yxhpdzvsak6i2-openvr-1.23.8/lib/libopenvr_api.so: undefined reference to `Json::Value::operator=(Json::Value)'
/nix/store/fhzz4yrdy17czwc9i4swhlpcp445inzb-binutils-2.40/bin/ld: /nix/store/8s3ancq1nkbv1ir7n17yxhpdzvsak6i2-openvr-1.23.8/lib/libopenvr_api.so: undefined reference to `Json::Value::operator!() const'

superherointj · 2023-03-13T20:48:58Z

pkgs/development/libraries/openvr/default.nix

Suggested change

platforms = with platforms; unix;

platforms = platforms.unix;

Scrumplex · 2023-03-13T21:11:24Z

Looks like fetchpatch actually breaks patches (from GitHub) that rename files. The OpenVR patch to support the system installation of jsoncpp, also included headers of the in-tree jsoncpp, which is why there was this mismatch.

Am I missing a specific option of fetchpatch here?

superherointj · 2023-03-13T21:22:31Z

Looks like fetchpatch actually breaks patches (from GitHub) that rename files. The OpenVR patch to support the system installation of jsoncpp, also included headers of the in-tree jsoncpp, which is why there was this mismatch.

Am I missing a specific option of fetchpatch here?

Try to reference the commit not the PR. We don't reference the PR, only commits. Because PR can change.

Scrumplex · 2023-03-13T21:23:42Z

Seems like this is a known issue (#32084). I also tried using fetchpatch2 and also tried to pull in the commits separately, but it doesn't work.

This is what I got when I tried fetchpatch2:

error: Normalized patch '/build/patch' is empty (while the fetched file was not)!
Did you maybe fetch a HTML representation of a patch instead of a raw patch?
Fetched file was:
From a7a6995d1d6f9ee1a17a3741661156f9706c40ce Mon Sep 17 00:00:00 2001
From: Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
Date: Thu, 15 Aug 2019 15:05:34 +0200
Subject: [PATCH] thirdparty: Move jsoncpp to thridparty directory.

Even though the previous patch in this patch set enabled the build with
a system wide jsoncpp and worked for me, it still left the internal
jsoncpp includes in the include path, since the includes were placed
in `CMAKE_CURRENT_SOURCE_DIR`. This could cause problems on other systems
when trying to build with a system wide jsoncpp.

In order to remove the internal json.h from the include path,
I moved all jsoncpp files into a thridparty directory amd include
it in the case of `USE_SYSTEM_JSONCPP` not being set.
---
 {src => thirdparty/jsoncpp}/json/json-forwards.h | 0
 {src => thirdparty/jsoncpp}/json/json.h          | 0
 {src => thirdparty/jsoncpp}/jsoncpp.cpp          | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {src => thirdparty/jsoncpp}/json/json-forwards.h (100%)
 rename {src => thirdparty/jsoncpp}/json/json.h (100%)
 rename {src => thirdparty/jsoncpp}/jsoncpp.cpp (100%)

diff --git a/src/json/json-forwards.h b/thirdparty/jsoncpp/json/json-forwards.h
similarity index 100%
rename from src/json/json-forwards.h
rename to thirdparty/jsoncpp/json/json-forwards.h
diff --git a/src/json/json.h b/thirdparty/jsoncpp/json/json.h
similarity index 100%
rename from src/json/json.h
rename to thirdparty/jsoncpp/json/json.h
diff --git a/src/jsoncpp.cpp b/thirdparty/jsoncpp/jsoncpp.cpp
similarity index 100%
rename from src/jsoncpp.cpp
rename to thirdparty/jsoncpp/jsoncpp.cpp

superherointj · 2023-03-13T21:25:33Z

Seems like this is a known issue (#32084). I also tried using fetchpatch2 and also tried to pull in the commits separately, but it doesn't work.

Feel free to include the patch file then. (but only for patches that fetchpatch didn't work.)

Scrumplex · 2023-03-13T21:26:51Z

Feel free to include the patch file then.

Well in this case, we only really need to deal with a directory being renamed, so I am just going to add a postUnpack stage.

superherointj · 2023-03-13T21:36:40Z

Result of nixpkgs-review pr 219548 run on x86_64-linux 1

5 packages built:

bottles
bottles-unwrapped
gamescope
libliftoff
openvr

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

PedroHLC

Tested it in a live system, gamescope was able to handle CDPR launcher and the Witcher 3 as expected.

NguyenCuong17012021

Tess

ofborg bot added the 8.has: package (new) This PR adds a new package label Mar 4, 2023

ofborg bot requested review from nrdxp, primeos and zhaofengli March 4, 2023 19:08

ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 4, 2023

Scrumplex force-pushed the gamescope-3.11.52 branch from c3e065a to 377956e Compare March 5, 2023 10:09

Scrumplex changed the title ~~gamescope: 3.11.49 -> 3.11.52-beta5~~ gamescope: 3.11.49 -> 3.11.52-beta6 Mar 5, 2023

Scrumplex mentioned this pull request Mar 12, 2023

meson can't find openvr via pkg-config ValveSoftware/gamescope#752

Open

Scrumplex force-pushed the gamescope-3.11.52 branch 3 times, most recently from b9a570f to fd7366b Compare March 12, 2023 11:30

PedroHLC self-requested a review March 13, 2023 14:18

PedroHLC approved these changes Mar 13, 2023

View reviewed changes

PedroHLC added the 12.approvals: 1 This PR was reviewed and approved by one person. label Mar 13, 2023

Scrumplex force-pushed the gamescope-3.11.52 branch from fd7366b to 9d5c5e5 Compare March 13, 2023 14:48

Scrumplex force-pushed the gamescope-3.11.52 branch from 9d5c5e5 to b9d911d Compare March 13, 2023 14:55

ofborg bot requested a review from PedroHLC March 13, 2023 15:19

ofborg bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Mar 13, 2023

superherointj reviewed Mar 13, 2023

View reviewed changes

pkgs/applications/window-managers/gamescope/default.nix Outdated Show resolved Hide resolved

superherointj reviewed Mar 13, 2023

View reviewed changes

pkgs/applications/window-managers/gamescope/default.nix Outdated Show resolved Hide resolved

superherointj added the awaiting_changes label Mar 13, 2023

superherointj reviewed Mar 13, 2023

View reviewed changes

pkgs/applications/window-managers/gamescope/default.nix Outdated Show resolved Hide resolved

Scrumplex force-pushed the gamescope-3.11.52 branch from b9d911d to d2eb923 Compare March 13, 2023 20:19

Scrumplex force-pushed the gamescope-3.11.52 branch from d2eb923 to e76d1f1 Compare March 13, 2023 20:22

PedroHLC reviewed Mar 13, 2023

View reviewed changes

pkgs/development/libraries/libliftoff/default.nix Outdated Show resolved Hide resolved

Scrumplex force-pushed the gamescope-3.11.52 branch from e76d1f1 to b9a1a14 Compare March 13, 2023 20:33

superherointj removed the awaiting_changes label Mar 13, 2023

ofborg bot requested a review from PedroHLC March 13, 2023 20:36

superherointj reviewed Mar 13, 2023

View reviewed changes

Scrumplex force-pushed the gamescope-3.11.52 branch from b9a1a14 to c16eb79 Compare March 13, 2023 21:09

Scrumplex force-pushed the gamescope-3.11.52 branch 3 times, most recently from e086d09 to f931ff4 Compare March 13, 2023 21:32

Scrumplex added 3 commits March 13, 2023 22:37

openvr: init at 1.23.8

1b88a5b

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

libliftoff: 0.3.0 -> 0.4.1

dc9f7e5

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

gamescope: 3.11.49 -> 3.11.52-beta6

00398e9

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

Scrumplex force-pushed the gamescope-3.11.52 branch from f931ff4 to 00398e9 Compare March 13, 2023 21:37

superherointj approved these changes Mar 13, 2023

View reviewed changes

PedroHLC approved these changes Mar 13, 2023

View reviewed changes

superherointj merged commit 9e91539 into NixOS:master Mar 13, 2023

PedroHLC mentioned this pull request Mar 13, 2023

POC: vulkan-gaming with HDR using latest gamescope and linux-hdr #215343

Closed

Scrumplex deleted the gamescope-3.11.52 branch September 6, 2023 06:39

NguyenCuong17012021 reviewed Jan 8, 2024

View reviewed changes

	platforms = with platforms; unix;
	platforms = platforms.unix;

Uh oh!

gamescope: 3.11.49 -> 3.11.52-beta6 #219548

gamescope: 3.11.49 -> 3.11.52-beta6 #219548

Uh oh!

Conversation

Scrumplex commented Mar 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

Scrumplex commented Mar 4, 2023

Uh oh!

PedroHLC commented Mar 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PedroHLC commented Mar 13, 2023

Uh oh!

Scrumplex commented Mar 13, 2023

Uh oh!

Uh oh!

superherointj commented Mar 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PedroHLC left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

superherointj commented Mar 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PedroHLC commented Mar 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

superherointj Mar 13, 2023

Choose a reason for hiding this comment

Uh oh!

Scrumplex commented Mar 13, 2023

Uh oh!

superherointj commented Mar 13, 2023

Uh oh!

Scrumplex commented Mar 13, 2023

Uh oh!

superherointj commented Mar 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Scrumplex commented Mar 13, 2023

Uh oh!

superherointj commented Mar 13, 2023

Uh oh!

PedroHLC left a comment

Choose a reason for hiding this comment

Uh oh!

NguyenCuong17012021 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Scrumplex commented Mar 4, 2023 •

edited

Loading

PedroHLC commented Mar 13, 2023 •

edited

Loading

superherointj commented Mar 13, 2023 •

edited

Loading

superherointj commented Mar 13, 2023 •

edited

Loading

PedroHLC commented Mar 13, 2023 •

edited

Loading

superherointj commented Mar 13, 2023 •

edited

Loading