Commit Graph

95 Commits

Author SHA1 Message Date
Martin Pulec
417497b406 AppRun: check system libva
Check if bundled libavcodec has all dependencies satisfied from system
libva, if not do not use the system ones.

Fixes the error message:
```
undefined symbol: vaMapBuffer2  (./squashfs-root/usr/lib/libavutil.so.59)
```

on (some) current Ubuntu 22.04 with current continuous AI.
2024-07-17 16:07:12 +02:00
Martin Pulec
89b173ba2b AppImage: option --ug-help for UG help
If run from within the AppImage, -h shows help of the AppImage wrapper
itself, not the one of UltraGrid. So add --ug-help as an alternative for
`-o uv -h`.

First considered was a shortopt -H, but this is currently mapped by UG
for --full-help (which can be used directly), so keep the long variant
in order not to make it confusing.
2024-07-09 09:27:19 +02:00
Martin Pulec
46b2c0ee64 AppRun: restore TIO with sighandler
Restore TIO always - the firejail doesn't always let UG exit gracefully
(seems like there is some timeout), so restore this with the wrapping
script.
2024-07-03 09:33:18 +02:00
Martin Pulec
e6473a01dd AppRun Firejail: allow Avahi over D-bus
needed for NDI discovery
2024-06-26 14:33:24 +02:00
Martin Pulec
51589f52da hd-rum-av: support for AppImage/Firejail 2024-05-28 08:51:01 +02:00
Martin Pulec
7373b28aaa AppRun: shorten conditions
||-syntax takes just one line instead of 3
2024-05-09 15:29:29 +02:00
Martin Pulec
3b30d2934b AppIamge: system libva usability improvement
In the current AppImages, the bundled libavcodec depends just on
libva.so.2 but libavutil depends on libva.so.2, libav-drm.so.2 and
libva-x11.so.2. Since the availability of any of libva-*.so was not
detected, even if those are not present (eg. in GRML 24.02 libva-x11.so.2
is missing), the system library was used.

As a solution, check the availability of all libav.* that is bundled
libavcodec and libavutil depending on.
2024-05-09 14:54:24 +02:00
Martin Pulec
65129a99e7 AppRun FJ (Linux): do not whitelist /tmp
if it happens that parent dir is /tmp, eg.:
`ug.AppImage -t testcard:file=/tmp/img.pam`

do not whitelist /tmp, otherwise following error occurs:
`Error: invalid whitelist path /tmp`
2024-04-12 10:56:52 +02:00
Martin Pulec
3efd4186a7 AppRun: exec UG binary with exec
This respawns the process instead of the script. The advantage is that
when the AppImage process is killed, UG is killed as well, eg. in this
case:
```
UltraGrid-continuous-x86_64.AppImage -t testcard & (sleep 3; kill $!)
```

Otherwise just the parent process (the shell) is killed, leaving the child
(UG) running on background, which is undesirable. See also:
<https://stackoverflow.com/questions/8533377/why-child-process-still-alive-after-parent-process-was-killed-in-linux>

For the above command, `kill -SIGTERM -$!` would be required to do
the job, but the parent shell process keeps "running" in the background
and `bg` needs to be run.
2024-02-19 15:10:38 +01: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
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
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
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 Pulec
2dbaec7255 AppRun: "printf" added to printed string by mistake 2023-03-09 14:14:26 +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
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
Martin Pulec
9f838ec1bb AppRun: whitelist CWD if dump requested
Dump/export dumps to current directory by default
2022-11-22 16:40:13 +01:00
Martin Pulec
19a2a336e5 AppRun: whitelist absolute paths
If user passses as the parameter relative path, it haven't worked.
2022-11-22 16:40:13 +01:00
Martin Pulec
45b010f53f AppRun: print man page only if 1-2 param given
Do not interfere with UltraGrid -m parameter -- show man if only 1-2
parameters given (`uv -m 1500` doesn't make much sense for UG),
otherwise pass it to UltraGrid.

This allows using commands like `UltraGrid-continuous-x86_64.AppImage -m
1316 -t testcard -d gl` (`-m` MTU parameter at the first place).
2022-11-14 10:18:39 +01:00
Martin Pulec
3b15dd2926 AppRun: do not print misleading message
Do not warn that bundled libva is used when libavcodec is not compiled
at all.
2022-10-24 15:06:53 +02:00
Martin Pulec
6b6070dcef AppRun: fixed exiting if TERM is not defined
tput returns non-zero if TERM is not set (eg. run by the CI check) and
shell is set to errexit (-e). (Previously the return value was hidden by
return value of calling echo).
2022-10-21 15:27:46 +02:00
Martin Pulec
762dbb0eae AppRun: colored output 2022-10-21 14:45:22 +02:00
Martin Pulec
fba27c434b Revert "AppRun: added libva-wayland to preload"
This reverts commit e687bd35ac.

This currently cause following error on Arch:

    expr: symbol lookup error: /lib/libva-wayland.so.2: undefined symbol: wl_proxy_marshal_flags
    id: symbol lookup error: /lib/libva-wayland.so.2: undefined symbol: wl_proxy_marshal_flags
2022-10-21 14:45:22 +02:00
Martin Pulec
e687bd35ac AppRun: added libva-wayland to preload
currently will not be used by CI because U18.04 doesn't link that
library
2022-10-11 16:22:54 +02:00