-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #477 from flathub/lwbt-patch-1
Update Makefile, intel-mediasdk, add stub scripts
- Loading branch information
Showing
12 changed files
with
178 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| diff -up MediaSDK-intel-mediasdk-22.6.4/api/mfx_dispatch/linux/mfxparser.cpp.gcc13 MediaSDK-intel-mediasdk-22.6.4/api/mfx_dispatch/linux/mfxparser.cpp | ||
| --- MediaSDK-intel-mediasdk-22.6.4/api/mfx_dispatch/linux/mfxparser.cpp.gcc13 2022-11-18 09:02:59.000000000 +0100 | ||
| +++ MediaSDK-intel-mediasdk-22.6.4/api/mfx_dispatch/linux/mfxparser.cpp 2023-01-17 21:26:56.794562323 +0100 | ||
| @@ -23,6 +23,7 @@ | ||
| #include <stdlib.h> | ||
| #include <string.h> | ||
|
|
||
| +#include <cstdint> | ||
| #include <list> | ||
|
|
||
| #include "mfxloader.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,14 @@ | ||
| #!/bin/bash | ||
|
|
||
| echo "# This is just a simple script for now." | ||
| echo "# The command below cannot be executed by the app itself from within the sandbox." | ||
| echo "# Please run the command to backup your data before a release upgrade." | ||
| echo "# Remove the data when you are confident that the migration was successful to free up storage space." | ||
| echo -e "# ---\n" | ||
| cat << 'EOF' | ||
| # This is just a simple script for now. | ||
| # The command below cannot be executed by the app itself from within the sandbox. | ||
| # Please run the command to backup your data before a release upgrade. | ||
| # Remove the data when you are confident that the migration was successful to free up storage space. | ||
| # --- | ||
| # shellcheck disable=SC2016 | ||
| echo -e \ | ||
| 'cp -a \\\n' \ | ||
| ' "${HOME}/.var/app/org.jellyfin.JellyfinServer/" \\\n' \ | ||
| ' "${HOME}/.var/app/org.jellyfin.JellyfinServer_bak_$(date -I)"' | ||
| # shellcheck disable=SC2016 | ||
| echo 'du -hs "${HOME}/.var/app/org.jellyfin.JellyfinServer"*' | ||
| cp -a \ | ||
| "${HOME}/.var/app/org.jellyfin.JellyfinServer/" \ | ||
| "${HOME}/.var/app/org.jellyfin.JellyfinServer_bak_$(date -I)" | ||
| du -hs "${HOME}/.var/app/org.jellyfin.JellyfinServer"* | ||
| EOF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/bin/bash | ||
|
|
||
| cat << 'EOF' | ||
| # The command below cannot be executed by the app itself from within the sandbox. | ||
| # Please copy the script below and execute it to configure automatic updates of ALL Flatpaks on your system. | ||
| # --- | ||
| # https://wiki.archlinux.org/title/Systemd/User#Automatic_start-up_of_systemd_user_instances | ||
| loginctl list-users | ||
| loginctl enable-linger $USER | ||
| loginctl list-users | ||
| unit="jellyfin.service" | ||
| cp -v "$(flatpak info --show-location org.jellyfin.JellyfinServer)/files/share/templates/${unit}" \ | ||
| "${HOME}/.local/share/systemd/user/${unit}" | ||
| # # Override defaults, like starting the app in --user scope. | ||
| # mkdir -pv "${HOME}/.local/share/systemd/user/${unit}.d/" | ||
| # echo -e "[Service]\nEnvironment=FLATPAK_SCOPE=--user" > "${HOME}/.local/share/systemd/user/${unit}.d/override.conf" | ||
| systemctl --user daemon-reload | ||
| systemctl --user --no-pager enable "${unit}" --now | ||
| sleep 1 | ||
| systemctl --user --no-pager --full status "${unit}" | ||
| EOF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| #!/bin/bash | ||
|
|
||
| cat << 'EOF' | ||
| # NOTE: Please check the capabilities of your desktop environment before proceeding with this solution. | ||
| # | ||
| # The command below cannot be executed by the app itself from within the sandbox. | ||
| # Please copy the script below and execute it to configure automatic updates of ALL Flatpaks on your system. | ||
| # --- | ||
| unit_selection=( | ||
| flatpak-update.service | ||
| flatpak-update.timer | ||
| flatpak-update-onactive.service | ||
| flatpak-update-onactive.timer | ||
| ) | ||
| # https://wiki.archlinux.org/title/Systemd/User#Automatic_start-up_of_systemd_user_instances | ||
| loginctl list-users | ||
| loginctl enable-linger $USER | ||
| loginctl list-users | ||
| for unit in "${unit_selection[@]}"; do | ||
| cp -v "$(flatpak info --show-location org.jellyfin.JellyfinServer)/files/share/templates/${unit}" \ | ||
| "${HOME}/.local/share/systemd/user/${unit}" | ||
| systemctl --user daemon-reload | ||
| systemctl --user --no-pager enable "${unit}" --now | ||
| sleep 1 | ||
| systemctl --user --no-pager --full status "${unit}" | ||
| done | ||
| EOF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| [Unit] | ||
| Description=Flatpak update | ||
| Requires=flatpak-update.service | ||
|
|
||
| [Timer] | ||
| OnBootSec=5min | ||
| #OnActiveSec=15min | ||
| OnUnitActiveSec=15min | ||
| Persistent=true | ||
| #RandomizedDelaySec=10min | ||
|
|
||
| [Install] | ||
| WantedBy=timers.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # NOTE: This service does not run inside the Flatpak. | ||
| [Unit] | ||
| Description=Daily flatpak update activities | ||
| Documentation=man:flatpak(1) | ||
| #ConditionACPower=true | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| ExecStartPre=/usr/bin/notify-send 'Flatpak' 'Flatpak daily update started' | ||
| ExecStart=/usr/bin/flatpak update --noninteractive --assumeyes | ||
| ExecStartPost=/usr/bin/flatpak remove --unused --noninteractive --assumeyes | ||
| ExecStopPost=/usr/bin/notify-send 'Flatpak' 'Flatpak daily update started' | ||
|
|
||
| [Install] | ||
| WantedBy=default.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| [Unit] | ||
| Description=Daily flatpak update activities | ||
| Requires=flatpak-update.service | ||
|
|
||
| [Timer] | ||
| OnBootSec=5m | ||
| #OnUnitActiveSec=6h | ||
| OnCalendar=*-*-* 6/12:00 | ||
| #RandomizedDelaySec=30m | ||
| RandomizedDelaySec=5m | ||
| Persistent=true | ||
|
|
||
| [Install] | ||
| WantedBy=timers.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| [Unit] | ||
| Description=Jellyfin Media Server (Flatpak) | ||
| Documentation=https://github.com/flathub/org.jellyfin.JellyfinServer/wiki | ||
| # This target does not exist in user scope? | ||
| #After = network-online.target | ||
|
|
||
| [Service] | ||
| Type=simple | ||
| Environment=FLATPAK_SCOPE=--system | ||
| ExecStart=/usr/bin/flatpak run $FLATPAK_SCOPE --command=jellyfin org.jellyfin.JellyfinServer --service | ||
| ExecStop=/usr/bin/flatpak kill org.jellyfin.JellyfinServer | ||
| Restart=on-failure | ||
| TimeoutSec=15 | ||
| SuccessExitStatus=0 143 | ||
|
|
||
| [Install] | ||
| # Modified for user scope. | ||
| #WantedBy = multi-user.target | ||
| WantedBy=default.target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters