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

Jump to bottom

Add bind for /usr/share/libdrm #32

Merged
6 commits merged into from
Sep 8, 2021
Merged

Add bind for /usr/share/libdrm #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
177d55c
Add bind for /usr/share/libdrm. Fixes the first issue in #31
AlanGriffiths Aug 9, 2021
9d3dd46
Tidy up LD_LIBRARY_PATH
AlanGriffiths Aug 9, 2021
8b9c410
Drop legacy pulseaudio and alsa plugs, audio-playback is sufficient now
AlanGriffiths Aug 9, 2021
cd0156a
Tidy up command-chain
AlanGriffiths Aug 9, 2021
b4a830c
Another hard coded path in Mesa.
AlanGriffiths Aug 20, 2021
5a7469b
Don't kill speech-dispatcher
AlanGriffiths Aug 20, 2021
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
10 changes: 7 additions & 3 deletions scripts/bin/scummvm-launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ then
fi
fi

# Hook up speech-dispatcher
mkdir -p $XDG_RUNTIME_DIR/speech-dispatcher
$SNAP/usr/bin/speech-dispatcher -d -C "$SNAP/etc/speech-dispatcher" -S "$XDG_RUNTIME_DIR/speech-dispatcher/speechd.sock" -m "$SNAP/usr/lib/speech-dispatcher-modules" -t 30
if snapctl is-connected audio-playback; then
# Hook up speech-dispatcher
mkdir -p $XDG_RUNTIME_DIR/speech-dispatcher
$SNAP/usr/bin/speech-dispatcher -d -C "$SNAP/etc/speech-dispatcher" -S "$XDG_RUNTIME_DIR/speech-dispatcher/speechd.sock" -m "$SNAP/usr/lib/speech-dispatcher-modules" -t 30
else
echo "WARNING: audio-playback interface not connected, speech and audio will not work."
fi

# Initial setup
if [ ! -f "${XDG_CONFIG_HOME}/scummvm/scummvm.ini" ]; then
Expand Down
24 changes: 15 additions & 9 deletions snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ compression: lzo

apps:
scummvm:
command-chain: ["snap/command-chain/alsa-launch"]
command-chain:
- snap/command-chain/alsa-launch
- bin/wayland-if-possible.sh
command: bin/scummvm-launch.sh
extensions: [gnome-3-28]
command: snap/command-chain/desktop-launch $SNAP/bin/wayland-if-possible.sh $SNAP/bin/scummvm-launch.sh
plugs:
- wayland
- x11
- opengl
- unity7
- pulseaudio
- alsa
- audio-playback
- network
- network-bind
Expand All @@ -46,19 +46,21 @@ apps:
- hardware-observe
- joystick
environment:
LD_LIBRARY_PATH: "$LD_LIBRARY_PATH:$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/libunity/:$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/pulseaudio/:$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/speech-dispatcher/"
LD_LIBRARY_PATH: "$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/libunity/:$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/pulseaudio/:$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/speech-dispatcher/"
ESPEAK_DATA_PATH: "$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/espeak-ng-data"
DBUS_FATAL_WARNINGS: 0

daemon:
command: bin/daemon-start.sh $SNAP/snap/command-chain/desktop-launch $SNAP/bin/wayland-if-possible.sh $SNAP/bin/scummvm-launch.sh -f
command-chain:
- bin/daemon-start.sh
- snap/command-chain/desktop-launch
- bin/wayland-if-possible.sh
command: bin/scummvm-launch.sh -f
daemon: simple
restart-condition: always
plugs:
- pulseaudio
- wayland
- opengl
- alsa
- audio-playback
- network
- network-bind
Expand All @@ -70,7 +72,7 @@ apps:
- hardware-observe
environment:
SDL_VIDEODRIVER: wayland
LD_LIBRARY_PATH: "$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/:$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/libunity/:$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/pulseaudio/:$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/speech-dispatcher/"
LD_LIBRARY_PATH: "$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/libunity/:$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/pulseaudio/:$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/speech-dispatcher/"
ESPEAK_DATA_PATH: "$SNAP/usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/espeak-ng-data"
PULSE_SYSTEM: 1
PULSE_RUNTIME_PATH: /var/run/pulse
Expand All @@ -88,6 +90,10 @@ layout:
bind: $SNAP/usr/share/applications
/usr/share/alsa:
bind: $SNAP/usr/share/alsa
/usr/share/libdrm:
bind: $SNAP/usr/share/libdrm
/usr/share/drirc.d:
bind: $SNAP/usr/share/drirc.d

parts:
scummvm:
Expand Down