[gnome-boxes/reorganize-flatpak-manifest: 1/2] flatpak: Reorder modules in the manifest




commit 05f720ebf290f0465278ffc3748bceca65d85151
Author: Felipe Borges <felipeborges gnome org>
Date:   Tue Apr 6 11:27:07 2021 +0200

    flatpak: Reorder modules in the manifest
    
    Our manifest has kept its structure right from when it was just a
    prototype, and given the number of dependencies Boxes has, it has
    become quite messy.
    
    These changes benefit from flatpak-builder's capability of using
    nested modules[0], which allows for a clearer order for modules
    and their leaf dependencies.
    
    This also drops the space before the colon in JSON, because that's
    just silly. :)
    
    https://docs.flatpak.org/en/latest/flatpak-builder-command-reference.html

 build-aux/flatpak/org.gnome.Boxes.json | 682 ++++++++++++++++-----------------
 1 file changed, 340 insertions(+), 342 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index 5f528706..85b493b5 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -1,11 +1,11 @@
 {
-    "app-id" : "org.gnome.BoxesDevel",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gnome-boxes",
-    "tags" : ["devel", "development", "nightly"],
-    "finish-args" : [
+    "app-id": "org.gnome.BoxesDevel",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "command": "gnome-boxes",
+    "tags": ["devel", "development", "nightly"],
+    "finish-args": [
         "--share=ipc",
         "--socket=fallback-x11",
         "--socket=x11",
@@ -25,247 +25,354 @@
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
         "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:Software"
     ],
-    "modules" : [
+    "modules": [
         {
-            "name" : "gtk-vnc",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dpulseaudio=enable"
-            ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://download.gnome.org/sources/gtk-vnc/1.0/gtk-vnc-1.0.0.tar.xz";,
-                    "sha256" : "a81a1f1a79ad4618027628ffac27d3391524c063d9411c7a36a5ec3380e6c080"
-                }
-            ]
-        },
-        {
-            "name" : "libnl",
-            "sources" : [
+            "name": "libvirt-glib",
+            "buildsystem": "meson",
+            "sources": [
                 {
-                    "type" : "archive",
-                    "url" : 
"https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz";,
-                    "sha256" : "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa"
+                    "type": "archive",
+                    "url": "https://libvirt.org/sources/glib/libvirt-glib-4.0.0.tar.xz";,
+                    "sha256": "8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd"
                 }
-            ]
-        },
-        {
-            "name" : "libusb",
-            "config-opts" : [
-                "--disable-udev"
             ],
-            "sources" : [
+            "modules": [
+                {
+                    "name": "libnl",
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": 
"https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz";,
+                            "sha256": "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa"
+                        }
+                    ]
+                },
                 {
-                    "type" : "archive",
-                    "url" : 
"https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2";,
-                    "sha256" : "db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d"
-                }
-            ]
-        },
-        {
-            "name" : "yajl",
-            "buildsystem": "cmake-ninja",
-            "builddir": true,
-            "config-opts": [
-                "-DCMAKE_BUILD_TYPE=Release"
-            ],
-            "sources" : [
+                    "name": "yajl",
+                    "buildsystem": "cmake-ninja",
+                    "builddir": true,
+                    "config-opts": [
+                        "-DCMAKE_BUILD_TYPE=Release"
+                    ],
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "https://github.com/lloyd/yajl/archive/2.1.0.tar.gz";,
+                            "sha256": "3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a"
+                        }
+                    ]
+                },
                 {
-                    "type" : "archive",
-                    "url" : "https://github.com/lloyd/yajl/archive/2.1.0.tar.gz";,
-                    "sha256": "3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a"
-                }
-            ]
-        },
-        {
-            "name" : "portablexdr",
-            "buildsystem" : "autotools",
-            "config-opts" : ["--disable-static"],
-            "sources" : [
+                    "name": "portablexdr",
+                    "buildsystem": "autotools",
+                    "config-opts": ["--disable-static"],
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": 
"https://people.redhat.com/~rjones/portablexdr/files/portablexdr-4.9.1.tar.gz";,
+                            "sha256": "5cf4bdd153cf4d44eaf10b725f451d0cfadc070b4b9a9ccfb64094b8f78de72c"
+                        },
+                        {
+                            "type": "script",
+                            "dest-filename": "autogen.sh",
+                            "commands": [
+                                "AUTOMAKE=\"automake --foreign\" autoreconf -vfi"
+                            ]
+                        },
+                        {
+                            "type": "shell",
+                            "commands": [
+                                "cp -f /usr/share/gnu-config/config.sub .",
+                                "cp -f /usr/share/gnu-config/config.guess ."
+                            ]
+                        }
+                    ]
+                },
                 {
-                    "type" : "archive",
-                    "url" : "https://people.redhat.com/~rjones/portablexdr/files/portablexdr-4.9.1.tar.gz";,
-                    "sha256" : "5cf4bdd153cf4d44eaf10b725f451d0cfadc070b4b9a9ccfb64094b8f78de72c"
+                    "name": "libtirpc",
+                    "config-opts": [
+                        "--disable-gssapi",
+                        "--libdir=/app/lib"
+                    ],
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": 
"http://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-1.2.6.tar.bz2";,
+                            "sha256": "4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc"
+                        }
+                    ]
                 },
                 {
-                    "type": "script",
-                    "dest-filename": "autogen.sh",
-                    "commands": [
-                        "AUTOMAKE=\"automake --foreign\" autoreconf -vfi"
+                    "name": "rpcsvc-proto",
+                    "buildsystem": "autotools",
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "https://github.com/thkukuk/rpcsvc-proto/archive/v1.4.1.tar.gz";,
+                            "sha256": "750f7e57b81407a25b707867e90d7ee80aeb53bf515b114fc218f3c78dc9a6e8"
+                        }
                     ]
                 },
                 {
-                    "type": "shell",
-                    "commands": [
-                        "cp -f /usr/share/gnu-config/config.sub .",
-                        "cp -f /usr/share/gnu-config/config.guess ."
+                    "name": "docutils",
+                    "buildsystem": "simple",
+                    "build-commands": [
+                        "pip3 install --prefix=/app docutils-0.16-py2.py3-none-any.whl"
+                    ],
+                    "sources": [
+                        {
+                            "type": "file",
+                            "url": 
"https://files.pythonhosted.org/packages/81/44/8a15e45ffa96e6cf82956dd8d7af9e666357e16b0d93b253903475ee947f/docutils-0.16-py2.py3-none-any.whl";,
+                            "sha256": "0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"
+                        }
                     ]
-                }
-            ]
-        },
-        {
-            "name" : "libtirpc",
-            "config-opts" : [
-                "--disable-gssapi",
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
+                },
                 {
-                    "type" : "archive",
-                    "url" : "http://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-1.2.6.tar.bz2";,
-                    "sha256" : "4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc"
+                    "name": "libvirt",
+                    "builddir": true,
+                    "buildsystem": "meson",
+                    "build-options": {
+                        "cflags": "-I/app/include/tirpc -ltirpc"
+                    },
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "https://libvirt.org/sources/libvirt-6.7.0.tar.xz";,
+                            "sha256": "655b9476c797cdd3bb12e2520acc37335e5299b2d56a5bb9ab3f55db40161342"
+                        },
+                        {
+                            "type": "patch",
+                            "path": "libvirt-use-monitor-in-xdg-runtime-dir.patch"
+                        }
+                    ]
                 }
             ]
         },
         {
-            "name" : "rpcsvc-proto",
-            "buildsystem" : "autotools",
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://github.com/thkukuk/rpcsvc-proto/archive/v1.4.1.tar.gz";,
-                    "sha256" : "750f7e57b81407a25b707867e90d7ee80aeb53bf515b114fc218f3c78dc9a6e8"
+            "name": "spice-gtk",
+            "buildsystem": "meson",
+            "build-options": {
+                "env": {
+                    "PYTHONPATH": "/app"
                 }
-            ]
-        },
-        {
-            "name" : "docutils",
-            "buildsystem" : "simple",
-            "build-commands" : [
-                "pip3 install --prefix=/app docutils-0.16-py2.py3-none-any.whl"
+            },
+            "config-opts": [
+                "-Dvapi=enabled",
+                "-Dwebdav=enabled",
+                "-Dgtk_doc=disabled"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "file",
-                    "url" : 
"https://files.pythonhosted.org/packages/81/44/8a15e45ffa96e6cf82956dd8d7af9e666357e16b0d93b253903475ee947f/docutils-0.16-py2.py3-none-any.whl";,
-                    "sha256" : "0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"
+                    "type": "archive",
+                    "url": "https://www.spice-space.org/download/gtk/spice-gtk-0.38.tar.xz";,
+                    "sha256": "5ae974731baf2b41316d4f0b3ae0c2e47f00bff91a5a617e189cd3dedcd96d8e"
                 }
-            ]
-        },
-        {
-            "name" : "libvirt",
-            "builddir" : true,
-            "buildsystem" : "meson",
-            "build-options" : {
-                "cflags" : "-I/app/include/tirpc -ltirpc"
-            },
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://libvirt.org/sources/libvirt-6.7.0.tar.xz";,
-                    "sha256" : "655b9476c797cdd3bb12e2520acc37335e5299b2d56a5bb9ab3f55db40161342"
+            ],
+            "modules": [
+                {
+                    "name": "spice-protocol",
+                    "buildsystem": "meson",
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": 
"https://www.spice-space.org/download/releases/spice-protocol-0.14.2.tar.xz";,
+                            "sha256": "8f3a63c8b68300dffe36f2e75eac57afa1e76d5d80af760fd138a0b3f44cf1e9"
+                        }
+                    ]
                 },
                 {
-                    "type" : "patch",
-                    "path" : "libvirt-use-monitor-in-xdg-runtime-dir.patch"
-                }
-            ]
-        },
-        {
-            "name" : "intltool",
-            "cleanup" : [ "*" ],
-            "sources" : [
+                    "name": "phodav",
+                    "buildsystem": "meson",
+                    "config-opts": [
+                        "-Dsystemd=disabled"
+                    ],
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "https://ftp.gnome.org/pub/GNOME/sources/phodav/2.4/phodav-2.4.tar.xz";,
+                            "sha256": "7dddc2b75e04d0866bb9c9a83028a597ebd73ef4c37bd6ebe1032a870b43b8c3"
+                        }
+                    ]
+                },
                 {
-                    "type" : "archive",
-                    "url" : "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz";,
-                    "sha256" : "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
-                }
-            ]
-        },
-        {
-            "name" : "libvirt-glib",
-            "buildsystem" : "meson",
-            "sources" : [
+                    "name": "python-pyparsing",
+                    "buildsystem": "simple",
+                    "build-commands": [
+                        "pip3 install --prefix=/app pyparsing-2.4.6-py2.py3-none-any.whl"
+                    ],
+                    "sources": [
+                        {
+                            "type": "file",
+                            "url": 
"https://files.pythonhosted.org/packages/5d/bc/1e58593167fade7b544bfe9502a26dc860940a79ab306e651e7f13be68c2/pyparsing-2.4.6-py2.py3-none-any.whl";,
+                            "sha256": "c342dccb5250c08d45fd6f8b4a559613ca603b57498511740e65cd11a2e7dcec"
+                        }
+                    ]
+                },
                 {
-                    "type" : "archive",
-                    "url" : "https://libvirt.org/sources/glib/libvirt-glib-4.0.0.tar.xz";,
-                    "sha256" : "8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd"
-                }
-            ]
-        },
-        {
-            "name" : "spice-protocol",
-            "buildsystem" : "meson",
-            "sources" : [
+                    "name": "libcacard",
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "https://www.spice-space.org/download/libcacard/libcacard-2.7.0.tar.xz";,
+                            "sha256": "16b1a0847d5f9d2290e0785eca40f2e49d1ed80814bfc758c05c76b3c89cdb6f"
+                        }
+                    ]
+                },
                 {
-                    "type" : "archive",
-                    "url" : "https://www.spice-space.org/download/releases/spice-protocol-0.14.2.tar.xz";,
-                    "sha256" : "8f3a63c8b68300dffe36f2e75eac57afa1e76d5d80af760fd138a0b3f44cf1e9"
+                    "name": "spice",
+                    "buildsystem": "meson",
+                    "config-opts": [
+                        "-Dlz4=false",
+                        "-Dmanual=false"
+                    ],
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "https://spice-space.org/download/releases/spice-0.14.3.tar.bz2";,
+                            "sha256": "551d4be4a07667cf0543f3c895beb6da8a93ef5a9829f2ae47817be5e616a114"
+                        }
+                    ]
                 }
             ]
         },
         {
-            "name" : "phodav",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dsystemd=disabled"
+            "name": "qemu",
+            "config-opts": [
+                "--disable-user",
+                "--enable-kvm",
+                "--enable-spice",
+                "--enable-opengl",
+                "--enable-virglrenderer",
+                "--enable-usb-redir",
+                "--enable-smartcard",
+                "--python=/bin/python3"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "archive",
-                    "url" : "https://ftp.gnome.org/pub/GNOME/sources/phodav/2.4/phodav-2.4.tar.xz";,
-                    "sha256" : "7dddc2b75e04d0866bb9c9a83028a597ebd73ef4c37bd6ebe1032a870b43b8c3"
+                    "type": "archive",
+                    "url": "https://download.qemu.org/qemu-5.1.0.tar.xz";,
+                    "sha256": "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5"
                 }
-            ]
-        },
-        {
-            "name" : "python-pyparsing",
-            "buildsystem" : "simple",
-            "build-commands" : [
-                "pip3 install --prefix=/app pyparsing-2.4.6-py2.py3-none-any.whl"
             ],
-            "sources" : [
+            "modules": [
+                {
+                    "name": "libusb",
+                    "config-opts": [
+                        "--disable-udev"
+                    ],
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": 
"https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2";,
+                            "sha256": "db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d"
+                        }
+                    ]
+                },
                 {
-                    "type" : "file",
-                    "url" : 
"https://files.pythonhosted.org/packages/5d/bc/1e58593167fade7b544bfe9502a26dc860940a79ab306e651e7f13be68c2/pyparsing-2.4.6-py2.py3-none-any.whl";,
-                    "sha256" : "c342dccb5250c08d45fd6f8b4a559613ca603b57498511740e65cd11a2e7dcec"
-                }
-            ]
-        },
-        {
-            "name" : "libcacard",
-            "sources" : [
+                    "name": "usbredir",
+                    "sources": [
+                        {
+                            "type": "git",
+                            "url": "https://gitlab.freedesktop.org/spice/usbredir.git";,
+                            "tag": "usbredir-0.8.0",
+                            "commit": "07b98b8e71f620dfdd57e92ddef6b677b259a092"
+                        }
+                    ]
+                },
                 {
-                    "type" : "archive",
-                    "url" : "https://www.spice-space.org/download/libcacard/libcacard-2.7.0.tar.xz";,
-                    "sha256": "16b1a0847d5f9d2290e0785eca40f2e49d1ed80814bfc758c05c76b3c89cdb6f"
+                    "name": "virglrenderer",
+                    "buildsystem": "meson",
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": 
"https://github.com/freedesktop/virglrenderer/archive/virglrenderer-0.8.2.tar.gz";,
+                            "sha256": "9fa93095cd9a3e5b13c740e5e3b656a989356732bdaf3e22acb7c38a1f1f4411"
+                        }
+                    ]
                 }
             ]
         },
         {
-            "name" : "spice",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dlz4=false",
-                "-Dmanual=false"
+            "name": "gtk-vnc",
+            "buildsystem": "meson",
+            "config-opts": [
+                "-Dpulseaudio=enable"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "archive",
-                    "url" : "https://spice-space.org/download/releases/spice-0.14.3.tar.bz2";,
-                    "sha256" : "551d4be4a07667cf0543f3c895beb6da8a93ef5a9829f2ae47817be5e616a114"
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/gtk-vnc/1.0/gtk-vnc-1.0.0.tar.xz";,
+                    "sha256": "a81a1f1a79ad4618027628ffac27d3391524c063d9411c7a36a5ec3380e6c080"
                 }
             ]
         },
         {
-            "name" : "spice-gtk",
+            "name": "libosinfo",
             "buildsystem": "meson",
-            "build-options" : {
-                "env" : {
-                    "PYTHONPATH" : "/app"
+            "config-opts": [
+                "-Dwith-pci-ids-path=/app/share/hwdata/pci.ids",
+                "-Dwith-usb-ids-path=/app/share/hwdata/usb.ids"
+            ],
+            "post-install": [
+                "install -Dm644 ../pci.ids /app/share/hwdata/pci.ids",
+                "install -Dm644 ../usb.ids /app/share/hwdata/usb.ids"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://releases.pagure.org/libosinfo/libosinfo-1.7.1.tar.xz";,
+                    "sha256": "bb26106ad4a9f8523f81b332d2aedb717cdcb0500b3f68ba7c6ff945c4d627e9"
+                },
+                {
+                    "type": "file",
+                    "path": "pci.ids"
+                },
+                {
+                    "type": "file",
+                    "path": "usb.ids"
                 }
-            },
-            "config-opts" : [
-                "-Dvapi=enabled",
-                "-Dwebdav=enabled",
-                "-Dgtk_doc=disabled"
             ],
-            "sources" : [
+            "modules": [
+                {
+                    "name": "cdrkit",
+                    "buildsystem": "cmake",
+                    "sources": [
+                        {
+                            "type": "git",
+                            "url": "https://github.com/Distrotech/cdrkit";,
+                            "branch": "7b4bb72389ea5ea3ecc94545036dcff4728ec38a"
+                        },
+                        {
+                            "type": "patch",
+                            "path": "genisoimage-extern.patch"
+                        }
+                    ]
+                },
+                {
+                    "name": "osinfo-db-tools",
+                    "buildsystem": "meson",
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "https://releases.pagure.org/libosinfo/osinfo-db-tools-1.7.0.tar.xz";,
+                            "sha256": "4bddbec5f407436e0b62f0d7657e866adc980709acf5321aa0d4c3eb54aea823"
+                        }
+                    ]
+                },
                 {
-                    "type" : "archive",
-                    "url" : "https://www.spice-space.org/download/gtk/spice-gtk-0.38.tar.xz";,
-                    "sha256" : "5ae974731baf2b41316d4f0b3ae0c2e47f00bff91a5a617e189cd3dedcd96d8e"
+                    "name": "osinfo-db",
+                    "buildsystem": "simple",
+                    "builddir": true,
+                    "build-commands": [
+                        "make",
+                        "osinfo-db-import --dir /app/share/osinfo/ osinfo-db-*.tar.xz"
+                    ],
+                    "sources": [
+                        {
+                            "type": "git",
+                            "url": "https://gitlab.com/libosinfo/osinfo-db.git";
+                        }
+                    ]
                 }
             ]
         },
@@ -295,174 +402,65 @@
                 }
             ]
         },
-
-        {
-            "name" : "usbredir",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/spice/usbredir.git";,
-                    "tag" : "usbredir-0.8.0",
-                    "commit" : "07b98b8e71f620dfdd57e92ddef6b677b259a092"
-                }
-            ]
-        },
         {
-            "name" : "virglrenderer",
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : 
"https://github.com/freedesktop/virglrenderer/archive/virglrenderer-0.8.2.tar.gz";,
-                    "sha256" : "9fa93095cd9a3e5b13c740e5e3b656a989356732bdaf3e22acb7c38a1f1f4411"
-                }
-            ]
-        },
-        {
-            "name" : "qemu",
-            "config-opts" : [
-                "--disable-user",
-                "--enable-kvm",
-                "--enable-spice",
-                "--enable-opengl",
-                "--enable-virglrenderer",
-                "--enable-usb-redir",
-                "--enable-smartcard",
-                "--python=/bin/python3"
-            ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://download.qemu.org/qemu-5.1.0.tar.xz";,
-                    "sha256" : "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5"
-                }
-            ]
-        },
-        {
-            "name" : "freerdp",
-            "buildsystem": "cmake-ninja",
-            "builddir": true,
+            "name": "gtk-frdp",
             "config-opts": [
-                "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
-                "-DWITH_OPENH264=ON",
-                "-DCMAKE_INSTALL_PREFIX=/app",
-                "-DCMAKE_INSTALL_LIBDIR=lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "http://pub.freerdp.com/releases/freerdp-2.1.2.tar.gz";,
-                    "sha256" : "f33bc6aef83b8ad3cbf2cdbc82dcfa980ec2b051efb72650f6f2365d55b79b8d"
-                }
-            ]
-        },
-        {
-            "name" : "cdrkit",
-            "buildsystem" : "cmake",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/Distrotech/cdrkit";,
-                    "branch" : "7b4bb72389ea5ea3ecc94545036dcff4728ec38a"
-                },
-                {
-                    "type" : "patch",
-                    "path" : "genisoimage-extern.patch"
-                }
-            ]
-        },
-        {
-            "name" : "osinfo-db-tools",
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://releases.pagure.org/libosinfo/osinfo-db-tools-1.7.0.tar.xz";,
-                    "sha256": "4bddbec5f407436e0b62f0d7657e866adc980709acf5321aa0d4c3eb54aea823"
-                }
-            ]
-        },
-        {
-            "name" : "libosinfo",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dwith-pci-ids-path=/app/share/hwdata/pci.ids",
-                "-Dwith-usb-ids-path=/app/share/hwdata/usb.ids"
-            ],
-            "post-install" : [
-                "install -Dm644 ../pci.ids /app/share/hwdata/pci.ids",
-                "install -Dm644 ../usb.ids /app/share/hwdata/usb.ids"
-            ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://releases.pagure.org/libosinfo/libosinfo-1.7.1.tar.xz";,
-                    "sha256": "bb26106ad4a9f8523f81b332d2aedb717cdcb0500b3f68ba7c6ff945c4d627e9"
-                },
-                {
-                    "type" : "file",
-                    "path" : "pci.ids"
-                },
-                {
-                    "type" : "file",
-                    "path" : "usb.ids"
-                }
-            ]
-        },
-        {
-            "name" : "osinfo-db",
-            "buildsystem" : "simple",
-            "builddir": true,
-            "build-commands" : [
-                "make",
-                "osinfo-db-import --dir /app/share/osinfo/ osinfo-db-*.tar.xz"
+                "--libdir=/app/lib"
             ],
-            "sources" : [
+            "buildsystem": "meson",
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.com/libosinfo/osinfo-db.git";
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/gnome/gtk-frdp.git";
                 }
-            ]
-        },
-        {
-            "name" : "gtk-frdp",
-            "config-opts" : [
-                "--libdir=/app/lib"
             ],
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/gnome/gtk-frdp.git";
+            "modules": [
+               {
+                    "name": "freerdp",
+                    "buildsystem": "cmake-ninja",
+                    "builddir": true,
+                    "config-opts": [
+                        "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
+                        "-DWITH_OPENH264=ON",
+                        "-DCMAKE_INSTALL_PREFIX=/app",
+                        "-DCMAKE_INSTALL_LIBDIR=lib"
+                    ],
+                    "sources": [
+                        {
+                            "type": "archive",
+                            "url": "http://pub.freerdp.com/releases/freerdp-2.1.2.tar.gz";,
+                            "sha256": "f33bc6aef83b8ad3cbf2cdbc82dcfa980ec2b051efb72650f6f2365d55b79b8d"
+                        }
+                    ]
                 }
             ]
         },
         {
-            "name" : "govf",
-            "config-opts" : [
+            "name": "govf",
+            "config-opts": [
                 "--libdir=/app/lib"
             ],
-            "buildsystem" : "meson",
-            "sources" : [
+            "buildsystem": "meson",
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/felipeborges/libovf-glib.git";
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/felipeborges/libovf-glib.git";
                 }
             ]
         },
         {
-            "name" : "gnome-boxes",
-            "buildsystem" : "meson",
-            "config-opts" : [
+            "name": "gnome-boxes",
+            "buildsystem": "meson",
+            "config-opts": [
                 "-Dflatpak=true",
                 "-Dprofile=development",
                 "-Ddistributor_name=gnome-boxes-nightly",
                 "-Ddistributor_version=master"
             ],
-            "sources" : [
+            "sources": [
                 {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/gnome/gnome-boxes.git";
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/gnome/gnome-boxes.git";
                 }
             ]
         }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]