mirror of
https://github.com/miracle-wm-org/miracle-wm.git
synced 2024-11-22 03:02:17 +03:00
snap: upgrade to core24 (#129)
This commit is contained in:
parent
ec04260b85
commit
a6cdcbe673
1
.github/workflows/snap.yml
vendored
1
.github/workflows/snap.yml
vendored
@ -12,7 +12,6 @@ concurrency:
|
||||
|
||||
jobs:
|
||||
Snap:
|
||||
if: false
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
timeout-minutes: 30
|
||||
|
1
.github/workflows/snap_publish.yml
vendored
1
.github/workflows/snap_publish.yml
vendored
@ -11,7 +11,6 @@ concurrency:
|
||||
|
||||
jobs:
|
||||
Snap:
|
||||
if: false
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
timeout-minutes: 30
|
||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -39,3 +39,4 @@ Technical_Test_-_Software_Engineer_-_Mir_-_Google_Docs.pdf
|
||||
temp-build
|
||||
|
||||
*.snap
|
||||
.idea
|
||||
|
@ -5,28 +5,28 @@ description: |
|
||||
miracle-wm is a Wayland compositor based off the Mir library
|
||||
that provides a tiling-window manager.
|
||||
confinement: classic
|
||||
base: core22
|
||||
base: core24
|
||||
version: 0.2.0
|
||||
|
||||
architectures:
|
||||
- build-on: amd64
|
||||
- build-on: arm64
|
||||
- build-on: armhf
|
||||
|
||||
platforms:
|
||||
amd64:
|
||||
arm64:
|
||||
armhf:
|
||||
|
||||
package-repositories:
|
||||
- type: apt
|
||||
ppa: mir-team/release
|
||||
ppa: mir-team/dev
|
||||
|
||||
apps:
|
||||
miracle-wm:
|
||||
command: &_command usr/local/bin/miracle-wm
|
||||
environment: &_environment
|
||||
# Prep for Mir
|
||||
MIR_SERVER_PLATFORM_PATH: ${SNAP}/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/mir/server-platform
|
||||
MIR_SERVER_PLATFORM_PATH: ${SNAP}/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/mir/server-platform
|
||||
__EGL_VENDOR_LIBRARY_DIRS: $SNAP/etc/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d
|
||||
LIBGL_DRIVERS_PATH: $SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/dri
|
||||
LIBGL_DRIVERS_PATH: $SNAP/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/dri
|
||||
LIBINPUT_QUIRKS_DIR: ${SNAP}/usr/share/libinput
|
||||
PATH: ${SNAP}/usr/local/bin/:${PATH}
|
||||
PATH: ${SNAP}/bin/:${SNAP}/usr/bin/:${SNAP}/usr/local/bin/:${PATH}
|
||||
# For "reasons" this is being set despite this being a classic snap. This overwrites the nonsense
|
||||
LD_LIBRARY_PATH: ""
|
||||
|
||||
@ -52,25 +52,34 @@ parts:
|
||||
build-packages:
|
||||
- pkg-config
|
||||
- libmiral-dev
|
||||
- libmiroil-dev
|
||||
- libmircommon-internal-dev
|
||||
- libmircommon-dev
|
||||
- libmirserver-internal-dev
|
||||
- libboost-filesystem-dev
|
||||
- libfreetype6-dev
|
||||
- libwayland-dev
|
||||
- libxkbcommon-dev
|
||||
- g++
|
||||
- make
|
||||
- git
|
||||
- libgtest-dev
|
||||
- libyaml-cpp-dev
|
||||
- libyaml-cpp0.7
|
||||
- libyaml-cpp0.8
|
||||
- libglib2.0-dev
|
||||
- libglib2.0-0
|
||||
- libevdev-dev
|
||||
- libevdev2
|
||||
- nlohmann-json3-dev
|
||||
- libnotify-dev
|
||||
- libgles2-mesa-dev
|
||||
- libmirrenderer-dev
|
||||
stage-packages:
|
||||
- libmiral6
|
||||
- libmiral7
|
||||
- libmiroil5
|
||||
- mir-graphics-drivers-desktop
|
||||
- mir-graphics-drivers-nvidia
|
||||
- pcre2-utils
|
||||
prime:
|
||||
- -lib/udev
|
||||
- -usr/doc
|
||||
@ -96,17 +105,13 @@ parts:
|
||||
- enable-patchelf
|
||||
plugin: nil
|
||||
stage-packages:
|
||||
- libgl1-mesa-dri
|
||||
- libtinfo5
|
||||
# included in this part because it tries to pull in mesa bits
|
||||
- gvncviewer
|
||||
- swaybg
|
||||
- synapse
|
||||
- xvfb
|
||||
- xwayland
|
||||
- libgl1-mesa-dri
|
||||
- libtinfo6
|
||||
# included in this part because they try to pull in mesa bits
|
||||
- xwayland
|
||||
stage:
|
||||
# The libraries in .../dri need no-patchelf, so they come from the mesa-unpatched part
|
||||
- -usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/dri
|
||||
- -usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/dri
|
||||
|
||||
mesa-no-patchelf:
|
||||
plugin: nil
|
||||
@ -116,4 +121,4 @@ parts:
|
||||
- no-patchelf # Otherwise snapcraft may strip the build ID and cause the driver to crash
|
||||
stage:
|
||||
# Only the libraries in .../dri need to not be patched, the rest come from the mesa part
|
||||
- usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/dri
|
||||
- usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/dri
|
||||
|
Loading…
Reference in New Issue
Block a user