[gnome-build-meta/valentindavid/fdsdk-21.08] freedesktop-sdk.bst: Update to master

From: Jordan Petridis <jpetridis src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-build-meta/valentindavid/fdsdk-21.08] freedesktop-sdk.bst: Update to master
Date: Thu, 1 Jul 2021 15:09:50 +0000 (UTC)

commit 4e8547236fbe0a54e56d07a233a399f659ff1ec5
Author: Valentin David <valentin david codethink co uk>
Date:   Wed Apr 21 19:16:15 2021 +0200

    freedesktop-sdk.bst: Update to master

 elements/core-deps/babl.bst         |  2 ++
 elements/core-deps/cvt.bst          | 38 +++++++++++++++++++++++++++++++++++++
 elements/core-deps/gegl.bst         |  1 +
 elements/core-deps/gsound.bst       |  2 ++
 elements/core-deps/slirp-helper.bst |  5 +----
 elements/core/gnome-tour.bst        |  4 +---
 elements/core/mutter.bst            |  3 ++-
 elements/freedesktop-sdk.bst        |  4 ++--
 elements/sdk-platform.bst           | 11 ++++++++---
 elements/sdk.bst                    |  2 +-
 elements/sdk/gst-plugins-bad.bst    |  2 +-
 elements/sdk/gtk+-3.bst             |  2 ++
 elements/sdk/gtk.bst                |  2 ++
 elements/sdk/libnghttp2.bst         | 17 -----------------
 elements/sdk/librsvg.bst            |  4 +---
 elements/sdk/libsecret.bst          |  2 +-
 elements/sdk/libsoup.bst            |  2 +-
 files/babl/meson-fix.patch          | 25 ++++++++++++++++++++++++
 files/gsound/automake-fix.patch     | 13 +++++++++++++
 files/gtk3-werror.patch             | 12 ++++++++++++
 junction.refs                       |  2 +-
 project.conf                        |  6 +++---
 22 files changed, 120 insertions(+), 41 deletions(-)
---
diff --git a/elements/core-deps/babl.bst b/elements/core-deps/babl.bst
index 19b0caca..ac1f7956 100644
--- a/elements/core-deps/babl.bst
+++ b/elements/core-deps/babl.bst
@@ -3,6 +3,8 @@ kind: meson
 sources:
 - kind: tar
   url: https://download.gimp.org/pub/babl/0.1/babl-0.1.86.tar.xz
+- kind: patch
+  path: files/babl/meson-fix.patch
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/cvt.bst b/elements/core-deps/cvt.bst
new file mode 100644
index 00000000..f94c02f2
--- /dev/null
+++ b/elements/core-deps/cvt.bst
@@ -0,0 +1,38 @@
+kind: autotools
+
+build-depends:
+- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+- freedesktop-sdk.bst:components/xorg-lib-x11.bst
+- freedesktop-sdk.bst:components/xorg-lib-xkbfile.bst
+- freedesktop-sdk.bst:components/xorg-lib-xfont2.bst
+
+depends:
+- freedesktop-sdk.bst:components/pixman.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  conf-local: >-
+    --disable-xvfb
+    --disable-xnest
+    --disable-xwin
+    --disable-libdrm
+    --disable-glamor
+    --disable-dri
+    --disable-dri2
+    --disable-dri3
+    --disable-glx
+    --disable-pciaccess
+    --disable-int10-module
+
+config:
+  build-commands:
+  - |
+    make -C 'hw/xfree86/modes'
+
+  install-commands:
+  - |
+    make -j1 -C 'hw/xfree86/utils/cvt' install-binPROGRAMS DESTDIR='%{install-root}'
+
+sources:
+- kind: tar
+  url: https://www.x.org/archive/individual/xserver/xorg-server-1.20.11.tar.bz2
diff --git a/elements/core-deps/gegl.bst b/elements/core-deps/gegl.bst
index b147b21a..f8734585 100644
--- a/elements/core-deps/gegl.bst
+++ b/elements/core-deps/gegl.bst
@@ -19,6 +19,7 @@ depends:
 - sdk/json-glib.bst
 - sdk/librsvg.bst
 - sdk/pango.bst
+- freedesktop-sdk.bst:components/libtiff.bst
 - freedesktop-sdk.bst:components/libwebp.bst
 - freedesktop-sdk.bst:components/poppler.bst
 - freedesktop-sdk.bst:components/sdl2.bst
diff --git a/elements/core-deps/gsound.bst b/elements/core-deps/gsound.bst
index 958b87e4..9d9fe5bd 100644
--- a/elements/core-deps/gsound.bst
+++ b/elements/core-deps/gsound.bst
@@ -3,6 +3,8 @@ sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gsound.git
   track: master
+- kind: patch
+  path: files/gsound/automake-fix.patch
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/slirp-helper.bst b/elements/core-deps/slirp-helper.bst
index c53cd182..6d93de1a 100644
--- a/elements/core-deps/slirp-helper.bst
+++ b/elements/core-deps/slirp-helper.bst
@@ -1,7 +1,7 @@
 kind: manual
 
 build-depends:
-- freedesktop-sdk.bst:extensions/rust/rust.bst
+- freedesktop-sdk.bst:components/rust.bst
 - freedesktop-sdk.bst:components/libffi.bst
 - freedesktop-sdk.bst:components/pkg-config.bst
 
@@ -10,9 +10,6 @@ depends:
 - freedesktop-sdk.bst:components/dbus.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
-environment:
-  PATH: /usr/bin:/usr/lib/sdk/rust/bin
-
 sources:
 - kind: tar
   url: https://static.crates.io/crates/libslirp/libslirp-4.3.0.crate
diff --git a/elements/core/gnome-tour.bst b/elements/core/gnome-tour.bst
index 29c7ecc2..67da6e24 100644
--- a/elements/core/gnome-tour.bst
+++ b/elements/core/gnome-tour.bst
@@ -5,12 +5,10 @@ sources:
   track: master
 - kind: cargo
 build-depends:
-- freedesktop-sdk.bst:extensions/rust/rust.bst
+- freedesktop-sdk.bst:components/rust.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/adwaita-icon-theme.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-environment:
-  PATH: /usr/bin:/usr/lib/sdk/rust/bin
diff --git a/elements/core/mutter.bst b/elements/core/mutter.bst
index cc883002..0e5778f0 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -6,6 +6,7 @@ sources:
   track: master
 
 build-depends:
+- core-deps/cvt.bst
 - core/sysprof.bst
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
@@ -35,7 +36,7 @@ depends:
 - freedesktop-sdk.bst:components/wayland.bst
 - freedesktop-sdk.bst:components/xorg-lib-xcursor.bst
 - freedesktop-sdk.bst:components/xorg-lib-xtst.bst
-- freedesktop-sdk.bst:components/xorg-server.bst
+- freedesktop-sdk.bst:components/xwayland.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
 variables:
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 0b14f9e1..e696d243 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -2,8 +2,8 @@ kind: junction
 sources:
 - kind: git_tag
   url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
-  track: release/20.08
-  track-tags: true
+  track: master
+  track-tags: false
 config:
   options:
     target_arch: '%{arch}'
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index cec99f42..4a891ae6 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -114,7 +114,6 @@ depends:
 - freedesktop-sdk.bst:components/libarchive.bst
 - freedesktop-sdk.bst:components/libassuan.bst
 - freedesktop-sdk.bst:components/libcap.bst
-- freedesktop-sdk.bst:components/libclc.bst
 - freedesktop-sdk.bst:components/libdatrie.bst
 - freedesktop-sdk.bst:components/libdbus.bst
 - freedesktop-sdk.bst:components/libdrm.bst
@@ -171,7 +170,6 @@ depends:
 - 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/pciutils.bst
 - freedesktop-sdk.bst:components/pcre2.bst
@@ -196,7 +194,8 @@ depends:
 - 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/vulkan-headers.bst
+- freedesktop-sdk.bst:components/vulkan-icd-loader.bst
 - freedesktop-sdk.bst:components/wayland.bst
 - freedesktop-sdk.bst:components/webrtc-audio-processing.bst
 - freedesktop-sdk.bst:components/wget.bst
@@ -239,3 +238,9 @@ depends:
 - freedesktop-sdk.bst:components/xz-docs.bst
 - freedesktop-sdk.bst:components/zip.bst
 - freedesktop-sdk.bst:integration/mtab.bst
+
+(?):
+- arch != "i686":
+    depends:
+      (>):
+      - freedesktop-sdk.bst:components/vulkan-validation-layers.bst
diff --git a/elements/sdk.bst b/elements/sdk.bst
index 42fc22e7..51c5b864 100644
--- a/elements/sdk.bst
+++ b/elements/sdk.bst
@@ -49,7 +49,7 @@ depends:
 - freedesktop-sdk.bst:components/spirv-tools.bst
 - freedesktop-sdk.bst:components/strace.bst
 - freedesktop-sdk.bst:components/texinfo.bst
-- freedesktop-sdk.bst:components/valgrind.bst
+- freedesktop-sdk.bst:components/valgrind-maybe.bst
 - freedesktop-sdk.bst:components/desktop-file-utils.bst
 - freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:components/jq.bst
diff --git a/elements/sdk/gst-plugins-bad.bst b/elements/sdk/gst-plugins-bad.bst
index 5d5beb21..de26db1d 100644
--- a/elements/sdk/gst-plugins-bad.bst
+++ b/elements/sdk/gst-plugins-bad.bst
@@ -21,7 +21,7 @@ runtime-depends:
 - 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/vulkan-headers.bst
 - freedesktop-sdk.bst:components/wayland.bst
 - freedesktop-sdk.bst:components/webrtc-audio-processing.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk/gtk+-3.bst b/elements/sdk/gtk+-3.bst
index e0dddebd..45e53d8c 100644
--- a/elements/sdk/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -4,6 +4,8 @@ sources:
 - kind: git_tag
   url: gitlab_gnome_org:GNOME/gtk.git
   track: gtk-3-24
+- kind: patch
+  path: files/gtk3-werror.patch
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/gtk.bst b/elements/sdk/gtk.bst
index 6733837a..62bc7ba1 100644
--- a/elements/sdk/gtk.bst
+++ b/elements/sdk/gtk.bst
@@ -9,6 +9,7 @@ build-depends:
 - sdk-deps/sassc.bst
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
+- freedesktop-sdk.bst:components/vulkan-headers.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
@@ -26,6 +27,7 @@ depends:
 - freedesktop-sdk.bst:components/hicolor-icon-theme.bst
 - freedesktop-sdk.bst:components/libepoxy.bst
 - freedesktop-sdk.bst:components/libxkbcommon.bst
+- freedesktop-sdk.bst:components/vulkan-icd-loader.bst
 - freedesktop-sdk.bst:components/wayland-protocols.bst
 - freedesktop-sdk.bst:components/wayland.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/sdk/librsvg.bst b/elements/sdk/librsvg.bst
index d8ab7b31..06199932 100644
--- a/elements/sdk/librsvg.bst
+++ b/elements/sdk/librsvg.bst
@@ -8,7 +8,7 @@ build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
-- freedesktop-sdk.bst:extensions/rust/rust.bst
+- freedesktop-sdk.bst:components/rust.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - sdk/gdk-pixbuf.bst
@@ -20,8 +20,6 @@ variables:
   conf-local: >-
     --disable-gtk-doc
     --enable-vala
-environment:
-  PATH: /usr/bin:/usr/lib/sdk/rust/bin
 public:
   bst:
     split-rules:
diff --git a/elements/sdk/libsecret.bst b/elements/sdk/libsecret.bst
index 7e5ee804..0d6a4cef 100644
--- a/elements/sdk/libsecret.bst
+++ b/elements/sdk/libsecret.bst
@@ -7,7 +7,7 @@ build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
-- freedesktop-sdk.bst:components/valgrind.bst
+- freedesktop-sdk.bst:components/valgrind-maybe.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
 - sdk/glib.bst
diff --git a/elements/sdk/libsoup.bst b/elements/sdk/libsoup.bst
index 1b79aaa9..bd71d6dd 100644
--- a/elements/sdk/libsoup.bst
+++ b/elements/sdk/libsoup.bst
@@ -18,9 +18,9 @@ runtime-depends:
 depends:
 - sdk/glib.bst
 - sdk/krb5.bst
-- sdk/libnghttp2.bst
 - freedesktop-sdk.bst:components/brotli.bst
 - freedesktop-sdk.bst:components/gnutls.bst
+- freedesktop-sdk.bst:components/libnghttp2.bst
 - freedesktop-sdk.bst:components/libpsl.bst
 - freedesktop-sdk.bst:components/libxml2.bst
 - freedesktop-sdk.bst:components/sqlite.bst
diff --git a/files/babl/meson-fix.patch b/files/babl/meson-fix.patch
new file mode 100644
index 00000000..9b001726
--- /dev/null
+++ b/files/babl/meson-fix.patch
@@ -0,0 +1,25 @@
+diff -ur babl.old/docs/meson.build babl/docs/meson.build
+--- babl.old/docs/meson.build  2021-05-06 10:13:09.486514532 +0200
++++ babl/docs/meson.build      2021-05-06 10:47:49.354403343 +0200
+@@ -101,11 +101,13 @@
+   endif
+ endforeach
+ 
+-
+-run_target('push_web',
+-  command: [
+-    'scp', index_html, index_static_html, babl_css, scptarget,
+-    '&&',
+-    'scp', graphic_files_install, scptarget + 'graphics/'
+-  ],
+-)
++scp = find_program('scp', required : false)
++if scp.found()
++  run_target('push_web',
++    command: [
++      scp, index_html, index_static_html, babl_css, scptarget,
++      '&&',
++      scp, graphic_files_install, scptarget + 'graphics/'
++     ],
++  )
++endif
diff --git a/files/gsound/automake-fix.patch b/files/gsound/automake-fix.patch
new file mode 100644
index 00000000..bb18fef6
--- /dev/null
+++ b/files/gsound/automake-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 11f8e01..0ca45f1 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -8,7 +8,7 @@ bin_PROGRAMS = gsound-play
+ gsound_play_SOURCES = gsound-play.vala
+ 
+ gsound_play_VALAFLAGS = \
+-    --vapidir ${abs_top_builddir}/gsound \
++    --vapidir $(abs_top_builddir)/gsound \
+     --pkg gsound \
+     ${NULL}
+ 
diff --git a/files/gtk3-werror.patch b/files/gtk3-werror.patch
new file mode 100644
index 00000000..7014fa02
--- /dev/null
+++ b/files/gtk3-werror.patch
@@ -0,0 +1,12 @@
+diff --git a/meson.build b/meson.build
+index cbd820da44..0438f6cc7d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -309,7 +309,6 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
+     '-Werror=sequence-point',
+     '-Werror=return-type',
+     '-Werror=trigraphs',
+-    '-Werror=array-bounds',
+     '-Werror=write-strings',
+     '-Werror=address',
+     '-Werror=int-to-pointer-cast',
diff --git a/junction.refs b/junction.refs
index c1e79a97..c8e0dc31 100644
--- a/junction.refs
+++ b/junction.refs
@@ -1,4 +1,4 @@
 projects:
   gnome:
     freedesktop-sdk.bst:
-    - ref: freedesktop-sdk-20.08.13-0-g55e82e3e76710655deea2a5d36ca07d9476f1c20
+    - ref: freedesktop-sdk-20.08rc.1-1370-gb7d2df415eddf08b03c76c7d1896ee37842543fc
diff --git a/project.conf b/project.conf
index 5985422a..769c4560 100644
--- a/project.conf
+++ b/project.conf
@@ -17,6 +17,9 @@ artifacts:
 fatal-warnings:
 - overlaps
 
+(@):
+- freedesktop-sdk.bst:include/strip.yml
+
 # Options to specify for the project, these provide
 # command line switches which control the behavior of
 # conditional directives in the element.bst files.
@@ -327,9 +330,6 @@ variables:
   - arch == "ppc64le":
       gcc_arch: "powerpc64le"
 
-  (@):
-  - freedesktop-sdk.bst:include/strip.yml
-
 plugins:
 - origin: pip
   package-name: buildstream-external
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]