mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-04 10:33:30 +00:00
CI,obs-vst: Update Flatpak KDE Runtime to version 6.4
The 6.4 runtime rely on Freedesktop 22.08 which provide a more recent version of Mesa and PipeWire. The switch to 22.08 also requires to migrate paths of VST 2 plugins.
This commit is contained in:
parent
cfcad30e3e
commit
723ca8f034
2
.github/workflows/flatpak.yml
vendored
2
.github/workflows/flatpak.yml
vendored
|
@ -50,7 +50,7 @@ jobs:
|
|||
env:
|
||||
FLATPAK_BUILD_PATH: flatpak_app/files/share
|
||||
container:
|
||||
image: bilelmoussaoui/flatpak-github-actions:kde-6.3
|
||||
image: bilelmoussaoui/flatpak-github-actions:kde-6.4
|
||||
options: --privileged
|
||||
strategy:
|
||||
matrix:
|
||||
|
|
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
|
@ -378,7 +378,7 @@ jobs:
|
|||
run:
|
||||
shell: bash
|
||||
container:
|
||||
image: bilelmoussaoui/flatpak-github-actions:kde-6.3
|
||||
image: bilelmoussaoui/flatpak-github-actions:kde-6.4
|
||||
options: --privileged
|
||||
steps:
|
||||
- name: 'Check for Github Labels'
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"app-id": "com.obsproject.Studio",
|
||||
"runtime": "org.kde.Platform",
|
||||
"runtime-version": "6.3",
|
||||
"runtime-version": "6.4",
|
||||
"sdk": "org.kde.Sdk",
|
||||
"command": "obs",
|
||||
"finish-args": [
|
||||
|
@ -19,7 +19,7 @@
|
|||
"--talk-name=org.a11y.Bus",
|
||||
"--own-name=org.kde.StatusNotifierItem-2-2",
|
||||
"--system-talk-name=org.freedesktop.Avahi",
|
||||
"--env=VST_PATH=/app/extensions/Plugins/lxvst"
|
||||
"--env=VST_PATH=/app/extensions/Plugins/vst"
|
||||
],
|
||||
"add-extensions": {
|
||||
"com.obsproject.Studio.Plugin": {
|
||||
|
@ -32,9 +32,9 @@
|
|||
},
|
||||
"org.freedesktop.LinuxAudio.Plugins": {
|
||||
"directory": "extensions/Plugins",
|
||||
"version": "21.08",
|
||||
"version": "22.08",
|
||||
"add-ld-path": "lib",
|
||||
"merge-dirs": "lxvst",
|
||||
"merge-dirs": "vst",
|
||||
"subdirectories": true,
|
||||
"no-autodownload": true
|
||||
}
|
||||
|
@ -332,38 +332,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pipewire",
|
||||
"buildsystem": "meson",
|
||||
"config-opts": [
|
||||
"-Daudiotestsrc=disabled",
|
||||
"-Droc=disabled",
|
||||
"-Dvideotestsrc=disabled",
|
||||
"-Dvolume=disabled",
|
||||
"-Dvulkan=disabled",
|
||||
"-Ddocs=disabled",
|
||||
"-Dman=disabled",
|
||||
"-Dbluez5-codec-ldac=disabled",
|
||||
"-Dbluez5-codec-aptx=disabled",
|
||||
"-Dlibcamera=disabled",
|
||||
"-Dudevrulesdir=/app/lib/udev/rules.d/",
|
||||
"-Dsession-managers=[]",
|
||||
"-Dtests=disabled",
|
||||
"-Dexamples=disabled",
|
||||
"-Dpw-cat=disabled"
|
||||
],
|
||||
"cleanup": [
|
||||
"/bin"
|
||||
],
|
||||
"sources": [
|
||||
{
|
||||
"type": "git",
|
||||
"url": "https://github.com/pipewire/pipewire.git",
|
||||
"tag": "0.3.40",
|
||||
"commit": "7afd80052b7c49754a13c9ab49c368f95b60e0a7"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "ntv2",
|
||||
"buildsystem": "cmake-ninja",
|
||||
|
|
|
@ -111,6 +111,19 @@ static void vst_update(void *data, obs_data_t *settings)
|
|||
|
||||
const char *path = obs_data_get_string(settings, "plugin_path");
|
||||
|
||||
#ifdef __linux__
|
||||
// Migrate freedesktop.org Flatpak runtime 21.08 VST paths to 22.08.
|
||||
if (QFile::exists("/.flatpak-info") &&
|
||||
QString(path).startsWith("/app/extensions/Plugins/lxvst")) {
|
||||
QString newPath(path);
|
||||
newPath.replace("/app/extensions/Plugins/lxvst",
|
||||
"/app/extensions/Plugins/vst");
|
||||
obs_data_set_string(settings, "plugin_path",
|
||||
newPath.toStdString().c_str());
|
||||
path = obs_data_get_string(settings, "plugin_path");
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!*path) {
|
||||
vstPlugin->unloadEffect();
|
||||
return;
|
||||
|
|
Loading…
Reference in a new issue