From a074953cdcd4c75eedecfc16c46f6543b5aa27db Mon Sep 17 00:00:00 2001
From: Rafael Gieschke <rafael@gieschke.de>
Date: Mon, 18 Nov 2024 18:55:35 +0100
Subject: [PATCH] wip

---
 ci/appimage.yml | 112 ++++++++++++++++++++++--------------------------
 1 file changed, 51 insertions(+), 61 deletions(-)

diff --git a/ci/appimage.yml b/ci/appimage.yml
index 793ddf3..1b7bbea 100644
--- a/ci/appimage.yml
+++ b/ci/appimage.yml
@@ -4,78 +4,68 @@ variables:
 stages:
   - build_appimage
 
-
 build-appimage-job:
   stage: build_appimage
   script:
-    - dnf install epel-release -y
-    - dnf --enablerepo=crb install wget
-        git
-        gcc
-        gcc-c++
-        flex
-        bison
-        wayland-devel
-        openssl-devel
-        gtk3-devel
-        libdrm-devel
-        openssl-devel
-        gtk3-devel
-        opus-devel
-        libcurl-devel
-        file
-        libjpeg-turbo-devel
-        nasm
-        libva-utils
-        patchelf
-        intel-mediasdk-devel
-        libgudev-devel
-        libva-devel -y
-    - vvsrc=$(pwd)
+    - dnf install -y epel-release
+    - dnf --enablerepo=crb install -y
+      wget
+      git
+      gcc
+      gcc-c++
+      flex
+      bison
+      wayland-devel
+      openssl-devel
+      gtk3-devel
+      libdrm-devel
+      openssl-devel
+      gtk3-devel
+      opus-devel
+      libcurl-devel
+      file
+      libjpeg-turbo-devel
+      nasm
+      libva-utils
+      patchelf
+      intel-mediasdk-devel
+      libgudev-devel
+      libva-devel
+      python3-pip
+    - pip3 install meson ninja pyparsing six
+
+    - vvsrc=$PWD
     - mkdir /home/code
     - cd /home/code
     - wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
     - wget https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage
-    - wget https://bootstrap.pypa.io/get-pip.py
-    - python3  get-pip.py
-    - pip install meson ninja pyparsing six
-    - git clone -b queueu_remove_experiment https://gitlab.uni-freiburg.de/opensourcevdi/spice-gtk.git;
-    - git clone -b new_video_codecs https://gitlab.uni-freiburg.de/opensourcevdi/spice-protocol.git;
-    - git clone -b code_selection https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer.git;
-    - git clone https://gitlab.freedesktop.org/gstreamer/gstreamer.git;
+
     - git clone https://github.com/GNOME/glib.git
+    - meson setup -Dsysprof=enabled -Dglib_debug=disabled --prefix=/usr glib/build glib
+    - ninja -C glib/build install
 
-    - cd /home/
-    - mkdir AppDir
-    - cd /home/code/glib;
-    - meson setup  -Dsysprof=enabled -Dglib_debug=disabled --prefix=/usr build
-    - cd build;
-    - ninja install;
-    - cd /home/code/gstreamer;
-    - meson -Dbad=enabled
-        -Dgst-plugins-base:pango=disabled
-        -Dgst-plugins-good:jpeg=disabled
-        -Dgst-plugins-bad:openjpeg=disabled
-        -Dgst-plugins-bad:jpegformat=disabled
-        -Dgst-plugins-bad:va=enabled
-        -Dgst-plugins-bad:wayland=enabled
-        -Dgst-plugins-bad:msdk=enabled
-        -Dgst-plugins-bad:aja=disabled
-        -Dgst-plugins-base:opus=disabled
-        -Dgpl=enabled
-        --prefix=/usr build;
-    - cd build;
-    - ninja install;
+    - git clone https://gitlab.freedesktop.org/gstreamer/gstreamer.git
+    - meson setup -Dbad=enabled
+      -Dgst-plugins-base:pango=disabled
+      -Dgst-plugins-good:jpeg=disabled
+      -Dgst-plugins-bad:openjpeg=disabled
+      -Dgst-plugins-bad:jpegformat=disabled
+      -Dgst-plugins-bad:va=enabled
+      -Dgst-plugins-bad:wayland=enabled
+      -Dgst-plugins-bad:msdk=enabled
+      -Dgst-plugins-bad:aja=disabled
+      -Dgst-plugins-base:opus=disabled
+      -Dgpl=enabled
+      --prefix=/usr gstreamer/build gstreamer
+    - ninja -C gstreamer/build install
 
-    - cd /home/code/spice-protocol;
-    - meson --prefix=/usr build;
-    - cd build;
-    - ninja install;
+    - git clone -b new_video_codecs https://gitlab.uni-freiburg.de/opensourcevdi/spice-protocol.git
+    - meson setup --prefix=/usr spice-protocol/build spice-protocol
+    - ninja -C spice-protocol/build install
 
-    - cd /home/code/spice-gtk;
-    - meson -Dwayland-protocols=enabled -Dbuiltin-mjpeg=false -Dopus=enabled -Dgtk=enabled --prefix=/usr --debug --buildtype=debug  build;
-    - cd build;
-    - ninja install;
+    - git clone -b queueu_remove_experiment https://gitlab.uni-freiburg.de/opensourcevdi/spice-gtk.git
+    - meson setup -Dwayland-protocols=enabled -Dbuiltin-mjpeg=false -Dopus=enabled -Dgtk=enabled --prefix=/usr --debug --buildtype=debug spice-gtk/build spice-gtk
+    - ninja -C spice-gtk/build install
 
     - cd $vvsrc
     - DESTDIR=/home/AppDir meson -Dspice=enabled --prefix=/usr --debug --buildtype=debug build;