GNOME.org
 

[pitivi/sdk: 4/7] build: Update SDK and deps

commit e7b25612f1d59dbce59a9536d4f7e3d814121cf9
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Tue Nov 5 20:41:20 2019 +0100

    build: Update SDK and deps
    
    meson has been removed as the one from the runtime is ok.
    
    sound-theme-freedesktop has been removed as there was an error.

 .gitlab-ci.yml                       | 10 +++---
 build/flatpak/org.pitivi.Pitivi.json | 63 +++++++-----------------------------
 docs/Bug_reporting.md                |  2 +-
 docs/Install_with_flatpak.md         |  4 +--
 4 files changed, 19 insertions(+), 60 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b69eb25..59167b4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
   XUNIT_PATH: ${CI_PROJECT_DIR}/xunit.xml
 
 build:
-  image: registry.gitlab.gnome.org/gnome/pitivi:master-sdk_3.32
+  image: registry.gitlab.gnome.org/gnome/pitivi:master-sdk_3.34
   stage: build
   artifacts:
     paths:
@@ -51,7 +51,7 @@ deploy:
   only:
     - master@GNOME/pitivi
     - 1.0@GNOME/pitivi
-    - thiblahute/sdk3.32@GNOME/pitivi
+    - thiblahute/sdk3.34@GNOME/pitivi
 
 # Not using a Dockerfile because we need the container to be privileged to run flatpak inside of it
 # and it is not possible to use a privileged `docker build`.
@@ -60,9 +60,9 @@ deploy:
     services:
         - docker:dind
     script:
-        - export IMAGE="${CI_REGISTRY}/${NAMESPACE}/${CI_PROJECT_NAME}:${BRANCH}-sdk_3.32"
-        - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.32"
-        - export TMPIMAGENAME="tmp-pitivi-${BRANCH}-sdk_3.32"
+        - export IMAGE="${CI_REGISTRY}/${NAMESPACE}/${CI_PROJECT_NAME}:${BRANCH}-sdk_3.34"
+        - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.34"
+        - export TMPIMAGENAME="tmp-pitivi-${BRANCH}-sdk_3.34"
         - export RUN_IN_SANDBOX="flatpak-builder --filesystem=${BUILDDIR} --filesystem=${CI_PROJECT_DIR} 
--env=PITIVI_DEVELOPMENT=1 --run app ${MANIFEST}"
         - export BUILDDIR="\${HOME}/pitivi"
         - export CLONE_PITIVI="git clone ${CI_PROJECT_URL}.git --single-branch \${HOME}/pitivi -b 
${CI_COMMIT_REF_NAME}"
diff --git a/build/flatpak/org.pitivi.Pitivi.json b/build/flatpak/org.pitivi.Pitivi.json
index 4b31c0bb..4fe77efd 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.32",
+    "runtime-version": "3.34",
     "command": "pitivi",
     "finish-args": [
         "--socket=x11",
@@ -20,8 +20,6 @@
     "sdk": "org.gnome.Sdk",
     "copy-icon": true,
     "build-options": {
-        "cflags": "-O2 -g",
-        "cxxflags": "-O2 -g",
         "env": {
             "PYTHON": "python3",
             "GST_PLUGIN_SYSTEM_PATH": "/app/lib/gstreamer-1.0/",
@@ -205,35 +203,6 @@
                 }
             ]
         },
-        {
-            "name": "meson",
-            "buildsystem": "simple",
-            "ensure-writable": ["easy-install.pth"],
-            "build-commands": [
-               "mkdir -p /app/lib/python3.5/site-packages",
-               "PYTHONUSERBASE=/app/ python3 setup.py install --prefix=/app"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": 
"https://files.pythonhosted.org/packages/d9/5b/3e1844ecb9f4872c2aa0ea8ec180c71a8b8bd60d6ea758f3339d9c659f86/meson-0.50.1.tar.gz";,
-                    "sha256": "242af7cd9088e8aeca7ff1a93e029c4d16d89880fdcf62913ad85a26bbe66316"
-                }
-            ]
-        },
-        {
-            "name": "sound-theme-freedesktop",
-            "ensure-writable": [
-                "easy-install.pth"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://anongit.freedesktop.org/git/sound-theme-freedesktop.git";,
-                    "branch": "0.8"
-                }
-            ]
-        },
         {
             "name": "gsound",
             "ensure-writable": [
@@ -258,8 +227,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": 
"http://download.videolan.org/pub/x264/snapshots/x264-snapshot-20181201-2245-stable.tar.bz2";,
-                    "sha256": "cd25d33c18e198b9138f8c465a5733322b082f715a7da76ec706e5d778bb9656"
+                    "url": 
"http://download.videolan.org/pub/x264/snapshots/x264-snapshot-20191103-2245-stable.tar.bz2";,
+                    "sha256": "d74f8f819104a94b0bd075aae39652b1957bcdd460e09b5202582c86e95a5bc0"
                 }
             ]
         },
@@ -268,8 +237,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.3.tar.gz";,
-                    "sha256": "4f3d69aefdf2dbaf9825408e452a8a414ffc60494c70633560700398820dc550"
+                    "url": "https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.3.1.tar.gz";,
+                    "sha256": "65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d"
                 }
             ]
         },
@@ -357,8 +326,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://bitbucket.org/multicoreware/x265/downloads/x265_2.9.tar.gz";,
-                    "sha256": "ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024"
+                    "url": "https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz";,
+                    "sha256": "fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc"
                 }
             ]
         },
@@ -410,7 +379,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/FFmpeg/FFmpeg.git";,
-                    "commit": "10506de9"
+                    "commit": "n4.1.4"
                 }
             ]
         },
@@ -439,18 +408,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/opencv/opencv/archive/3.4.4.tar.gz";,
-                    "sha256": "a35b00a71d77b484f73ec485c65fe56c7a6fa48acd5ce55c197aef2e13c78746"
-                }
-            ]
-        },
-        {
-            "name": "libunwind",
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/libunwind/libunwind.git";,
-                    "commit": "v1.2.1"
+                    "url": "https://github.com/opencv/opencv/archive/3.4.8.tar.gz";,
+                    "sha256": "f0901648a1db3dc3af30e65082665921dbe998673137380450bdd91e8251b567"
                 }
             ]
         },
@@ -637,7 +596,7 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/libpeas";
+                    "url": "https://gitlab.gnome.org/GNOME/libpeas.git";
                 }
             ]
         },
diff --git a/docs/Bug_reporting.md b/docs/Bug_reporting.md
index 1eb01105..2b97b589 100644
--- a/docs/Bug_reporting.md
+++ b/docs/Bug_reporting.md
@@ -117,7 +117,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.32 | grep Origin | awk '{ print $2 }')
+GNOME_REPO=$(flatpak info org.gnome.Platform//3.34 | 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/Install_with_flatpak.md b/docs/Install_with_flatpak.md
index f57ab5a4..9de58a54 100644
--- a/docs/Install_with_flatpak.md
+++ b/docs/Install_with_flatpak.md
@@ -36,7 +36,7 @@ $ flatpak install flathub org.pitivi.Pitivi
 
 ```
 $ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-$ flatpak install flathub org.gnome.Platform//3.32
+$ flatpak install flathub org.gnome.Platform//3.34
 $ flatpak install http://flatpak.pitivi.org/pitivi.flatpakref
 ```
 
@@ -44,7 +44,7 @@ $ flatpak install http://flatpak.pitivi.org/pitivi.flatpakref
 
 ```
 $ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-$ flatpak install flathub org.gnome.Platform//3.32
+$ flatpak install flathub org.gnome.Platform//3.34
 $ flatpak install http://flatpak.pitivi.org/pitivi-master.flatpakref
 ```
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]