Snap stable build config for 4.4.0

Warzone2100 · Nov 6, 2023 · 52327ab · 52327ab
1 parent 8b760fb
commit 52327ab
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 55 deletions.
diff --git a/.snapcraft.yaml b/.snapcraft.yaml
@@ -3,7 +3,7 @@ name: warzone2100 # no spaces, all lower-case
 adopt-info: warzone2100 # specify the *part* name
 confinement: strict
 grade: stable
-base: core20
+base: core22
 # Enable LZO compression for the snap
 compression: lzo
 # Limit architectures to those supported by the gnome extension (and future core20)
@@ -13,35 +13,36 @@ architectures:
   - build-on: arm64
   - build-on: armhf
 layout:
-  /usr/share/vulkan:
-    symlink: $SNAP/usr/share/vulkan
-  /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvulkan_intel.so:
-    symlink: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvulkan_intel.so
-  /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvulkan_radeon.so:
-    symlink: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvulkan_radeon.so
-#  # Try the following once base is updated to core22
-#  /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvulkan_broadcom.so:
-#    symlink: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvulkan_broadcom.so
-#  /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvulkan_freedreno.so:
-#    symlink: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvulkan_freedreno.so
-#  /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvulkan_lvp.so:
-#    symlink: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvulkan_lvp.so
-
+  /usr/share/libdrm:
+    bind: $SNAP/graphics/libdrm
+  /usr/share/drirc.d:
+    symlink: $SNAP/graphics/drirc.d
+  /usr/share/X11/XErrorDB:
+    symlink: $SNAP/graphics/X11/XErrorDB
+  /usr/share/X11/locale:
+    symlink: $SNAP/graphics/X11/locale
 plugs:
   wz2100-sequences:
     interface: content
     content: wz2100-sequences
     target: $SNAP/usr/share/warzone2100/sequences
     default-provider: warzone2100-videos
+  graphics-core22:
+    interface: content
+    target: $SNAP/graphics
+    default-provider: mesa-core22
 apps:
   warzone2100:
-    extensions: [gnome-3-38]
+    extensions: [gnome]
+    command-chain:
+      - bin/graphics-core22-wrapper
     command: usr/bin/warzone2100-launcher.sh warzone2100
     common-id: net.wz2100.warzone2100 # should match the appdata/metainfo file's <id> field
     desktop: usr/share/applications/net.wz2100.warzone2100.desktop
     environment:
       XDG_DATA_HOME: $SNAP_USER_COMMON
       XDG_CONFIG_HOME: $SNAP_USER_COMMON
+      LIBDECOR_PLUGIN_DIR: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/libdecor/plugins-1
     plugs:
       - audio-playback
       - desktop
@@ -55,30 +56,31 @@ apps:
       - x11
 parts:
   sdl:
-    source: https://github.com/libsdl-org/SDL/releases/download/release-2.26.4/SDL2-2.26.4.tar.gz
-    source-checksum: sha512/138f52a23d796803c450722c8a4db8226214522e99f1e5ae657e2b28eb45abf0c81c9c3df9ab16f1a07d59722ed9415d64dd04332ff040cdfbbc0329f0d05ce4
-    plugin: autotools
-    autotools-configure-parameters:
-      - --prefix=/usr
-      - --disable-alsa
-      - --disable-arts
-      - --disable-esd
-      - --disable-nas
-      - --disable-oss
+    source: https://github.com/libsdl-org/SDL/releases/download/release-2.28.4/SDL2-2.28.4.tar.gz
+    source-checksum: sha512/16950ccedcfdef42ee6eba1a6bf09ed7231ea0205fe8600388de2aed1aba94da2e5450d16e9732dce9f12569a238730b3727bf64b8699f1fed4cb3c5c94c3eaa
+    plugin: cmake
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DSDL_ALSA=OFF
+      - -DSDL_ARTS=OFF
+      - -DSDL_ESD=OFF
+      - -DSDL_NAS=OFF
+      - -DSDL_OSS=OFF
     override-build: |
-      snapcraftctl build
-      sed -i 's|"/usr"|"'"$SNAPCRAFT_STAGE/usr"'"|g' "$SNAPCRAFT_PART_INSTALL/usr/lib/cmake/SDL2/sdl2-config.cmake"
+      craftctl default
     build-packages:
       - git
       - libdbus-1-dev
       - libudev-dev
       - fcitx-libs-dev
+      - libdecor-0-dev
       - libegl1-mesa-dev
       - libgl1-mesa-dev
       - libgles2-mesa-dev
       - libibus-1.0-dev
       - libjack-dev
       - libpulse-dev
+      - libpipewire-0.3-dev
       - libsamplerate0-dev
       - libsndfile1-dev
       - libts-dev
@@ -97,6 +99,8 @@ parts:
       - libxxf86vm-dev
       - libgbm-dev
     stage-packages:
+      - libdecor-0-0
+      - libdecor-0-plugin-1
       - libdbus-1-3
       - libudev1
       - fcitx-libs
@@ -108,6 +112,7 @@ parts:
       - libibus-1.0-5
       - libjack0
       - libpulse0
+      - libpipewire-0.3-0
       - libsamplerate0
       - libts0
       - libsndfile1
@@ -130,24 +135,24 @@ parts:
     plugin: nil
     source: .
     override-build: |
-      mkdir -p "${SNAPCRAFT_PART_INSTALL}/usr/bin"
-      cp -av "${SNAPCRAFT_PART_SRC}/pkg/snap/warzone2100-launcher.sh" "${SNAPCRAFT_PART_INSTALL}/usr/bin/"
+      mkdir -p "${CRAFT_PART_INSTALL}/usr/bin"
+      cp -av "${CRAFT_PART_SRC}/pkg/snap/warzone2100-launcher.sh" "${CRAFT_PART_INSTALL}/usr/bin/"
   warzone2100:
     after: [sdl, launcher]
     plugin: cmake
     source: https://github.com/Warzone2100/warzone2100.git
     parse-info:
       # Parse this appdata/metainfo file for summary, description,
       # and icon. Use the installed path relative to the Snap's root
-      - usr/share/metainfo/net.wz2100.warzone2100.appdata.xml
+      - usr/share/metainfo/net.wz2100.warzone2100.metainfo.xml
     override-pull: |
       # Obtain the desired tag from the .stable_tag file
-      echo "SNAPCRAFT_PROJECT_DIR=$SNAPCRAFT_PROJECT_DIR"
-      STABLE_TAG_CONFIG="$SNAPCRAFT_PROJECT_DIR/.stable_tag"
+      echo "CRAFT_PROJECT_DIR=$CRAFT_PROJECT_DIR"
+      STABLE_TAG_CONFIG="$CRAFT_PROJECT_DIR/.stable_tag"
       TAG_REF=$(cat "${STABLE_TAG_CONFIG}")
       echo "TAG_REF=$TAG_REF"
 
-      snapcraftctl pull
+      craftctl default
 
       echo "git submodule deinit --all"
       git submodule deinit --all
@@ -159,37 +164,40 @@ parts:
       git checkout "${TAG_REF}"
       echo "git submodule update"
       git submodule update --init
-      snapcraftctl set-version "$TAG_REF"
+      craftctl set version="$TAG_REF"
 
       # Write out important release config environment variables
       cat > .snapenv <<EOENV
       WZ_DISTRIBUTOR="Snapcraft"
       EOENV
     override-build: |
-      echo "SNAPCRAFT_TARGET_ARCH=${SNAPCRAFT_TARGET_ARCH}"
-      echo "SNAPCRAFT_ARCH_TRIPLET=${SNAPCRAFT_ARCH_TRIPLET}"
+      echo "CRAFT_TARGET_ARCH=${CRAFT_TARGET_ARCH}"
+      echo "CRAFT_ARCH_TRIPLET=${CRAFT_ARCH_TRIPLET}"
 
       # Install Vulkan SDK
-      . "${SNAPCRAFT_PART_SRC}/.ci/snap/install_vulkan_sdk.sh"
+      . "${CRAFT_PART_SRC}/.ci/snap/install_vulkan_sdk.sh"
 
       if [ -f ".snapenv" ]; then set -a; source .snapenv; set +a; fi
       set +u
       if [ -z "$WZ_DISTRIBUTOR" ]; then export WZ_DISTRIBUTOR="UNKNOWN"; fi
-      cmake -S "$SNAPCRAFT_PART_SRC" -B. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DWZ_ENABLE_WARNINGS:BOOL=ON -DWZ_DISTRIBUTOR:STRING="${WZ_DISTRIBUTOR}" -DWZ_OUTPUT_NAME_SUFFIX="${WZ_OUTPUT_NAME_SUFFIX}" -DWZ_NAME_SUFFIX="${WZ_NAME_SUFFIX}" -G"Ninja"
+      cmake -S "$CRAFT_PART_SRC" -B. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DWZ_ENABLE_WARNINGS:BOOL=ON -DWZ_DISTRIBUTOR:STRING="${WZ_DISTRIBUTOR}" -DWZ_OUTPUT_NAME_SUFFIX="${WZ_OUTPUT_NAME_SUFFIX}" -DWZ_NAME_SUFFIX="${WZ_NAME_SUFFIX}" -G"Ninja"
       cmake --build . -- -j$SNAPCRAFT_PARALLEL_BUILD_COUNT
-      DESTDIR=$SNAPCRAFT_PART_INSTALL cmake --build . -- install
+      DESTDIR=$CRAFT_PART_INSTALL cmake --build . -- install
 
       # Include the icon's path in the desktop file, not just the name.
       # This needs to happen post-build or the build versioning will show as "modified locally"
-      sed -i -E 's|Icon=(.*)|Icon=/usr/share/icons/\1.png|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/net.wz2100.warzone2100.desktop
+      sed -i -E 's|Icon=(.*)|Icon=/usr/share/icons/\1.png|' $CRAFT_PART_INSTALL/usr/share/applications/net.wz2100.warzone2100.desktop
+    # Note: Some packages are provided by the gnome extension, and are commented out below
+    # See: https://snapcraft.io/docs/gnome-extension#heading--packages
+    # And: https://github.com/ubuntu/gnome-sdk/blob/gnome-42-2204-sdk/snapcraft.yaml, https://github.com/ubuntu/gnome-sdk/blob/gnome-42-2204/snapcraft.yaml
     build-packages:
       - asciidoctor
-      - g++
+      #- g++
       - gettext
-      - libfontconfig1-dev
+      #- libfontconfig1-dev
       - libfreetype-dev
-      - libfribidi-dev
-      - libharfbuzz-dev
+      #- libfribidi-dev
+      #- libharfbuzz-dev
       - libopenal-dev
       - libphysfs-dev
       - libpng-dev
@@ -206,10 +214,10 @@ parts:
       - wget
       - zip
     stage-packages:
-      - libfontconfig1
+      #- libfontconfig1
       - libfreetype6
-      - libfribidi0
-      - libharfbuzz0b
+      #- libfribidi0
+      #- libharfbuzz0b
       - libogg0
       - libopenal1
       - libopus0
@@ -224,10 +232,19 @@ parts:
       - libsodium23
       - libsqlite3-0
       - libglu1-mesa
-      - mesa-vulkan-drivers
+      # - mesa-vulkan-drivers # provided by graphics-core22 / mesa-core22
       - unzip
       - zip
     source-type: git
+  graphics-core22:
+    after: [warzone2100]
+    source: https://github.com/MirServer/graphics-core22.git
+    plugin: dump
+    override-prime: |
+      craftctl default
+      ${CRAFT_PART_SRC}/bin/graphics-core22-cleanup mesa-core22 nvidia-core22
+    prime:
+      - bin/graphics-core22-wrapper
   # This part removes all the files in this snap which already exist in
   # connected content and base snaps. Since these files will be available
   # at runtime from the content and base snaps, they do not need to be
@@ -239,15 +256,16 @@ parts:
     after: # Make this part run last; list all your other parts here
       - sdl
       - warzone2100
+      - graphics-core22
     plugin: nil
     build-snaps: # List all content-snaps and base snaps you're using here
-      - core20
+      - core22
       - gtk-common-themes
-      - gnome-3-38-2004
+      - gnome-42-2204
     override-prime: |
       set -eux
-      for snap in "core20" "gtk-common-themes" "gnome-3-38-2004"; do  # List all content-snaps and base snaps you're using here
-          cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
+      for snap in "core22" "gtk-common-themes" "gnome-42-2204"; do  # List all content-snaps and base snaps you're using here
+          cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$CRAFT_PRIME/{}" \;
       done
       # The following is required while using core18 + gnome-3-34
       # See: https://forum.snapcraft.io/t/undefined-symbol-hb-buffer-set-invisible-glyph-with-gnome-3-34/24287

diff --git a/.stable_tag b/.stable_tag
@@ -1 +1 @@
-4.3.5
+4.4.0
diff --git a/pkg/snap/warzone2100-launcher.sh b/pkg/snap/warzone2100-launcher.sh
@@ -8,4 +8,12 @@ if [ ! -d "$SNAP_USER_COMMON/warzone2100" ]; then
   fi
 fi
 
-exec env "XDG_DATA_HOME=$SNAP_USER_COMMON" env "XDG_CONFIG_HOME=$SNAP_USER_COMMON" "$@"
+export XDG_DATA_HOME="${SNAP_USER_COMMON}"
+export XDG_CONFIG_HOME="${SNAP_USER_COMMON}"
+
+# default SDL_VIDEODRIVER if unset (prefer wayland)
+if [ -z "${SDL_VIDEODRIVER}" ]; then
+	export SDL_VIDEODRIVER="wayland,x11"
+fi
+
+exec "$@"