Title: [279063] trunk/Tools/buildstream
- Revision
- 279063
- Author
- [email protected]
- Date
- 2021-06-21 00:53:39 -0700 (Mon, 21 Jun 2021)
Log Message
[Flatpak SDK] Update to FDO 20.08.13 release
https://bugs.webkit.org/show_bug.cgi?id=227176
Patch by Philippe Normand <[email protected]> on 2021-06-21
Reviewed by Žan Doberšek.
This release contains libvpx 1.10.0 which we need since the libwebrtc bump to M92. The
current version we have has ABI incompatible with what libwebrtc expects and this issue was
hidden by r277036 which pulls in the bundled libvpx headers...
* elements/freedesktop-sdk.bst:
* patches/fdo-0001-meson-Bump-to-0.56.1.patch: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/buildstream/ChangeLog (279062 => 279063)
--- trunk/Tools/buildstream/ChangeLog 2021-06-21 02:51:33 UTC (rev 279062)
+++ trunk/Tools/buildstream/ChangeLog 2021-06-21 07:53:39 UTC (rev 279063)
@@ -1,3 +1,17 @@
+2021-06-21 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] Update to FDO 20.08.13 release
+ https://bugs.webkit.org/show_bug.cgi?id=227176
+
+ Reviewed by Žan Doberšek.
+
+ This release contains libvpx 1.10.0 which we need since the libwebrtc bump to M92. The
+ current version we have has ABI incompatible with what libwebrtc expects and this issue was
+ hidden by r277036 which pulls in the bundled libvpx headers...
+
+ * elements/freedesktop-sdk.bst:
+ * patches/fdo-0001-meson-Bump-to-0.56.1.patch: Removed.
+
2021-06-07 Philippe Normand <[email protected]>
Unreviewed, fix libsoup3 build in Flatpak SDK
Modified: trunk/Tools/buildstream/elements/freedesktop-sdk.bst (279062 => 279063)
--- trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2021-06-21 02:51:33 UTC (rev 279062)
+++ trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2021-06-21 07:53:39 UTC (rev 279063)
@@ -5,14 +5,12 @@
url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
# Changed to track git commit from upstream bst
track: 'release/20.08'
- ref: freedesktop-sdk-20.08.4-26-g4421da17dc0a37cc6bb159eceb64b839841c7392
+ ref: freedesktop-sdk-20.08.13-29-g096698709baa9286c4d8a1143a1b094eca3ff844
- kind: patch
path: patches/nettle-no-debug.diff
- kind: patch
path: patches/fdo-0001-pango-Bump-to-1.47.patch
- kind: patch
- path: patches/fdo-0001-meson-Bump-to-0.56.1.patch
-- kind: patch
path: patches/fdo-0001-dav1d-Bump-to-version-0.8.2.patch
- kind: patch
path: patches/fdo-0001-libvpx-Enable-high-bit-depth-support.patch
Deleted: trunk/Tools/buildstream/patches/fdo-0001-meson-Bump-to-0.56.1.patch (279062 => 279063)
--- trunk/Tools/buildstream/patches/fdo-0001-meson-Bump-to-0.56.1.patch 2021-06-21 02:51:33 UTC (rev 279062)
+++ trunk/Tools/buildstream/patches/fdo-0001-meson-Bump-to-0.56.1.patch 2021-06-21 07:53:39 UTC (rev 279063)
@@ -1,50 +0,0 @@
-From d4031cb7ca754eb44fda67d906dc2ecf22690f1b Mon Sep 17 00:00:00 2001
-From: Philippe Normand <[email protected]>
-Date: Wed, 6 Jan 2021 18:05:30 +0000
-Subject: [PATCH] meson: Bump to 0.56.1
-
----
- elements/components/meson.bst | 6 ++----
- .../meson/aarch64-can-potentially-build-arm.patch | 14 --------------
- 2 files changed, 2 insertions(+), 18 deletions(-)
- delete mode 100644 patches/meson/aarch64-can-potentially-build-arm.patch
-
-diff --git a/elements/components/meson.bst b/elements/components/meson.bst
-index b09d8bd81..3ca0cfa1f 100644
---- a/elements/components/meson.bst
-+++ b/elements/components/meson.bst
-@@ -12,9 +12,7 @@ build-depends:
- sources:
- - kind: git_tag
- url: github:mesonbuild/meson.git
-- track: '0.55'
-- ref: 0.55.3-0-g776acd2a805c9b42b4f0375150977df42130317f
-+ track: '0.56'
-+ ref: 0.56.1-0-gf9e6917f79a62aea367ede149031e7deef9d5521
- - kind: patch
- path: patches/meson/meson-no-lib64.patch
--- kind: patch
-- path: patches/meson/aarch64-can-potentially-build-arm.patch
-diff --git a/patches/meson/aarch64-can-potentially-build-arm.patch b/patches/meson/aarch64-can-potentially-build-arm.patch
-deleted file mode 100644
-index fd01df2c2..000000000
---- a/patches/meson/aarch64-can-potentially-build-arm.patch
-+++ /dev/null
-@@ -1,14 +0,0 @@
--diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
--index 52a305d2e..0d8a3c379 100644
----- a/mesonbuild/environment.py
--+++ b/mesonbuild/environment.py
--@@ -443,7 +443,8 @@ def machine_info_can_run(machine_info: MachineInfo):
-- true_build_cpu_family = detect_cpu_family({})
-- return \
-- (machine_info.cpu_family == true_build_cpu_family) or \
--- ((true_build_cpu_family == 'x86_64') and (machine_info.cpu_family == 'x86'))
--+ ((true_build_cpu_family == 'x86_64') and (machine_info.cpu_family == 'x86')) or \
--+ ((true_build_cpu_family == 'aarch64') and (machine_info.cpu_family == 'arm'))
--
-- def search_version(text):
-- # Usually of the type 4.1.4 but compiler output may contain
---
-2.29.2
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
