From ceae99c270a0979c339ca3d5961fbd3984d5005b Mon Sep 17 00:00:00 2001
From: tytan652 <tytan652@tytanium.xyz>
Date: Thu, 29 Aug 2024 11:28:19 +0200
Subject: [PATCH] build-aux: Update Flatpak CEF from 103/5060 to 127/6533

The CEF module is also modified to:
- Use the pre-built wrapper included in the tarball
- Preserve debug symbols inside its binaries
  - The copy done later by OBS Studio build-system will be split from
    its debug symbols
---
 build-aux/com.obsproject.Studio.json |  3 ++-
 build-aux/modules/99-cef.json        | 18 +++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/build-aux/com.obsproject.Studio.json b/build-aux/com.obsproject.Studio.json
index 70129fbd9bafc8..2b8c10767b510b 100644
--- a/build-aux/com.obsproject.Studio.json
+++ b/build-aux/com.obsproject.Studio.json
@@ -98,7 +98,8 @@
             ],
             "post-install": [
                 "install -d /app/plugins",
-                "install -d /app/extensions/Plugins"
+                "install -d /app/extensions/Plugins",
+                "rm -rf /app/cef # Skip stripping original CEF library"
             ],
             "sources": [
                 {
diff --git a/build-aux/modules/99-cef.json b/build-aux/modules/99-cef.json
index 23bf14cd64eed0..bfe235beea6c11 100644
--- a/build-aux/modules/99-cef.json
+++ b/build-aux/modules/99-cef.json
@@ -1,19 +1,15 @@
 {
     "name": "cef",
-    "buildsystem": "cmake-ninja",
-    "config-opts": [
-        "-DCMAKE_BUILD_TYPE=Release"
-    ],
-    "no-make-install": true,
-    "make-args": [
-        "libcef_dll_wrapper"
-    ],
+    "build-options": {
+        "no-debuginfo": true
+    },
+    "buildsystem": "simple",
     "build-commands": [
         "mkdir -p /app/cef/libcef_dll_wrapper",
         "cp -R ./include /app/cef",
         "cp -R ./Release /app/cef",
         "cp -R ./Resources /app/cef",
-        "cp -R ./libcef_dll_wrapper/libcef_dll_wrapper.a /app/cef/libcef_dll_wrapper"
+        "cp -R ./build/libcef_dll_wrapper/libcef_dll_wrapper.a /app/cef/libcef_dll_wrapper"
     ],
     "cleanup": [
         "*"
@@ -21,8 +17,8 @@
     "sources": [
         {
             "type": "archive",
-            "url": "https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux_x86_64_v3.tar.xz",
-            "sha256": "1253a6a36c3b8ac5b5ece9bfdb6eae6ab75e49516375fc475e2e871795ad9bea"
+            "url": "https://cdn-fastly.obsproject.com/downloads/cef_binary_6533_linux_x86_64.tar.xz",
+            "sha256": "fab66dfc9cfd2e26fb87798f855aef30c2004edc8e19570d37af555644ae1655"
         }
     ]
 }