From 4f5806daa87271b034feab91161c5ab5db181eb4 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 12 Sep 2022 22:05:25 +0200
Subject: [PATCH] Use upstream gstreamer

---
 .gitlab-ci.yml                   |  8 ++++----
 io.github.NhekoReborn.Nheko.yaml | 32 +-------------------------------
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89157309..271cf039 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,8 +136,8 @@ build-flatpak-amd64:
   before_script:
     - apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0
     - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-21.08
-    - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-21.08
+    - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-22.08
+    - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-22.08
   script:
     - export VERSION=$(git describe)
     - mkdir -p build-flatpak
@@ -164,8 +164,8 @@ build-flatpak-arm64:
   before_script:
     - apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0
     - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-21.08
-    - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-21.08
+    - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-22.08
+    - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-22.08
   script:
     - export VERSION=$(git describe)
     - mkdir -p build-flatpak
diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml
index 5f3872ff..12c32641 100644
--- a/io.github.NhekoReborn.Nheko.yaml
+++ b/io.github.NhekoReborn.Nheko.yaml
@@ -1,7 +1,7 @@
 id: io.github.NhekoReborn.Nheko
 command: io.github.NhekoReborn.Nheko
 runtime: org.kde.Platform
-runtime-version: '5.15-21.08'
+runtime-version: '5.15-22.08'
 sdk: org.kde.Sdk
 finish-args:
   - --device=dri
@@ -23,17 +23,11 @@ cleanup:
   - /bin/mdb*
   - '*.a'
   - /libexec
-  - /lib/girepository-1.0/
-  - /lib/gst-validate-launcher/
-  - /lib/gstreamer-1.0/include/
-  - /lib/gstreamer-1.0/validate/
   - /lib/cmake/
-  - /bin/gst-*
   - /bin/cmark
   - /bin/event_rpcgen.py
   - /bin/playout
   - /bin/secret-tool
-  - /share/gir-1.0
 modules:
   - name: lmdb
     sources:
@@ -151,30 +145,6 @@ modules:
       - sha256: 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3
         type: archive
         url: https://github.com/nlohmann/json/archive/v3.10.4.tar.gz
-  - buildsystem: meson
-    name: gstreamer
-    sources:
-      - commit: ccf22e315cedf81e0075ab179ffb1b733da5206e
-        tag: 1.20.3
-        type: git
-        url: https://gitlab.freedesktop.org/gstreamer/gstreamer.git
-    config-opts:
-      - -Dcompositor=enabled
-      - -Dgl=enabled
-      - -Dgood=enabled
-      - -Dgst-plugins-good:pulse=enabled
-      - -Dgst-plugins-good:qt5=enabled
-      - -Dgst-plugins-good:rtp=enabled
-      - -Dgst-plugins-good:rtpmanager=enabled
-      - -Dgst-plugins-good:vpx=enabled
-      - -Dbad=enabled
-      - -Dgst-plugins-bad:dtls=enabled
-      - -Dgst-plugins-bad:gl=enabled
-      - -Dgst-plugins-bad:openh264=enabled
-      - -Dgst-plugins-bad:opus=enabled
-      - -Dgst-plugins-bad:srtp=enabled
-      - -Dgst-plugins-bad:webrtc=enabled
-      - -Dgst-plugins-bad:flite=disabled
   - buildsystem: qmake
     name: qt-jdenticon
     no-make-install: true