From 62d83f82cca47a32e3b740a1daa3d6fae0df6ee9 Mon Sep 17 00:00:00 2001 From: Sri Aditya Devaguptapu Date: Thu, 26 Oct 2023 01:38:33 +0000 Subject: [PATCH 1/6] Update org.pitivi.Pitivi.json --- build/flatpak/org.pitivi.Pitivi.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/build/flatpak/org.pitivi.Pitivi.json b/build/flatpak/org.pitivi.Pitivi.json index f1b33c7a7..cad480d74 100644 --- a/build/flatpak/org.pitivi.Pitivi.json +++ b/build/flatpak/org.pitivi.Pitivi.json @@ -36,6 +36,22 @@ "python3-matplotlib.json", "libcanberra/libcanberra.json", "python3-librosa.json", + { + "name": "meson", + "buildsystem": "simple", + "ensure-writable": ["easy-install.pth"], + "build-commands": [ + "mkdir -p /app/lib/python3.7/site-packages", + "PYTHONUSERBASE=/app/ python3 setup.py install --prefix=/app" + ], + "sources": [ + { + "type": "archive", + "url": "https://files.pythonhosted.org/packages/5e/da/e6f22f0d3730635aa8504cc0d7ae16406b3794bbfea04c854e2c215c7acb/meson-0.55.3.tar.gz", + "sha256": "6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5" + } + ] + }, { "name": "gsound", "buildsystem": "meson", -- GitLab From 4ad2c7cce7a2a41924126cc4cb985d39d6588b6b Mon Sep 17 00:00:00 2001 From: Sri Aditya Devaguptapu Date: Thu, 26 Oct 2023 23:12:16 +0000 Subject: [PATCH 2/6] Update org.pitivi.Pitivi.json --- build/flatpak/org.pitivi.Pitivi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/flatpak/org.pitivi.Pitivi.json b/build/flatpak/org.pitivi.Pitivi.json index cad480d74..30edb4137 100644 --- a/build/flatpak/org.pitivi.Pitivi.json +++ b/build/flatpak/org.pitivi.Pitivi.json @@ -47,7 +47,7 @@ "sources": [ { "type": "archive", - "url": "https://files.pythonhosted.org/packages/5e/da/e6f22f0d3730635aa8504cc0d7ae16406b3794bbfea04c854e2c215c7acb/meson-0.55.3.tar.gz", + "url": "https://github.com/mesonbuild/meson/releases/tag/1.1.0/meson-1.1.0.tar.gz.gz", "sha256": "6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5" } ] -- GitLab From 4ee279ad1dd929b234a597ca30f253831602a64a Mon Sep 17 00:00:00 2001 From: Sri Aditya Devaguptapu Date: Fri, 27 Oct 2023 00:14:22 +0000 Subject: [PATCH 3/6] Update org.pitivi.Pitivi.json --- build/flatpak/org.pitivi.Pitivi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/flatpak/org.pitivi.Pitivi.json b/build/flatpak/org.pitivi.Pitivi.json index 30edb4137..94ce0b9b1 100644 --- a/build/flatpak/org.pitivi.Pitivi.json +++ b/build/flatpak/org.pitivi.Pitivi.json @@ -48,7 +48,7 @@ { "type": "archive", "url": "https://github.com/mesonbuild/meson/releases/tag/1.1.0/meson-1.1.0.tar.gz.gz", - "sha256": "6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5" + "sha256": "d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f" } ] }, -- GitLab From 58942ba1823dc6841e02a2bb1d54826cb8203a28 Mon Sep 17 00:00:00 2001 From: Sri Aditya Devaguptapu Date: Fri, 27 Oct 2023 00:16:17 +0000 Subject: [PATCH 4/6] Update org.pitivi.Pitivi.json --- build/flatpak/org.pitivi.Pitivi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/flatpak/org.pitivi.Pitivi.json b/build/flatpak/org.pitivi.Pitivi.json index 94ce0b9b1..78bb07b8c 100644 --- a/build/flatpak/org.pitivi.Pitivi.json +++ b/build/flatpak/org.pitivi.Pitivi.json @@ -47,7 +47,7 @@ "sources": [ { "type": "archive", - "url": "https://github.com/mesonbuild/meson/releases/tag/1.1.0/meson-1.1.0.tar.gz.gz", + "url": "https://github.com/mesonbuild/meson/releases/download/1.1.0/meson-1.1.0.tar.gz", "sha256": "d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f" } ] -- GitLab From 6c66d7ac1cb1f51f4d16cf9b23a3607df6924c57 Mon Sep 17 00:00:00 2001 From: Sri Aditya Devaguptapu Date: Sat, 4 Nov 2023 02:09:03 +0000 Subject: [PATCH 5/6] Update org.pitivi.Pitivi.json --- build/flatpak/org.pitivi.Pitivi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/flatpak/org.pitivi.Pitivi.json b/build/flatpak/org.pitivi.Pitivi.json index 78bb07b8c..939d0e55b 100644 --- a/build/flatpak/org.pitivi.Pitivi.json +++ b/build/flatpak/org.pitivi.Pitivi.json @@ -41,7 +41,7 @@ "buildsystem": "simple", "ensure-writable": ["easy-install.pth"], "build-commands": [ - "mkdir -p /app/lib/python3.7/site-packages", + "mkdir -p /app/lib/python3.10/site-packages", "PYTHONUSERBASE=/app/ python3 setup.py install --prefix=/app" ], "sources": [ -- GitLab From 86b451369b8d5d70565921d439be9d84749d6e8f Mon Sep 17 00:00:00 2001 From: Sri Aditya Devaguptapu Date: Thu, 16 Nov 2023 02:58:39 +0000 Subject: [PATCH 6/6] Update meson.build --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4435353df..b9dbff561 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('pitivi', 'c', version : '2023.03', meson_version : '>= 0.46.0') +project('pitivi', 'c', version : '2023.03', meson_version : '>= 1.1.0') host_system = host_machine.system() pymod = import('python') -- GitLab