Diff
Modified: trunk/.gitignore (266454 => 266455)
--- trunk/.gitignore 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/.gitignore 2020-09-02 13:29:55 UTC (rev 266455)
@@ -18,6 +18,7 @@
/Tools/buildstream/.venv
/Tools/buildstream/cache
/Tools/buildstream/flatpak-version.yml
+/Tools/buildstream/repo
# Ignore auto-generated files by VS & VSCode.
*.vcproj.*.user
Modified: trunk/ChangeLog (266454 => 266455)
--- trunk/ChangeLog 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/ChangeLog 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,3 +1,13 @@
+2020-09-02 Philippe Normand <pnorm...@igalia.com>
+
+ [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.
+
2020-08-31 Stephan Szabo <stephan.sz...@sony.com>
[PlayStation] Build fix for intermittent copy errors
Modified: trunk/Tools/ChangeLog (266454 => 266455)
--- trunk/Tools/ChangeLog 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/ChangeLog 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,3 +1,68 @@
+2020-09-02 Philippe Normand <pnorm...@igalia.com>
+
+ [Flatpak SDK] Update to FDO 20.08
+ https://bugs.webkit.org/show_bug.cgi?id=215763
+
+ Reviewed by Žan Doberšek.
+
+ 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.
+
2020-09-01 Diego Pino Garcia <dp...@igalia.com>
[Flatpak SDK] Adapt clean-webkit script to flatpak
Modified: trunk/Tools/buildstream/elements/flatpak/platform.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/flatpak/platform.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/flatpak/platform.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -22,7 +22,6 @@
Environment:
GI_TYPELIB_PATH: /app/lib/girepository-1.0
- GST_PLUGIN_SYSTEM_PATH: /app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:%{libdir}/gstreamer-1.0
XDG_DATA_DIRS: /app/share:/usr/share:/usr/share/runtime/share:/run/host/share
Extension org.webkit.Platform.Locale:
@@ -32,29 +31,11 @@
# bst doesn't support inheriting extensions.
# When syncing, skip the Locale extension, and add the freedesktop-sdk
# version to extensions that don't have a version
- Extension org.freedesktop.Platform.GL:
- # 1.4 is for Nvidia drivers
- versions: "%{freedesktop-sdk-flatpak-branch};1.4"
- version: "1.4"
- directory: "%{lib}/GL"
- subdirectories: "true"
- no-autodownload: "true"
- autodelete: "false"
- add-ld-path: "lib"
- merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d"
- download-if: "active-gl-driver"
- enable-if: "active-gl-driver"
Extension org.freedesktop.Platform.Timezones:
directory: share/zoneinfo
version: '%{freedesktop-sdk-flatpak-branch}'
- Extension org.freedesktop.Platform.GStreamer:
- directory: lib/extensions/gstreamer-1.0
- subdirectories: 'true'
- no-autodownload: 'true'
- version: '%{freedesktop-sdk-flatpak-branch}'
-
Extension org.freedesktop.Platform.Icontheme:
directory: share/runtime/share/icons
subdirectories: 'true'
Modified: trunk/Tools/buildstream/elements/flatpak/sdk.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/flatpak/sdk.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/flatpak/sdk.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -23,7 +23,6 @@
Environment:
GI_TYPELIB_PATH: /app/lib/girepository-1.0
- GST_PLUGIN_SYSTEM_PATH: /app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:%{libdir}/gstreamer-1.0
XDG_DATA_DIRS: /app/share:/usr/share:/usr/share/runtime/share:/run/host/share
Extension org.webkit.Sdk.Debug:
@@ -42,17 +41,6 @@
# When syncing, skip the Debug, Docs and Locale extensions, and
# add the freedesktop-sdk version to extensions that don't have
# a version.
- Extension org.freedesktop.Platform.GL:
- # 1.4 is for Nvidia drivers
- versions: "%{freedesktop-sdk-flatpak-branch};1.4"
- version: "1.4"
- directory: "%{lib}/GL"
- subdirectories: "true"
- autodelete: "false"
- add-ld-path: "lib"
- merge-dirs: "vulkan/icd.d;glvnd/egl_vendor.d;OpenCL/vendors;lib/dri;lib/d3d;vulkan/explicit_layer.d"
- download-if: "active-gl-driver"
- enable-if: "active-gl-driver"
Extension org.freedesktop.Platform.Timezones:
directory: share/zoneinfo
Modified: trunk/Tools/buildstream/elements/flatpak-platform-extensions.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/flatpak-platform-extensions.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/flatpak-platform-extensions.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,11 +1,11 @@
kind: flatpak_repo
build-depends:
-- freedesktop-sdk.bst:deploy-tools/flatpak.bst
+- freedesktop-sdk.bst:components/flatpak.bst
config:
environment:
- - deploy-tools/flatpak.bst
+ - components/flatpak.bst
arch: '%{gcc_arch}'
branch: '1.0'
repo-mode: bare-user-only
Modified: trunk/Tools/buildstream/elements/flatpak-runtimes.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/flatpak-runtimes.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/flatpak-runtimes.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,7 +1,7 @@
kind: flatpak_repo
build-depends:
-- freedesktop-sdk.bst:deploy-tools/flatpak.bst
+- freedesktop-sdk.bst:components/flatpak.bst
(?):
# platform and sdk should not be built on i686
@@ -31,7 +31,7 @@
config:
environment:
- - deploy-tools/flatpak.bst
+ - components/flatpak.bst
arch: '%{gcc_arch}'
branch: '%{sdk-branch}'
repo-mode: bare-user-only
Modified: trunk/Tools/buildstream/elements/freedesktop-sdk.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/freedesktop-sdk.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -4,15 +4,11 @@
- kind: git_tag
url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
# Changed to track git commit from upstream bst
- track: '19.08'
+ track: 'release/20.08'
track-tags: true
- ref: freedesktop-sdk-19.08.12-0-ga7778d9c98b5fbff712c2c8b17e3e804df9baaab
+ ref: freedesktop-sdk-20.08.0-0-g5931bbdc1a1d3da5f3218a718ff1b4f28d6b114f
- kind: patch
path: patches/nettle-no-debug.diff
-- kind: patch
- path: patches/fdo/0001-Pango-Bump-to-1.45-master.patch
-- kind: patch
- path: patches/fdo/0001-dav1d-Bump-to-0.7.0.patch
config:
options:
target_arch: '%{arch}'
Deleted: trunk/Tools/buildstream/elements/sdk/at-spi2-atk.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/at-spi2-atk.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/at-spi2-atk.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,21 +0,0 @@
-kind: meson
-sources:
-- kind: tar
- url: gnome_downloads:at-spi2-atk/2.33/at-spi2-atk-2.33.2.tar.xz
- ref: 64d4351b245d717ec6f4f81fd40fe67481ff8e62d3893d465f01e71d9a3db3d3
-build-depends:
-- freedesktop-sdk.bst:components/libxml2.bst
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
-depends:
-- sdk/at-spi2-core.bst
-- sdk/atk.bst
-- sdk/glib.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
-public:
- bst:
- overlap-whitelist:
- - '**'
- split-rules:
- devel:
- (>):
- - '%{libdir}/libatk-bridge-2.0.so'
Deleted: trunk/Tools/buildstream/elements/sdk/at-spi2-core.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/at-spi2-core.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/at-spi2-core.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,20 +0,0 @@
-kind: meson
-sources:
-- kind: tar
- url: gnome_downloads:at-spi2-core/2.33/at-spi2-core-2.33.2.tar.xz
- ref: 0e3f44707cccf9ec9098f84abdf91ea654c919eac3c688400f8d261383cc2abe
-build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
-depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- freedesktop-sdk.bst:components/dbus.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
-public:
- bst:
- overlap-whitelist:
- - '**'
- split-rules:
- devel:
- (>):
- - '%{libdir}/libatspi.so'
Deleted: trunk/Tools/buildstream/elements/sdk/atk.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/atk.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/atk.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,19 +0,0 @@
-kind: meson
-sources:
-- kind: tar
- url: gnome_downloads:atk/2.33/atk-2.33.3.tar.xz
- ref: 532d1081e87b9f0a8d71733101e791818442fa1896531621d1aecc189e1a4ffe
-build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
-depends:
-- sdk/glib.bst
-- sdk/gobject-introspection.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
-public:
- bst:
- overlap-whitelist:
- - '**'
- split-rules:
- devel:
- (>):
- - '%{libdir}/libatk-1.0.so'
Deleted: trunk/Tools/buildstream/elements/sdk/brotli.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/brotli.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/brotli.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,17 +0,0 @@
-kind: cmake
-sources:
-- kind: tar
- url: github_com:google/brotli/archive/v1.0.5.tar.gz
- ref: 3d5bedd48edb909fe3b87cb99f7d139b987ef6f1616b7e22d74e928270a2fd20
-build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
-depends:
-- freedesktop-sdk.bst:bootstrap-import.bst
-public:
- bst:
- split-rules:
- devel:
- (>):
- - '%{libdir}/libbrotlicommon.so'
- - '%{libdir}/libbrotlidec.so'
- - '%{libdir}/libbrotlienc.so'
Modified: trunk/Tools/buildstream/elements/sdk/glib.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/glib.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/glib.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,15 +1,13 @@
kind: meson
sources:
- kind: tar
- url: gnome_downloads:glib/2.64/glib-2.64.2.tar.xz
- ref: 9a2f21ed8f13b9303399de13a0252b7cbcede593d26971378ec6cb90e87f2277
+ url: gnome_downloads:glib/2.65/glib-2.65.1.tar.xz
+ ref: bc63bf6c32713e0ee1dddc28e03f23b4a20c78bcb9a2c5b0f4eea41e46fb9cee
depends:
- filename: components/libffi.bst
junction: freedesktop-sdk.bst
- filename: components/util-linux.bst
junction: freedesktop-sdk.bst
-- filename: components/pcre.bst
- junction: freedesktop-sdk.bst
- filename: components/python3.bst
junction: freedesktop-sdk.bst
# a dummy dependency so our glib is always staged
@@ -27,6 +25,7 @@
-Dgtk_doc=false
-Dinstalled-tests=true
-Dselinux=disabled
+ -Dinternal_pcre=false
public:
bst:
integration-commands:
Deleted: trunk/Tools/buildstream/elements/sdk/gobject-introspection.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/gobject-introspection.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/gobject-introspection.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,27 +0,0 @@
-kind: meson
-sources:
-- kind: tar
- url: gnome_downloads:gobject-introspection/1.64/gobject-introspection-1.64.0.tar.xz
- ref: eac05a63091c81adfdc8ef34820bcc7e7778c5b9e34734d344fc9e69ddf4fc82
-build-depends:
-- freedesktop-sdk.bst:components/bison.bst
-- freedesktop-sdk.bst:components/flex.bst
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
-depends:
-- sdk/glib.bst
-- freedesktop-sdk.bst:bootstrap-import.bst
-- freedesktop-sdk.bst:components/python3-mako.bst
-- freedesktop-sdk.bst:components/python3-markdown.bst
-variables:
- meson-local: >-
- -Dgtk_doc=false
- -Dcairo=disabled
- -Ddoctool=enabled
-public:
- bst:
- split-rules:
- devel:
- (>):
- - '%{datadir}/gobject-introspection-1.0'
- - '%{datadir}/gobject-introspection-1.0/**'
- - '%{libdir}/libgirepository-1.0.so'
Modified: trunk/Tools/buildstream/elements/sdk/graphene.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/graphene.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/graphene.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -7,7 +7,7 @@
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/gobject-introspection.bst
- freedesktop-sdk.bst:bootstrap-import.bst
public:
bst:
Modified: trunk/Tools/buildstream/elements/sdk/gst-plugins-bad.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/gst-plugins-bad.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugins-bad.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -14,7 +14,6 @@
- sdk/openjpeg.bst
- sdk/libkate.bst
- sdk/libusrsctp.bst
-- sdk/libsrtp2.bst
- sdk-build-depends/libusb.bst
- filtered-openh264.bst
- freedesktop-sdk.bst:components/aom.bst
@@ -25,12 +24,12 @@
- freedesktop-sdk.bst:components/libfdk-aac.bst
- freedesktop-sdk.bst:components/libglvnd.bst
- freedesktop-sdk.bst:components/libnice.bst
+- freedesktop-sdk.bst:components/libsrtp2.bst
- freedesktop-sdk.bst:components/libwebp.bst
- freedesktop-sdk.bst:components/libgudev.bst
- freedesktop-sdk.bst:components/openal.bst
- freedesktop-sdk.bst:components/orc.bst
- freedesktop-sdk.bst:components/sndfile.bst
-- freedesktop-sdk.bst:components/vulkan.bst
- freedesktop-sdk.bst:components/wayland.bst
- freedesktop-sdk.bst:components/webrtc-audio-processing.bst
- freedesktop-sdk.bst:bootstrap-import.bst
@@ -105,6 +104,7 @@
-Dvdpau=disabled
-Dvoaacenc=disabled
-Dvoamrwbenc=disabled
+ -Dvulkan=disabled
-Dwasapi=disabled
-Dwebp=disabled
-Dwebrtcdsp=disabled
Modified: trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -14,7 +14,7 @@
- sdk/gst-plugins-base.bst
- sdk/gtk+-3.bst
- sdk/libsoup.bst
-- sdk/v4lutils.bst
+- freedesktop-sdk.bst:components/v4l-utils.bst
- qt5/qtdeclarative.bst
- qt5/qtquickcontrols2.bst
- qt5/qtquickcontrols.bst
Modified: trunk/Tools/buildstream/elements/sdk/gstreamer.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/gstreamer.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/gstreamer.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -5,7 +5,7 @@
ref: e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e
build-depends:
-- sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/gobject-introspection.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
- freedesktop-sdk.bst:components/flex.bst
- freedesktop-sdk.bst:components/bison.bst
Modified: trunk/Tools/buildstream/elements/sdk/gtk+-3.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/gtk+-3.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/gtk+-3.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,18 +1,16 @@
kind: meson
sources:
- kind: tar
- url: gnome_downloads:gtk+/3.24/gtk+-3.24.16.tar.xz
- ref: 0d5e1e1494101b8c0c63c0526180780559eee469f021ca0d714018b20fa3d8e8
-- kind: patch
- path: patches/gtk-meson-Bump-to-latest-version-of-the-3.24-branch.patch
+ url: gnome_downloads:gtk+/3.24/gtk+-3.24.22.tar.xz
+ ref: bf18a4a5dff28a7b02aaef1b949c2d09c96c18387eddab152bb4cd55a5b67dda
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
-- sdk/at-spi2-atk.bst
-- sdk/atk.bst
+- freedesktop-sdk.bst:components/at-spi2-atk.bst
+- freedesktop-sdk.bst:components/atk.bst
- freedesktop-sdk.bst:components/gdk-pixbuf.bst
- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/gobject-introspection.bst
- freedesktop-sdk.bst:components/pango.bst
- freedesktop-sdk.bst:components/cairo.bst
- freedesktop-sdk.bst:components/hicolor-icon-theme.bst
Modified: trunk/Tools/buildstream/elements/sdk/gtk.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/gtk.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/gtk.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -4,14 +4,14 @@
- kind: git_tag
url: gitlab_gnome_org:GNOME/gtk.git
track: master
- ref: 3.98.5-67-g0d901ef174abd79908935430da3701bf4ce62121
+ ref: 3.99.0-649-g9377ce984d55a68623c7b9d50f138fb8ebdb039b
build-depends:
- sdk-build-depends/sassc.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
-- sdk/at-spi2-atk.bst
-- sdk/atk.bst
+- freedesktop-sdk.bst:components/at-spi2-atk.bst
+- freedesktop-sdk.bst:components/atk.bst
- freedesktop-sdk.bst:components/gdk-pixbuf.bst
- sdk/glib.bst
- sdk/graphene.bst
@@ -30,6 +30,7 @@
variables:
meson-local: >-
-Denable-broadway-backend=true
+ -Dvulkan=disabled
public:
bst:
Added: trunk/Tools/buildstream/elements/sdk/libdrm.bst (0 => 266455)
--- trunk/Tools/buildstream/elements/sdk/libdrm.bst (rev 0)
+++ trunk/Tools/buildstream/elements/sdk/libdrm.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -0,0 +1,24 @@
+kind: meson
+description: libdrm
+
+depends:
+- filename: freedesktop-sdk.bst:bootstrap-import.bst
+- filename: freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+ type: build
+- filename: freedesktop-sdk.bst:components/xorg-lib-pciaccess.bst
+
+public:
+ bst:
+ overlap-whitelist:
+ - '**'
+ split-rules:
+ devel:
+ (>):
+ - '%{libdir}/libdrm.so'
+ - '%{libdir}/libkms.so'
+
+sources:
+- kind: git_tag
+ url: gitlab_freedesktop_org:mesa/drm.git
+ track: master
+ ref: libdrm-2.4.102-0-gbb70ab82fd599b0a0db3d22354f05ae87fbc4515
Modified: trunk/Tools/buildstream/elements/sdk/libgcrypt.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/libgcrypt.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/libgcrypt.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -11,7 +11,7 @@
sources:
- kind: git_tag
url: https://dev.gnupg.org/source/libgcrypt.git
- ref: libgcrypt-1.8.4
+ ref: libgcrypt-1.8.6
- kind: patch
path: patches/libgcrypt-0001-Use-pkg-config-to-detect-gpg-error.patch
- kind: patch
Modified: trunk/Tools/buildstream/elements/sdk/libsecret.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/libsecret.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/libsecret.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,10 +1,8 @@
kind: meson
sources:
- kind: tar
- url: gnome_downloads:libsecret/0.20/libsecret-0.20.2.tar.xz
- ref: 81e9143833785cdcf96c1da5d0357a8bcf0cd2b0119f15aa0cae775d1f19ffc3
-- kind: patch
- path: patches/libsecret-b53e9876f4611525b7a8f69a3110fbec51dcede0.patch
+ url: gnome_downloads:libsecret/0.20/libsecret-0.20.3.tar.xz
+ ref: 4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4
build-depends:
- freedesktop-sdk.bst:components/valgrind.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
@@ -11,7 +9,7 @@
- freedesktop-sdk.bst:components/libxslt.bst
depends:
- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/gobject-introspection.bst
- freedesktop-sdk.bst:components/libgcrypt.bst
- freedesktop-sdk.bst:bootstrap-import.bst
variables:
Modified: trunk/Tools/buildstream/elements/sdk/libsoup.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/libsoup.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/libsoup.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -4,11 +4,11 @@
url: gnome_downloads:libsoup/2.71/libsoup-2.71.0.tar.xz
ref: 88e24fad72d16e1cb692c8782688dbee4bf44151efb0d9ed25b14f3849d9896e
build-depends:
-- sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/gobject-introspection.bst
- freedesktop-sdk.bst:components/python3.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
-- sdk/brotli.bst
+- freedesktop-sdk.bst:components/brotli.bst
- sdk/glib.bst
- sdk/krb5.bst
- freedesktop-sdk.bst:components/libpsl.bst
Deleted: trunk/Tools/buildstream/elements/sdk/libsrtp2.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/libsrtp2.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/libsrtp2.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,12 +0,0 @@
-kind: autotools
-build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
-
-depends:
-- freedesktop-sdk.bst:bootstrap-import.bst
-
-sources:
-- kind: git
- url: github_com:cisco/libsrtp.git
- ref: d02d21111e379c297e93a9033d7b653135f732ee
-
Added: trunk/Tools/buildstream/elements/sdk/mesa.bst (0 => 266455)
--- trunk/Tools/buildstream/elements/sdk/mesa.bst (rev 0)
+++ trunk/Tools/buildstream/elements/sdk/mesa.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -0,0 +1,111 @@
+kind: meson
+
+build-depends:
+- freedesktop-sdk.bst:components/bison.bst
+- freedesktop-sdk.bst:components/flex.bst
+- freedesktop-sdk.bst:components/python3.bst
+- freedesktop-sdk.bst:components/python3-mako.bst
+- freedesktop-sdk.bst:components/vulkan.bst
+- freedesktop-sdk.bst:components/wayland-protocols.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
+
+depends:
+- freedesktop-sdk.bst:bootstrap-import.bst
+- freedesktop-sdk.bst:components/glslang.bst
+- freedesktop-sdk.bst:components/llvm.bst
+- freedesktop-sdk.bst:components/libva.bst
+- freedesktop-sdk.bst:components/libclc.bst
+- freedesktop-sdk.bst:components/opencl.bst
+- freedesktop-sdk.bst:components/xorg-lib-xdamage.bst
+- freedesktop-sdk.bst:components/xorg-lib-xfixes.bst
+- freedesktop-sdk.bst:components/xorg-lib-xrandr.bst
+- freedesktop-sdk.bst:components/xorg-lib-xshmfence.bst
+- freedesktop-sdk.bst:components/xorg-lib-xxf86vm.bst
+- freedesktop-sdk.bst:components/wayland.bst
+- freedesktop-sdk.bst:components/libglvnd.bst
+- freedesktop-sdk.bst:components/libvdpau.bst
+- freedesktop-sdk.bst:components/libunwind.bst
+- sdk/libdrm.bst
+
+variables:
+ (?):
+ - arch == "i686" or arch == "x86_64":
+ gallium_drivers: iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl,zink
+ dri_drivers: i915,i965,nouveau,r100,r200
+ vulkan_drivers: amd,intel
+ enable_libunwind: 'true'
+ - arch == "arm" or arch == "aarch64":
+ gallium_drivers: etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,virgl,v3d,vc4,zink
+ dri_drivers: ''
+ vulkan_drivers: freedreno
+ enable_libunwind: 'false'
+ - arch == "ppc64le":
+ gallium_drivers: nouveau,r600,r300,radeonsi,swrast,virgl
+ dri_drivers: r100,r200,nouveau
+ vulkan_drivers: amd
+ enable_libunwind: 'false'
+
+ meson-local: >-
+ -Db_ndebug=false
+ -Ddri3=true
+ -Ddri-drivers=%{dri_drivers}
+ -Degl=true
+ -Dgallium-drivers=%{gallium_drivers}
+ -Dgallium-nine=true
+ -Dgallium-omx=disabled
+ -Dgallium-opencl=icd
+ -Dgallium-va=true
+ -Dgallium-vdpau=true
+ -Dgallium-xa=false
+ -Dgallium-xvmc=false
+ -Dgbm=true
+ -Dgles1=false
+ -Dgles2=true
+ -Dglvnd=true
+ -Dglx=dri
+ -Dosmesa=gallium
+ -Dlibunwind=%{enable_libunwind}
+ -Dllvm=true
+ -Dlmsensors=false
+ -Dplatforms=x11,drm,surfaceless,wayland
+ -Dselinux=false
+ -Dshared-glapi=true
+ -Dvalgrind=false
+ -Dvulkan-overlay-layer=true
+ -Dvulkan-drivers=%{vulkan_drivers}
+ -Dvulkan-icd-dir="%{libdir}/vulkan/icd.d"
+ -Dxlib-lease=true
+ -Dprefer-iris=false
+
+config:
+ install-commands:
+ (>):
+ - |
+ mkdir -p "%{install-root}%{libdir}/GL"
+ ln -sr '%{install-root}%{datadir}/glvnd' '%{install-root}%{libdir}/GL/glvnd'
+
+
+public:
+ bst:
+ overlap-whitelist:
+ - '**'
+ split-rules:
+ devel:
+ (>):
+ - '%{libdir}/libgbm.so'
+ - '%{libdir}/libglapi.so'
+ - '%{libdir}/libwayland-egl.so'
+ - '%{libdir}/libMesaOpenCL.so'
+ - '%{libdir}/d3d/d3dadapter9.so'
+ cpe:
+ product: mesa
+ vendor: mesa3d
+
+sources:
+- kind: git_tag
+ url: gitlab_freedesktop_org:mesa/mesa.git
+ track: '20.1'
+ ref: mesa-20.1.5-0-g3ba7f954b8a4ca6a8754fec06b8c0d179f2db64a
+- kind: patch
+ path: patches/mesa/mesa_libdrm_deps.patch
Modified: trunk/Tools/buildstream/elements/sdk/openxr.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/openxr.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/openxr.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -15,7 +15,7 @@
- kind: git_tag
url: github_com:KhronosGroup/OpenXR-SDK.git
track: master
- ref: release-1.0.9-0-g97cfe495bb7a3853266b646d1c79e169387f9c7a
+ ref: release-1.0.11-0-ge3a4e41d61544d8e2eba73f00da99b6818ec472b
variables:
cmake-local: >-
Modified: trunk/Tools/buildstream/elements/sdk/pygobject.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/pygobject.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/pygobject.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -7,6 +7,6 @@
- freedesktop-sdk.bst:components/pkg-config.bst
depends:
- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/gobject-introspection.bst
- sdk/pycairo.bst
- freedesktop-sdk.bst:bootstrap-import.bst
Modified: trunk/Tools/buildstream/elements/sdk/python2-pygobject.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/python2-pygobject.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/python2-pygobject.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -4,7 +4,7 @@
- freedesktop-sdk.bst:bootstrap-import.bst
- sdk/python2.bst
- sdk/glib.bst
-- sdk/gobject-introspection.bst
+- freedesktop-sdk.bst:components/gobject-introspection.bst
- sdk/python2-pycairo.bst
build-depends:
Modified: trunk/Tools/buildstream/elements/sdk/rr.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/rr.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/rr.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -16,4 +16,4 @@
- kind: git_tag
url: github_com:mozilla/rr
track: master
- ref: 5.3.0-174-gc302cfdcf5259ba5203ba08c1e4a3678e033955d
+ ref: 5.3.0-316-gcd61ba22ccc05b426691312784674c0eb8e654ef
Modified: trunk/Tools/buildstream/elements/sdk/shared-mime-info.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/shared-mime-info.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/shared-mime-info.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -2,7 +2,7 @@
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
-- freedesktop-sdk.bst:components/itstools.bst
+- freedesktop-sdk.bst:components/itstool.bst
- sdk/intltool.bst
- freedesktop-sdk.bst:components/perl-xml-parser.bst
Deleted: trunk/Tools/buildstream/elements/sdk/v4lutils.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/v4lutils.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/v4lutils.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,9 +0,0 @@
-kind: autotools
-sources:
-- kind: tar
- url: https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.18.0.tar.bz2
- ref: 6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d
-build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
-depends:
-- freedesktop-sdk.bst:bootstrap-import.bst
Modified: trunk/Tools/buildstream/elements/sdk/woff2.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/woff2.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/woff2.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -6,7 +6,7 @@
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
depends:
-- sdk/brotli.bst
+- freedesktop-sdk.bst:components/brotli.bst
- freedesktop-sdk.bst:bootstrap-import.bst
public:
bst:
Modified: trunk/Tools/buildstream/elements/sdk/xorg-server.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk/xorg-server.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk/xorg-server.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -51,7 +51,5 @@
sources:
- kind: tar
- url: https://www.x.org/releases/individual/xserver/xorg-server-1.19.6.tar.bz2
- ref: a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197
-- kind: patch
- path: patches/xserver-search-for-DRI-drivers-at-LIBGL_DRIVERS_PATH-environ.patch
\ No newline at end of file
+ url: https://www.x.org/releases/individual/xserver/xorg-server-1.20.8.tar.bz2
+ ref: d17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146
Modified: trunk/Tools/buildstream/elements/sdk-build-depends/swig.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk-build-depends/swig.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk-build-depends/swig.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -5,7 +5,6 @@
depends:
- freedesktop-sdk.bst:bootstrap-import.bst
-- freedesktop-sdk.bst:components/pcre.bst
sources:
- kind: tar
Modified: trunk/Tools/buildstream/elements/sdk-platform.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk-platform.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk-platform.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -9,10 +9,6 @@
# replaced (patched) elements:
- sdk/adwaita-icon-theme.bst
-- sdk/at-spi2-atk.bst
-- sdk/at-spi2-core.bst
-- sdk/atk.bst
-- sdk/brotli.bst
- sdk/capnp.bst
- sdk/ccls.bst
- sdk/enchant-2.bst
@@ -33,6 +29,7 @@
- sdk/krb5.bst
- sdk/libavif.bst
- sdk/libcap-ng.bst
+- sdk/libdrm.bst
- sdk/libevent.bst
- sdk/libgcrypt.bst
- sdk/libkate.bst
@@ -40,11 +37,11 @@
- sdk/libnotify.bst
- sdk/libsecret.bst
- sdk/libsoup.bst
-- sdk/libsrtp2.bst
- sdk/libusrsctp.bst
- sdk/libwpe.bst
- sdk/libzstd.bst
- sdk/lzo2.bst
+- sdk/mesa.bst
- sdk/openjpeg.bst
- sdk/openxr.bst
- sdk/os-release.bst
@@ -61,7 +58,6 @@
- sdk/ruby-highline.bst
- sdk/shared-mime-info.bst
- sdk/subversion.bst
-- sdk/v4lutils.bst
- sdk/woff2.bst
- sdk/wpebackend-fdo.bst
- sdk/x264.bst
@@ -72,6 +68,10 @@
- freedesktop-sdk.bst:components/alsa-plugins.bst
- freedesktop-sdk.bst:components/appstream-glib.bst
- freedesktop-sdk.bst:components/aspell.bst
+- freedesktop-sdk.bst:components/at-spi2-atk.bst
+- freedesktop-sdk.bst:components/at-spi2-core.bst
+- freedesktop-sdk.bst:components/atk.bst
+- freedesktop-sdk.bst:components/brotli.bst
- freedesktop-sdk.bst:components/ca-certificates.bst
- freedesktop-sdk.bst:components/cairo.bst
- freedesktop-sdk.bst:components/ccache.bst
@@ -125,7 +125,6 @@
- freedesktop-sdk.bst:components/libcap.bst
- freedesktop-sdk.bst:components/libclc.bst
- freedesktop-sdk.bst:components/libdatrie.bst
-- freedesktop-sdk.bst:components/libdrm.bst
- freedesktop-sdk.bst:components/libepoxy.bst
- freedesktop-sdk.bst:components/liberation-fonts.bst
- freedesktop-sdk.bst:components/libexif.bst
@@ -138,6 +137,7 @@
- freedesktop-sdk.bst:components/libnice.bst
- freedesktop-sdk.bst:components/libogg.bst
- freedesktop-sdk.bst:components/libpng.bst
+- freedesktop-sdk.bst:components/libportal.bst
- freedesktop-sdk.bst:components/libproxy.bst
- freedesktop-sdk.bst:components/libpsl.bst
- freedesktop-sdk.bst:components/libpulse.bst
@@ -144,6 +144,7 @@
- freedesktop-sdk.bst:components/libsamplerate.bst
- freedesktop-sdk.bst:components/libseccomp.bst
- freedesktop-sdk.bst:components/libselinux.bst
+- freedesktop-sdk.bst:components/libsrtp2.bst
- freedesktop-sdk.bst:components/libtasn1.bst
- freedesktop-sdk.bst:components/libthai.bst
- freedesktop-sdk.bst:components/libtheora.bst
@@ -150,7 +151,6 @@
- freedesktop-sdk.bst:components/libtiff.bst
- freedesktop-sdk.bst:components/libtool.bst
- freedesktop-sdk.bst:components/libunistring.bst
-- freedesktop-sdk.bst:components/libva-vdpau-driver.bst
- freedesktop-sdk.bst:components/libva.bst
- freedesktop-sdk.bst:components/libvdpau.bst
- freedesktop-sdk.bst:components/libvorbis.bst
@@ -176,12 +176,10 @@
- freedesktop-sdk.bst:components/openssh.bst
- freedesktop-sdk.bst:components/opus.bst
- freedesktop-sdk.bst:components/orc.bst
-- freedesktop-sdk.bst:components/osmesa.bst
- freedesktop-sdk.bst:components/p11-kit.bst
- freedesktop-sdk.bst:components/pango.bst
- freedesktop-sdk.bst:components/pciutils.bst
-- freedesktop-sdk.bst:components/pcre.bst
-- freedesktop-sdk.bst:components/pcre2.bst
+- freedesktop-sdk.bst:components/perf.bst
- freedesktop-sdk.bst:components/pipewire.bst
- freedesktop-sdk.bst:components/pixman.bst
- freedesktop-sdk.bst:components/python3-pip.bst
@@ -204,6 +202,7 @@
- freedesktop-sdk.bst:components/tzdata.bst
- freedesktop-sdk.bst:components/unzip.bst
- freedesktop-sdk.bst:components/util-linux.bst
+- freedesktop-sdk.bst:components/v4l-utils.bst
- freedesktop-sdk.bst:components/vulkan.bst
- freedesktop-sdk.bst:components/wayland.bst
- freedesktop-sdk.bst:components/webrtc-audio-processing.bst
@@ -244,6 +243,5 @@
- freedesktop-sdk.bst:components/xorg-lib-xtst.bst
- freedesktop-sdk.bst:components/xorg-lib-xv.bst
- freedesktop-sdk.bst:components/xorg-lib-xxf86vm.bst
-- freedesktop-sdk.bst:components/xz.bst
- freedesktop-sdk.bst:components/zip.bst
- freedesktop-sdk.bst:integration/mtab.bst
Modified: trunk/Tools/buildstream/elements/sdk.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/sdk.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/sdk.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -37,7 +37,7 @@
- freedesktop-sdk.bst:components/texinfo.bst
- freedesktop-sdk.bst:components/valgrind.bst
- freedesktop-sdk.bst:components/desktop-file-utils.bst
-- freedesktop-sdk.bst:components/itstools.bst
+- freedesktop-sdk.bst:components/itstool.bst
- freedesktop-sdk.bst:components/jq.bst
- freedesktop-sdk.bst:components/wayland-protocols.bst
- freedesktop-sdk.bst:components/xdg-portal-interfaces.bst
Modified: trunk/Tools/buildstream/elements/test-infra/httpd.bst (266454 => 266455)
--- trunk/Tools/buildstream/elements/test-infra/httpd.bst 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/elements/test-infra/httpd.bst 2020-09-02 13:29:55 UTC (rev 266455)
@@ -6,7 +6,6 @@
depends:
- freedesktop-sdk.bst:bootstrap-import.bst
-- freedesktop-sdk.bst:components/pcre.bst
- freedesktop-sdk.bst:components/expat.bst
- test-infra/apr.bst
- test-infra/apr-util.bst
Deleted: trunk/Tools/buildstream/patches/fdo/0001-Pango-Bump-to-1.45-master.patch (266454 => 266455)
--- trunk/Tools/buildstream/patches/fdo/0001-Pango-Bump-to-1.45-master.patch 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/patches/fdo/0001-Pango-Bump-to-1.45-master.patch 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,24 +0,0 @@
-From 516d95bc957cd1aa6c1c546d7a75a17a2b2257ca Mon Sep 17 00:00:00 2001
-From: Philippe Normand <ph...@igalia.com>
-Date: Wed, 3 Jun 2020 13:31:39 +0100
-Subject: [PATCH] Pango: Bump to 1.45 master
-
----
- elements/components/pango.bst | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/elements/components/pango.bst b/elements/components/pango.bst
-index 0f698d9bc..aeaed84fc 100644
---- a/elements/components/pango.bst
-+++ b/elements/components/pango.bst
-@@ -31,6 +31,4 @@ sources:
- - kind: git_tag
- url: gnome:pango.git
- track: master
-- track-extra:
-- - 1.44.7
-- ref: 1.44.7-0-g9f03d48261cb25e59ba029b194e70881d6ae8f37
-+ ref: 1.44.7-90-ge48ae523d07168718815148aafca7ceec05ecff5
---
-2.26.2
-
Deleted: trunk/Tools/buildstream/patches/fdo/0001-dav1d-Bump-to-0.7.0.patch (266454 => 266455)
--- trunk/Tools/buildstream/patches/fdo/0001-dav1d-Bump-to-0.7.0.patch 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/patches/fdo/0001-dav1d-Bump-to-0.7.0.patch 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,22 +0,0 @@
-From a4dc4cae545532cfbd98724573488036a0842324 Mon Sep 17 00:00:00 2001
-From: Philippe Normand <ph...@igalia.com>
-Date: Sat, 6 Jun 2020 13:00:47 +0100
-Subject: [PATCH] dav1d: Bump to 0.7.0
-
----
- elements/components/dav1d.bst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/elements/components/dav1d.bst b/elements/components/dav1d.bst
-index e1ea10fdd..d0150deec 100644
---- a/elements/components/dav1d.bst
-+++ b/elements/components/dav1d.bst
-@@ -22,4 +22,4 @@ sources:
- - kind: git_tag
- url: videolan:dav1d.git
- track: master
-- ref: 0.4.0-0-g5f63e531b9d10a09afe0a6b4875ca4852a7e58c1
-+ ref: 0.7.0-0-gdf40d36d84fbdd3aae827b36d1a15739efb9225b
---
-2.26.2
-
Deleted: trunk/Tools/buildstream/patches/gtk-meson-Bump-to-latest-version-of-the-3.24-branch.patch (266454 => 266455)
--- trunk/Tools/buildstream/patches/gtk-meson-Bump-to-latest-version-of-the-3.24-branch.patch 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/patches/gtk-meson-Bump-to-latest-version-of-the-3.24-branch.patch 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,24 +0,0 @@
-From c010a95d8c9aeda827d78884f93f152706ea6232 Mon Sep 17 00:00:00 2001
-From: Philippe Normand <ph...@igalia.com>
-Date: Fri, 3 Apr 2020 10:52:29 +0100
-Subject: [PATCH] meson: Bump to latest version of the 3.24 branch
-
-3.24.16 was tagged without bumping the version in the Meson build definitions.
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 0c31ca0f30..a7acd96ce7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,5 +1,5 @@
- project('gtk+-3.0', 'c',
-- version: '3.24.14',
-+ version: '3.24.16',
- default_options: [
- 'buildtype=debugoptimized',
- 'warning_level=1'
---
-2.25.1
-
Deleted: trunk/Tools/buildstream/patches/libsecret-b53e9876f4611525b7a8f69a3110fbec51dcede0.patch (266454 => 266455)
--- trunk/Tools/buildstream/patches/libsecret-b53e9876f4611525b7a8f69a3110fbec51dcede0.patch 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/patches/libsecret-b53e9876f4611525b7a8f69a3110fbec51dcede0.patch 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,25 +0,0 @@
-From b53e9876f4611525b7a8f69a3110fbec51dcede0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzelt...@gmail.com>
-Date: Thu, 19 Mar 2020 01:42:22 +0100
-Subject: [PATCH] docs: Add man subdir only if manpage is enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andreas Müller <schnitzelt...@gmail.com>
----
- docs/meson.build | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/docs/meson.build b/docs/meson.build
-index cc8d964..06db370 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -1,4 +1,6 @@
--subdir('man')
-+if with_manpage
-+ subdir('man')
-+endif
- if with_gtkdoc
- subdir('reference/libsecret')
- endif
Added: trunk/Tools/buildstream/patches/mesa/mesa_libdrm_deps.patch (0 => 266455)
--- trunk/Tools/buildstream/patches/mesa/mesa_libdrm_deps.patch (rev 0)
+++ trunk/Tools/buildstream/patches/mesa/mesa_libdrm_deps.patch 2020-09-02 13:29:55 UTC (rev 266455)
@@ -0,0 +1,25 @@
+diff --git a/src/loader/meson.build b/src/loader/meson.build
+index e7dce88d443..b3aac7c1edf 100644
+--- a/src/loader/meson.build
++++ b/src/loader/meson.build
+@@ -49,6 +49,6 @@ libloader = static_library(
+ ['loader.c', 'pci_id_driver_map.c'],
+ c_args : loader_c_args,
+ include_directories : [inc_include, inc_src, inc_util],
+- dependencies : [dep_libdrm, dep_thread, idep_xmlconfig_headers],
++ dependencies : [dep_libdrm, dep_thread, dep_libdrm_nouveau, idep_xmlconfig_headers],
+ build_by_default : false,
+ )
+diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
+index a0c497ba3ba..72b17dead23 100644
+--- a/src/mesa/drivers/dri/i965/meson.build
++++ b/src/mesa/drivers/dri/i965/meson.build
+@@ -141,7 +141,7 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100', '110']
+ c_vis_args, no_override_init_args, c_sse2_args,
+ '-DGEN_VERSIONx10=@0@'.format(v),
+ ],
+- dependencies : [dep_libdrm, idep_nir_headers],
++ dependencies : [dep_libdrm, dep_libdrm_intel, idep_nir_headers],
+ )
+ endforeach
+
Deleted: trunk/Tools/buildstream/patches/xserver-search-for-DRI-drivers-at-LIBGL_DRIVERS_PATH-environ.patch (266454 => 266455)
--- trunk/Tools/buildstream/patches/xserver-search-for-DRI-drivers-at-LIBGL_DRIVERS_PATH-environ.patch 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/patches/xserver-search-for-DRI-drivers-at-LIBGL_DRIVERS_PATH-environ.patch 2020-09-02 13:29:55 UTC (rev 266455)
@@ -1,84 +0,0 @@
-From fcbd29debee422bcb147057a089fd1da5e699656 Mon Sep 17 00:00:00 2001
-From: Carlos Alberto Lopez Perez <clo...@igalia.com>
-Date: Wed, 23 Mar 2016 03:47:58 +0100
-Subject: [PATCH xserver] Search for DRI drivers at LIBGL_DRIVERS_PATH
- environment variable.
-
- * The Mesa driver uses this environment variable to override the
- default compiled search path for DRI drivers.
-
- * This is useful for testing purposes when the user needs to
- override the system default one at runtime.
----
- glx/glxdricommon.c | 40 ++++++++++++++++++++++++++++++----------
- 1 file changed, 30 insertions(+), 10 deletions(-)
-
-diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
-index 62cce13..543f631 100644
---- a/glx/glxdricommon.c
-+++ b/glx/glxdricommon.c
-@@ -246,8 +246,6 @@ glxConvertConfigs(const __DRIcoreExtension * core,
- return head.next;
- }
-
--static const char dri_driver_path[] = DRI_DRIVER_PATH;
--
- /* Temporary define to allow building without a dri_interface.h from
- * updated Mesa. Some day when we don't care about Mesa that old any
- * more this can be removed.
-@@ -261,22 +259,44 @@ glxProbeDriver(const char *driverName,
- void **coreExt, const char *coreName, int coreVersion,
- void **renderExt, const char *renderName, int renderVersion)
- {
-- int i;
-+ int i, len;
- void *driver;
- char filename[PATH_MAX];
- char *get_extensions_name;
- const __DRIextension **extensions = NULL;
-+ const char *dri_driver_path, *p, *next;
-
-- snprintf(filename, sizeof filename, "%s/%s_dri.so",
-- dri_driver_path, driverName);
-+ dri_driver_path = getenv("LIBGL_DRIVERS_PATH");
-+
-+ if (dri_driver_path == NULL)
-+ dri_driver_path = DRI_DRIVER_PATH;
-+
-+ for (p = dri_driver_path; *p; p = next) {
-+ next = strchr(p, ':');
-+ if (next == NULL) {
-+ len = strlen(p);
-+ next = p + len;
-+ }
-+ else {
-+ len = next - p;
-+ next++;
-+ }
-+
-+ snprintf(filename, sizeof filename, "%.*s/%s_dri.so",
-+ len, p, driverName);
-+
-+ driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
-+ if (driver == NULL)
-+ LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
-+ filename, dlerror());
-+ else
-+ break;
-
-- driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
-- if (driver == NULL) {
-- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
-- filename, dlerror());
-- goto cleanup_failure;
- }
-
-+ if (driver == NULL)
-+ goto cleanup_failure;
-+
- if (asprintf(&get_extensions_name, "%s_%s",
- __DRI_DRIVER_GET_EXTENSIONS, driverName) != -1) {
- const __DRIextension **(*get_extensions)(void);
---
-2.1.4
-
Modified: trunk/Tools/buildstream/project.conf (266454 => 266455)
--- trunk/Tools/buildstream/project.conf 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/buildstream/project.conf 2020-09-02 13:29:55 UTC (rev 266455)
@@ -200,7 +200,7 @@
- '${XDG_RUNTIME_DIR}'
variables:
- sdk-branch: "0.2"
+ sdk-branch: "0.3"
gcc_arch: "%{arch}"
abi: "gnu"
gcc_triplet: "%{gcc_arch}-linux-%{abi}"
Modified: trunk/Tools/flatpak/flatpakutils.py (266454 => 266455)
--- trunk/Tools/flatpak/flatpakutils.py 2020-09-02 09:45:29 UTC (rev 266454)
+++ trunk/Tools/flatpak/flatpakutils.py 2020-09-02 13:29:55 UTC (rev 266455)
@@ -724,11 +724,13 @@
env_var_prefixes_to_keep = [
"G",
"CCACHE",
+ "EGL",
"GIGACAGE",
"GTK",
"ICECC",
"JSC",
"MESA",
+ "LIBGL",
"RUST",
"SCCACHE",
"WAYLAND",
