소스 검색

build-aux: Update Flatpak VPL modules

* Update libvpl to 2.11.0
  * Adds a build option to no longer require ONEVPL_SEARCH_PATH to be set
* Update onevpl-intel-gpu to vpl-gpu-rt 24.2.2
tytan652 1 년 전
부모
커밋
aa3f980603
3개의 변경된 파일11개의 추가작업 그리고 15개의 파일을 삭제
  1. 2 3
      build-aux/com.obsproject.Studio.json
  2. 5 8
      build-aux/modules/50-libvpl.json
  3. 4 4
      build-aux/modules/50-vpl-gpu-rt.json

+ 2 - 3
build-aux/com.obsproject.Studio.json

@@ -18,8 +18,7 @@
         "--talk-name=org.freedesktop.Notifications",
         "--talk-name=org.a11y.Bus",
         "--system-talk-name=org.freedesktop.Avahi",
-        "--env=VST_PATH=/app/extensions/Plugins/vst",
-        "--env=ONEVPL_SEARCH_PATH=/app/lib"
+        "--env=VST_PATH=/app/extensions/Plugins/vst"
     ],
     "add-extensions": {
         "com.obsproject.Studio.Plugin": {
@@ -60,10 +59,10 @@
         "modules/50-libqrcodegencpp.json",
         "modules/50-libvpl.json",
         "modules/50-ntv2.json",
-        "modules/50-onevpl-intel-gpu.json",
         "modules/50-rnnoise.json",
         "modules/50-swig.json",
         "modules/50-v4l-utils.json",
+        "modules/50-vpl-gpu-rt.json",
         "modules/90-asio.json",
         "modules/90-nlohmann-json.json",
         "modules/90-uthash.json",

+ 5 - 8
build-aux/modules/50-libvpl.json

@@ -4,13 +4,10 @@
     "builddir": true,
     "config-opts": [
         "-DCMAKE_BUILD_TYPE=Release",
-        "-DBUILD_DEV=ON",
-        "-DBUILD_PREVIEW=OFF",
-        "-DBUILD_TOOLS=OFF",
-        "-DBUILD_TOOLS_ONEVPL_EXPERIMENTAL=OFF",
-        "-DINSTALL_EXAMPLE_CODE=OFF",
+        "-DENABLE_LIBDIR_IN_RUNTIME_SEARCH=ON",
+        "-DINSTALL_DEV=ON",
         "-DBUILD_EXAMPLES=OFF",
-        "-DBUILD_DISPATCHER_ONEVPL_EXPERIMENTAL=OFF",
+        "-DBUILD_EXPERIMENTAL=OFF",
         "-DBUILD_SHARED_LIBS=ON"
     ],
     "cleanup": [
@@ -21,8 +18,8 @@
         {
             "type": "git",
             "url": "https://github.com/intel/libvpl.git",
-            "commit": "79ef61b11790c70941cfa4d167b5d20d3a4e9744",
-            "tag": "v2.10.1"
+            "commit": "11a9bbda5b22ac1c544da59b4007bb57f737b487",
+            "tag": "v2.11.0"
         }
     ]
 }

+ 4 - 4
build-aux/modules/50-onevpl-intel-gpu.json → build-aux/modules/50-vpl-gpu-rt.json

@@ -1,5 +1,5 @@
 {
-    "name": "onevpl-intel-gpu",
+    "name": "vpl-gpu-rt",
     "buildsystem": "cmake-ninja",
     "builddir": true,
     "config-opts": [
@@ -14,9 +14,9 @@
     "sources": [
         {
             "type": "git",
-            "url": "https://github.com/oneapi-src/oneVPL-intel-gpu.git",
-            "commit": "852fa9f705ef44c004d014548601f3804a6de705",
-            "tag": "intel-onevpl-23.4.3"
+            "url": "https://github.com/intel/vpl-gpu-rt.git",
+            "commit": "d74cb6391eaad4a2db9cbec6a8a335b6f1a555c4",
+            "tag": "intel-onevpl-24.2.2"
         },
         {
             "type": "shell",