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

feat: Update to core24 #412

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

feat: Update to core24 #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d126bf
feat: Update to core24
ashuntu Oct 29, 2024
439bcaf
chore: Bump meson to 1.6.0
ashuntu Oct 29, 2024
ca1fc7d
fix: Correct sed version matching
ashuntu Oct 30, 2024
7a4a36c
chore: Add .vscode to gitignore
ashuntu Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/stage
/prime
/snap/.snapcraft
.vscode/
20 changes: 11 additions & 9 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ description: |
adopt-info: steam
grade: stable
confinement: strict
architectures:
- build-on: amd64
base: core22
platforms:
amd64:
build-on: [amd64]
base: core24
compression: lzo
assumes:
- snapd2.62
Expand Down Expand Up @@ -123,7 +124,7 @@ hooks:
- opengl

environment:
LD_LIBRARY_PATH: $SNAP/graphics/lib/i386-linux-gnu:$SNAP/graphics/usr/lib:$SNAP/usr/lib/i386-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu:$SNAP/lib/i386-linux-gnu:$SNAP/usr/lib/i386-linux-gnu/pulseaudio${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
LD_LIBRARY_PATH: $SNAP/graphics/usr/lib/i386-linux-gnu:$SNAP/graphics/usr/lib:$SNAP/usr/lib/i386-linux-gnu:$SNAP/usr/lib/x86_64-linux-gnu:$SNAP/lib/i386-linux-gnu:$SNAP/usr/lib/i386-linux-gnu/pulseaudio${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
LIBGL_DRIVERS_PATH: $SNAP/graphics/usr/lib/i386-linux-gnu/dri:$SNAP/graphics/usr/lib/x86_64-linux-gnu/dri:${LIBGL_DRIVERS_PATH:+:$LIBGL_DRIVERS_PATH}

parts:
Expand Down Expand Up @@ -186,6 +187,7 @@ parts:
stage-packages:
- libasound2
- libasound2-plugins
- libmp3lame0
- yad
stage:
# restrict to only audio-related files - you need to ensure
Expand Down Expand Up @@ -237,9 +239,9 @@ parts:
after: [ninja]
plugin: nil
source: https://github.com/mesonbuild/meson.git
source-tag: "1.4.1"
source-tag: "1.6.0"
override-build: |
python3 -m pip install .
python3 -m pip install . --break-system-packages
mkdir -p $CRAFT_PART_INSTALL/usr/lib/python3/dist-packages
rm -rf $CRAFT_PART_INSTALL/usr/lib/python3/dist-packages/meson*
python3 -m pip install --target=$CRAFT_PART_INSTALL/usr .
Expand Down Expand Up @@ -305,7 +307,7 @@ parts:
- -usr/share/vulkan/implicit_layer.d/MangoHud.json
- -usr/share/vulkan/implicit_layer.d/libMangoApp.json
- -usr/share/doc/mangohud/MangoHud.conf.example
- -usr/share/man/man1/mangohud.1
- -usr/share/man/man1/mangohud.1

gamemode:
after: [meson-deps]
Expand Down Expand Up @@ -362,8 +364,8 @@ parts:
- libvulkan1:amd64
- libxml2:i386
- libxml2:amd64
- libicu70:i386
- libicu70:amd64
- libicu74:i386
- libicu74:amd64
- zlib1g:i386
- zlib1g:amd64
- xdg-utils
Expand Down
4 changes: 2 additions & 2 deletions src/nvidia32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ def nvidia_version():
modinfo = os.popen(
"modinfo /usr/lib/modules/$(uname -r)/updates/dkms/nvidia.ko* 2> /dev/null"
" | grep -m 1 '^version:'"
" | sed 's/version:\s*//'"
" | sed 's/version:\\s*//'"
).read().splitlines()
modinfo = modinfo or os.popen(
"modinfo /usr/lib/modules/$(uname -r)/kernel/nvidia*/nvidia.ko* 2> /dev/null"
" | grep -m 1 '^version:'"
" | sed 's/version:\s*//'"
" | sed 's/version:\\s*//'"
).read().splitlines()

if not modinfo:
Expand Down
Loading