From 7e186d4eec9bcdb1d6a82ffff84c554ca9227e8b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 20 Jan 2025 15:09:34 +0900 Subject: [PATCH] ES-DE: migrating to static manifest + trying to use FFMPEG-FULL --- .github/workflows/build_es-de.yml | 3 - .gitignore | 1 - es-de-module.yml | 99 ------------------- manifest-header.yml | 56 ----------- net.retrodeck.es-de.yml | 155 ++++++++++++++++++++++++++++++ update_es-de_manifest.sh | 0 6 files changed, 155 insertions(+), 159 deletions(-) delete mode 100644 es-de-module.yml delete mode 100644 manifest-header.yml create mode 100755 net.retrodeck.es-de.yml delete mode 100644 update_es-de_manifest.sh diff --git a/.github/workflows/build_es-de.yml b/.github/workflows/build_es-de.yml index afd3fdfbb..ebf45b562 100644 --- a/.github/workflows/build_es-de.yml +++ b/.github/workflows/build_es-de.yml @@ -26,9 +26,6 @@ jobs: - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" - - name: "Creating ES-DE manifest" - run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/update_es-de_manifest.sh" - - name: "[DEBUG] Outputting manifest" run: cat net.retrodeck.es-de.yml diff --git a/.gitignore b/.gitignore index 1562a49a7..f3aa12f9f 100644 --- a/.gitignore +++ b/.gitignore @@ -116,6 +116,5 @@ es-de-build-dir es-de-repo retrodeck-repo net.retrodeck.es-de.yml.bak -net.retrodeck.es-de.yml net.retrodeck.es-de.appdata.xml.bak ./RetroDECK diff --git a/es-de-module.yml b/es-de-module.yml deleted file mode 100644 index 6f6d9cf4a..000000000 --- a/es-de-module.yml +++ /dev/null @@ -1,99 +0,0 @@ -modules: - - # dependency of: CEMU, ES-DE - - name: pugixml - buildsystem: cmake-ninja - config-opts: - - -DBUILD_SHARED_LIBS=ON - cleanup: - - /include - - /lib/cmake - - /lib/pkgconfig - sources: - - type: archive - url: https://github.com/zeux/pugixml/releases/download/v1.14/pugixml-1.14.tar.gz - sha256: 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015 - x-checker-data: - type: anitya - project-id: 3728 - url-template: https://github.com/zeux/pugixml/releases/download/v$version/pugixml-$version.tar.gz - - # ES-DE - START - # https://gitlab.com/es-de/emulationstation-de - - - name: ffmpeg - config-opts: - - --disable-static - - --disable-programs - - --disable-doc - - --enable-gpl - - --enable-shared - - --enable-libvorbis - - --enable-libopus - - --enable-libvpx - - --enable-postproc - sources: - - type: git - url: https://github.com/FFmpeg/FFmpeg.git - tag: n6.1 - - - name: freeimage - no-autogen: true - build-options: - cxxflags: -std=c++14 - make-args: - - DESTDIR=/app - sources: - - type: archive - url: http://downloads.sourceforge.net/freeimage/FreeImage3180.zip - sha256: f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd - - type: shell - commands: - - sed -i 's|-o root -g root ||' ./Makefile.gnu - - sed -i 's|/usr|/app|' ./Makefile.gnu - - - name: libgit2 - buildsystem: cmake-ninja - config-opts: - - -DCMAKE_BUILD_TYPE=Release - - -DBUILD_SHARED_LIBS:BOOL=ON - - -DTHREADSAFE=ON - sources: - - type: git - url: https://github.com/libgit2/libgit2.git - tag: v1.6.3 - - # Needed from ES-DE 2.1.0+ - - name: libpoppler-glib - buildsystem: cmake-ninja - config-opts: - - -DENABLE_BOOST=OFF - sources: - - type: archive - # original link not working, found a mirror - url: https://poppler.freedesktop.org/poppler-22.11.0.tar.xz - #url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 - sha256: 093ba9844ed774285517361c15e21a31ba4df278a499263d4403cca74f2da828 - cleanup: - - /lib/pkgconfig - - /include - - '*.a' - - '*.la' - - - name: ES-DE - buildsystem: cmake-ninja - config-opts: - - -DRETRODECK=on - build-options: - cflags: -I/app/include - ldflags: -L/app/lib - cleanup: - - es-app - - es-core - sources: - - type: git - url: THISREPO - branch: THISBRANCH - - type: shell - - # ES-DE - END \ No newline at end of file diff --git a/manifest-header.yml b/manifest-header.yml deleted file mode 100644 index fd80d3542..000000000 --- a/manifest-header.yml +++ /dev/null @@ -1,56 +0,0 @@ -app-id: net.retrodeck.es-de -runtime: org.kde.Platform -runtime-version: "6.7" -sdk: org.kde.Sdk -sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm18 -command: /app/bin/es-de - -cleanup: - - /include - - /share/ffmpeg - - /lib/cmake - - /lib/pkgconfig - - /include - - /bin/glslangValidator - - /bin/zip* - - /bin/zstd* - - /lib/pkg-config - - /share/doc - - /share/man - - /src - - '*.a' - - '*.la' - - /lib/debug - - /share/runtime - -finish-args: - - --socket=wayland - - --socket=x11 - - --socket=pulseaudio - - --share=ipc - - --share=network - - --device=all - - --filesystem=host - - --filesystem=home/.var/app/com.valvesoftware.Steam - - --allow=multiarch - - --talk-name=org.freedesktop.ScreenSaver - - --talk-name=org.freedesktop.PowerManagement.Inhibit - - --talk-name=org.freedesktop.login1.Manager - - --filesystem=xdg-run/app/com.discordapp.Discord:create - - --filesystem=xdg-config/gtk-3.0:ro - - --env=QT_QPA_PLATFORM=wayland;wayland-egl;xcb - # Dolphin - - --allow=bluetooth - # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows - - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.es-de - - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.es-de - # XEMU - Fixes issues with openSUSE systems, QEMU_AUDIO_DRV is defined as "pa" causing xemu to not launch - - --unset-env=QEMU_AUDIO_DRV - # BoilR - - --filesystem=xdg-data/Steam:rw #Steam (flatpak) - - --filesystem=~/.steam:rw # Steam (Non-flatpak) - - --filesystem=~/.var/app/com.valvesoftware.Steam:rw # Steam (Flatpak) - # PPSSPP, DOLPHIN - - --filesystem=xdg-run/gamescope-0:ro - diff --git a/net.retrodeck.es-de.yml b/net.retrodeck.es-de.yml new file mode 100755 index 000000000..329852cbc --- /dev/null +++ b/net.retrodeck.es-de.yml @@ -0,0 +1,155 @@ +app-id: net.retrodeck.es-de +runtime: org.kde.Platform +runtime-version: "6.7" +sdk: org.kde.Sdk +sdk-extensions: + - org.freedesktop.Sdk.Extension.llvm18 +command: /app/bin/es-de + +add-extensions: + org.freedesktop.Platform.ffmpeg-full: + directory: lib/ffmpeg + version: *runtime-version + +cleanup: + - /include + - /share/ffmpeg + - /lib/cmake + - /lib/pkgconfig + - /include + - /bin/glslangValidator + - /bin/zip* + - /bin/zstd* + - /lib/pkg-config + - /share/doc + - /share/man + - /src + - '*.a' + - '*.la' + - /lib/debug + - /share/runtime + +finish-args: + - --socket=wayland + - --socket=x11 + - --socket=pulseaudio + - --share=ipc + - --share=network + - --device=all + - --filesystem=host + - --filesystem=home/.var/app/com.valvesoftware.Steam + - --allow=multiarch + - --talk-name=org.freedesktop.ScreenSaver + - --talk-name=org.freedesktop.PowerManagement.Inhibit + - --talk-name=org.freedesktop.login1.Manager + - --filesystem=xdg-run/app/com.discordapp.Discord:create + - --filesystem=xdg-config/gtk-3.0:ro + - --env=QT_QPA_PLATFORM=wayland;wayland-egl;xcb + # Dolphin + - --allow=bluetooth + # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows + - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.es-de + - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.es-de + # XEMU - Fixes issues with openSUSE systems, QEMU_AUDIO_DRV is defined as "pa" causing xemu to not launch + - --unset-env=QEMU_AUDIO_DRV + # BoilR + - --filesystem=xdg-data/Steam:rw #Steam (flatpak) + - --filesystem=~/.steam:rw # Steam (Non-flatpak) + - --filesystem=~/.var/app/com.valvesoftware.Steam:rw # Steam (Flatpak) + # PPSSPP, DOLPHIN + - --filesystem=xdg-run/gamescope-0:ro + +modules: + + # dependency of: CEMU, ES-DE + - name: pugixml + buildsystem: cmake-ninja + config-opts: + - -DBUILD_SHARED_LIBS=ON + cleanup: + - /include + - /lib/cmake + - /lib/pkgconfig + sources: + - type: archive + url: https://github.com/zeux/pugixml/releases/download/v1.14/pugixml-1.14.tar.gz + sha256: 2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015 + x-checker-data: + type: anitya + project-id: 3728 + url-template: https://github.com/zeux/pugixml/releases/download/v$version/pugixml-$version.tar.gz + + # https://gitlab.com/es-de/emulationstation-de + + # - name: ffmpeg + # config-opts: + # - --disable-static + # - --disable-programs + # - --disable-doc + # - --enable-gpl + # - --enable-shared + # - --enable-libvorbis + # - --enable-libopus + # - --enable-libvpx + # - --enable-postproc + # sources: + # - type: git + # url: https://github.com/FFmpeg/FFmpeg.git + # tag: n6.1 + + - name: freeimage + no-autogen: true + build-options: + cxxflags: -std=c++14 + make-args: + - DESTDIR=/app + sources: + - type: archive + url: http://downloads.sourceforge.net/freeimage/FreeImage3180.zip + sha256: f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd + - type: shell + commands: + - sed -i 's|-o root -g root ||' ./Makefile.gnu + - sed -i 's|/usr|/app|' ./Makefile.gnu + + - name: libgit2 + buildsystem: cmake-ninja + config-opts: + - -DCMAKE_BUILD_TYPE=Release + - -DBUILD_SHARED_LIBS:BOOL=ON + - -DTHREADSAFE=ON + sources: + - type: git + url: https://github.com/libgit2/libgit2.git + tag: v1.6.3 + + # Needed from ES-DE 2.1.0+ + - name: libpoppler-glib + buildsystem: cmake-ninja + config-opts: + - -DENABLE_BOOST=OFF + sources: + - type: archive + # original link not working, found a mirror + url: https://poppler.freedesktop.org/poppler-22.11.0.tar.xz + #url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 + sha256: 093ba9844ed774285517361c15e21a31ba4df278a499263d4403cca74f2da828 + cleanup: + - /lib/pkgconfig + - /include + - '*.a' + - '*.la' + + - name: ES-DE + buildsystem: cmake-ninja + config-opts: + - -DRETRODECK=on + build-options: + cflags: -I/app/include + ldflags: -L/app/lib + cleanup: + - es-app + - es-core + sources: + - type: dir + path: ./ \ No newline at end of file diff --git a/update_es-de_manifest.sh b/update_es-de_manifest.sh deleted file mode 100644 index e69de29bb..000000000