[pitivi/thiblahute/sdk3.30: 1/2] build: Update flatpak SDK and deps
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/thiblahute/sdk3.30: 1/2] build: Update flatpak SDK and deps
- Date: Mon, 14 Jan 2019 14:35:24 +0000 (UTC)
commit 4291916d41782ff1e38320fe025fc47a4707a7ab
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Sun Dec 2 23:56:44 2018 +0100
build: Update flatpak SDK and deps
Fixes #2262
.gitlab-ci.yml | 2 +-
build/flatpak/gavl/gavl-armel-ftbfs.patch | 18 ++++
build/flatpak/org.pitivi.Pitivi.json | 161 +++++++++++++++++++-----------
3 files changed, 122 insertions(+), 59 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01b2a7a3..5f265dd1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,7 +51,7 @@ test-results:
- echo ${BRANCH}
- export IMAGE="${CI_REGISTRY}/${NAMESPACE}/${CI_PROJECT_NAME}:${BRANCH}"
- echo ${IMAGE}
- - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.28"
+ - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30"
- echo ${BASE_IMAGE}
- export TMPIMAGENAME="tmp-pitivi-${BRANCH}"
- echo ${TMPIMAGENAME}
diff --git a/build/flatpak/gavl/gavl-armel-ftbfs.patch b/build/flatpak/gavl/gavl-armel-ftbfs.patch
new file mode 100644
index 00000000..a7a6b5e9
--- /dev/null
+++ b/build/flatpak/gavl/gavl-armel-ftbfs.patch
@@ -0,0 +1,18 @@
+Description: Fix build failure on Ubuntu armel.
+Bug-Ubuntu: https://launchpad.net/bugs/704027
+Author: Alessio Treglia <alessio debian org>
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gavl.orig/src/Makefile.am
++++ gavl/src/Makefile.am
+@@ -30,7 +30,7 @@ benchmark_LDADD = ../gavl/libgavl.la @RT
+
+
+ volume_test_SOURCES = volume_test.c
+-volume_test_LDADD = ../gavl/libgavl.la
++volume_test_LDADD = -lm ../gavl/libgavl.la
+
+ dump_frame_table_SOURCES = dump_frame_table.c
+ dump_frame_table_LDADD = ../gavl/libgavl.la
diff --git a/build/flatpak/org.pitivi.Pitivi.json b/build/flatpak/org.pitivi.Pitivi.json
index cc38db4b..8dc838c7 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.28",
+ "runtime-version": "3.30",
"command": "pitivi",
"finish-args": [
"--socket=x11",
@@ -20,8 +20,8 @@
"sdk": "org.gnome.Sdk",
"copy-icon": true,
"build-options": {
- "cflags": "-O0 -g",
- "cxxflags": "-O0 -g",
+ "cflags": "-O2 -g",
+ "cxxflags": "-O2 -g",
"env": {
"PYTHON": "python3",
"GST_PLUGIN_SYSTEM_PATH": "/app/lib/gstreamer-1.0/",
@@ -38,14 +38,14 @@
"easy-install.pth"
],
"build-commands": [
- "mkdir -p /app/lib/python3.5/site-packages",
- "CFLAGS='-L/usr/lib -Lbuild/temp.linux-x86_64-3.4 -I/usr/include -I/usr/include/python3.5m/'
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.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"
],
"sources": [
{
"type": "archive",
- "url":
"https://files.pythonhosted.org/packages/d5/6e/f00492653d0fdf6497a181a1c1d46bbea5a2383e7faf4c8ca6d6f3d2581d/numpy-1.14.5.zip";,
- "sha256": "a4a433b3a264dbc9aa9c7c241e87c0358a503ea6394f8737df1683c7c9a102ac"
+ "url":
"https://files.pythonhosted.org/packages/2d/80/1809de155bad674b494248bcfca0e49eb4c5d8bee58f26fe7a0dd45029e2/numpy-1.15.4.zip";,
+ "sha256": "3d734559db35aa3697dadcea492a423118c5c55d176da2f3be9c98d4803fc2a7"
}
]
},
@@ -61,8 +61,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://pypi.python.org/packages/3c/ec/a94f8cf7274ea60b5413df054f82a8980523efd712ec55a59e7c3357cf7c/pyparsing-2.2.0.tar.gz#md5=0214e42d63af850256962b6744c948d9";,
- "sha256": "0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04"
+ "url":
"https://files.pythonhosted.org/packages/d0/09/3e6a5eeb6e04467b737d55f8bba15247ac0876f98fae659e58cd744430c6/pyparsing-2.3.0.tar.gz";,
+ "sha256": "f353aab21fd474459d97b709e527b5571314ee5f067441dc9f88e33eecd96592"
}
]
},
@@ -78,13 +78,13 @@
"sources": [
{
"type": "archive",
- "url":
"https://pypi.python.org/packages/a4/09/c47e57fc9c7062b4e83b075d418800d322caa87ec0ac21e6308bd3a2d519/pytz-2017.2.zip#md5=";,
- "sha256": "f5c056e8f62d45ba8215e5cb8f50dfccb198b4b9fbea8500674f3443e4689589"
+ "url":
"https://files.pythonhosted.org/packages/cd/71/ae99fc3df1b1c5267d37ef2c51b7d79c44ba8a5e37b48e3ca93b4d74d98b/pytz-2018.7.tar.gz";,
+ "sha256": "31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca"
}
]
},
{
- "name": "six",
+ "name": "cycler",
"buildsystem": "simple",
"ensure-writable": [
"easy-install.pth"
@@ -95,13 +95,13 @@
"sources": [
{
"type": "archive",
- "url":
"https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-1.10.0.tar.gz#md5=34eed507548117b2ab523ab14b2f8b55";,
- "sha256": "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a"
+ "url":
"https://files.pythonhosted.org/packages/c2/4b/137dea450d6e1e3d474e1d873cd1d4f7d3beed7e0dc973b06e8e10d32488/cycler-0.10.0.tar.gz";,
+ "sha256": "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"
}
]
},
{
- "name": "Cycler",
+ "name": "setuptools-scm",
"buildsystem": "simple",
"ensure-writable": [
"easy-install.pth"
@@ -112,8 +112,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://pypi.python.org/packages/c2/4b/137dea450d6e1e3d474e1d873cd1d4f7d3beed7e0dc973b06e8e10d32488/cycler-0.10.0.tar.gz#md5=4cb42917ac5007d1cdff6cccfe2d016b";,
- "sha256": "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8"
+ "url":
"https://files.pythonhosted.org/packages/09/b4/d148a70543b42ff3d81d57381f33104f32b91f970ad7873f463e75bf7453/setuptools_scm-3.1.0.tar.gz";,
+ "sha256": "1191f2a136b5e86f7ca8ab00a97ef7aef997131f1f6d4971be69a1ef387d8b40"
}
]
},
@@ -129,25 +129,43 @@
"sources": [
{
"type": "archive",
- "url":
"https://pypi.python.org/packages/51/fc/39a3fbde6864942e8bb24c93663734b74e281b984d1b8c4f95d64b0c21f6/python-dateutil-2.6.0.tar.gz#md5=6e38f91e8c94c15a79ce22768dfeca87";,
- "sha256": "62a2f8df3d66f878373fd0072eacf4ee52194ba302e00082828e0d263b0418d2"
+ "url":
"https://files.pythonhosted.org/packages/0e/01/68747933e8d12263d41ce08119620d9a7e5eb72c876a3442257f74490da0/python-dateutil-2.7.5.tar.gz";,
+ "sha256": "88f9287c0174266bb0d8cedd395cfba9c58e87e5ad86b2ce58859bc11be3cf02"
}
]
},
{
- "name": "matplotlib",
+ "name": "kiwisolver",
"buildsystem": "simple",
"ensure-writable": [
"easy-install.pth"
],
+ "build-commands": [
+ "python3 setup.py install --prefix=/app"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url":
"https://files.pythonhosted.org/packages/31/60/494fcce70d60a598c32ee00e71542e52e27c978e5f8219fae0d4ac6e2864/kiwisolver-1.0.1.tar.gz";,
+ "sha256": "ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278"
+ }
+ ]
+ },
+ {
+ "name": "matplotlib",
+ "buildsystem": "simple",
+ "ensure-writable": [
+ "easy-install.pth",
+ "setuptools.pth"
+ ],
"build-commands": [
"CXX=/usr/bin/g++ CC=/usr/bin/gcc PYTHONUSERBASE=/app/ python3 setup.py install
--prefix=/app"
],
"sources": [
{
"type": "archive",
- "url":
"https://pypi.python.org/packages/f5/f0/9da3ef24ea7eb0ccd12430a261b66eca36b924aeef06e17147f9f9d7d310/matplotlib-2.0.2.tar.gz";,
- "sha256": "0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1"
+ "url":
"https://files.pythonhosted.org/packages/eb/a0/31b6ba00bc4dcbc06f0b80d1ad6119a9cc3081ecb04a00117f6c1ca3a084/matplotlib-2.2.3.tar.gz";,
+ "sha256": "7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5"
}
]
},
@@ -159,7 +177,7 @@
]
},
"config-opts": [
- "--module=ipdb==0.8.1"
+ "--module=ipdb==0.11"
],
"sources": [
{
@@ -177,7 +195,7 @@
]
},
"config-opts": [
- "--module=nose2==0.6.5"
+ "--module=nose2==0.8.0"
],
"sources": [
{
@@ -224,7 +242,7 @@
"sources": [
{
"type": "git",
- "url": "https://git.gnome.org/browse/gsound";,
+ "url": "https://gitlab.gnome.org/GNOME/gsound.git";,
"branch": "1.0.2"
}
]
@@ -240,8 +258,8 @@
"sources": [
{
"type": "archive",
- "url":
"http://download.videolan.org/pub/x264/snapshots/x264-snapshot-20140212-2245-stable.tar.bz2";,
- "sha256": "5d98e9e4faf6dd55e7193ed379aff477b8acbda6777758956ef7e5f05067be18"
+ "url":
"http://download.videolan.org/pub/x264/snapshots/x264-snapshot-20181201-2245-stable.tar.bz2";,
+ "sha256": "cd25d33c18e198b9138f8c465a5733322b082f715a7da76ec706e5d778bb9656"
}
]
},
@@ -250,21 +268,38 @@
"sources": [
{
"type": "archive",
- "url": "http://downloads.xiph.org/releases/opus/opus-1.1.2.tar.gz";,
- "sha256": "0e290078e31211baa7b5886bcc8ab6bc048b9fc83882532da4a1a45e58e907fd"
+ "url": "https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.3.tar.gz";,
+ "sha256": "4f3d69aefdf2dbaf9825408e452a8a414ffc60494c70633560700398820dc550"
}
]
},
{
"name": "gavl",
+ "rm-configure": true,
"config-opts": [
- "--without-doxygen"
+ "--without-doxygen",
+ "--disable-static",
+ "--enable-shared"
],
"sources": [
{
"type": "archive",
- "url": "https://github.com/pitivi/projects/releases/download/mirror/gavl-1.4.0.tar.gz";,
+ "url": "https://downloads.sourceforge.net/project/gmerlin/gavl/1.4.0/gavl-1.4.0.tar.gz";,
+ "mirror-urls": ["http://http.debian.net/debian/pool/main/g/gavl/gavl_1.4.0.orig.tar.gz";],
"sha256": "51aaac41391a915bd9bad07710957424b046410a276e7deaff24a870929d33ce"
+ },
+ {
+ "type": "patch",
+ "path": "gavl/gavl-armel-ftbfs.patch"
+ },
+ {
+ "type": "shell",
+ "commands": ["pwd", "cp -p /usr/share/automake-*/config.{sub,guess} ."]
+ },
+ {
+ "type": "script",
+ "dest-filename": "autogen.sh",
+ "commands": ["autoreconf -vfi"]
}
]
},
@@ -283,18 +318,24 @@
"sources": [
{
"type": "archive",
- "url": "http://www.surina.net/soundtouch/soundtouch-1.8.0.tar.gz";,
- "sha256": "3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b"
+ "url":
"https://gitlab.com/soundtouch/soundtouch/-/archive/2.1.2/soundtouch-2.1.2.tar.bz2";,
+ "sha256": "992bba58ecda8c0a3a94cc9648ccebbb84fb6f4f8c1a90fbb4ec3817354ad40d"
}
]
},
{
"name": "lame",
+ "config-opts": [
+ "--enable-shared",
+ "--disable-static",
+ "--disable-frontend"
+ ],
"sources": [
{
"type": "archive",
- "url": "https://github.com/pitivi/projects/releases/download/mirror/lame-3.99.5.tar.gz";,
- "sha256": "24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
+ "url": "https://downloads.sourceforge.net/lame/lame-3.100.tar.gz";,
+ "mirror-urls": ["http://http.debian.net/debian/pool/main/l/lame/lame_3.100.orig.tar.gz";],
+ "sha256": "ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e"
}
]
},
@@ -303,32 +344,21 @@
"sources": [
{
"type": "archive",
- "url":
"https://github.com/pitivi/projects/releases/download/mirror/vo-aacenc-0.1.3.tar.gz";,
+ "url": "https://downloads.sourceforge.net/opencore-amr/vo-aacenc/vo-aacenc-0.1.3.tar.gz";,
+ "mirror-urls":
["http://ftp.debian.org/debian/pool/main/v/vo-aacenc/vo-aacenc_0.1.3.orig.tar.gz";],
"sha256": "e51a7477a359f18df7c4f82d195dab4e14e7414cbd48cf79cc195fc446850f36"
}
]
},
{
"name": "x265",
- "cmake": true,
+ "buildsystem": "cmake",
"subdir": "source",
"sources": [
{
"type": "archive",
- "url": "https://bitbucket.org/multicoreware/x265/downloads/x265_1.9.tar.gz";,
- "sha256": "3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8"
- }
- ]
- },
- {
- "name": "opencv",
- "buildsystem": "cmake",
- "builddir": true,
- "sources": [
- {
- "type": "git",
- "branch": "2.4.13.6",
- "url": "https://github.com/opencv/opencv";
+ "url": "https://bitbucket.org/multicoreware/x265/downloads/x265_2.9.tar.gz";,
+ "sha256": "ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024"
}
]
},
@@ -380,21 +410,37 @@
{
"type": "git",
"url": "https://github.com/FFmpeg/FFmpeg.git";,
- "branch": "3ef38c414e7908b2f66552081efe485bce52037c"
+ "commit": "10506de9"
}
]
},
{
"name": "fdkaac",
"config-opts": [
- "--disable-static"
+ "--with-pic",
+ "--disable-static",
+ "--enable-shared"
],
"sources": [
{
"type": "git",
"url": "https://github.com/mstorsjo/fdk-aac.git";,
- "branch": "v0.1.5",
- "commit": "74c1a2a4f831285cbd93ec1427f1670d3c5c5e52"
+ "branch": "v0.1.6"
+ }
+ ]
+ },
+ {
+ "name": "opencv",
+ "buildsystem": "cmake-ninja",
+ "builddir": true,
+ "cleanup": [
+ "/bin"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://github.com/opencv/opencv/archive/3.4.4.tar.gz";,
+ "sha256": "a35b00a71d77b484f73ec485c65fe56c7a6fa48acd5ce55c197aef2e13c78746"
}
]
},
@@ -523,7 +569,7 @@
"buildsystem": "meson",
"builddir": true,
"config-opts": [
- "-Dpygi-overrides-dir=/app/lib/python3.5/site-packages/gi/overrides/",
+ "-Dpygi-overrides-dir=/app/lib/python3.7/site-packages/gi/overrides/",
"--libdir=lib"
],
"sources": [
@@ -536,7 +582,6 @@
},
{
"name": "gst-devtools",
- "config-opts": [],
"buildsystem": "meson",
"builddir": true,
"config-opts": [
@@ -627,7 +672,7 @@
"sources": [
{
"type": "git",
- "url": "https://git.gnome.org/browse/pitivi";,
+ "url": "https://gitlab.gnome.org/GNOME/pitivi.git";,
"branch": "master"
}
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
