[pitivi/sdk: 9/10] Update to GNOME SDK 3.38
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/sdk: 9/10] Update to GNOME SDK 3.38
- Date: Fri, 18 Dec 2020 00:37:42 +0000 (UTC)
commit 8ff7c604898aaa34f3193009a23bc94828e649eb
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Mon Nov 16 22:58:16 2020 +0100
Update to GNOME SDK 3.38
Fixes #2408
build/flatpak/org.pitivi.Pitivi.json | 29 +++++++++++++---------
build/flatpak/python3-matplotlib.json | 4 +--
docs/Bug_reporting.md | 2 +-
docs/How_to_update_SDK.md | 46 +++++++++++++++++++++++++++++++++++
docs/Install_with_flatpak.md | 2 +-
5 files changed, 67 insertions(+), 16 deletions(-)
---
diff --git a/build/flatpak/org.pitivi.Pitivi.json b/build/flatpak/org.pitivi.Pitivi.json
index ba496d1ff..3cc492558 100644
--- a/build/flatpak/org.pitivi.Pitivi.json
+++ b/build/flatpak/org.pitivi.Pitivi.json
@@ -2,7 +2,7 @@
"app-id": "org.pitivi.Pitivi",
"branch": "master",
"runtime": "org.gnome.Platform",
- "runtime-version": "3.36",
+ "runtime-version": "3.38",
"command": "pitivi",
"finish-args": [
"--socket=x11",
@@ -35,6 +35,16 @@
"python3-hotdoc.json",
"python3-pylint.json",
"python3-matplotlib.json",
+ {
+ "name": "libcanberra",
+ "sources": [
+ {
+ "type": "git",
+ "url": "git://git.0pointer.de/libcanberra",
+ "branch": "c0620e432650e81062c1967cc669829dbd29b310"
+ }
+ ]
+ },
{
"name": "gsound",
"ensure-writable": [
@@ -324,18 +334,13 @@
]
},
{
- "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"
- ],
+ "name": "orc",
+ "buildsystem": "meson",
"sources": [
{
- "type": "archive",
- "url":
"https://files.pythonhosted.org/packages/5e/da/e6f22f0d3730635aa8504cc0d7ae16406b3794bbfea04c854e2c215c7acb/meson-0.55.3.tar.gz",
- "sha256": "6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5"
+ "type": "git",
+ "branch": "0.4.32",
+ "url": "https://gitlab.freedesktop.org/gstreamer/orc.git"
}
]
},
@@ -456,7 +461,7 @@
"buildsystem": "meson",
"builddir": true,
"config-opts": [
- "-Dpygi-overrides-dir=/app/lib/python3.7/site-packages/gi/overrides/",
+ "-Dpygi-overrides-dir=/app/lib/python3.8/site-packages/gi/overrides/",
"--libdir=lib"
],
"sources": [
diff --git a/build/flatpak/python3-matplotlib.json b/build/flatpak/python3-matplotlib.json
index 2a52c3932..b4c0a1812 100644
--- a/build/flatpak/python3-matplotlib.json
+++ b/build/flatpak/python3-matplotlib.json
@@ -10,8 +10,8 @@
"easy-install.pth"
],
"build-commands": [
- "mkdir -p /app/lib/python3.7/site-packages",
- "CFLAGS='-L/usr/lib -I/usr/include -I/usr/include/python3.7m/' CXX=/usr/bin/g++
CC=/usr/bin/gcc PYTHONUSERBASE=/app/ python3 setup.py install --prefix=/app # Working around linking issues"
+ "mkdir -p /app/lib/python3.8/site-packages",
+ "CFLAGS='-L/usr/lib -I/usr/include -I/usr/include/python3.8m/' CXX=/usr/bin/g++
CC=/usr/bin/gcc PYTHONUSERBASE=/app/ python3 setup.py install --prefix=/app # Working around linking issues"
],
"sources": [
{
diff --git a/docs/Bug_reporting.md b/docs/Bug_reporting.md
index 1eee65e13..1a058269f 100644
--- a/docs/Bug_reporting.md
+++ b/docs/Bug_reporting.md
@@ -107,7 +107,7 @@ gdb python3 -ex "run $PITIVI_REPO_DIR/bin/pitivi"
1. Make sure you have the GNOME Sdk and Debug symbols installed:
```
-GNOME_REPO=$(flatpak info org.gnome.Platform//3.36 | grep Origin | awk '{ print $2 }')
+GNOME_REPO=$(flatpak info org.gnome.Platform//3.38 | grep Origin | awk '{ print $2 }')
for i in $(flatpak list | grep org.pitivi.Pitivi/ | awk '{ print $1 }'); do
flatpak install --user $GNOME_REPO $(flatpak info $i |grep Runtime |awk '{ print $2 }' |sed
s/Platform/Sdk/)
flatpak update --user $(flatpak info $i |grep Runtime |awk '{ print $2 }' |sed s/Platform/Sdk/)
diff --git a/docs/How_to_update_SDK.md b/docs/How_to_update_SDK.md
new file mode 100644
index 000000000..4a04ccdfa
--- /dev/null
+++ b/docs/How_to_update_SDK.md
@@ -0,0 +1,46 @@
+---
+short-description: How to update the SDK used by the Pitivi development environment
+...
+
+# How to update the SDK
+
+## Update the dev env
+
+First, look in org.pitivi.Pitivi.json for the current SDK version:
+
+```
+ "runtime-version": "3.38",
+```
+
+Grep the entire repo for this runtime version and replace it with the next
+version.
+
+Rebuild your local dev env:
+
+```
+$ . bin/pitivi-env
+(ptv-flatpak) $ ptvenv --update
+```
+
+Run the tests:
+
+```
+(ptv-flatpak) $ ptvtests
+```
+
+## Build the tests runner image
+
+This podman image is used to
+
+Push the branch to origin:
+
+```
+$ git checkout -b sdk
+$ git push origin sdk
+```
+
+Go to GitLab > CI / CD > [Schedules] and create a new schedule: description
+"build new sdk", select branch "sdk", uncheck Active.
+
+Go back to the [Schedules] page and click the Play button to start a pipeline.
+Notice in the Last Pipeline column a link to the pipeline you just started.
diff --git a/docs/Install_with_flatpak.md b/docs/Install_with_flatpak.md
index ff7de58ba..60171004a 100644
--- a/docs/Install_with_flatpak.md
+++ b/docs/Install_with_flatpak.md
@@ -40,7 +40,7 @@ Built daily out of the development branch.
```
$ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-$ flatpak install flathub org.gnome.Platform//3.36
+$ flatpak install flathub org.gnome.Platform//3.38
$ flatpak install http://flatpak.pitivi.org/pitivi-master.flatpakref
```
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]