snapcraft: Fix dbus name. Add alsa conf to layouts and add plug. Add missing dev and runtime packages.

This commit is contained in:
Scarlett Moore 2023-10-30 08:31:27 -07:00
parent 20d67c5019
commit 5aa1cc9bb7
1 changed files with 26 additions and 21 deletions

View File

@ -9,7 +9,7 @@ apps:
kasts: kasts:
# extensions: # extensions:
# - kde-neon # - kde-neon
common-id: org.kde.kasts.desktop common-id: org.kde.kasts
desktop: usr/share/applications/org.kde.kasts.desktop desktop: usr/share/applications/org.kde.kasts.desktop
command: usr/bin/kasts command: usr/bin/kasts
plugs: plugs:
@ -24,6 +24,7 @@ apps:
- network - network
- network-bind - network-bind
- network-manager-observe - network-manager-observe
- alsa
command-chain: command-chain:
- snap/command-chain/desktop-launch - snap/command-chain/desktop-launch
assumes: assumes:
@ -40,10 +41,10 @@ plugs:
interface: content interface: content
target: $SNAP/data-dir/sounds target: $SNAP/data-dir/sounds
default-provider: gtk-common-themes default-provider: gtk-common-themes
kf5-5-110-qt-5-15-11-core22: kf5-5-111-qt-5-15-11-core22:
content: kf5-5-110-qt-5-15-11-core22-all content: kf5-5-111-qt-5-15-11-core22-all
interface: content interface: content
default-provider: kf5-5-110-qt-5-15-11-core22 default-provider: kf5-5-111-qt-5-15-11-core22
target: $SNAP/kf5 target: $SNAP/kf5
environment: environment:
SNAP_DESKTOP_RUNTIME: $SNAP/kf5 SNAP_DESKTOP_RUNTIME: $SNAP/kf5
@ -52,7 +53,7 @@ environment:
QT_QUICK_CONTROLS_STYLE: org.kde.desktop QT_QUICK_CONTROLS_STYLE: org.kde.desktop
GST_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/gstreamer-1.0" GST_PLUGIN_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/gstreamer-1.0"
GST_PLUGIN_SYSTEM_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/gstreamer-1.0" GST_PLUGIN_SYSTEM_PATH: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/gstreamer-1.0"
GST_PLUGIN_SCANNER: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner" GST_PLUGIN_SCANNER: "$SNAP/kf5/usr/lib/$CRAFT_ARCH_TRIPLET/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
hooks: hooks:
configure: configure:
plugs: plugs:
@ -66,10 +67,12 @@ layout:
bind: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/alsa-lib" bind: "$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/alsa-lib"
"/usr/share/alsa": "/usr/share/alsa":
bind: "$SNAP/usr/share/alsa" bind: "$SNAP/usr/share/alsa"
"/etc/alsa/conf.d":
bind: "$SNAP/etc/alsa/conf.d"
slots: slots:
session-dbus-interface: session-dbus-interface:
interface: dbus interface: dbus
name: org.kde.kasts name: org.mpris.MediaPlayer2.kasts
bus: session bus: session
package-repositories: package-repositories:
- type: apt - type: apt
@ -86,18 +89,18 @@ parts:
source-type: local source-type: local
plugin: make plugin: make
make-parameters: make-parameters:
- PLATFORM_PLUG=kf5-5-110-qt-5-15-11-core22 - PLATFORM_PLUG=kf5-5-111-qt-5-15-11-core22
build-snaps: build-snaps:
- kf5-5-110-qt-5-15-11-core22-sdk - kf5-5-111-qt-5-15-11-core22-sdk
build-environment: build-environment:
- &id001 - &id001
PATH: /snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/bin${PATH:+:$PATH} PATH: /snap/kf5-5-111-qt-5-15-11-core22-sdk/current/usr/bin${PATH:+:$PATH}
- &id002 - &id002
XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS} XDG_DATA_DIRS: $CRAFT_STAGE/usr/share:/snap/kf5-5-111-qt-5-15-11-core22-sdk/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}
- &id003 - &id003
XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kf5-5-110-qt-5-15-11-core22-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME} XDG_CONFIG_HOME: $CRAFT_STAGE/etc/xdg:/snap/kf5-5-111-qt-5-15-11-core22-sdk/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}
- &id004 - &id004
CRAFT_CMAKE_ARGS: -DCMAKE_FIND_ROOT_PATH=/snap/kf5-5-110-qt-5-15-11-core22-sdk/current${CRAFT_CMAKE_ARGS:+:$CRAFT_CMAKE_ARGS} CRAFT_CMAKE_ARGS: -DCMAKE_FIND_ROOT_PATH=/snap/kf5-5-111-qt-5-15-11-core22-sdk/current${CRAFT_CMAKE_ARGS:+:$CRAFT_CMAKE_ARGS}
kasts: kasts:
after: after:
- kde-neon - kde-neon
@ -113,17 +116,19 @@ parts:
- qtdeclarative5-dev - qtdeclarative5-dev
- qtmultimedia5-dev - qtmultimedia5-dev
- qtquickcontrols2-5-dev - qtquickcontrols2-5-dev
- libvlc-dev
- libsecret-1-dev
stage-packages: stage-packages:
- gstreamer1.0-alsa
- gstreamer1.0-plugins-base
- gstreamer1.0-plugins-bad
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-ugly
- gstreamer1.0-libav
- libasound2 - libasound2
- libasound2-data - libasound2-data
- libasound2-plugins - libasound2-plugins
- phonon4qt5 - libasound2-plugins-extra
- gstreamer1.0-alsa
- gstreamer1.0-pulseaudio
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-bad
- gstreamer1.0-plugins-ugly
- phonon4qt5-backend-gstreamer
- oxygen-sounds - oxygen-sounds
- libkf5syndication5 - libkf5syndication5
- kirigami-addons-data - kirigami-addons-data
@ -136,9 +141,9 @@ parts:
- libtag1v5 - libtag1v5
- libqt5keychain1 - libqt5keychain1
- libkf5networkmanagerqt6 - libkf5networkmanagerqt6
- libgstreamer1.0-0
- libvlc5 - libvlc5
- libnm0 - libnm0
- libsecret-1-0
source: . source: .
source-type: local source-type: local
cmake-parameters: cmake-parameters:
@ -147,7 +152,7 @@ parts:
- "-DENABLE_TESTING=OFF" - "-DENABLE_TESTING=OFF"
- "-DBUILD_TESTING=OFF" - "-DBUILD_TESTING=OFF"
- "-DKDE_SKIP_TEST_SETTINGS=ON" - "-DKDE_SKIP_TEST_SETTINGS=ON"
- "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current" - "-DCMAKE_FIND_ROOT_PATH=$CRAFT_STAGE\\;/snap/kf5-5-111-qt-5-15-11-core22-sdk/current"
- "-DKDE_INSTALL_PLUGINDIR=/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/plugins/" - "-DKDE_INSTALL_PLUGINDIR=/usr/lib/$CRAFT_ARCH_TRIPLET/qt5/plugins/"
prime: prime:
- "-usr/lib/*/cmake/*" - "-usr/lib/*/cmake/*"