~comcloudway/melon

d70fff2143ae167112606faec13900739674331f — Jakob Meier 18 days ago 8c2a3b3
Use gnome sdk 47beta flatpak

Allows us to get rid of all the cargo-c code and having to manually
build the gstreamer rust plugins, as they are now included in the
flatpak and gnome sdk
2 files changed, 4 insertions(+), 33 deletions(-)

M flatpak/icu.ccw.Melon.yml
M flatpak/python3-lxml.json
M flatpak/icu.ccw.Melon.yml => flatpak/icu.ccw.Melon.yml +1 -30
@@ 1,16 1,9 @@
---
app-id: icu.ccw.Melon
runtime: org.gnome.Platform
runtime-version: '46'
runtime-version: '47beta'
sdk: org.gnome.Sdk
command: melon
# from https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/blob/eb494599378cbb6d133b11748527402f59a97982/video/gtk4/README.md
build-options:
  env:
    CARGO_HOME: "/run/build/cargo-c/cargo"
  append-path: "/usr/lib/sdk/rust-stable/bin"
sdk-extensions:
  - org.freedesktop.Sdk.Extension.rust-stable
finish-args:
  - "--share=network"
  - "--share=ipc"


@@ 32,28 25,6 @@ cleanup:
  - "*.la"
  - "*.a"
modules:
  # gstreamer dependencies
  # from https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/blob/eb494599378cbb6d133b11748527402f59a97982/video/gtk4/README.md
  - name: "cargo-c"
    buildsystem: "simple"
    build-commands:
      - "cargo install cargo-c --root /app"
    build-options:
      build-args:
        - "--share=network"
    cleanup:
      - "*"
  - name: "gst-plugins-rs"
    buildsystem: "simple"
    sources:
      - type: "git"
        url: "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
        branch: "0.11.1"  # adjusted to match alpine edge
    build-options:
      build-args:
        - "--share=network"
    build-commands:
      - "cargo cinstall -p gst-plugin-gtk4 --prefix=/app"
  # dependencies
  - python3-beautifulsoup4.json
  - python3-lxml.json

M flatpak/python3-lxml.json => flatpak/python3-lxml.json +3 -3
@@ 2,13 2,13 @@
    "name": "python3-lxml",
    "buildsystem": "simple",
    "build-commands": [
        "pip3 install --ignore-installed --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"lxml\""
        "pip3 install --verbose --ignore-installed --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"lxml\" --no-build-isolation"
    ],
    "sources": [
        {
            "type": "file",
            "url": "https://files.pythonhosted.org/packages/30/39/7305428d1c4f28282a4f5bdbef24e0f905d351f34cf351ceb131f5cddf78/lxml-4.9.3.tar.gz",
            "sha256": "48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c"
            "url": "https://files.pythonhosted.org/packages/ea/e2/3834472e7f18801e67a3cd6f3c203a5456d6f7f903cfb9a990e62098a2f3/lxml-5.2.1.tar.gz",
            "sha256": "3f7765e69bbce0906a7c74d5fe46d2c7a7596147318dbc08e4a2431f3060e306"
        }
    ]
}