From c45d6e4d247796a32c7f4f6e953a01a6d7e4bfa7 Mon Sep 17 00:00:00 2001
From: tytan652 <tytan652@tytanium.xyz>
Date: Thu, 18 Jan 2024 11:04:44 +0100
Subject: [PATCH] build-aux: Update KDE Flatpak runtime to 6.6

This new runtime version relies on Freedesktop SDK 23.08.

Disable PipeWire module since Freedesktop SDK 23.08 provides a more
recent version of PipeWire.

Intel Media SDK is patch to support being compiled with more recent
version of GCC
---
 build-aux/com.obsproject.Studio.json          |  3 +--
 build-aux/modules/50-intel-media-sdk.json     | 12 ++++------
 ...ipewire.json => 50-pipewire.json.disabled} |  0
 ...tel-media-sdk-fix-reproducible-build.patch | 22 +++++++++++++++++++
 .../020-intel-media-sdk-gcc13-fix.patch       | 10 +++++++++
 5 files changed, 37 insertions(+), 10 deletions(-)
 rename build-aux/modules/{50-pipewire.json => 50-pipewire.json.disabled} (100%)
 create mode 100644 build-aux/modules/patches/intel-media-sdk/010-intel-media-sdk-fix-reproducible-build.patch
 create mode 100644 build-aux/modules/patches/intel-media-sdk/020-intel-media-sdk-gcc13-fix.patch

diff --git a/build-aux/com.obsproject.Studio.json b/build-aux/com.obsproject.Studio.json
index 3985bc9c5..232e426cf 100644
--- a/build-aux/com.obsproject.Studio.json
+++ b/build-aux/com.obsproject.Studio.json
@@ -1,7 +1,7 @@
 {
     "id": "com.obsproject.Studio",
     "runtime": "org.kde.Platform",
-    "runtime-version": "6.5",
+    "runtime-version": "6.6",
     "sdk": "org.kde.Sdk",
     "command": "obs",
     "finish-args": [
@@ -62,7 +62,6 @@
         "modules/50-ntv2.json",
         "modules/50-onevpl-intel-gpu.json",
         "modules/50-onevpl.json",
-        "modules/50-pipewire.json",
         "modules/50-rnnoise.json",
         "modules/50-swig.json",
         "modules/50-v4l-utils.json",
diff --git a/build-aux/modules/50-intel-media-sdk.json b/build-aux/modules/50-intel-media-sdk.json
index 8f52b5c21..885969376 100644
--- a/build-aux/modules/50-intel-media-sdk.json
+++ b/build-aux/modules/50-intel-media-sdk.json
@@ -23,16 +23,12 @@
             "tag": "intel-mediasdk-23.2.2"
         },
         {
-            "type": "file",
-            "dest-filename": "010-intel-media-sdk-fix-reproducible-build.patch",
-            "url": "https://github.com/Intel-Media-SDK/MediaSDK/commit/f6925886f27a39eed2e43c5b7b6c342d00f7a970.patch",
-            "sha256": "f1d8a4edf953cfec1516f1a8383c5ee033245aba16cfae0bc79b7de1a6365fcc"
+            "type": "patch",
+            "path": "patches/intel-media-sdk/010-intel-media-sdk-fix-reproducible-build.patch"
         },
         {
-            "type": "shell",
-            "commands": [
-                "patch -Np1 -i 010-intel-media-sdk-fix-reproducible-build.patch"
-            ]
+            "type": "patch",
+            "path": "patches/intel-media-sdk/020-intel-media-sdk-gcc13-fix.patch"
         }
     ]
 }
diff --git a/build-aux/modules/50-pipewire.json b/build-aux/modules/50-pipewire.json.disabled
similarity index 100%
rename from build-aux/modules/50-pipewire.json
rename to build-aux/modules/50-pipewire.json.disabled
diff --git a/build-aux/modules/patches/intel-media-sdk/010-intel-media-sdk-fix-reproducible-build.patch b/build-aux/modules/patches/intel-media-sdk/010-intel-media-sdk-fix-reproducible-build.patch
new file mode 100644
index 000000000..7bb19c16e
--- /dev/null
+++ b/build-aux/modules/patches/intel-media-sdk/010-intel-media-sdk-fix-reproducible-build.patch
@@ -0,0 +1,22 @@
+From f6925886f27a39eed2e43c5b7b6c342d00f7a970 Mon Sep 17 00:00:00 2001
+From: kpcyrd <git@rxv.cc>
+Date: Mon, 17 May 2021 02:01:08 +0200
+Subject: [PATCH] Reproducible Builds: Do not record kernel version in binaries
+
+---
+ builder/FindGlobals.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/builder/FindGlobals.cmake b/builder/FindGlobals.cmake
+index 6c96fc8e03..b13886c380 100644
+--- a/builder/FindGlobals.cmake
++++ b/builder/FindGlobals.cmake
+@@ -201,7 +201,7 @@ endif()
+ if( MFX_SYSTEM )
+   set( BUILD_INFO "${MFX_SYSTEM} ${CMAKE_SYSTEM_VERSION} | ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" )
+ else()
+-  set( BUILD_INFO "${CMAKE_SYSTEM} ${CMAKE_SYSTEM_VERSION} | ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" )
++  set( BUILD_INFO "${CMAKE_SYSTEM_NAME} | ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" )
+ endif()
+ 
+ if(UNIX AND MFX_GLIBC)
diff --git a/build-aux/modules/patches/intel-media-sdk/020-intel-media-sdk-gcc13-fix.patch b/build-aux/modules/patches/intel-media-sdk/020-intel-media-sdk-gcc13-fix.patch
new file mode 100644
index 000000000..ad6867d07
--- /dev/null
+++ b/build-aux/modules/patches/intel-media-sdk/020-intel-media-sdk-gcc13-fix.patch
@@ -0,0 +1,10 @@
+--- a/api/mfx_dispatch/linux/mfxparser.cpp
++++ b/api/mfx_dispatch/linux/mfxparser.cpp
+@@ -19,6 +19,7 @@
+ // SOFTWARE.
+ 
+ #include <ctype.h>
++#include <cstdint>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>