Diff
Modified: trunk/Tools/buildstream/ChangeLog (291546 => 291547)
--- trunk/Tools/buildstream/ChangeLog 2022-03-20 16:37:43 UTC (rev 291546)
+++ trunk/Tools/buildstream/ChangeLog 2022-03-20 16:48:43 UTC (rev 291547)
@@ -1,3 +1,25 @@
+2022-03-20 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] Bump to meson 0.60
+ https://bugs.webkit.org/show_bug.cgi?id=238112
+
+ Reviewed by Adrian Perez de Castro.
+
+ * elements/freedesktop-sdk.bst: Update junction and include patches for Meson update and
+ follow-up recipe updates.
+ * elements/sdk-platform.bst: Remove shared-mime-info, the same version is shipped by the upstream SDK already.
+ * elements/sdk/glib.bst: Remove invalid meson options
+ * elements/sdk/gst-plugins-bad.bst: Ditto.
+ * elements/sdk/gst-plugins-base.bst: Ditto.
+ * elements/sdk/gstreamer.bst: Ditto.
+ * elements/sdk/gtk+-3.bst: Ditto.
+ * elements/sdk/gtk.bst: Ditto.
+ * elements/sdk/shared-mime-info.bst: Removed.
+ * patches/fdo-0001-gdk-pixbuf-Remove-invalid-meson-options.patch: Added.
+ * patches/fdo-0001-gst-plugins-bad-Remove-invalid-meson-option.patch: Added.
+ * patches/fdo-0001-meson-Bump-to-0.60.3.patch: Added.
+ * patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch: Added.
+
2022-03-20 Adrian Perez de Castro <[email protected]>
[Flatpak SDK] Include gi-docgen and its dependencies
Modified: trunk/Tools/buildstream/elements/freedesktop-sdk.bst (291546 => 291547)
--- trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2022-03-20 16:37:43 UTC (rev 291546)
+++ trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2022-03-20 16:48:43 UTC (rev 291547)
@@ -3,11 +3,19 @@
- kind: git_tag
url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
track: 'release/21.08'
- ref: freedesktop-sdk-21.08.11-49-g655e58554588f1f7a41aeb6c88b8c7fdb0de7e6d
+ ref: freedesktop-sdk-21.08.11-68-gc5c9e4d4b64f099843657fabbab295b3b77403c6
- kind: patch
path: patches/fdo-0001-Bump-libnice-to-current-git-master-HEAD.patch
- kind: patch
path: patches/fdo-0001-pango-Bump-to-1.50.4.patch
+- kind: patch
+ path: patches/fdo-0001-meson-Bump-to-0.60.3.patch
+- kind: patch
+ path: patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch
+- kind: patch
+ path: patches/fdo-0001-gdk-pixbuf-Remove-invalid-meson-options.patch
+- kind: patch
+ path: patches/fdo-0001-gst-plugins-bad-Remove-invalid-meson-option.patch
config:
options:
target_arch: '%{arch}'
Modified: trunk/Tools/buildstream/elements/sdk/glib.bst (291546 => 291547)
--- trunk/Tools/buildstream/elements/sdk/glib.bst 2022-03-20 16:37:43 UTC (rev 291546)
+++ trunk/Tools/buildstream/elements/sdk/glib.bst 2022-03-20 16:48:43 UTC (rev 291547)
@@ -21,7 +21,6 @@
variables:
meson-local: >-
-Dgtk_doc=false
- -Dinstalled-tests=true
-Dselinux=disabled
public:
bst:
Modified: trunk/Tools/buildstream/elements/sdk/gst-plugins-bad.bst (291546 => 291547)
--- trunk/Tools/buildstream/elements/sdk/gst-plugins-bad.bst 2022-03-20 16:37:43 UTC (rev 291546)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugins-bad.bst 2022-03-20 16:48:43 UTC (rev 291547)
@@ -42,7 +42,6 @@
-Dbs2b=disabled
-Dchromaprint=disabled
-Dcolormanagement=disabled
- -Dcuda=disabled
-Dcurl-ssh2=disabled
-Dcurl=disabled
-Dd3dvideosink=disabled
@@ -66,7 +65,6 @@
-Dladspa=disabled
-Dldac=disabled
-Dlibde265=disabled
- -Dlibmms=disabled
-Dlv2=disabled
-Dmagicleap=disabled
-Dmicrodns=disabled
@@ -77,9 +75,6 @@
-Dmusepack=disabled
-Dneon=disabled
-Dnvcodec=disabled
- -Dnvdec=disabled
- -Dnvenc=disabled
- -Dofa=disabled
-Donnx=disabled
-Dopenal=disabled
-Dopenaptx=disabled
@@ -103,8 +98,6 @@
-Dtinyalsa=disabled
-Dttml=disabled
-Dva=disabled
- -Dvaacenc=disabled
- -Dvdpau=disabled
-Dvoaacenc=disabled
-Dvoamrwbenc=disabled
-Dvulkan=disabled
Modified: trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst (291546 => 291547)
--- trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst 2022-03-20 16:37:43 UTC (rev 291546)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst 2022-03-20 16:48:43 UTC (rev 291547)
@@ -34,7 +34,6 @@
-Dlibvisual=disabled
-Dtremor=disabled
-Dexamples=disabled
- -Dgtk_doc=disabled
-Ddoc=disabled
-Dtests=disabled
public:
Modified: trunk/Tools/buildstream/elements/sdk/gstreamer.bst (291546 => 291547)
--- trunk/Tools/buildstream/elements/sdk/gstreamer.bst 2022-03-20 16:37:43 UTC (rev 291546)
+++ trunk/Tools/buildstream/elements/sdk/gstreamer.bst 2022-03-20 16:48:43 UTC (rev 291547)
@@ -29,7 +29,6 @@
-Dlibdw=enabled
-Ddbghelp=disabled
-Dbash-completion=disabled
- -Dgtk_doc=disabled
-Ddoc=disabled
-Dpackage-origin="webkit-sdk"
public:
Modified: trunk/Tools/buildstream/elements/sdk/gtk+-3.bst (291546 => 291547)
--- trunk/Tools/buildstream/elements/sdk/gtk+-3.bst 2022-03-20 16:37:43 UTC (rev 291546)
+++ trunk/Tools/buildstream/elements/sdk/gtk+-3.bst 2022-03-20 16:48:43 UTC (rev 291547)
@@ -33,7 +33,6 @@
-Dinstalled_tests=true
-Dtests=false
-Dx11_backend=true
- -Dwayland-backend=true
-Dgtk_doc=false
-Dman=false
-Dintrospection=true
Modified: trunk/Tools/buildstream/elements/sdk/gtk.bst (291546 => 291547)
--- trunk/Tools/buildstream/elements/sdk/gtk.bst 2022-03-20 16:37:43 UTC (rev 291546)
+++ trunk/Tools/buildstream/elements/sdk/gtk.bst 2022-03-20 16:48:43 UTC (rev 291547)
@@ -29,8 +29,6 @@
variables:
meson-local: >-
- -Denable-broadway-backend=true
- -Dprint-cloudprint=disabled
-Dmedia-ffmpeg=disabled
-Dvulkan=disabled
-Dbuild-tests=false
Deleted: trunk/Tools/buildstream/elements/sdk/shared-mime-info.bst (291546 => 291547)
--- trunk/Tools/buildstream/elements/sdk/shared-mime-info.bst 2022-03-20 16:37:43 UTC (rev 291546)
+++ trunk/Tools/buildstream/elements/sdk/shared-mime-info.bst 2022-03-20 16:48:43 UTC (rev 291547)
@@ -1,25 +0,0 @@
-kind: meson
-
-build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
-- freedesktop-sdk.bst:components/docbook-xsl.bst
-- freedesktop-sdk.bst:components/itstool.bst
-- freedesktop-sdk.bst:components/xmlto.bst
-
-depends:
-- sdk/glib.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
-- freedesktop-sdk.bst:components/libxml2.bst
-
-sources:
-- kind: git_tag
- url: gitlab_freedesktop_org:xdg/shared-mime-info
- track: '2.1'
- ref: 2.1-0-g18e558fa1c8b90b86757ade09a4ba4d6a6cf8f70
-public:
- bst:
- overlap-whitelist:
- - '**'
- integration-commands:
- - |
- PKGSYSTEM_ENABLE_FSYNC=0 update-mime-database "%{datadir}/mime"
Modified: trunk/Tools/buildstream/elements/sdk-platform.bst (291546 => 291547)
--- trunk/Tools/buildstream/elements/sdk-platform.bst 2022-03-20 16:37:43 UTC (rev 291546)
+++ trunk/Tools/buildstream/elements/sdk-platform.bst 2022-03-20 16:48:43 UTC (rev 291547)
@@ -59,7 +59,6 @@
- sdk/ruby-highline.bst
- sdk/ruby-webrick.bst
- sdk/sccache.bst
-- sdk/shared-mime-info.bst
- sdk/sparkle-cdm.bst
- sdk/subversion.bst
- sdk/woff2.bst
@@ -204,6 +203,7 @@
- freedesktop-sdk.bst:components/sdl2-net.bst
- freedesktop-sdk.bst:components/sdl2-ttf.bst
- freedesktop-sdk.bst:components/sdl2.bst
+- freedesktop-sdk.bst:components/shared-mime-info.bst
- freedesktop-sdk.bst:components/sndfile.bst
- freedesktop-sdk.bst:components/speex.bst
- freedesktop-sdk.bst:components/speexdsp.bst
Added: trunk/Tools/buildstream/patches/fdo-0001-gdk-pixbuf-Remove-invalid-meson-options.patch (0 => 291547)
--- trunk/Tools/buildstream/patches/fdo-0001-gdk-pixbuf-Remove-invalid-meson-options.patch (rev 0)
+++ trunk/Tools/buildstream/patches/fdo-0001-gdk-pixbuf-Remove-invalid-meson-options.patch 2022-03-20 16:48:43 UTC (rev 291547)
@@ -0,0 +1,25 @@
+From b79f1c050dce1f774e980c2e8ba0cf8725de41f2 Mon Sep 17 00:00:00 2001
+From: Philippe Normand <[email protected]>
+Date: Sat, 19 Mar 2022 17:32:56 +0000
+Subject: [PATCH] gdk-pixbuf: Remove invalid meson options
+
+---
+ elements/components/gdk-pixbuf.bst | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/elements/components/gdk-pixbuf.bst b/elements/components/gdk-pixbuf.bst
+index f22d6fab0..237c4d6e2 100644
+--- a/elements/components/gdk-pixbuf.bst
++++ b/elements/components/gdk-pixbuf.bst
+@@ -15,8 +15,6 @@ depends:
+
+ variables:
+ meson-local: >
+- -Dx11=false
+- -Djasper=false
+ -Dbuiltin_loaders=png,jpeg
+ -Dinstalled_tests=false
+
+--
+2.35.1
+
Added: trunk/Tools/buildstream/patches/fdo-0001-gst-plugins-bad-Remove-invalid-meson-option.patch (0 => 291547)
--- trunk/Tools/buildstream/patches/fdo-0001-gst-plugins-bad-Remove-invalid-meson-option.patch (rev 0)
+++ trunk/Tools/buildstream/patches/fdo-0001-gst-plugins-bad-Remove-invalid-meson-option.patch 2022-03-20 16:48:43 UTC (rev 291547)
@@ -0,0 +1,24 @@
+From dad7850992ceb9d7ab4d5582a87011768fa29070 Mon Sep 17 00:00:00 2001
+From: Philippe Normand <[email protected]>
+Date: Sat, 19 Mar 2022 18:03:07 +0000
+Subject: [PATCH] gst-plugins-bad: Remove invalid meson option
+
+---
+ elements/components/gstreamer-plugins-bad.bst | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/elements/components/gstreamer-plugins-bad.bst b/elements/components/gstreamer-plugins-bad.bst
+index 455bfe3bf..41da813d8 100644
+--- a/elements/components/gstreamer-plugins-bad.bst
++++ b/elements/components/gstreamer-plugins-bad.bst
+@@ -48,7 +48,6 @@ variables:
+ -Dpackage-origin="freedesktop-sdk"
+ -Drsvg=enabled
+ -Dsndfile=enabled
+- -Dvdpau=disabled
+ -Dvulkan=enabled
+ -Dwayland=enabled
+ -Dwebp=enabled
+--
+2.35.1
+
Added: trunk/Tools/buildstream/patches/fdo-0001-meson-Bump-to-0.60.3.patch (0 => 291547)
--- trunk/Tools/buildstream/patches/fdo-0001-meson-Bump-to-0.60.3.patch (rev 0)
+++ trunk/Tools/buildstream/patches/fdo-0001-meson-Bump-to-0.60.3.patch 2022-03-20 16:48:43 UTC (rev 291547)
@@ -0,0 +1,36 @@
+From 0cfdf05a0e1489907e0e45a9f68cd63a9ab03e6d Mon Sep 17 00:00:00 2001
+From: Philippe Normand <[email protected]>
+Date: Sat, 19 Mar 2022 16:42:03 +0000
+Subject: [PATCH] meson: Bump to 0.60.3
+
+Needed for GStreamer development builds.
+---
+ elements/components/meson.bst | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/elements/components/meson.bst b/elements/components/meson.bst
+index 4c4e1ba5b..17654df2c 100644
+--- a/elements/components/meson.bst
++++ b/elements/components/meson.bst
+@@ -1,5 +1,4 @@
+ kind: pip
+-
+ depends:
+ - bootstrap-import.bst
+ - components/python3.bst
+@@ -12,9 +11,9 @@ build-depends:
+ sources:
+ - kind: pypi
+ name: meson
+- url: pypi:57/90/1f5768627ef72e95483b2a899f5efc6efa6c999966b2a1a5ba2d1de6db9c/meson-0.59.4.tar.gz
+- sha256sum: a77988cc50554f73ede075bc9bf77a2d7ecb6ff892f2a0180d4940920eaaec84
++ url: pypi:48/fb/09b5098772ce484b203be026d8047c596a28107e1ecc0df1412058d9f715/meson-0.60.3.tar.gz
++ sha256sum: 87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e
+ include:
+- - 0\.59\..*
++ - 0\.60\..*
+ - kind: patch
+ path: patches/meson/meson-no-lib64.patch
+--
+2.35.1
+
Added: trunk/Tools/buildstream/patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch (0 => 291547)
--- trunk/Tools/buildstream/patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch (rev 0)
+++ trunk/Tools/buildstream/patches/fdo-0001-shared-mime-info-Backport-meson-0.60-build-fix.patch 2022-03-20 16:48:43 UTC (rev 291547)
@@ -0,0 +1,144 @@
+From 3d67db03d8c8c513881645d7900de6c7d8a8159f Mon Sep 17 00:00:00 2001
+From: Philippe Normand <[email protected]>
+Date: Sat, 19 Mar 2022 17:16:11 +0000
+Subject: [PATCH] shared-mime-info: Backport meson 0.60 build fix
+
+https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/162
+---
+ elements/components/shared-mime-info.bst | 2 +
+ ...tom-itstool-to-builtin-msgfmt-for-cr.patch | 113 ++++++++++++++++++
+ 2 files changed, 115 insertions(+)
+ create mode 100644 patches/shared-mime-info-0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
+
+diff --git a/elements/components/shared-mime-info.bst b/elements/components/shared-mime-info.bst
+index 0aa629d50..2cdad570a 100644
+--- a/elements/components/shared-mime-info.bst
++++ b/elements/components/shared-mime-info.bst
+@@ -22,3 +22,5 @@ sources:
+ track-extra:
+ - '2.0'
+ ref: 2.1-0-g18e558fa1c8b90b86757ade09a4ba4d6a6cf8f70
++- kind: patch
++ path: patches/shared-mime-info-0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
+diff --git a/patches/shared-mime-info-0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch b/patches/shared-mime-info-0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
+new file mode 100644
+index 000000000..6b104e081
+--- /dev/null
++++ b/patches/shared-mime-info-0001-migrate-from-custom-itstool-to-builtin-msgfmt-for-cr.patch
+@@ -0,0 +1,113 @@
++From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
++From: Eli Schwartz <[email protected]>
++Date: Mon, 8 Nov 2021 18:22:47 -0500
++Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
++ translated XML
++
++gettext upstream has supported this for a very long time (since 0.19.7
++via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
++and itstool is (mostly) a legacy of the time before gettext had proper
++support for these sorts of use cases.
++
++This is similar to the state of intltool, which is described at
++https://wiki.gnome.org/MigratingFromIntltoolToGettext
++
++During the port from autotools to meson, the legacy use of itstool was
++faithfully translated to meson in the only way possible: by jumping
++through hoops to run ninja inside ninja in order to generate the .mo
++files for itstool, because meson's i18n module used a flawed design and
++there was no "real" target to create those files, only a .PHONY
++run_target which other rules cannot depend on.
++
++Although meson 0.60.0 added support for real targets for the built .mo
++files, this changed the rules for output filenames, breaking the script.
++
++But msgfmt does not care, and anyways comes with builtin meson functions
++for convenient use with XML files. So let's take this opportunity to
++drop legacy dependencies and use the modern, builtin tooling, which
++fixes this bug as a side effect.
++
++Fixes #170
++---
++ .gitlab-ci.yml | 2 --
++ README.md | 2 +-
++ data/freedesktop_generate.sh | 12 ------------
++ data/meson.build | 16 +++++-----------
++ meson.build | 1 -
++ 5 files changed, 6 insertions(+), 27 deletions(-)
++ delete mode 100755 data/freedesktop_generate.sh
++
++diff --git a/README.md b/README.md
++index c23d9d5..b2fb0ac 100644
++--- a/README.md
+++++ b/README.md
++@@ -19,7 +19,7 @@ $ ninja -v -C _build install
++ ```
++
++ It requires the glib development package to be installed as well as
++-gettext and itstool.
+++gettext.
++ This database is translated at Transifex.
++
++
++diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh
++deleted file mode 100755
++index 62ccffa..0000000
++--- a/data/freedesktop_generate.sh
+++++ /dev/null
++@@ -1,12 +0,0 @@
++-#!/bin/sh -e
++-
++-src_root="$1"
++-build_root="$2"
++-
++-ninja -C "${build_root}" shared-mime-info-gmo
++-
++-itstool \
++- --its "${src_root}/data/its/shared-mime-info.its" \
++- --join "${src_root}/data/freedesktop.org.xml.in" \
++- -o "${build_root}/data/freedesktop.org.xml" \
++- "${build_root}/po/"*".gmo"
++diff --git a/data/meson.build b/data/meson.build
++index 24361c9..09ed7a9 100644
++--- a/data/meson.build
+++++ b/data/meson.build
++@@ -1,18 +1,12 @@
++
++ install_man('update-mime-database.1')
++
++-freedesktop_org_xml = custom_target('freedesktop.org.xml',
++- input : files(
++- 'freedesktop.org.xml.in',
++- 'its/shared-mime-info.its',
++- 'its/shared-mime-info.loc',
++- ),
+++freedesktop_org_xml = i18n.merge_file(
+++ input: 'freedesktop.org.xml.in',
++ output: 'freedesktop.org.xml',
++- command: [
++- find_program('freedesktop_generate.sh'),
++- meson.source_root(),
++- meson.build_root()
++- ],
+++ data_dirs: '.',
+++ po_dir: '../po',
+++ type: 'xml',
++ install: true,
++ install_dir: get_option('datadir') / 'mime' / 'packages',
++ )
++diff --git a/meson.build b/meson.build
++index 0d08c8a..60f17ae 100644
++--- a/meson.build
+++++ b/meson.build
++@@ -20,7 +20,6 @@ config.set_quoted('VERSION', meson.project_version())
++ ###############################################################################
++ # Find tools
++
++-itstool = find_program('itstool')
++ xmllint = find_program('xmllint')
++ xmlto = find_program('xmlto', required: false)
++
++--
++2.35.1
++
+--
+2.35.1
+
