Skip to content

Commit 4e0c11c

Browse files
philnphiln
committed
[Flatpak SDK] Update to FDO 20.08
https://bugs.webkit.org/show_bug.cgi?id=215763 Reviewed by Žan Doberšek. .: * .gitignore: Ignore buildstream local Flatpak repository. This is created only when manually building the SDK. Tools: Highlights: - ICU 67 (see bug 215327) - gcc update from 9.3.0 to 10.0 - clang update from 8.0 to 10.0 - perf is now included - usable pipewire (host needs a working daemon and recent enough xdg-desktop-portal though) - Mesa is no longer loaded from the flathub GL extension, but included in our downstream SDK, with debug symbols This patch only includes the build definitions updates, bumping the SDK branch to 0.3. The actual migration will be landed in a follow-up patch. * buildstream/elements/flatpak-platform-extensions.bst: * buildstream/elements/flatpak-runtimes.bst: * buildstream/elements/flatpak/platform.bst: * buildstream/elements/flatpak/sdk.bst: * buildstream/elements/freedesktop-sdk.bst: * buildstream/elements/sdk-build-depends/swig.bst: * buildstream/elements/sdk-platform.bst: * buildstream/elements/sdk.bst: * buildstream/elements/sdk/at-spi2-atk.bst: Removed. * buildstream/elements/sdk/at-spi2-core.bst: Removed. * buildstream/elements/sdk/atk.bst: Removed. * buildstream/elements/sdk/brotli.bst: Removed. * buildstream/elements/sdk/glib.bst: * buildstream/elements/sdk/gobject-introspection.bst: Removed. * buildstream/elements/sdk/graphene.bst: * buildstream/elements/sdk/gst-plugins-bad.bst: * buildstream/elements/sdk/gst-plugins-good.bst: * buildstream/elements/sdk/gstreamer.bst: * buildstream/elements/sdk/gtk+-3.bst: * buildstream/elements/sdk/gtk.bst: * buildstream/elements/sdk/libdrm.bst: Added. * buildstream/elements/sdk/libgcrypt.bst: * buildstream/elements/sdk/libsecret.bst: * buildstream/elements/sdk/libsoup.bst: * buildstream/elements/sdk/libsrtp2.bst: Removed. * buildstream/elements/sdk/mesa.bst: Added. * buildstream/elements/sdk/pygobject.bst: * buildstream/elements/sdk/python2-pygobject.bst: * buildstream/elements/sdk/rr.bst: * buildstream/elements/sdk/shared-mime-info.bst: * buildstream/elements/sdk/v4lutils.bst: Removed. * buildstream/elements/sdk/woff2.bst: * buildstream/elements/sdk/xorg-server.bst: * buildstream/elements/test-infra/httpd.bst: * buildstream/patches/fdo/0001-Pango-Bump-to-1.45-master.patch: Removed. * buildstream/patches/fdo/0001-dav1d-Bump-to-0.7.0.patch: Removed. * buildstream/patches/gtk-meson-Bump-to-latest-version-of-the-3.24-branch.patch: Removed. * buildstream/patches/libsecret-b53e9876f4611525b7a8f69a3110fbec51dcede0.patch: Removed. * buildstream/patches/mesa/mesa_libdrm_deps.patch: Added. * buildstream/patches/xserver-search-for-DRI-drivers-at-LIBGL_DRIVERS_PATH-environ.patch: Removed because a variant was landed upstream 2 years ago: https://gitlab.freedesktop.org/xorg/xserver/-/commit/319af6f471912160ab3eb6395ef50f9950063d43 * buildstream/project.conf: * flatpak/flatpakutils.py: (WebkitFlatpak.run_in_sandbox): White-list a few Mesa environment variables. Canonical link: https://commits.webkit.org/228860@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266455 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent f92358c commit 4e0c11c

46 files changed

Lines changed: 287 additions & 398 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ xcuserdata
1818
/Tools/buildstream/.venv
1919
/Tools/buildstream/cache
2020
/Tools/buildstream/flatpak-version.yml
21+
/Tools/buildstream/repo
2122

2223
# Ignore auto-generated files by VS & VSCode.
2324
*.vcproj.*.user

‎ChangeLog‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2020-09-02 Philippe Normand <pnormand@igalia.com>
2+
3+
[Flatpak SDK] Update to FDO 20.08
4+
https://bugs.webkit.org/show_bug.cgi?id=215763
5+
6+
Reviewed by Žan Doberšek.
7+
8+
* .gitignore: Ignore buildstream local Flatpak repository. This is created only when
9+
manually building the SDK.
10+
111
2020-08-31 Stephan Szabo <stephan.szabo@sony.com>
212

313
[PlayStation] Build fix for intermittent copy errors

‎Tools/ChangeLog‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,68 @@
1+
2020-09-02 Philippe Normand <pnormand@igalia.com>
2+
3+
[Flatpak SDK] Update to FDO 20.08
4+
https://bugs.webkit.org/show_bug.cgi?id=215763
5+
6+
Reviewed by Žan Doberšek.
7+
8+
Highlights:
9+
10+
- ICU 67 (see bug 215327)
11+
- gcc update from 9.3.0 to 10.0
12+
- clang update from 8.0 to 10.0
13+
- perf is now included
14+
- usable pipewire (host needs a working daemon and recent enough xdg-desktop-portal though)
15+
- Mesa is no longer loaded from the flathub GL extension, but included in our downstream SDK, with debug symbols
16+
17+
This patch only includes the build definitions updates, bumping the SDK branch to 0.3. The
18+
actual migration will be landed in a follow-up patch.
19+
20+
* buildstream/elements/flatpak-platform-extensions.bst:
21+
* buildstream/elements/flatpak-runtimes.bst:
22+
* buildstream/elements/flatpak/platform.bst:
23+
* buildstream/elements/flatpak/sdk.bst:
24+
* buildstream/elements/freedesktop-sdk.bst:
25+
* buildstream/elements/sdk-build-depends/swig.bst:
26+
* buildstream/elements/sdk-platform.bst:
27+
* buildstream/elements/sdk.bst:
28+
* buildstream/elements/sdk/at-spi2-atk.bst: Removed.
29+
* buildstream/elements/sdk/at-spi2-core.bst: Removed.
30+
* buildstream/elements/sdk/atk.bst: Removed.
31+
* buildstream/elements/sdk/brotli.bst: Removed.
32+
* buildstream/elements/sdk/glib.bst:
33+
* buildstream/elements/sdk/gobject-introspection.bst: Removed.
34+
* buildstream/elements/sdk/graphene.bst:
35+
* buildstream/elements/sdk/gst-plugins-bad.bst:
36+
* buildstream/elements/sdk/gst-plugins-good.bst:
37+
* buildstream/elements/sdk/gstreamer.bst:
38+
* buildstream/elements/sdk/gtk+-3.bst:
39+
* buildstream/elements/sdk/gtk.bst:
40+
* buildstream/elements/sdk/libdrm.bst: Added.
41+
* buildstream/elements/sdk/libgcrypt.bst:
42+
* buildstream/elements/sdk/libsecret.bst:
43+
* buildstream/elements/sdk/libsoup.bst:
44+
* buildstream/elements/sdk/libsrtp2.bst: Removed.
45+
* buildstream/elements/sdk/mesa.bst: Added.
46+
* buildstream/elements/sdk/pygobject.bst:
47+
* buildstream/elements/sdk/python2-pygobject.bst:
48+
* buildstream/elements/sdk/rr.bst:
49+
* buildstream/elements/sdk/shared-mime-info.bst:
50+
* buildstream/elements/sdk/v4lutils.bst: Removed.
51+
* buildstream/elements/sdk/woff2.bst:
52+
* buildstream/elements/sdk/xorg-server.bst:
53+
* buildstream/elements/test-infra/httpd.bst:
54+
* buildstream/patches/fdo/0001-Pango-Bump-to-1.45-master.patch: Removed.
55+
* buildstream/patches/fdo/0001-dav1d-Bump-to-0.7.0.patch: Removed.
56+
* buildstream/patches/gtk-meson-Bump-to-latest-version-of-the-3.24-branch.patch: Removed.
57+
* buildstream/patches/libsecret-b53e9876f4611525b7a8f69a3110fbec51dcede0.patch: Removed.
58+
* buildstream/patches/mesa/mesa_libdrm_deps.patch: Added.
59+
* buildstream/patches/xserver-search-for-DRI-drivers-at-LIBGL_DRIVERS_PATH-environ.patch:
60+
Removed because a variant was landed upstream 2 years ago:
61+
https://gitlab.freedesktop.org/xorg/xserver/-/commit/319af6f471912160ab3eb6395ef50f9950063d43
62+
* buildstream/project.conf:
63+
* flatpak/flatpakutils.py:
64+
(WebkitFlatpak.run_in_sandbox): White-list a few Mesa environment variables.
65+
166
2020-09-01 Diego Pino Garcia <dpino@igalia.com>
267

368
[Flatpak SDK] Adapt clean-webkit script to flatpak

‎Tools/buildstream/elements/flatpak-platform-extensions.bst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
kind: flatpak_repo
22

33
build-depends:
4-
- freedesktop-sdk.bst:deploy-tools/flatpak.bst
4+
- freedesktop-sdk.bst:components/flatpak.bst
55

66
config:
77
environment:
8-
- deploy-tools/flatpak.bst
8+
- components/flatpak.bst
99
arch: '%{gcc_arch}'
1010
branch: '1.0'
1111
repo-mode: bare-user-only

‎Tools/buildstream/elements/flatpak-runtimes.bst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kind: flatpak_repo
22

33
build-depends:
4-
- freedesktop-sdk.bst:deploy-tools/flatpak.bst
4+
- freedesktop-sdk.bst:components/flatpak.bst
55

66
(?):
77
# platform and sdk should not be built on i686
@@ -31,7 +31,7 @@ build-depends:
3131

3232
config:
3333
environment:
34-
- deploy-tools/flatpak.bst
34+
- components/flatpak.bst
3535
arch: '%{gcc_arch}'
3636
branch: '%{sdk-branch}'
3737
repo-mode: bare-user-only

‎Tools/buildstream/elements/flatpak/platform.bst‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ config:
2222

2323
Environment:
2424
GI_TYPELIB_PATH: /app/lib/girepository-1.0
25-
GST_PLUGIN_SYSTEM_PATH: /app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:%{libdir}/gstreamer-1.0
2625
XDG_DATA_DIRS: /app/share:/usr/share:/usr/share/runtime/share:/run/host/share
2726

2827
Extension org.webkit.Platform.Locale:
@@ -32,29 +31,11 @@ config:
3231
# bst doesn't support inheriting extensions.
3332
# When syncing, skip the Locale extension, and add the freedesktop-sdk
3433
# version to extensions that don't have a version
35-
Extension org.freedesktop.Platform.GL:
36-
# 1.4 is for Nvidia drivers
37-
versions: "%{freedesktop-sdk-flatpak-branch};1.4"
38-
version: "1.4"
39-
directory: "%{lib}/GL"
40-
subdirectories: "true"
41-
no-autodownload: "true"
42-
autodelete: "false"
43-
add-ld-path: "lib"
44-
merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d"
45-
download-if: "active-gl-driver"
46-
enable-if: "active-gl-driver"
4734

4835
Extension org.freedesktop.Platform.Timezones:
4936
directory: share/zoneinfo
5037
version: '%{freedesktop-sdk-flatpak-branch}'
5138

52-
Extension org.freedesktop.Platform.GStreamer:
53-
directory: lib/extensions/gstreamer-1.0
54-
subdirectories: 'true'
55-
no-autodownload: 'true'
56-
version: '%{freedesktop-sdk-flatpak-branch}'
57-
5839
Extension org.freedesktop.Platform.Icontheme:
5940
directory: share/runtime/share/icons
6041
subdirectories: 'true'

‎Tools/buildstream/elements/flatpak/sdk.bst‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ config:
2323

2424
Environment:
2525
GI_TYPELIB_PATH: /app/lib/girepository-1.0
26-
GST_PLUGIN_SYSTEM_PATH: /app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:%{libdir}/gstreamer-1.0
2726
XDG_DATA_DIRS: /app/share:/usr/share:/usr/share/runtime/share:/run/host/share
2827

2928
Extension org.webkit.Sdk.Debug:
@@ -42,17 +41,6 @@ config:
4241
# When syncing, skip the Debug, Docs and Locale extensions, and
4342
# add the freedesktop-sdk version to extensions that don't have
4443
# a version.
45-
Extension org.freedesktop.Platform.GL:
46-
# 1.4 is for Nvidia drivers
47-
versions: "%{freedesktop-sdk-flatpak-branch};1.4"
48-
version: "1.4"
49-
directory: "%{lib}/GL"
50-
subdirectories: "true"
51-
autodelete: "false"
52-
add-ld-path: "lib"
53-
merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d"
54-
download-if: "active-gl-driver"
55-
enable-if: "active-gl-driver"
5644

5745
Extension org.freedesktop.Platform.Timezones:
5846
directory: share/zoneinfo

‎Tools/buildstream/elements/freedesktop-sdk.bst‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ sources:
44
- kind: git_tag
55
url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
66
# Changed to track git commit from upstream bst
7-
track: '19.08'
7+
track: 'release/20.08'
88
track-tags: true
9-
ref: freedesktop-sdk-19.08.12-0-ga7778d9c98b5fbff712c2c8b17e3e804df9baaab
9+
ref: freedesktop-sdk-20.08.0-0-g5931bbdc1a1d3da5f3218a718ff1b4f28d6b114f
1010
- kind: patch
1111
path: patches/nettle-no-debug.diff
12-
- kind: patch
13-
path: patches/fdo/0001-Pango-Bump-to-1.45-master.patch
14-
- kind: patch
15-
path: patches/fdo/0001-dav1d-Bump-to-0.7.0.patch
1612
config:
1713
options:
1814
target_arch: '%{arch}'

‎Tools/buildstream/elements/sdk-build-depends/swig.bst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ build-depends:
55

66
depends:
77
- freedesktop-sdk.bst:bootstrap-import.bst
8-
- freedesktop-sdk.bst:components/pcre.bst
98

109
sources:
1110
- kind: tar

‎Tools/buildstream/elements/sdk-platform.bst‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ depends:
99

1010
# replaced (patched) elements:
1111
- sdk/adwaita-icon-theme.bst
12-
- sdk/at-spi2-atk.bst
13-
- sdk/at-spi2-core.bst
14-
- sdk/atk.bst
15-
- sdk/brotli.bst
1612
- sdk/capnp.bst
1713
- sdk/ccls.bst
1814
- sdk/enchant-2.bst
@@ -33,18 +29,19 @@ depends:
3329
- sdk/krb5.bst
3430
- sdk/libavif.bst
3531
- sdk/libcap-ng.bst
32+
- sdk/libdrm.bst
3633
- sdk/libevent.bst
3734
- sdk/libgcrypt.bst
3835
- sdk/libkate.bst
3936
- sdk/libmanette.bst
4037
- sdk/libnotify.bst
4138
- sdk/libsecret.bst
4239
- sdk/libsoup.bst
43-
- sdk/libsrtp2.bst
4440
- sdk/libusrsctp.bst
4541
- sdk/libwpe.bst
4642
- sdk/libzstd.bst
4743
- sdk/lzo2.bst
44+
- sdk/mesa.bst
4845
- sdk/openjpeg.bst
4946
- sdk/openxr.bst
5047
- sdk/os-release.bst
@@ -61,7 +58,6 @@ depends:
6158
- sdk/ruby-highline.bst
6259
- sdk/shared-mime-info.bst
6360
- sdk/subversion.bst
64-
- sdk/v4lutils.bst
6561
- sdk/woff2.bst
6662
- sdk/wpebackend-fdo.bst
6763
- sdk/x264.bst
@@ -72,6 +68,10 @@ depends:
7268
- freedesktop-sdk.bst:components/alsa-plugins.bst
7369
- freedesktop-sdk.bst:components/appstream-glib.bst
7470
- freedesktop-sdk.bst:components/aspell.bst
71+
- freedesktop-sdk.bst:components/at-spi2-atk.bst
72+
- freedesktop-sdk.bst:components/at-spi2-core.bst
73+
- freedesktop-sdk.bst:components/atk.bst
74+
- freedesktop-sdk.bst:components/brotli.bst
7575
- freedesktop-sdk.bst:components/ca-certificates.bst
7676
- freedesktop-sdk.bst:components/cairo.bst
7777
- freedesktop-sdk.bst:components/ccache.bst
@@ -125,7 +125,6 @@ depends:
125125
- freedesktop-sdk.bst:components/libcap.bst
126126
- freedesktop-sdk.bst:components/libclc.bst
127127
- freedesktop-sdk.bst:components/libdatrie.bst
128-
- freedesktop-sdk.bst:components/libdrm.bst
129128
- freedesktop-sdk.bst:components/libepoxy.bst
130129
- freedesktop-sdk.bst:components/liberation-fonts.bst
131130
- freedesktop-sdk.bst:components/libexif.bst
@@ -138,19 +137,20 @@ depends:
138137
- freedesktop-sdk.bst:components/libnice.bst
139138
- freedesktop-sdk.bst:components/libogg.bst
140139
- freedesktop-sdk.bst:components/libpng.bst
140+
- freedesktop-sdk.bst:components/libportal.bst
141141
- freedesktop-sdk.bst:components/libproxy.bst
142142
- freedesktop-sdk.bst:components/libpsl.bst
143143
- freedesktop-sdk.bst:components/libpulse.bst
144144
- freedesktop-sdk.bst:components/libsamplerate.bst
145145
- freedesktop-sdk.bst:components/libseccomp.bst
146146
- freedesktop-sdk.bst:components/libselinux.bst
147+
- freedesktop-sdk.bst:components/libsrtp2.bst
147148
- freedesktop-sdk.bst:components/libtasn1.bst
148149
- freedesktop-sdk.bst:components/libthai.bst
149150
- freedesktop-sdk.bst:components/libtheora.bst
150151
- freedesktop-sdk.bst:components/libtiff.bst
151152
- freedesktop-sdk.bst:components/libtool.bst
152153
- freedesktop-sdk.bst:components/libunistring.bst
153-
- freedesktop-sdk.bst:components/libva-vdpau-driver.bst
154154
- freedesktop-sdk.bst:components/libva.bst
155155
- freedesktop-sdk.bst:components/libvdpau.bst
156156
- freedesktop-sdk.bst:components/libvorbis.bst
@@ -176,12 +176,10 @@ depends:
176176
- freedesktop-sdk.bst:components/openssh.bst
177177
- freedesktop-sdk.bst:components/opus.bst
178178
- freedesktop-sdk.bst:components/orc.bst
179-
- freedesktop-sdk.bst:components/osmesa.bst
180179
- freedesktop-sdk.bst:components/p11-kit.bst
181180
- freedesktop-sdk.bst:components/pango.bst
182181
- freedesktop-sdk.bst:components/pciutils.bst
183-
- freedesktop-sdk.bst:components/pcre.bst
184-
- freedesktop-sdk.bst:components/pcre2.bst
182+
- freedesktop-sdk.bst:components/perf.bst
185183
- freedesktop-sdk.bst:components/pipewire.bst
186184
- freedesktop-sdk.bst:components/pixman.bst
187185
- freedesktop-sdk.bst:components/python3-pip.bst
@@ -204,6 +202,7 @@ depends:
204202
- freedesktop-sdk.bst:components/tzdata.bst
205203
- freedesktop-sdk.bst:components/unzip.bst
206204
- freedesktop-sdk.bst:components/util-linux.bst
205+
- freedesktop-sdk.bst:components/v4l-utils.bst
207206
- freedesktop-sdk.bst:components/vulkan.bst
208207
- freedesktop-sdk.bst:components/wayland.bst
209208
- freedesktop-sdk.bst:components/webrtc-audio-processing.bst
@@ -244,6 +243,5 @@ depends:
244243
- freedesktop-sdk.bst:components/xorg-lib-xtst.bst
245244
- freedesktop-sdk.bst:components/xorg-lib-xv.bst
246245
- freedesktop-sdk.bst:components/xorg-lib-xxf86vm.bst
247-
- freedesktop-sdk.bst:components/xz.bst
248246
- freedesktop-sdk.bst:components/zip.bst
249247
- freedesktop-sdk.bst:integration/mtab.bst

0 commit comments

Comments
 (0)