Commit Graph

158 Commits

Author SHA1 Message Date
Martin Pulec
5e9fc00864 fix macOS 15.4 beta crashes due to LC_RPATH dups
Fixes the UG crashes caused by the multiplication of
"@executable_path/../libs/" caused by replacing multiple (originally
distinct) LC_RPATH values with this one.

+ removed invalid comment from Makefile (actually was related to
"bundle-nolib" target that is no longer present)

closes GH-436
2025-04-02 12:54:18 +02:00
Martin Pulec
26ba0bc6d8 AppImage Firejail: suppress private-tmp in config
Upstream Firejail (0.9.75) has now private-tmp enabld by default in
default.profile, which breaks run from the nounted AppImage.
2025-03-28 09:34:00 +01:00
Martin Pulec
c7aad836a1 AppRun Firejail fix
Omit adding --read-only=/tmp fixed - now paths are "-enclosed, handle
eventual mutliplied leading / and evental trailing one and don't assume
space after (not needed now, " delimits that).
2025-03-21 12:58:50 +01:00
Martin Pulec
c3bc5a6ef9 AppImage Firajail: drop --ipc-namespace
breaks display vulkan_sdl2 with x11 driver (but not wayland!)
2025-03-21 12:58:49 +01:00
Martin Pulec
b6a540c552 CI mac: use macos-13
macOS 12 is no longer supported and as Homebrew has a policy, that it
compiles packages from sources on unsupported macOSes, it is needed to
switch to newer macOS to keep reasonable build times.
2024-10-21 15:04:54 +02:00
Martin Pulec
842a2427c6 create-appimage.sh: do not exclude libpipewire-0.3.so.0
ilibpipewire-0.3.so.0 was added to excludelist causing the distcheck fail,
see [1]

We do not need to exclude the lib, because we already handle the preload
in data/scripts/Linux-AppImage/AppRun:282 (the case is similar as for
libjack.so.0 as also mentioned in the related AppImage issue).

[1]:
04af461f47
2024-08-28 12:10:14 +02:00
Martin Piatka
24691102c6 CI Win: Dependencies for screen capture 2024-07-22 11:22:22 +02:00
Martin Pulec
c2c3bdc050 AppRun Firejail: allow Avahi over D-bus
needed for NDI discovery
2024-07-22 11:22:20 +02:00
Martin Pulec
d8c28fabf8 macos-wrapper: change version from 10.15 to 12
Current C/C++ workflow builds already on macOS 12, so that also macOS
versions 10.15 and 11 would be incompatible.
2024-05-22 10:05:29 +02:00
Martin Pulec
b73edbf575 scripts: remove SC2140 disable
It is not needed to split the string like this:
```
a="potentially long string on"\
"multiple lines"
```
but it is better rather to put the '\' inside the string:
```
a="potentially long string on\
multiple lines"
```
2024-02-09 12:14:21 +01:00
Martin Pulec
d093dbb0a9 AppRun: resolve tilde expansion (just "~/") 2023-11-30 11:26:22 +01:00
Martin Pulec
8670a1d25f AppRun: set LD_LIBRARY_PATH at the end
set LD_LIBRARY_PATH just before uv (or other tool) is run

This minimizes interference when running the script.
2023-11-03 16:16:06 +01:00
Martin Pulec
e09db568f9 AppRun FJ: allow /bin/bash
Bash is needed in /bin on U23.10 when running with Firejail (even though
/bin/sh is dash on that system).
2023-11-03 16:15:43 +01:00
Martin Pulec
af33553e1c AppRun FJ: do not whitelist /dev
eg. for `-d file:n=/dev/null` - whitelisting /dev is invalid:

    Error: invalid whitelist path /dev
2023-11-01 17:01:27 +01:00
Martin Pulec
f05a200add AppRun FJ: recognize also n[ame]=<n> paths 2023-11-01 15:55:41 +01:00
Martin Pulec
bb4ad12970 AppRun: preload also VDPAU 2023-10-09 16:25:43 +02:00
Martin Piatka
1cbb716198 vcap/pipewire: Buildable without screencast dbus portal stuff 2023-10-05 16:05:17 +02:00
Martin Pulec
b5cd530824 AppRun: do not disable dbus-user
Dbus is required for dbus audio and currently it even fails in Arch
without, see:

https://github.com/CESNET/UltraGrid/actions/runs/5642223630/job/15281663172
2023-07-26 09:50:44 +02:00
Martin Pulec
47be77ed94 create-appimage.sh: do not require fc-match
If not running in GitHub CI, do not fail on fc-match absence, only print
the error.
2023-07-24 14:48:12 +02:00
Martin Pulec
c381978ab3 create-appimage.sh: removed stdout->stderr redir
+ removed the subshell

The redirection is actually no longer neeeded - we do not need to bother
where the output goes but the reason for the redirection is no longer
valid - the created AppImage is no longer outputted.
2023-07-18 10:49:05 +02:00
Martin Pulec
74d1bf7963 CI Linux: prevent mkappimage auto upload
mkappimage now tries to automatically upload the asset if it detects
running in GitHub CI, which is not the behavior we perhaps want because
it deletes and recreates our _continuous_ release.

See following failed run:
https://github.com/CESNET/UltraGrid/actions/runs/5575039257/jobs/10185765784

+ fixed `wget` presence check in `create-appimage.sh`
2023-07-18 10:01:07 +02:00
Martin Pulec
bbe5c9e986 AppRun Firejail: disable mnt only if possible
If /mnt, /media, /run/mount, /run/media is included on command-line, do
not toggle Firejail option --disable-mnt.
2023-06-23 11:19:08 +02:00
Martin Pulec
16d11f013d AppRun Filejail: whitelist -t file:<name> 2023-06-15 16:43:46 +02:00
Martin Pulec
80df5db0fd AppImage Firejail: support for spaces in names 2023-06-08 15:42:51 +02:00
Martin Pulec
1d246688d8 AppRun: accept FIREJAIL_OPTS from caller
The caller can now provide its own FIREJAIL_OPTS (if something is
needed).

+ do not pass explicitly UG_FONT_DIR to firejail - the environment isn't
  entirely pruned, the env vars usually pass to the Firejail, except of
  some, including LD_PRELOAD, LD_LIBRARY_PATH and TMPDIR, which are
  already passed.
2023-05-18 08:43:51 +02:00
Martin Pulec
e15f57c38a AppRun: do not pass SoundFont in env var
Do not use env var SDL_SOUNDFONT to pass sounfont path but let the
sdl_mixer UG module load the fonts directly (as on other platforms).
2023-05-18 08:43:51 +02:00
Martin Pulec
78796781db bundled SoundFount is sf3 2023-05-18 08:43:39 +02:00
Martin Pulec
30e9484ff7 AppImage: bundle a SoundFont file
In order to sdl_mixer being able to synthetise MIDI.
2023-04-28 10:15:11 +02:00
Martin Pulec
34f5d2d036 AppRun Firejail updates
- TMPDIR was not writtable - `--read-only=/tmp` after
  `--read-write=/tmp/something` overrides read-write, order needs to be
  reversed
- for args file, filename, make parent directory writtable - it may not
  only be read, but also written (like `--protocol sdp:file=out.sdp`)
+ FIREJAIL_DEBUG to print assembled Firejail arguments
2023-04-27 15:21:18 +02:00
Martin Pulec
47fac9109c AppRun: use $ULTRAGRID_AUTOUPDATE val as interval
If $ULTRAGRID_AUTOUPDATE is set to >= 0, use it as update interval (in
days).

Since the value 0 was used to suppress the update warning, the value
to suppress the warning was required to change to -1.
2023-04-21 10:04:56 +02:00
Martin Pulec
0bd5c1d12c AppRun: autoupdater updates
- if updated, restart the command using the new AppImage
- if update fails (eg. no error connection), AppImage will continue
  running
2023-04-20 17:30:01 +02:00
Martin Pulec
b4b138b74f AppRun: do not use LD_LIB_PATH for handle_updates()
The command-line tools used here (eg. stat) may use our custom libraries
(like libselinux) which may not be entirely compatible (it just most
likely ends up with a warning).

+ do the same for get_tools() and set_libva_ld_preload()
+ use original (if any) LD_LIBRARY_PATH for set_ld_preload()
+ removed unneeded `exit $?` (it is implicit)
2023-04-05 16:32:58 +02:00
Martin Pulec
35bf20065e AppRun: use get_loader() from preload.sh 2023-04-05 16:12:55 +02:00
Martin Pulec
c0cde4bc82 Firejail: allow pipewire screen capture
additionally requires root (not to be disabled by default.profile) + not
disabling dbus
2023-04-05 15:24:11 +02:00
Martin Pulec
538fc2af3f AppRun: preload also libpipewire
libpipewire is incompatible with preloaded jack on current Arch and
causes a crash (unsatisfied jack pipewire function dependency).

Anyways, the pipewire screen capture didn't work with the bundled
library, anyways, so we certainly need one from system.
2023-04-05 15:24:11 +02:00
Martin Pulec
8ea11c3413 AppRun: run tput prior to setting LD_LIB_PATH
Setting LD_LIBRARY_PATH would override the library path also for tput
executable, leading to possible incompatible version of ncurses in
bundle, leading to following error:

    tput: /tmp/.mount_UG-20-oJoJEf/usr/lib/libncursesw.so.6: version `NCURSES6_TINFO_6.2.20211010' not found (required by tput)

(and of course the color escape sequence is not returned)
2023-04-04 15:59:47 +02:00
Martin Pulec
1930b7b857 create-appimage.sh: fixed shellcheck warnings 2023-04-04 14:26:58 +02:00
Martin Pulec
062f771fde AppImage: don't use bundled Wayland libraries
Don't use bundled Wayland libraries when running on Wayland but use it
otherwise to satisfy possibly unsatisfied dependencies.

See also previous commit - Wayland libraries seem not to be portable and
prevent SDL2 native run on Wayland. After this change, SDL2 runs on
U22.04 in Weston (without Xwayland).
2023-04-04 14:19:55 +02:00
Martin Piatka
46c6486353 create-appimage: Bundle qt plugins with correct version
Starting from about 20th January, the wrong version (qt4) started
getting bundled on the Ubuntu runner.
2023-03-13 15:55:13 +01:00
Martin Pulec
2dbaec7255 AppRun: "printf" added to printed string by mistake 2023-03-09 14:14:26 +01:00
Martin Pulec
d6aaf6a6c3 create-appimage.sh: add --fail as curl opt 2023-01-25 16:25:53 +01:00
Martin Pulec
571b9a7064 AppRun firejail: removed deprecated --shell
firejail repors it's deprecated as for 0.9.72 and refuses to run
2023-01-18 11:38:16 +01:00
Martin Pulec
698b854e48 create-appimage.sh: pass GITHUB_TOKEN if available
to avoid GitHub rate-limiting

+ added '-Ss' options to curl
2023-01-02 16:22:50 +01:00
Martin Pulec
7d033195b3 AppRun,create-appimage.sh: added missing expr redirections 2023-01-02 10:44:31 +01:00
Martin Pulec
4f7c37ca97 AppImage: fixed appimageupdate not running on U22.04
llibfuse2 is missing there
2023-01-02 10:27:20 +01:00
Martin Pulec
fb0729bb6e AppRun: do not mount /tmp RO if will be written 2022-12-02 11:18:12 +01:00
Martin Pulec
de64f60d29 AppRun: simplify a bit
do more work in add_whitelist()
2022-12-02 11:15:20 +01:00
Martin Pulec
2714c6b3bf AppRun: watch adding /tmp
Beware not to add --whitelist=/tmp[something] because that would hide
the actual mounted image (/tmp/.mount_ultragridsomething). As /tmp is
remounted RO, just make the "whitelisted" dirs RW.

+ add to whitelist $DIR (path to executable) if it is not /tmp (eg.
  extracted AppImage somewhere)
2022-12-02 11:15:18 +01:00
Martin Pulec
0c14f1180a AppRun: supress shellcheck warning 2022-11-25 11:02:20 +01:00
Martin Pulec
2a423ef77a AppRun: whitelist+mkdir also dump/record with dir
Take explicit path from '-d dump:<dir>' or '--record=<dir>' and
whitelist + mkdir it (it may not exist yet and then whitelisting would
not work).
2022-11-22 16:40:13 +01:00