<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[286290] trunk/Tools/buildstream</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/286290">286290</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-11-30 03:47:24 -0800 (Tue, 30 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[Flatpak SDK] Update to FDO 21.08.6 release
https://bugs.webkit.org/show_bug.cgi?id=233570

Patch by Philippe Normand <pnormand@igalia.com> on 2021-11-30
Reviewed by Adrian Perez de Castro.

- update to FDO SDK 21.08.6 release, including ccache 4.5.
- update to GStreamer 1.18.5
- update internal pipenv used by bst to pygobject 3.42 (needed for f35 host)
- minor drive-by fixes in gst recipes correcting docker image export, for some reason a
  manual export of the repo to a docker image triggers gst-inspect-1.0 calls that are
  expecting user input, so force a non-existant pager as a workaround. This doesn't happen
  when exporting the repo to flatpak runtimes...

* Pipfile:
* Pipfile.lock:
* elements/freedesktop-sdk.bst:
* elements/sdk/gst-libav.bst:
* elements/sdk/gst-plugin-closedcaption.bst:
* elements/sdk/gst-plugin-dav1d.bst:
* elements/sdk/gst-plugins-bad.bst:
* elements/sdk/gst-plugins-base.bst:
* elements/sdk/gst-plugins-good.bst:
* elements/sdk/gstreamer.bst:
* patches/fdo-sdk-0001-Bump-ccache-to-4.4.2.patch: Removed.
* patches/gst-plugins-base-0001-gst-don-t-use-volatile-to-mean-atomic.patch: Removed.
* patches/gst-plugins-base-0001-gstgl-Fix-build-when-Meson-0.58.0rc1.patch: Removed.
* patches/gst-plugins-good-0001-gst-don-t-use-volatile-to-mean-atomic.patch: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsbuildstreamChangeLog">trunk/Tools/buildstream/ChangeLog</a></li>
<li><a href="#trunkToolsbuildstreamPipfile">trunk/Tools/buildstream/Pipfile</a></li>
<li><a href="#trunkToolsbuildstreamPipfilelock">trunk/Tools/buildstream/Pipfile.lock</a></li>
<li><a href="#trunkToolsbuildstreamelementsfreedesktopsdkbst">trunk/Tools/buildstream/elements/freedesktop-sdk.bst</a></li>
<li><a href="#trunkToolsbuildstreamelementssdkgstlibavbst">trunk/Tools/buildstream/elements/sdk/gst-libav.bst</a></li>
<li><a href="#trunkToolsbuildstreamelementssdkgstpluginclosedcaptionbst">trunk/Tools/buildstream/elements/sdk/gst-plugin-closedcaption.bst</a></li>
<li><a href="#trunkToolsbuildstreamelementssdkgstplugindav1dbst">trunk/Tools/buildstream/elements/sdk/gst-plugin-dav1d.bst</a></li>
<li><a href="#trunkToolsbuildstreamelementssdkgstpluginsbadbst">trunk/Tools/buildstream/elements/sdk/gst-plugins-bad.bst</a></li>
<li><a href="#trunkToolsbuildstreamelementssdkgstpluginsbasebst">trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst</a></li>
<li><a href="#trunkToolsbuildstreamelementssdkgstpluginsgoodbst">trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst</a></li>
<li><a href="#trunkToolsbuildstreamelementssdkgstreamerbst">trunk/Tools/buildstream/elements/sdk/gstreamer.bst</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsbuildstreampatchesfdosdk0001Bumpccacheto442patch">trunk/Tools/buildstream/patches/fdo-sdk-0001-Bump-ccache-to-4.4.2.patch</a></li>
<li><a href="#trunkToolsbuildstreampatchesgstpluginsbase0001gstdontusevolatiletomeanatomicpatch">trunk/Tools/buildstream/patches/gst-plugins-base-0001-gst-don-t-use-volatile-to-mean-atomic.patch</a></li>
<li><a href="#trunkToolsbuildstreampatchesgstpluginsbase0001gstglFixbuildwhenMeson0580rc1patch">trunk/Tools/buildstream/patches/gst-plugins-base-0001-gstgl-Fix-build-when-Meson-0.58.0rc1.patch</a></li>
<li><a href="#trunkToolsbuildstreampatchesgstpluginsgood0001gstdontusevolatiletomeanatomicpatch">trunk/Tools/buildstream/patches/gst-plugins-good-0001-gst-don-t-use-volatile-to-mean-atomic.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsbuildstreamChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/ChangeLog (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/ChangeLog        2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/ChangeLog   2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2021-11-30  Philippe Normand  <pnormand@igalia.com>
+
+        [Flatpak SDK] Update to FDO 21.08.6 release
+        https://bugs.webkit.org/show_bug.cgi?id=233570
+
+        Reviewed by Adrian Perez de Castro.
+
+        - update to FDO SDK 21.08.6 release, including ccache 4.5.
+        - update to GStreamer 1.18.5
+        - update internal pipenv used by bst to pygobject 3.42 (needed for f35 host)
+        - minor drive-by fixes in gst recipes correcting docker image export, for some reason a
+          manual export of the repo to a docker image triggers gst-inspect-1.0 calls that are
+          expecting user input, so force a non-existant pager as a workaround. This doesn't happen
+          when exporting the repo to flatpak runtimes...
+
+        * Pipfile:
+        * Pipfile.lock:
+        * elements/freedesktop-sdk.bst:
+        * elements/sdk/gst-libav.bst:
+        * elements/sdk/gst-plugin-closedcaption.bst:
+        * elements/sdk/gst-plugin-dav1d.bst:
+        * elements/sdk/gst-plugins-bad.bst:
+        * elements/sdk/gst-plugins-base.bst:
+        * elements/sdk/gst-plugins-good.bst:
+        * elements/sdk/gstreamer.bst:
+        * patches/fdo-sdk-0001-Bump-ccache-to-4.4.2.patch: Removed.
+        * patches/gst-plugins-base-0001-gst-don-t-use-volatile-to-mean-atomic.patch: Removed.
+        * patches/gst-plugins-base-0001-gstgl-Fix-build-when-Meson-0.58.0rc1.patch: Removed.
+        * patches/gst-plugins-good-0001-gst-don-t-use-volatile-to-mean-atomic.patch: Removed.
+
</ins><span class="cx"> 2021-11-23  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [Flatpak SDK] Add build recipe for libjxl, fix after r286057
</span></span></pre></div>
<a id="trunkToolsbuildstreamPipfile"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/Pipfile (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/Pipfile  2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/Pipfile     2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> [packages]
</span><span class="cx"> buildstream = "==1.6.3"
</span><span class="cx"> buildstream-external = "*"
</span><del>-pygobject = "==3.36"
</del><ins>+pygobject = "==3.42"
</ins></span></pre></div>
<a id="trunkToolsbuildstreamPipfilelock"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/Pipfile.lock (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/Pipfile.lock     2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/Pipfile.lock        2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> {
</span><span class="cx">     "_meta": {
</span><span class="cx">         "hash": {
</span><del>-            "sha256": "36f450c9f2fbb2cc59f15987cb9140f9c2477692175e9ee1f30e59b2b214f3e8"
</del><ins>+            "sha256": "97974f55df47f61fd857b351f72b24cdcbc919d92466f8a5bc038a67aef63f65"
</ins><span class="cx">         },
</span><span class="cx">         "pipfile-spec": 6,
</span><span class="cx">         "requires": {},
</span><span class="lines">@@ -23,105 +23,99 @@
</span><span class="cx">         },
</span><span class="cx">         "buildstream-external": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:05b8c2e223038609b1071812f27e2e95e9fa3a7f88de479a599d54baf3e848cc"
</del><ins>+                "sha256:2cc9e449cf4b0671dbc17f7a4961867ad7b213795a37001a4bc1c3180b341f29"
</ins><span class="cx">             ],
</span><span class="cx">             "index": "pypi",
</span><del>-            "version": "==0.24.0"
</del><ins>+            "version": "==0.25.0"
</ins><span class="cx">         },
</span><span class="cx">         "certifi": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee",
-                "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"
</del><ins>+                "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872",
+                "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"
</ins><span class="cx">             ],
</span><del>-            "version": "==2021.5.30"
</del><ins>+            "version": "==2021.10.8"
</ins><span class="cx">         },
</span><span class="cx">         "charset-normalizer": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b",
-                "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"
</del><ins>+                "sha256:735e240d9a8506778cd7a453d97e817e536bb1fc29f4f6961ce297b9c7a917b0",
+                "sha256:83fcdeb225499d6344c8f7f34684c2981270beacc32ede2e669e94f7fa544405"
</ins><span class="cx">             ],
</span><span class="cx">             "markers": "python_version >= '3'",
</span><del>-            "version": "==2.0.4"
</del><ins>+            "version": "==2.0.8"
</ins><span class="cx">         },
</span><span class="cx">         "click": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a",
-                "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6"
</del><ins>+                "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3",
+                "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"
</ins><span class="cx">             ],
</span><span class="cx">             "markers": "python_version >= '3.6'",
</span><del>-            "version": "==8.0.1"
</del><ins>+            "version": "==8.0.3"
</ins><span class="cx">         },
</span><span class="cx">         "grpcio": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:02e8a8b41db8e13df53078355b439363e4ac46d0ac9a8a461a39e42829e2bcf8",
-                "sha256:050901a5baa6c4ca445e1781ef4c32d864f965ccec70c46cd5ad92d15e282c6a",
-                "sha256:1ab44dde4e1b225d3fc873535ca6e642444433131dd2891a601b75fb46c87c11",
-                "sha256:2068a2b896ac67103c4a5453d5435fafcbb1a2f41eaf25148d08780096935cee",
-                "sha256:20f57c5d09a36e0d0c8fe16ee1905f4307edb1d04f6034b56320f7fbc1a1071a",
-                "sha256:25731b2c20a4ed51bea7e3952d5e83d408a5df32d03c7553457b2e6eb8bcb16c",
-                "sha256:27e2c6213fc04e71a862bacccb51f3c8e722255933f01736ace183e92d860ee6",
-                "sha256:2a4308875b9b986000513c6b04c2e7424f436a127f15547036c42d3cf8289374",
-                "sha256:2a958ad794292e12d8738a06754ebaf71662e635a89098916c18715b27ca2b5b",
-                "sha256:2bc7eebb405aac2d7eecfaa881fd73b489f99c01470d7193b4431a6ce199b9c3",
-                "sha256:366b6b35b3719c5570588e21d866460c5666ae74e3509c2a5a73ca79997abdaf",
-                "sha256:3c14e2087f809973d5ee8ca64f772a089ead0167286f3f21fdda8b6029b50abb",
-                "sha256:3c57fa7fec932767bc553bfb956759f45026890255bd232b2f797c3bc4dfeba2",
-                "sha256:3cccf470fcaab65a1b0a826ff34bd7c0861eb82ed957a83c6647a983459e4ecd",
-                "sha256:4039645b8b5d19064766f3a6fa535f1db52a61c4d4de97a6a8945331a354d527",
-                "sha256:4163e022f365406be2da78db890035463371effea172300ce5af8a768142baf3",
-                "sha256:4258b778ce09ffa3b7c9a26971c216a34369e786771afbf4f98afe223f27d248",
-                "sha256:43c57987e526d1b893b85099424387b22de6e3eee4ea7188443de8d657d11cc0",
-                "sha256:43e0f5c49f985c94332794aa6c4f15f3a1ced336f0c6a6c8946c67b5ab111ae9",
-                "sha256:46cfb0f2b757673bfd36ab4b0e3d61988cc1a0d47e0597e91462dcbef7528f35",
-                "sha256:46d510a7af777d2f38ef4c1d25491add37cad24143012f3eebe72dc5c6d0fc4c",
-                "sha256:476fa94ba8efb09213baabd757f6f93e839794d8ae0eaa371347d6899e8f57a0",
-                "sha256:4b3fcc1878a1a5b71e1ecdfe82c74f7cd9eadaa43e25be0d67676dcec0c9d39f",
-                "sha256:5091b4a5ee8454a8f0c8ac45946ca25d6142c3be4b1fba141f1d62a6e0b5c696",
-                "sha256:5127f4ba1f52fda28037ae465cf4b0e5fabe89d5ac1d64d15b073b46b7db5e16",
-                "sha256:52100d800390d58492ed1093de6faccd957de6fc29b1a0e5948c84f275d9228f",
-                "sha256:544e1c1a133b43893e03e828c8325be5b82e20d3b0ef0ee3942d32553052a1b5",
-                "sha256:5628e7cc69079159f9465388ff21fde1e1a780139f76dd99d319119d45156f45",
-                "sha256:57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407",
-                "sha256:691f5b3a75f072dfb7b093f46303f493b885b7a42f25a831868ffaa22ee85f9d",
-                "sha256:6ba6ad60009da2258cf15a72c51b7e0c2f58c8da517e97550881e488839e56c6",
-                "sha256:6d51be522b573cec14798d4742efaa69d234bedabce122fec2d5489abb3724d4",
-                "sha256:7b95b3329446408e2fe6db9b310d263303fa1a94649d08ec1e1cc12506743d26",
-                "sha256:88dbef504b491b96e3238a6d5360b04508c34c62286080060c85fddd3caf7137",
-                "sha256:8ed1e52ad507a54d20e6aaedf4b3edcab18cc12031eafe6de898f97513d8997b",
-                "sha256:a1fb9936b86b5efdea417fe159934bcad82a6f8c6ab7d1beec4bf3a78324d975",
-                "sha256:a2733994b05ee5382da1d0378f6312b72c5cb202930c7fa20c794a24e96a1a34",
-                "sha256:a6211150765cc2343e69879dfb856718b0f7477a4618b5f9a8f6c3ee84c047c0",
-                "sha256:a659f7c634cacfcf14657687a9fa3265b0a1844b1c19d140f3b66aebfba1a66b",
-                "sha256:b0ff14dd872030e6b2fce8a6811642bd30d93833f794d3782c7e9eb2f01234cc",
-                "sha256:b236eb4b50d83754184b248b8b1041bb1546287fff7618c4b7001b9f257bb903",
-                "sha256:c44958a24559f875d902d5c1acb0ae43faa5a84f6120d1d0d800acb52f96516e",
-                "sha256:c8fe430add656b92419f6cd0680b64fbe6347c831d89a7788324f5037dfb3359",
-                "sha256:cd2e39a199bcbefb3f4b9fa6677c72b0e67332915550fed3bd7c28b454bf917d",
-                "sha256:cffdccc94e63710dd6ead01849443390632c8e0fec52dc26e4fddf9f28ac9280",
-                "sha256:d5a105f5a595b89a0e394e5b147430b115333d07c55efb0c0eddc96055f0d951",
-                "sha256:dc3a24022a90c1754e54315009da6f949b48862c1d06daa54f9a28f89a5efacb",
-                "sha256:de83a045005703e7b9e67b61c38bb72cd49f68d9d2780d2c675353a3a3f2816f",
-                "sha256:e98aca5cfe05ca29950b3d99006b9ddb54fde6451cd12cb2db1443ae3b9fa076",
-                "sha256:ed845ba6253c4032d5a01b7fb9db8fe80299e9a437e695a698751b0b191174be",
-                "sha256:f2621c82fbbff1496993aa5fbf60e235583c7f970506e818671ad52000b6f310"
</del><ins>+                "sha256:0209f30741de1875413f40e89bec9c647e7afad4a3549a6a1682c1ee23da68ca",
+                "sha256:06d5364e85e0fa50ee68bffd9c93a6aff869a91c68f1fd7ba1b944e063a0ff9f",
+                "sha256:17433f7eb01737240581b33fbc2eae7b7fa6d3429571782580bceaf05ec56cb8",
+                "sha256:21aa4a111b3381d3dd982a3df62348713b29f651aa9f6dfbc9415adbfe28d2ba",
+                "sha256:2956da789d74fc35d2c869b3aa45dbf41c5d862c056ca8b5e35a688347ede809",
+                "sha256:29fc36c99161ff307c8ca438346b2e36f81dac5ecdbabc983d0b255d7913fb19",
+                "sha256:2aba7f93671ec971c5c70db81633b49a2f974aa09a2d811aede344a32bad1896",
+                "sha256:2b264cf303a22c46f8d455f42425c546ad6ce22f183debb8d64226ddf1e039f4",
+                "sha256:3a13953e12dc40ee247b5fe6ef22b5fac8f040a76b814a11bf9f423e82402f28",
+                "sha256:47ab65be9ba7a0beee94bbe2fb1dd03cb7832db9df4d1f8fae215a16b3edeb5e",
+                "sha256:4a8f2c7490fe3696e0cdd566e2f099fb91b51bc75446125175c55581c2f7bc11",
+                "sha256:53e10d07e541073eb9a84d49ecffb831c3cbb970bcd8cd8de8431e935bf66c2e",
+                "sha256:5441d343602ce10ba48fcb36bb5de197a15a01dc9ee0f71c2a73cd5cd3d7f5ac",
+                "sha256:59163b8d2e0d85f0ecbee52b348f867eec7e0f909177564fb3956363f7e616e5",
+                "sha256:5b9f0c4822e3a52a1663a315752c6bbdbed0ec15a660d3e64137335acbb5b7ce",
+                "sha256:603d71de14ab1f1fd1254b69ceda73545943461b1f51f82fda9477503330b6ea",
+                "sha256:64f2b3e6474e2ad865478b64f0850d15842acbb2623de5f78a60ceabe00c63e0",
+                "sha256:65720d2bf05e2b78c4bffe372f13c41845bae5658fd3f5dd300c374dd240e5cb",
+                "sha256:6655df5f31664bac4cd6c9b52f389fd92cd10025504ad83685038f47e11e29d8",
+                "sha256:66f910b6324ae69625e63db2eb29d833c307cfa36736fe13d2f841656c5f658f",
+                "sha256:6b69726d7bbb633133c1b0d780b1357aa9b7a7f714fead6470bab1feb8012806",
+                "sha256:6e5eec67909795f7b1ff2bd941bd6c2661ca5217ea9c35003d73314100786f60",
+                "sha256:6ef72f0abdb89fb7c366a99e04823ecae5cda9f762f2234f42fc280447277cd6",
+                "sha256:76b5fa4c6d88f804456e763461cf7a1db38b200669f1ba00c579014ab5aa7965",
+                "sha256:7742606ac2bc03ed10360f4f630e0cc01dce864fe63557254e9adea21bb51416",
+                "sha256:7a3c9b8e13365529f9426d4754085e8a9c2ad718a41a46a97e4e30e87bb45eae",
+                "sha256:8e8cd9909fdd232ecffb954936fd90c935ebe0b5fce36c88813f8247ce54019c",
+                "sha256:a6f9ed5320b93c029615b75f6c8caf2c76aa6545d8845f3813908892cfc5f84e",
+                "sha256:b4d7115ee08a36f3f50a6233bd78280e40847e078d2a5bb39c0ab0db4490d58f",
+                "sha256:b74bbac7e039cf23ed0c8edd820c31e90a52a22e28a03d45274a0956addde8d2",
+                "sha256:b781f412546830be55644f7c48251d30860f4725981862d4a1ea322f80d9cd34",
+                "sha256:bf916ee93ea2fd52b5286ed4e19cbbde5e82754914379ea91dc5748550df3b4e",
+                "sha256:d08ce780bbd8d1a442d855bd681ed0f7483c65d2c8ed83701a9ea4f13678411f",
+                "sha256:d1451a8c0c01c5b5fdfeb8f777820cb277fb5d797d972f57a41bb82483c44a79",
+                "sha256:d58b3774ee2084c31aad140586a42e18328d9823959ca006a0b85ad7937fe405",
+                "sha256:d6c0b159b38fcc3bbc3331105197c1f58ac0d294eb83910d136a325a85def88f",
+                "sha256:d7f66eb220898787d7821a7931e35ae2512ed74f79f75adcd7ea2fb3119ca87d",
+                "sha256:d92c1721c7981812d0f42dfc8248b15d3b6a2ea79eb8870776364423de2aa245",
+                "sha256:e2d9c6690d4c88cd51ee395d7ba5bd1d26d7c37e94cb59e7fd62ff21ecaf891d",
+                "sha256:e62140c46d8125927c673c72c960cb387c02b2a1a3c6985a8b0a3914d27c0018",
+                "sha256:ea3560ffbfe08327024380508190103937fef25e355d2259f8b5c003a0732f55",
+                "sha256:f2e3f250e5398bf474c6e140df1b67494bf1e31c5277b5bf93841a564cbc22d0",
+                "sha256:f385e40846ff81d1c6dce98dcc192c7988a46540758804c4a2e6da5a0e3e3e05",
+                "sha256:f721b42a20d886c03d9b1f461b228cdaf02ccf6c4550e263f7fd3ce3ff19a8f1"
</ins><span class="cx">             ],
</span><del>-            "version": "==1.39.0"
</del><ins>+            "markers": "python_version >= '3.6'",
+            "version": "==1.42.0"
</ins><span class="cx">         },
</span><span class="cx">         "idna": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a",
-                "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"
</del><ins>+                "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff",
+                "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"
</ins><span class="cx">             ],
</span><span class="cx">             "markers": "python_version >= '3'",
</span><del>-            "version": "==3.2"
</del><ins>+            "version": "==3.3"
</ins><span class="cx">         },
</span><span class="cx">         "jinja2": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4",
-                "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4"
</del><ins>+                "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8",
+                "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"
</ins><span class="cx">             ],
</span><span class="cx">             "markers": "python_version >= '3.6'",
</span><del>-            "version": "==3.0.1"
</del><ins>+            "version": "==3.0.3"
</ins><span class="cx">         },
</span><span class="cx">         "markupsafe": {
</span><span class="cx">             "hashes": [
</span><span class="lines">@@ -128,6 +122,7 @@
</span><span class="cx">                 "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298",
</span><span class="cx">                 "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64",
</span><span class="cx">                 "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b",
</span><ins>+                "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194",
</ins><span class="cx">                 "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567",
</span><span class="cx">                 "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff",
</span><span class="cx">                 "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724",
</span><span class="lines">@@ -135,6 +130,7 @@
</span><span class="cx">                 "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646",
</span><span class="cx">                 "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35",
</span><span class="cx">                 "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6",
</span><ins>+                "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a",
</ins><span class="cx">                 "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6",
</span><span class="cx">                 "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad",
</span><span class="cx">                 "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26",
</span><span class="lines">@@ -142,15 +138,20 @@
</span><span class="cx">                 "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac",
</span><span class="cx">                 "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7",
</span><span class="cx">                 "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6",
</span><ins>+                "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047",
</ins><span class="cx">                 "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75",
</span><span class="cx">                 "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f",
</span><ins>+                "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b",
</ins><span class="cx">                 "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135",
</span><span class="cx">                 "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8",
</span><span class="cx">                 "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a",
</span><span class="cx">                 "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a",
</span><ins>+                "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1",
</ins><span class="cx">                 "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9",
</span><span class="cx">                 "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864",
</span><span class="cx">                 "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914",
</span><ins>+                "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee",
+                "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f",
</ins><span class="cx">                 "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18",
</span><span class="cx">                 "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8",
</span><span class="cx">                 "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2",
</span><span class="lines">@@ -157,12 +158,16 @@
</span><span class="cx">                 "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d",
</span><span class="cx">                 "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b",
</span><span class="cx">                 "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b",
</span><ins>+                "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86",
+                "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6",
</ins><span class="cx">                 "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f",
</span><span class="cx">                 "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb",
</span><span class="cx">                 "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833",
</span><span class="cx">                 "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28",
</span><ins>+                "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e",
</ins><span class="cx">                 "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415",
</span><span class="cx">                 "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902",
</span><ins>+                "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f",
</ins><span class="cx">                 "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d",
</span><span class="cx">                 "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9",
</span><span class="cx">                 "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d",
</span><span class="lines">@@ -170,10 +175,14 @@
</span><span class="cx">                 "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066",
</span><span class="cx">                 "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c",
</span><span class="cx">                 "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1",
</span><ins>+                "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a",
+                "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207",
</ins><span class="cx">                 "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f",
</span><span class="cx">                 "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53",
</span><ins>+                "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd",
</ins><span class="cx">                 "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134",
</span><span class="cx">                 "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85",
</span><ins>+                "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9",
</ins><span class="cx">                 "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5",
</span><span class="cx">                 "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94",
</span><span class="cx">                 "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509",
</span><span class="lines">@@ -191,35 +200,33 @@
</span><span class="cx">         },
</span><span class="cx">         "protobuf": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:13ee7be3c2d9a5d2b42a1030976f760f28755fcf5863c55b1460fd205e6cd637",
-                "sha256:145ce0af55c4259ca74993ddab3479c78af064002ec8227beb3d944405123c71",
-                "sha256:14c1c9377a7ffbeaccd4722ab0aa900091f52b516ad89c4b0c3bb0a4af903ba5",
-                "sha256:1556a1049ccec58c7855a78d27e5c6e70e95103b32de9142bae0576e9200a1b0",
-                "sha256:26010f693b675ff5a1d0e1bdb17689b8b716a18709113288fead438703d45539",
-                "sha256:2ae692bb6d1992afb6b74348e7bb648a75bb0d3565a3f5eea5bec8f62bd06d87",
-                "sha256:2bfb815216a9cd9faec52b16fd2bfa68437a44b67c56bee59bc3926522ecb04e",
-                "sha256:4ffbd23640bb7403574f7aff8368e2aeb2ec9a5c6306580be48ac59a6bac8bde",
-                "sha256:59e5cf6b737c3a376932fbfb869043415f7c16a0cf176ab30a5bbc419cd709c1",
-                "sha256:6902a1e4b7a319ec611a7345ff81b6b004b36b0d2196ce7a748b3493da3d226d",
-                "sha256:6ce4d8bf0321e7b2d4395e253f8002a1a5ffbcfd7bcc0a6ba46712c07d47d0b4",
-                "sha256:6d847c59963c03fd7a0cd7c488cadfa10cda4fff34d8bc8cba92935a91b7a037",
-                "sha256:72804ea5eaa9c22a090d2803813e280fb273b62d5ae497aaf3553d141c4fdd7b",
-                "sha256:7a4c97961e9e5b03a56f9a6c82742ed55375c4a25f2692b625d4087d02ed31b9",
-                "sha256:85d6303e4adade2827e43c2b54114d9a6ea547b671cb63fafd5011dc47d0e13d",
-                "sha256:8727ee027157516e2c311f218ebf2260a18088ffb2d29473e82add217d196b1c",
-                "sha256:99938f2a2d7ca6563c0ade0c5ca8982264c484fdecf418bd68e880a7ab5730b1",
-                "sha256:9b7a5c1022e0fa0dbde7fd03682d07d14624ad870ae52054849d8960f04bc764",
-                "sha256:a22b3a0dbac6544dacbafd4c5f6a29e389a50e3b193e2c70dae6bbf7930f651d",
-                "sha256:a38bac25f51c93e4be4092c88b2568b9f407c27217d3dd23c7a57fa522a17554",
-                "sha256:a981222367fb4210a10a929ad5983ae93bd5a050a0824fc35d6371c07b78caf6",
-                "sha256:ab6bb0e270c6c58e7ff4345b3a803cc59dbee19ddf77a4719c5b635f1d547aa8",
-                "sha256:c56c050a947186ba51de4f94ab441d7f04fcd44c56df6e922369cc2e1a92d683",
-                "sha256:e76d9686e088fece2450dbc7ee905f9be904e427341d289acbe9ad00b78ebd47",
-                "sha256:ebcb546f10069b56dc2e3da35e003a02076aaa377caf8530fe9789570984a8d2",
-                "sha256:f0e59430ee953184a703a324b8ec52f571c6c4259d496a19d1cabcdc19dabc62",
-                "sha256:ffea251f5cd3c0b9b43c7a7a912777e0bc86263436a87c2555242a348817221b"
</del><ins>+                "sha256:038daf4fa38a7e818dd61f51f22588d61755160a98db087a046f80d66b855942",
+                "sha256:28ccea56d4dc38d35cd70c43c2da2f40ac0be0a355ef882242e8586c6d66666f",
+                "sha256:36d90676d6f426718463fe382ec6274909337ca6319d375eebd2044e6c6ac560",
+                "sha256:3cd0458870ea7d1c58e948ac8078f6ba8a7ecc44a57e03032ed066c5bb318089",
+                "sha256:5935c8ce02e3d89c7900140a8a42b35bc037ec07a6aeb61cc108be8d3c9438a6",
+                "sha256:615b426a177780ce381ecd212edc1e0f70db8557ed72560b82096bd36b01bc04",
+                "sha256:62a8e4baa9cb9e064eb62d1002eca820857ab2138440cb4b3ea4243830f94ca7",
+                "sha256:655264ed0d0efe47a523e2255fc1106a22f6faab7cc46cfe99b5bae085c2a13e",
+                "sha256:6e8ea9173403219239cdfd8d946ed101f2ab6ecc025b0fda0c6c713c35c9981d",
+                "sha256:71b0250b0cfb738442d60cab68abc166de43411f2a4f791d31378590bfb71bd7",
+                "sha256:74f33edeb4f3b7ed13d567881da8e5a92a72b36495d57d696c2ea1ae0cfee80c",
+                "sha256:77d2fadcf369b3f22859ab25bd12bb8e98fb11e05d9ff9b7cd45b711c719c002",
+                "sha256:8b30a7de128c46b5ecb343917d9fa737612a6e8280f440874e5cc2ba0d79b8f6",
+                "sha256:8e51561d72efd5bd5c91490af1f13e32bcba8dab4643761eb7de3ce18e64a853",
+                "sha256:a529e7df52204565bcd33738a7a5f288f3d2d37d86caa5d78c458fa5fabbd54d",
+                "sha256:b691d996c6d0984947c4cf8b7ae2fe372d99b32821d0584f0b90277aa36982d3",
+                "sha256:d80f80eb175bf5f1169139c2e0c5ada98b1c098e2b3c3736667f28cbbea39fc8",
+                "sha256:d83e1ef8cb74009bebee3e61cc84b1c9cd04935b72bca0cbc83217d140424995",
+                "sha256:d8919368410110633717c406ab5c97e8df5ce93020cfcf3012834f28b1fab1ea",
+                "sha256:db3532d9f7a6ebbe2392041350437953b6d7a792de10e629c1e4f5a6b1fe1ac6",
+                "sha256:e7b24c11df36ee8e0c085e5b0dc560289e4b58804746fb487287dda51410f1e2",
+                "sha256:e7e8d2c20921f8da0dea277dfefc6abac05903ceac8e72839b2da519db69206b",
+                "sha256:e813b1c9006b6399308e917ac5d298f345d95bb31f46f02b60cd92970a9afa17",
+                "sha256:fd390367fc211cc0ffcf3a9e149dfeca78fecc62adb911371db0cec5c8b7472d"
</ins><span class="cx">             ],
</span><del>-            "version": "==3.17.3"
</del><ins>+            "markers": "python_version >= '3.5'",
+            "version": "==3.19.1"
</ins><span class="cx">         },
</span><span class="cx">         "psutil": {
</span><span class="cx">             "hashes": [
</span><span class="lines">@@ -274,10 +281,10 @@
</span><span class="cx">         },
</span><span class="cx">         "pygobject": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:b97f570e55017fcd3732164811f24ecf63983a4834f61b55b0aaf64ecefac856"
</del><ins>+                "sha256:b9803991ec0b0b4175e81fee0ad46090fa7af438fe169348a9b18ae53447afcd"
</ins><span class="cx">             ],
</span><span class="cx">             "index": "pypi",
</span><del>-            "version": "==3.36"
</del><ins>+            "version": "==3.42"
</ins><span class="cx">         },
</span><span class="cx">         "requests": {
</span><span class="cx">             "hashes": [
</span><span class="lines">@@ -289,39 +296,12 @@
</span><span class="cx">         },
</span><span class="cx">         "ruamel.yaml": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33",
-                "sha256:ea21da1198c4b41b8e7a259301cc9710d3b972bf8ba52f06218478e6802dd1f1"
</del><ins>+                "sha256:9751de4cbb57d4bfbf8fc394e125ed4a2f170fbff3dc3d78abf50be85924f8be",
+                "sha256:9af3ec5d7f8065582f3aa841305465025d0afd26c5fb54e15b964e11838fc74f"
</ins><span class="cx">             ],
</span><span class="cx">             "markers": "python_version >= '3'",
</span><del>-            "version": "==0.17.16"
</del><ins>+            "version": "==0.17.17"
</ins><span class="cx">         },
</span><del>-        "ruamel.yaml.clib": {
-            "hashes": [
-                "sha256:0847201b767447fc33b9c235780d3aa90357d20dd6108b92be544427bea197dd",
-                "sha256:1866cf2c284a03b9524a5cc00daca56d80057c5ce3cdc86a52020f4c720856f0",
-                "sha256:31ea73e564a7b5fbbe8188ab8b334393e06d997914a4e184975348f204790277",
-                "sha256:3fb9575a5acd13031c57a62cc7823e5d2ff8bc3835ba4d94b921b4e6ee664104",
-                "sha256:4ff604ce439abb20794f05613c374759ce10e3595d1867764dd1ae675b85acbd",
-                "sha256:72a2b8b2ff0a627496aad76f37a652bcef400fd861721744201ef1b45199ab78",
-                "sha256:78988ed190206672da0f5d50c61afef8f67daa718d614377dcd5e3ed85ab4a99",
-                "sha256:7b2927e92feb51d830f531de4ccb11b320255ee95e791022555971c466af4527",
-                "sha256:7f7ecb53ae6848f959db6ae93bdff1740e651809780822270eab111500842a84",
-                "sha256:825d5fccef6da42f3c8eccd4281af399f21c02b32d98e113dbc631ea6a6ecbc7",
-                "sha256:846fc8336443106fe23f9b6d6b8c14a53d38cef9a375149d61f99d78782ea468",
-                "sha256:89221ec6d6026f8ae859c09b9718799fea22c0e8da8b766b0b2c9a9ba2db326b",
-                "sha256:9efef4aab5353387b07f6b22ace0867032b900d8e91674b5d8ea9150db5cae94",
-                "sha256:a32f8d81ea0c6173ab1b3da956869114cae53ba1e9f72374032e33ba3118c233",
-                "sha256:a49e0161897901d1ac9c4a79984b8410f450565bbad64dbfcbf76152743a0cdb",
-                "sha256:ada3f400d9923a190ea8b59c8f60680c4ef8a4b0dfae134d2f2ff68429adfab5",
-                "sha256:bf75d28fa071645c529b5474a550a44686821decebdd00e21127ef1fd566eabe",
-                "sha256:cfdb9389d888c5b74af297e51ce357b800dd844898af9d4a547ffc143fa56751",
-                "sha256:d67f273097c368265a7b81e152e07fb90ed395df6e552b9fa858c6d2c9f42502",
-                "sha256:dc6a613d6c74eef5a14a214d433d06291526145431c3b964f5e16529b1842bed",
-                "sha256:de9c6b8a1ba52919ae919f3ae96abb72b994dd0350226e28f3686cb4f142165c"
-            ],
-            "markers": "python_version < '3.10' and platform_python_implementation == 'CPython'",
-            "version": "==0.2.6"
-        },
</del><span class="cx">         "six": {
</span><span class="cx">             "hashes": [
</span><span class="cx">                 "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
</span><span class="lines">@@ -340,38 +320,61 @@
</span><span class="cx">         },
</span><span class="cx">         "ujson": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:117855246a9ea3f61f3b69e5ca1b1d11d622b3126f50a0ec08b577cb5c87e56e",
-                "sha256:148680f2bc6e52f71c56908b65f59b36a13611ac2f75a86f2cb2bce2b2c2588c",
-                "sha256:1fb2455e62f20ab4a6d49f78b5dc4ff99c72fdab9466e761120e9757fa35f4d7",
-                "sha256:2251fc9395ba4498cbdc48136a179b8f20914fa8b815aa9453b20b48ad120f43",
-                "sha256:22b63ec4409f0d2f2c4c9d5aa331997e02470b7a15a3233f3cc32f2f9b92d58c",
-                "sha256:41b7e5422184249b5b94d1571206f76e5d91e8d721ce51abe341a88f41dd6692",
-                "sha256:44993136fd2ecade747b6db95917e4f015a3279e09a08113f70cbbd0d241e66a",
-                "sha256:44db30b8fc52e70a6f67def11804f74818addafef0a65cd7f0abb98b7830920f",
-                "sha256:807bb0585f30a650ec981669827721ed3ee1ee24f2c6f333a64982a40eb66b82",
-                "sha256:81a49dbf176ae041fc86d2da564f5b9b46faf657306035632da56ecfd7203193",
-                "sha256:8e8fe9bbeca130debb10eea7910433a0714c8efc057fad36353feccb87c1d07f",
-                "sha256:9005d0d952d0c1b3dff5cdb79df2bde35a3499e2de3f708a22c45bbb4089a1f6",
-                "sha256:971d4b450e689bfec8ad6b22060fb9b9bec1e0860dbdf0fa7cfe4068adbc5f58",
-                "sha256:989bed422e7e20c7ba740a4e1bbeb28b3b6324e04f023ea238a2e5449fc53668",
-                "sha256:9e962df227fd1d851ff095382a9f8432c2470c3ee640f02ae14231dc5728e6f3",
-                "sha256:a873c93d43f9bd14d9e9a6d2c6eb7aae4aad9717fe40c748d0cd4b6ed7767c62",
-                "sha256:be6013cda610c5149fb80a84ee815b210aa2e7fe4edf1d2bce42c02336715208",
-                "sha256:d1c2fb32976982e4e75ca0843a1e7b2254b8c5d8c45d979ebf2db29305b4fa31",
-                "sha256:d2955dd5cce0e76ba56786d647aaedca2cebb75eda9f0ec1787110c3646751a8",
-                "sha256:f135db442e5470d9065536745968efc42a60233311c8509b9327bcd59a8821c7",
-                "sha256:f453480b275192ae40ef350a4e8288977f00b02e504ed34245ebd12d633620cb"
</del><ins>+                "sha256:00fd67952b1a8a46cf5b0a51b3838187332d13d2e8d178423c5a5405c21d9e7c",
+                "sha256:01d12df8eb25afb939a003284b5b5adca9788c1176c445641e5980fa892562ac",
+                "sha256:087cd977f4f63f885a49607244e7e157801a22aadcc075a262d3c3633138573c",
+                "sha256:0c81159d3f1bcb5729ba019e63e78ee6c91b556e1ac0e67c7579768720fd3c4e",
+                "sha256:103cbabe4e6fd70c957219519e37d65be612d7c74d91ef19022a2c8f8c5e4e82",
+                "sha256:1601354caaab0697a9b24815a31611ad013d29cf957d545fc1cd59835b82e3c1",
+                "sha256:18040475d997d93a6851d8bee474fba2ec94869e8f826dddd66cdae4aa3fdb92",
+                "sha256:1f211c7c0c9377cbf4650aa990118d0c2cce3c5fad476c39ecd35b6714ba4463",
+                "sha256:294e907f134fb5d83e0a4439cf4040d74da77157938b4db5730cd174621dcf8b",
+                "sha256:2a06006dad34c8cfaa734bd6458452e46702b368da53b56e7732351082aa0420",
+                "sha256:327ec982bb89abe779fe463e1013c47aae6ed53b76600af7cb1e8b8cb0ee9f85",
+                "sha256:32ee97ec37af31b35ca4395732d883bf74fb70309d38485f7fb9a5cc3332c53e",
+                "sha256:3609e0514f6f721c6c9818b9374ec91b994e59fb193af2f924ca3f2f32009f1c",
+                "sha256:3d8eaab72ad8129c12ed90ebf310230bd014b6bbf99145ebf2bc890238e0254f",
+                "sha256:43d2403451d7bd27b6a600f89d4bd2cf6e1b3494254509d8b5ef3c8e94ae4d8e",
+                "sha256:47af81df5d575e36d4be9396db94f35c8f62de3077a405f9af94f9756255cef5",
+                "sha256:4f35dcf6d2a67e913a7135809006bd000d55ad5b5834b5dbe5b82dcf8db1ac05",
+                "sha256:5d1083a0dcb39b43cfcd948f09e480c23eb4af66d7d08f6b36951f4c629c3bd1",
+                "sha256:6df94e675b05ecf4e7a57883a73b916ffcb5872d7b1298ac5cef8ac1cbce73c6",
+                "sha256:7a318df321d7adc3de876b29640cca8de1ad4d4e4fe7c4a76d64d9d6f1676304",
+                "sha256:7b0a63865ec2978ebafb0906bf982eb52bea26fc98e2ae5e59b9d204afe2d762",
+                "sha256:843fd8b3246b2b20bbae48b2334d26507c9531b2b014533adfc6132e3ec8e60c",
+                "sha256:85f28c38952b8a94183ab15ec6c6e89c117d00ceeae5d754ef1a33e01e28b845",
+                "sha256:8a0d9dde58937976cd06cd776411b77b0e5d38db0a3c1be28ee8bb428ff5a42b",
+                "sha256:9baa160ba1d3f712a356e77718251c9d9eee43ed548debdcc9d75b06a75b3e82",
+                "sha256:9c5330692122b999997911252466a7d17e4e428d7d9a8db0b99ba81b8b9c010c",
+                "sha256:9f4a34386785a33600ac7442fec34c3d8b2d7e5309cfc94bc7c9ba93f12640c2",
+                "sha256:a6c32356145d95a0403b5895d60c36798a48af13b8863e43ad7457a0361afad0",
+                "sha256:b0b9cde57eebaac26de040f8ebf0541e06fe9bcf7e42872dc036d2ced7d99ccf",
+                "sha256:b0e9510e867c72a87db2d16377c2bef912f29afd8381d1fdae332b9b7f697efa",
+                "sha256:b270088e472f1d65a0a0aab3190010b9ac1a5b2969d39bf2b53c0fbf339bc87a",
+                "sha256:b72fadeea5727204674c9f77166da7feaafdf70f1ed50bb15bf321f7c39c7194",
+                "sha256:b80a35bad8fad1772f992bae8086b0cde788cd3b37f35d0d4506c93e6edad645",
+                "sha256:b850029d64008e970cae04ada69aa33e1cd412106a1efde221269c1cda1b40cc",
+                "sha256:baee56eca35cb5fbe02c28bd9c0936be41a96fa5c0812d9d4b7edeb5c3d568a0",
+                "sha256:bf199015910fcfa19b6e12881abeb462498791b2ab0111ff8b17095d0477e9d4",
+                "sha256:d8e2a52fbeee55db306b9306892f5cde7e78c56069c1212abf176d1886fff60a",
+                "sha256:de42986e2602b6a0baca452ff50e9cbe66faf256761295d5d07ae3f6757b487d",
+                "sha256:df481d4e13ca34d870d1fdf387742867edff3f78a1eea1bbcd72ea2fa68d9a6e",
+                "sha256:e46c1462761db518fae51ab0d89a6256aeac148a795f7244d9084c459b477af5",
+                "sha256:e7e73ec5ba1b42c2027773f69b70eff28df132907aa98b28166c39d3ea45e85b",
+                "sha256:f158fdb08e022f2f16f0fba317a80558b0cebc7e2c84ae783e5f75616d5c90d5",
+                "sha256:fc9a508efb829bf0542be9b2578d8da08f0ab1fa712e086ebb777d6ec9e6d8d2",
+                "sha256:fd0901db652a58f46550074596227dbddb7a02d2de744d3cd2358101f78037bb"
</ins><span class="cx">             ],
</span><span class="cx">             "markers": "python_version >= '3.6'",
</span><del>-            "version": "==4.1.0"
</del><ins>+            "version": "==4.3.0"
</ins><span class="cx">         },
</span><span class="cx">         "urllib3": {
</span><span class="cx">             "hashes": [
</span><del>-                "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4",
-                "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"
</del><ins>+                "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece",
+                "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"
</ins><span class="cx">             ],
</span><span class="cx">             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
</span><del>-            "version": "==1.26.6"
</del><ins>+            "version": "==1.26.7"
</ins><span class="cx">         }
</span><span class="cx">     },
</span><span class="cx">     "develop": {}
</span></span></pre></div>
<a id="trunkToolsbuildstreamelementsfreedesktopsdkbst"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/elements/freedesktop-sdk.bst (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/elements/freedesktop-sdk.bst     2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/elements/freedesktop-sdk.bst        2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -3,9 +3,7 @@
</span><span class="cx"> - kind: git_tag
</span><span class="cx">   url: gitlab_com:freedesktop-sdk/freedesktop-sdk.git
</span><span class="cx">   track: 'release/21.08'
</span><del>-  ref: freedesktop-sdk-21.08.2-22-gdc1e3345272fc70397b441832940b956fca5df14
-- kind: patch
-  path: patches/fdo-sdk-0001-Bump-ccache-to-4.4.2.patch
</del><ins>+  ref: freedesktop-sdk-21.08.6-13-g6a4b45189f5087bd40f96757b9f970880aa8e5bc
</ins><span class="cx"> config:
</span><span class="cx">   options:
</span><span class="cx">     target_arch: '%{arch}'
</span></span></pre></div>
<a id="trunkToolsbuildstreamelementssdkgstlibavbst"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/elements/sdk/gst-libav.bst (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/elements/sdk/gst-libav.bst       2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/elements/sdk/gst-libav.bst  2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> kind: meson
</span><span class="cx"> sources:
</span><span class="cx"> - kind: tar
</span><del>-  url: gst_downloads:gst-libav/gst-libav-1.18.4.tar.xz
-  ref: 344a463badca216c2cef6ee36f9510c190862bdee48dc4591c0a430df7e8c396
</del><ins>+  url: gst_downloads:gst-libav/gst-libav-1.18.5.tar.xz
+  ref: 822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548
</ins><span class="cx"> build-depends:
</span><span class="cx"> - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
</span><span class="cx"> - freedesktop-sdk.bst:components/nasm.bst
</span><span class="lines">@@ -16,7 +16,6 @@
</span><span class="cx">   meson-local: >-
</span><span class="cx">     -Dc_args=-DTRIPLET=\"%{gcc_triplet}\"
</span><span class="cx">     -Ddoc=disabled
</span><del>-
</del><span class="cx"> public:
</span><span class="cx">   bst:
</span><span class="cx">     overlap-whitelist:
</span><span class="lines">@@ -24,4 +23,4 @@
</span><span class="cx"> 
</span><span class="cx">     integration-commands:
</span><span class="cx">     - |
</span><del>-      gst-inspect-1.0 libav
</del><ins>+      PAGER=this-is-not-a-pager gst-inspect-1.0 libav
</ins></span></pre></div>
<a id="trunkToolsbuildstreamelementssdkgstpluginclosedcaptionbst"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/elements/sdk/gst-plugin-closedcaption.bst (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/elements/sdk/gst-plugin-closedcaption.bst        2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugin-closedcaption.bst   2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">   bst:
</span><span class="cx">     integration-commands:
</span><span class="cx">     - |
</span><del>-      gst-inspect-1.0 cea608tott
</del><ins>+      PAGER=this-is-not-a-pager gst-inspect-1.0 cea608tott
</ins><span class="cx"> 
</span><span class="cx"> sources:
</span><span class="cx"> - kind: tar
</span></span></pre></div>
<a id="trunkToolsbuildstreamelementssdkgstplugindav1dbst"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/elements/sdk/gst-plugin-dav1d.bst (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/elements/sdk/gst-plugin-dav1d.bst        2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugin-dav1d.bst   2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">   bst:
</span><span class="cx">     integration-commands:
</span><span class="cx">     - |
</span><del>-      gst-inspect-1.0 rsdav1d
</del><ins>+      PAGER=this-is-not-a-pager gst-inspect-1.0 rsdav1d
</ins><span class="cx"> 
</span><span class="cx"> sources:
</span><span class="cx"> - kind: tar
</span></span></pre></div>
<a id="trunkToolsbuildstreamelementssdkgstpluginsbadbst"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/elements/sdk/gst-plugins-bad.bst (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/elements/sdk/gst-plugins-bad.bst 2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugins-bad.bst    2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> kind: meson
</span><span class="cx"> sources:
</span><span class="cx"> - kind: tar
</span><del>-  url: gst_downloads:gst-plugins-bad/gst-plugins-bad-1.18.4.tar.xz
-  ref: 74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f
</del><ins>+  url: gst_downloads:gst-plugins-bad/gst-plugins-bad-1.18.5.tar.xz
+  ref: a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e
</ins><span class="cx"> # Should be shipped in GStreamer 1.20. https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2125
</span><span class="cx"> - kind: patch
</span><span class="cx">   path: patches/gst-plugins-bad-0001-debugutils-Add-fakeaudiosink-element.patch
</span><span class="lines">@@ -116,7 +116,6 @@
</span><span class="cx">     -Dx265=disabled
</span><span class="cx">     -Dzbar=disabled
</span><span class="cx">     -Dzxing=disabled
</span><del>-
</del><span class="cx"> public:
</span><span class="cx">   bst:
</span><span class="cx">     split-rules:
</span></span></pre></div>
<a id="trunkToolsbuildstreamelementssdkgstpluginsbasebst"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst        2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugins-base.bst   2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,13 +1,8 @@
</span><span class="cx"> kind: meson
</span><span class="cx"> sources:
</span><span class="cx"> - kind: tar
</span><del>-  url: gst_downloads:gst-plugins-base/gst-plugins-base-1.18.4.tar.xz
-  ref: 29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323
-# These patches are upstream already, to be released in 1.18.5.
-- kind: patch
-  path: patches/gst-plugins-base-0001-gst-don-t-use-volatile-to-mean-atomic.patch
-- kind: patch
-  path: patches/gst-plugins-base-0001-gstgl-Fix-build-when-Meson-0.58.0rc1.patch
</del><ins>+  url: gst_downloads:gst-plugins-base/gst-plugins-base-1.18.5.tar.xz
+  ref: 960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3
</ins><span class="cx"> build-depends:
</span><span class="cx"> - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
</span><span class="cx"> depends:
</span><span class="lines">@@ -42,7 +37,6 @@
</span><span class="cx">     -Dgtk_doc=disabled
</span><span class="cx">     -Ddoc=disabled
</span><span class="cx">     -Dtests=disabled
</span><del>-
</del><span class="cx"> public:
</span><span class="cx">   bst:
</span><span class="cx">     overlap-whitelist:
</span></span></pre></div>
<a id="trunkToolsbuildstreamelementssdkgstpluginsgoodbst"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst        2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/elements/sdk/gst-plugins-good.bst   2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,11 +1,8 @@
</span><span class="cx"> kind: meson
</span><span class="cx"> sources:
</span><span class="cx"> - kind: tar
</span><del>-  url: gst_downloads:gst-plugins-good/gst-plugins-good-1.18.4.tar.xz
-  ref: b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0
-# These patches are upstream already, to be released in 1.18.5.
-- kind: patch
-  path: patches/gst-plugins-good-0001-gst-don-t-use-volatile-to-mean-atomic.patch
</del><ins>+  url: gst_downloads:gst-plugins-good/gst-plugins-good-1.18.5.tar.xz
+  ref: 3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b
</ins><span class="cx"> build-depends:
</span><span class="cx"> - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
</span><span class="cx"> depends:
</span></span></pre></div>
<a id="trunkToolsbuildstreamelementssdkgstreamerbst"></a>
<div class="modfile"><h4>Modified: trunk/Tools/buildstream/elements/sdk/gstreamer.bst (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/elements/sdk/gstreamer.bst       2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/elements/sdk/gstreamer.bst  2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,12 +1,11 @@
</span><span class="cx"> kind: meson
</span><span class="cx"> sources:
</span><span class="cx"> - kind: tar
</span><del>-  url: gst_downloads:gstreamer/gstreamer-1.18.4.tar.xz
-  ref: 9aeec99b38e310817012aa2d1d76573b787af47f8a725a65b833880a094dfbc5
</del><ins>+  url: gst_downloads:gstreamer/gstreamer-1.18.5.tar.xz
+  ref: 55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a
</ins><span class="cx"> # Backport of https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/679 to be shipped in 1.20.
</span><span class="cx"> - kind: patch
</span><span class="cx">   path: patches/gstreamer-0001-devicemonitor-Stop-only-the-already-started-provider.patch
</span><del>-
</del><span class="cx"> build-depends:
</span><span class="cx"> - freedesktop-sdk.bst:components/gobject-introspection.bst
</span><span class="cx"> - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
</span><span class="lines">@@ -31,7 +30,6 @@
</span><span class="cx">     -Dgtk_doc=disabled
</span><span class="cx">     -Ddoc=disabled
</span><span class="cx">     -Dpackage-origin="webkit-sdk"
</span><del>-
</del><span class="cx"> public:
</span><span class="cx">   bst:
</span><span class="cx">     overlap-whitelist:
</span></span></pre></div>
<a id="trunkToolsbuildstreampatchesfdosdk0001Bumpccacheto442patch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/buildstream/patches/fdo-sdk-0001-Bump-ccache-to-4.4.2.patch (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/patches/fdo-sdk-0001-Bump-ccache-to-4.4.2.patch  2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/patches/fdo-sdk-0001-Bump-ccache-to-4.4.2.patch     2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>-From ac4633b31800146a9811b64de1fcc82209183f2e Mon Sep 17 00:00:00 2001
-From: Lauro Moura <lmoura@igalia.com>
-Date: Wed, 27 Oct 2021 22:45:08 -0300
-Subject: [PATCH] Bump ccache to 4.4.2
-
----
- elements/components/ccache.bst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/elements/components/ccache.bst b/elements/components/ccache.bst
-index 8c8e17a18..9f34f8c6d 100644
---- a/elements/components/ccache.bst
-+++ b/elements/components/ccache.bst
-@@ -18,4 +18,4 @@ sources:
- - kind: git_tag
-   url: github:ccache/ccache.git
-   track: master
--  ref: v4.4-0-g6ac58b50ec7ad402395acba9b1a5fdcbeabf347d
-+  ref: v4.4.2-0-g89def7d170f930a4480a132679f6a9e03d972787
--- 
-2.27.0
-
</del></span></pre></div>
<a id="trunkToolsbuildstreampatchesgstpluginsbase0001gstdontusevolatiletomeanatomicpatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/buildstream/patches/gst-plugins-base-0001-gst-don-t-use-volatile-to-mean-atomic.patch (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/patches/gst-plugins-base-0001-gst-don-t-use-volatile-to-mean-atomic.patch        2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/patches/gst-plugins-base-0001-gst-don-t-use-volatile-to-mean-atomic.patch   2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,840 +0,0 @@
</span><del>-From 5eb5bec7b5e3d0a2972784bbe1d28b21257a3734 Mon Sep 17 00:00:00 2001
-From: Matthew Waters <matthew@centricular.com>
-Date: Thu, 18 Mar 2021 19:18:36 +1100
-Subject: [PATCH] gst: don't use volatile to mean atomic
-
-volatile is not sufficient to provide atomic guarantees and real atomics
-should be used instead.  GCC 11 has started warning about using volatile
-with atomic operations.
-
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
-
-Discovered in https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/868
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1106>
----
- ext/gl/gstgleffects.c                                 |  2 +-
- ext/gl/gstglimagesink.h                               |  2 +-
- ext/opus/gstopusenc.c                                 | 10 +++++-----
- gst-libs/gst/audio/gstaudiodecoder.c                  |  2 +-
- gst-libs/gst/audio/gstaudiometa.c                     |  6 +++---
- gst-libs/gst/audio/streamvolume.c                     |  2 +-
- gst-libs/gst/gl/cocoa/gstglcaopengllayer.m            |  2 +-
- gst-libs/gst/gl/egl/gstgldisplay_egl.c                |  2 +-
- gst-libs/gst/gl/egl/gstglmemoryegl.c                  |  2 +-
- gst-libs/gst/gl/gbm/gstgldisplay_gbm.c                |  2 +-
- gst-libs/gst/gl/gl_mkenum.py                          |  4 ++--
- gst-libs/gst/gl/gstglbasememory.c                     |  2 +-
- gst-libs/gst/gl/gstglbuffer.c                         |  2 +-
- gst-libs/gst/gl/gstglcontext.c                        |  4 ++--
- gst-libs/gst/gl/gstgldebug.c                          |  2 +-
- gst-libs/gst/gl/gstgldisplay.c                        |  2 +-
- gst-libs/gst/gl/gstglfeature.c                        |  2 +-
- gst-libs/gst/gl/gstglmemory.c                         |  2 +-
- gst-libs/gst/gl/gstglmemorypbo.c                      |  2 +-
- gst-libs/gst/gl/gstglquery.c                          |  2 +-
- gst-libs/gst/gl/gstglrenderbuffer.c                   |  2 +-
- gst-libs/gst/gl/gstglsl.c                             |  2 +-
- gst-libs/gst/gl/gstglsyncmeta.c                       |  4 ++--
- gst-libs/gst/gl/gstglutils.c                          |  4 ++--
- gst-libs/gst/gl/gstglwindow.c                         |  2 +-
- gst-libs/gst/gl/wayland/wayland_event_source.c        |  2 +-
- gst-libs/gst/pbutils/encoding-profile.c               |  8 ++++----
- gst-libs/gst/pbutils/gstaudiovisualizer.c             |  2 +-
- gst-libs/gst/rtp/gstrtpmeta.c                         |  2 +-
- gst-libs/gst/rtsp/gstrtspextension.c                  |  2 +-
- gst-libs/gst/tag/gsttagmux.c                          |  2 +-
- gst-libs/gst/tag/xmpwriter.c                          |  2 +-
- gst-libs/gst/video/gstvideoaffinetransformationmeta.c |  2 +-
- gst-libs/gst/video/gstvideoaggregator.c               |  8 ++++----
- gst-libs/gst/video/gstvideodecoder.c                  |  2 +-
- gst-libs/gst/video/gstvideoencoder.c                  |  2 +-
- gst-libs/gst/video/gstvideometa.c                     | 10 +++++-----
- gst-libs/gst/video/video-anc.c                        |  6 +++---
- gst-libs/gst/video/video-multiview.c                  |  4 ++--
- gst-libs/gst/video/video-overlay-composition.c        |  2 +-
- gst/adder/gstadder.h                                  |  4 ++--
- gst/encoding/gstencodebin.c                           |  2 +-
- gst/playback/gstplay-enum.c                           |  4 ++--
- gst/videorate/gstvideorate.h                          |  2 +-
- gst/videoscale/gstvideoscale.c                        |  2 +-
- 45 files changed, 70 insertions(+), 70 deletions(-)
-
-diff --git a/ext/gl/gstgleffects.c b/ext/gl/gstgleffects.c
-index 70f727a0f9..85798b0c32 100644
---- a/ext/gl/gstgleffects.c
-+++ b/ext/gl/gstgleffects.c
-@@ -650,7 +650,7 @@ gst_gl_effects_filters_descriptors (void)
- gboolean
- gst_gl_effects_register_filters (GstPlugin * plugin, GstRank rank)
- {
--  static volatile gsize registered = 0;
-+  static gsize registered = 0;

-   if (g_once_init_enter (&registered)) {
-     GTypeInfo info = {
-diff --git a/ext/gl/gstglimagesink.h b/ext/gl/gstglimagesink.h
-index 1a75fb9371..78fed89dc4 100644
---- a/ext/gl/gstglimagesink.h
-+++ b/ext/gl/gstglimagesink.h
-@@ -106,7 +106,7 @@ struct _GstGLImageSink
-     GstBuffer *next_sync;
-     GstGLSyncMeta *next_sync_meta;

--    volatile gint to_quit;
-+    gint to_quit;
-     gboolean keep_aspect_ratio;
-     gint par_n, par_d;

-diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c
-index bbe1f99cf4..b875b547da 100644
---- a/ext/opus/gstopusenc.c
-+++ b/ext/opus/gstopusenc.c
-@@ -78,7 +78,7 @@ gst_opus_enc_bandwidth_get_type (void)
-     {OPUS_AUTO, "Auto", "auto"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -104,7 +104,7 @@ gst_opus_enc_frame_size_get_type (void)
-     {60, "60", "60"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -128,7 +128,7 @@ gst_opus_enc_audio_type_get_type (void)
-         "restricted-lowdelay"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -151,7 +151,7 @@ gst_opus_enc_bitrate_type_get_type (void)
-     {BITRATE_TYPE_CONSTRAINED_VBR, "Constrained VBR", "constrained-vbr"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -815,7 +815,7 @@ gst_opus_enc_sink_event (GstAudioEncoder * benc, GstEvent * event)
- static GstCaps *
- gst_opus_enc_get_sink_template_caps (void)
- {
--  static volatile gsize init = 0;
-+  static gsize init = 0;
-   static GstCaps *caps = NULL;

-   if (g_once_init_enter (&init)) {
-diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c
-index ee32141da0..47e9e1f53c 100644
---- a/gst-libs/gst/audio/gstaudiodecoder.c
-+++ b/gst-libs/gst/audio/gstaudiodecoder.c
-@@ -338,7 +338,7 @@ static void gst_audio_decoder_init (GstAudioDecoder * dec,
- GType
- gst_audio_decoder_get_type (void)
- {
--  static volatile gsize audio_decoder_type = 0;
-+  static gsize audio_decoder_type = 0;

-   if (g_once_init_enter (&audio_decoder_type)) {
-     GType _type;
-diff --git a/gst-libs/gst/audio/gstaudiometa.c b/gst-libs/gst/audio/gstaudiometa.c
-index ec937443ae..e010ca3375 100644
---- a/gst-libs/gst/audio/gstaudiometa.c
-+++ b/gst-libs/gst/audio/gstaudiometa.c
-@@ -177,7 +177,7 @@ gst_buffer_add_audio_downmix_meta (GstBuffer * buffer,
- GType
- gst_audio_downmix_meta_api_get_type (void)
- {
--  static volatile GType type;
-+  static GType type;
-   static const gchar *tags[] =
-       { GST_META_TAG_AUDIO_STR, GST_META_TAG_AUDIO_CHANNELS_STR, NULL };

-@@ -280,7 +280,7 @@ gst_buffer_add_audio_clipping_meta (GstBuffer * buffer,
- GType
- gst_audio_clipping_meta_api_get_type (void)
- {
--  static volatile GType type;
-+  static GType type;
-   static const gchar *tags[] =
-       { GST_META_TAG_AUDIO_STR, GST_META_TAG_AUDIO_RATE_STR, NULL };

-@@ -463,7 +463,7 @@ gst_buffer_add_audio_meta (GstBuffer * buffer, const GstAudioInfo * info,
- GType
- gst_audio_meta_api_get_type (void)
- {
--  static volatile GType type;
-+  static GType type;
-   static const gchar *tags[] = {
-     GST_META_TAG_AUDIO_STR, GST_META_TAG_AUDIO_CHANNELS_STR,
-     GST_META_TAG_AUDIO_RATE_STR, NULL
-diff --git a/gst-libs/gst/audio/streamvolume.c b/gst-libs/gst/audio/streamvolume.c
-index cdcacc1b14..72a845ac0f 100644
---- a/gst-libs/gst/audio/streamvolume.c
-+++ b/gst-libs/gst/audio/streamvolume.c
-@@ -66,7 +66,7 @@ gst_stream_volume_class_init (GstStreamVolumeInterface * iface)
- GType
- gst_stream_volume_get_type (void)
- {
--  static volatile gsize type = 0;
-+  static gsize type = 0;
-   if (g_once_init_enter (&type)) {
-     GType tmp;
-     static const GTypeInfo info = {
-diff --git a/gst-libs/gst/gl/cocoa/gstglcaopengllayer.m b/gst-libs/gst/gl/cocoa/gstglcaopengllayer.m
-index 254a3f21f4..f8895fd68c 100644
---- a/gst-libs/gst/gl/cocoa/gstglcaopengllayer.m
-+++ b/gst-libs/gst/gl/cocoa/gstglcaopengllayer.m
-@@ -33,7 +33,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
- static void
- _init_debug (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT(gst_gl_ca_opengl_layer_debug, "glcaopengllayer",
-diff --git a/gst-libs/gst/gl/egl/gstgldisplay_egl.c b/gst-libs/gst/gl/egl/gstgldisplay_egl.c
-index 84911658e5..6562d8d374 100644
---- a/gst-libs/gst/gl/egl/gstgldisplay_egl.c
-+++ b/gst-libs/gst/gl/egl/gstgldisplay_egl.c
-@@ -74,7 +74,7 @@ static guintptr gst_gl_display_egl_get_handle (GstGLDisplay * display);
- static void
- init_debug (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gldisplayegl", 0,
-diff --git a/gst-libs/gst/gl/egl/gstglmemoryegl.c b/gst-libs/gst/gl/egl/gstglmemoryegl.c
-index 84b07c99c9..c33d129498 100644
---- a/gst-libs/gst/gl/egl/gstglmemoryegl.c
-+++ b/gst-libs/gst/gl/egl/gstglmemoryegl.c
-@@ -257,7 +257,7 @@ gst_gl_memory_egl_allocator_init (GstGLMemoryEGLAllocator * allocator)
- void
- gst_gl_memory_egl_init_once (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     gst_gl_memory_init_once ();
-diff --git a/gst-libs/gst/gl/gbm/gstgldisplay_gbm.c b/gst-libs/gst/gl/gbm/gstgldisplay_gbm.c
-index 3e81ed7213..485c5d013b 100644
---- a/gst-libs/gst/gl/gbm/gstgldisplay_gbm.c
-+++ b/gst-libs/gst/gl/gbm/gstgldisplay_gbm.c
-@@ -398,7 +398,7 @@ gst_gl_display_gbm_shutdown_gbm (GstGLDisplayGBM * display_gbm)
- static void
- _init_debug (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay");
-diff --git a/gst-libs/gst/gl/gl_mkenum.py b/gst-libs/gst/gl/gl_mkenum.py
-index 7056a96572..1f52f77b31 100644
---- a/gst-libs/gst/gl/gl_mkenum.py
-+++ b/gst-libs/gst/gl/gl_mkenum.py
-@@ -22,11 +22,11 @@ c_array = ['--fhead',
-            '--fprod',
-            "\n/* enumerations from \"@basename@\" */",
-            '--vhead',
--           "GType\n@enum_name@_get_type (void)\n{\n  static volatile gsize g_define_type_id__volatile = 0;\n  if (g_once_init_enter (&g_define_type_id__volatile)) {\n    static const G@Type@Value values[] = {",
-+           "GType\n@enum_name@_get_type (void)\n{\n  static gsize static_g_define_type_id = 0;\n  if (g_once_init_enter (&static_g_define_type_id)) {\n    static const G@Type@Value values[] = {",
-            '--vprod',
-            "      { C_@TYPE@ (@VALUENAME@), \"@VALUENAME@\", \"@valuenick@\" },",
-            '--vtail',
--           "      { 0, NULL, NULL }\n    };\n    GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n    g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n  }\n  return g_define_type_id__volatile;\n}\n"
-+           "      { 0, NULL, NULL }\n    };\n    GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n    g_once_init_leave (&static_g_define_type_id, g_define_type_id);\n  }\n  return static_g_define_type_id;\n}\n"
- ]

- cmd = []
-diff --git a/gst-libs/gst/gl/gstglbasememory.c b/gst-libs/gst/gl/gstglbasememory.c
-index 534b3133c4..6fe37fa4f0 100644
---- a/gst-libs/gst/gl/gstglbasememory.c
-+++ b/gst-libs/gst/gl/gstglbasememory.c
-@@ -502,7 +502,7 @@ _mem_free (GstAllocator * allocator, GstMemory * memory)
- void
- gst_gl_base_memory_init_once (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT (GST_CAT_GL_BASE_MEMORY, "glbasememory", 0,
-diff --git a/gst-libs/gst/gl/gstglbuffer.c b/gst-libs/gst/gl/gstglbuffer.c
-index 5a45007571..d76a8910f9 100644
---- a/gst-libs/gst/gl/gstglbuffer.c
-+++ b/gst-libs/gst/gl/gstglbuffer.c
-@@ -455,7 +455,7 @@ gst_gl_buffer_allocator_init (GstGLBufferAllocator * allocator)
- void
- gst_gl_buffer_init_once (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     gst_gl_base_memory_init_once ();
-diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c
-index 446524996e..4278d0b05a 100644
---- a/gst-libs/gst/gl/gstglcontext.c
-+++ b/gst-libs/gst/gl/gstglcontext.c
-@@ -150,7 +150,7 @@ load_self_module (gpointer user_data)
-  */
- struct ContextShareGroup
- {
--  volatile int refcount;
-+  int refcount;
- };

- static struct ContextShareGroup *
-@@ -305,7 +305,7 @@ gst_gl_context_class_init (GstGLContextClass * klass)
- static void
- _init_debug (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT (gst_gl_context_debug, "glcontext", 0,
-diff --git a/gst-libs/gst/gl/gstgldebug.c b/gst-libs/gst/gl/gstgldebug.c
-index 4c653b8f87..bc7e319d38 100644
---- a/gst-libs/gst/gl/gstgldebug.c
-+++ b/gst-libs/gst/gl/gstgldebug.c
-@@ -105,7 +105,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_marker_debug);
- static void
- _init_debug (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_GET (gst_performance, "GST_PERFORMANCE");
-diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c
-index 5bf9fc5891..dbd2d0ad52 100644
---- a/gst-libs/gst/gl/gstgldisplay.c
-+++ b/gst-libs/gst/gl/gstgldisplay.c
-@@ -277,7 +277,7 @@ gst_gl_display_new (void)
- {
-   GstGLDisplay *display = NULL;
-   const gchar *user_choice, *platform_choice;
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT (gst_gl_display_debug, "gldisplay", 0,
-diff --git a/gst-libs/gst/gl/gstglfeature.c b/gst-libs/gst/gl/gstglfeature.c
-index eed0dbc9ce..ba84e7e50b 100644
---- a/gst-libs/gst/gl/gstglfeature.c
-+++ b/gst-libs/gst/gl/gstglfeature.c
-@@ -43,7 +43,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
- static void
- _init_debug (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glfeature", 0,
-diff --git a/gst-libs/gst/gl/gstglmemory.c b/gst-libs/gst/gl/gstglmemory.c
-index 76c04eb1b5..01a378fcc3 100644
---- a/gst-libs/gst/gl/gstglmemory.c
-+++ b/gst-libs/gst/gl/gstglmemory.c
-@@ -1107,7 +1107,7 @@ gst_gl_memory_get_texture_id (GstGLMemory * gl_mem)
- void
- gst_gl_memory_init_once (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     gst_gl_base_memory_init_once ();
-diff --git a/gst-libs/gst/gl/gstglmemorypbo.c b/gst-libs/gst/gl/gstglmemorypbo.c
-index 260f193828..b5d9f0f16a 100644
---- a/gst-libs/gst/gl/gstglmemorypbo.c
-+++ b/gst-libs/gst/gl/gstglmemorypbo.c
-@@ -816,7 +816,7 @@ gst_gl_memory_pbo_upload_transfer (GstGLMemoryPBO * gl_mem)
- void
- gst_gl_memory_pbo_init_once (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     gst_gl_memory_init_once ();
-diff --git a/gst-libs/gst/gl/gstglquery.c b/gst-libs/gst/gl/gstglquery.c
-index 588b572bea..c9ba2684e6 100644
---- a/gst-libs/gst/gl/gstglquery.c
-+++ b/gst-libs/gst/gl/gstglquery.c
-@@ -58,7 +58,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
- static void
- _init_debug (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glquery", 0, "glquery element");
-diff --git a/gst-libs/gst/gl/gstglrenderbuffer.c b/gst-libs/gst/gl/gstglrenderbuffer.c
-index 4399c7ef87..7f93d912c6 100644
---- a/gst-libs/gst/gl/gstglrenderbuffer.c
-+++ b/gst-libs/gst/gl/gstglrenderbuffer.c
-@@ -310,7 +310,7 @@ gst_gl_renderbuffer_get_id (GstGLRenderbuffer * gl_mem)
- void
- gst_gl_renderbuffer_init_once (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     gst_gl_base_memory_init_once ();
-diff --git a/gst-libs/gst/gl/gstglsl.c b/gst-libs/gst/gl/gstglsl.c
-index a9811ad075..ce01a6ca31 100644
---- a/gst-libs/gst/gl/gstglsl.c
-+++ b/gst-libs/gst/gl/gstglsl.c
-@@ -40,7 +40,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
- static void
- _init_debug (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glsl", 0,
-diff --git a/gst-libs/gst/gl/gstglsyncmeta.c b/gst-libs/gst/gl/gstglsyncmeta.c
-index d74b3cd461..31fa6796c5 100644
---- a/gst-libs/gst/gl/gstglsyncmeta.c
-+++ b/gst-libs/gst/gl/gstglsyncmeta.c
-@@ -333,7 +333,7 @@ static gboolean
- _gst_gl_sync_meta_init (GstGLSyncMeta * sync_meta, gpointer params,
-     GstBuffer * buffer)
- {
--  static volatile gsize _init;
-+  static gsize _init;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT (gst_gl_sync_meta_debug, "glsyncmeta", 0,
-@@ -359,7 +359,7 @@ _gst_gl_sync_meta_init (GstGLSyncMeta * sync_meta, gpointer params,
- GType
- gst_gl_sync_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;
-   static const gchar *tags[] = { NULL };

-   if (g_once_init_enter (&type)) {
-diff --git a/gst-libs/gst/gl/gstglutils.c b/gst-libs/gst/gl/gstglutils.c
-index a60aa45198..6120e8bce1 100644
---- a/gst-libs/gst/gl/gstglutils.c
-+++ b/gst-libs/gst/gl/gstglutils.c
-@@ -56,7 +56,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_utils_debug);
- static GstDebugCategory *
- _init_gl_utils_debug_category (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT (gst_gl_utils_debug, "glutils", 0,
-@@ -87,7 +87,7 @@ static void
- _init_context_debug (void)
- {
- #ifndef GST_DISABLE_GST_DEBUG
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_GET (GST_CAT_CONTEXT, "GST_CONTEXT");
-diff --git a/gst-libs/gst/gl/gstglwindow.c b/gst-libs/gst/gl/gstglwindow.c
-index 2348ff0909..419ce177cf 100644
---- a/gst-libs/gst/gl/gstglwindow.c
-+++ b/gst-libs/gst/gl/gstglwindow.c
-@@ -160,7 +160,7 @@ gst_gl_window_default_close (GstGLWindow * window)
- static void
- _init_debug (void)
- {
--  static volatile gsize _init = 0;
-+  static gsize _init = 0;

-   if (g_once_init_enter (&_init)) {
-     GST_DEBUG_CATEGORY_INIT (gst_gl_window_debug, "glwindow", 0,
-diff --git a/gst-libs/gst/gl/wayland/wayland_event_source.c b/gst-libs/gst/gl/wayland/wayland_event_source.c
-index 99dd2ac2ac..8e9a6848c2 100644
---- a/gst-libs/gst/gl/wayland/wayland_event_source.c
-+++ b/gst-libs/gst/gl/wayland/wayland_event_source.c
-@@ -45,7 +45,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
- static void
- init_debug (void)
- {
--  static volatile gsize _debug;
-+  static gsize _debug;

-   if (g_once_init_enter (&_debug)) {
-     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glwaylandeventsource", 0,
-diff --git a/gst-libs/gst/pbutils/encoding-profile.c b/gst-libs/gst/pbutils/encoding-profile.c
-index ec6115f87f..0046e03452 100644
---- a/gst-libs/gst/pbutils/encoding-profile.c
-+++ b/gst-libs/gst/pbutils/encoding-profile.c
-@@ -338,9 +338,9 @@ gst_encoding_profile_class_intern_init (gpointer klass)
- GType
- gst_encoding_profile_get_type (void)
- {
--  static volatile gsize g_define_type_id__volatile = 0;
-+  static gsize g_define_type_id_init = 0;

--  if (g_once_init_enter (&g_define_type_id__volatile)) {
-+  if (g_once_init_enter (&g_define_type_id_init)) {
-     GType g_define_type_id = g_type_register_static_simple (G_TYPE_OBJECT,
-         g_intern_static_string ("GstEncodingProfile"),
-         sizeof (GstEncodingProfileClass),
-@@ -363,9 +363,9 @@ gst_encoding_profile_get_type (void)
-     /* Register gst-specific GValue functions */
-     gst_value_register (&gstvtable);

--    g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
-+    g_once_init_leave (&g_define_type_id_init, g_define_type_id);
-   }
--  return g_define_type_id__volatile;
-+  return g_define_type_id_init;
- }


-diff --git a/gst-libs/gst/pbutils/gstaudiovisualizer.c b/gst-libs/gst/pbutils/gstaudiovisualizer.c
-index 91a02fc7dc..336079757b 100644
---- a/gst-libs/gst/pbutils/gstaudiovisualizer.c
-+++ b/gst-libs/gst/pbutils/gstaudiovisualizer.c
-@@ -499,7 +499,7 @@ gst_audio_visualizer_change_shader (GstAudioVisualizer * scope)
- GType
- gst_audio_visualizer_get_type (void)
- {
--  static volatile gsize audio_visualizer_type = 0;
-+  static gsize audio_visualizer_type = 0;

-   if (g_once_init_enter (&audio_visualizer_type)) {
-     static const GTypeInfo audio_visualizer_info = {
-diff --git a/gst-libs/gst/rtp/gstrtpmeta.c b/gst-libs/gst/rtp/gstrtpmeta.c
-index 9028db82db..1968f49643 100644
---- a/gst-libs/gst/rtp/gstrtpmeta.c
-+++ b/gst-libs/gst/rtp/gstrtpmeta.c
-@@ -190,7 +190,7 @@ gst_rtp_source_meta_append_csrc (GstRTPSourceMeta * meta, const guint32 * csrc,
- GType
- gst_rtp_source_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;
-   static const gchar *tags[] = { NULL };

-   if (g_once_init_enter (&type)) {
-diff --git a/gst-libs/gst/rtsp/gstrtspextension.c b/gst-libs/gst/rtsp/gstrtspextension.c
-index ab31791747..73903f5426 100644
---- a/gst-libs/gst/rtsp/gstrtspextension.c
-+++ b/gst-libs/gst/rtsp/gstrtspextension.c
-@@ -49,7 +49,7 @@ static guint gst_rtsp_extension_signals[LAST_SIGNAL] = { 0 };
- GType
- gst_rtsp_extension_get_type (void)
- {
--  static volatile gsize gst_rtsp_extension_type = 0;
-+  static gsize gst_rtsp_extension_type = 0;
-   static const GTypeInfo gst_rtsp_extension_info = {
-     sizeof (GstRTSPExtensionInterface),
-     (GBaseInitFunc) gst_rtsp_extension_iface_init,
-diff --git a/gst-libs/gst/tag/gsttagmux.c b/gst-libs/gst/tag/gsttagmux.c
-index 0b90acf80b..f7ba1e8da1 100644
---- a/gst-libs/gst/tag/gsttagmux.c
-+++ b/gst-libs/gst/tag/gsttagmux.c
-@@ -90,7 +90,7 @@ static gboolean gst_tag_mux_sink_event (GstPad * pad, GstObject * parent,
- GType
- gst_tag_mux_get_type (void)
- {
--  static volatile gsize tag_mux_type = 0;
-+  static gsize tag_mux_type = 0;

-   if (g_once_init_enter (&tag_mux_type)) {
-     const GInterfaceInfo interface_info = { NULL, NULL, NULL };
-diff --git a/gst-libs/gst/tag/xmpwriter.c b/gst-libs/gst/tag/xmpwriter.c
-index d714e0a034..f16b4917bd 100644
---- a/gst-libs/gst/tag/xmpwriter.c
-+++ b/gst-libs/gst/tag/xmpwriter.c
-@@ -53,7 +53,7 @@ typedef struct
- GType
- gst_tag_xmp_writer_get_type (void)
- {
--  static volatile gsize xmp_config_type = 0;
-+  static gsize xmp_config_type = 0;

-   if (g_once_init_enter (&xmp_config_type)) {
-     GType _type;
-diff --git a/gst-libs/gst/video/gstvideoaffinetransformationmeta.c b/gst-libs/gst/video/gstvideoaffinetransformationmeta.c
-index 0032249ba9..22903b29fc 100644
---- a/gst-libs/gst/video/gstvideoaffinetransformationmeta.c
-+++ b/gst-libs/gst/video/gstvideoaffinetransformationmeta.c
-@@ -36,7 +36,7 @@
- GType
- gst_video_affine_transformation_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;
-   static const gchar *tags[] =
-       { GST_META_TAG_VIDEO_STR, GST_META_TAG_VIDEO_ORIENTATION_STR,
-     GST_META_TAG_VIDEO_ORIENTATION_STR, NULL
-diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c
-index eb4170e1e3..72dc5e9f04 100644
---- a/gst-libs/gst/video/gstvideoaggregator.c
-+++ b/gst-libs/gst/video/gstvideoaggregator.c
-@@ -770,9 +770,9 @@ static gint video_aggregator_private_offset = 0;
- GType
- gst_video_aggregator_get_type (void)
- {
--  static volatile gsize g_define_type_id_volatile = 0;
-+  static gsize static_g_define_type_id = 0;

--  if (g_once_init_enter (&g_define_type_id_volatile)) {
-+  if (g_once_init_enter (&static_g_define_type_id)) {
-     GType g_define_type_id = g_type_register_static_simple (GST_TYPE_AGGREGATOR,
-         g_intern_static_string ("GstVideoAggregator"),
-         sizeof (GstVideoAggregatorClass),
-@@ -785,9 +785,9 @@ gst_video_aggregator_get_type (void)
-         g_type_add_instance_private (g_define_type_id,
-         sizeof (GstVideoAggregatorPrivate));

--    g_once_init_leave (&g_define_type_id_volatile, g_define_type_id);
-+    g_once_init_leave (&static_g_define_type_id, g_define_type_id);
-   }
--  return g_define_type_id_volatile;
-+  return static_g_define_type_id;
- }

- static inline GstVideoAggregatorPrivate *
-diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c
-index 935a2ff3a6..36f19de6df 100644
---- a/gst-libs/gst/video/gstvideodecoder.c
-+++ b/gst-libs/gst/video/gstvideodecoder.c
-@@ -499,7 +499,7 @@ static gboolean gst_video_decoder_transform_meta_default (GstVideoDecoder *
- GType
- gst_video_decoder_get_type (void)
- {
--  static volatile gsize type = 0;
-+  static gsize type = 0;

-   if (g_once_init_enter (&type)) {
-     GType _type;
-diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c
-index d45a4f6e70..9811ba0d4d 100644
---- a/gst-libs/gst/video/gstvideoencoder.c
-+++ b/gst-libs/gst/video/gstvideoencoder.c
-@@ -291,7 +291,7 @@ static gboolean gst_video_encoder_transform_meta_default (GstVideoEncoder *
- GType
- gst_video_encoder_get_type (void)
- {
--  static volatile gsize type = 0;
-+  static gsize type = 0;

-   if (g_once_init_enter (&type)) {
-     GType _type;
-diff --git a/gst-libs/gst/video/gstvideometa.c b/gst-libs/gst/video/gstvideometa.c
-index 6bb45dc081..bfd91465cb 100644
---- a/gst-libs/gst/video/gstvideometa.c
-+++ b/gst-libs/gst/video/gstvideometa.c
-@@ -120,7 +120,7 @@ gst_video_meta_transform (GstBuffer * dest, GstMeta * meta,
- GType
- gst_video_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;
-   static const gchar *tags[] =
-       { GST_META_TAG_VIDEO_STR, GST_META_TAG_MEMORY_STR,
-     GST_META_TAG_VIDEO_COLORSPACE_STR,
-@@ -577,7 +577,7 @@ gst_video_crop_meta_transform (GstBuffer * dest, GstMeta * meta,
- GType
- gst_video_crop_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;
-   static const gchar *tags[] =
-       { GST_META_TAG_VIDEO_STR, GST_META_TAG_VIDEO_SIZE_STR,
-     GST_META_TAG_VIDEO_ORIENTATION_STR, NULL
-@@ -638,7 +638,7 @@ gst_video_meta_transform_scale_get_quark (void)
- GType
- gst_video_gl_texture_upload_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;
-   static const gchar *tags[] =
-       { GST_META_TAG_VIDEO_STR, GST_META_TAG_MEMORY_STR, NULL };

-@@ -806,7 +806,7 @@ gst_video_gl_texture_upload_meta_upload (GstVideoGLTextureUploadMeta * meta,
- GType
- gst_video_region_of_interest_meta_api_get_type (void)
- {
--  static volatile GType type;
-+  static GType type;
-   static const gchar *tags[] =
-       { GST_META_TAG_VIDEO_STR, GST_META_TAG_VIDEO_ORIENTATION_STR,
-     GST_META_TAG_VIDEO_SIZE_STR, NULL
-@@ -1064,7 +1064,7 @@ gst_video_region_of_interest_meta_get_param (GstVideoRegionOfInterestMeta *
- GType
- gst_video_time_code_meta_api_get_type (void)
- {
--  static volatile GType type;
-+  static GType type;

-   if (g_once_init_enter (&type)) {
-     static const gchar *tags[] = { NULL };
-diff --git a/gst-libs/gst/video/video-anc.c b/gst-libs/gst/video/video-anc.c
-index 4748c50913..638266d06e 100644
---- a/gst-libs/gst/video/video-anc.c
-+++ b/gst-libs/gst/video/video-anc.c
-@@ -932,7 +932,7 @@ gst_video_vbi_encoder_write_line (GstVideoVBIEncoder * encoder, guint8 * data)
- GType
- gst_video_caption_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;

-   if (g_once_init_enter (&type)) {
-     static const gchar *tags[] = { NULL };
-@@ -1135,7 +1135,7 @@ gst_video_caption_type_to_caps (GstVideoCaptionType type)
- GType
- gst_video_afd_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;

-   if (g_once_init_enter (&type)) {
-     static const gchar *tags[] = {
-@@ -1274,7 +1274,7 @@ gst_buffer_add_video_afd_meta (GstBuffer * buffer, guint8 field,
- GType
- gst_video_bar_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;

-   if (g_once_init_enter (&type)) {
-     static const gchar *tags[] = {
-diff --git a/gst-libs/gst/video/video-multiview.c b/gst-libs/gst/video/video-multiview.c
-index 2a6d04881f..107728db02 100644
---- a/gst-libs/gst/video/video-multiview.c
-+++ b/gst-libs/gst/video/video-multiview.c
-@@ -28,7 +28,7 @@
- GType
- gst_video_multiview_flagset_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;

-   if (g_once_init_enter (&type)) {
-     GType _type = gst_flagset_register (GST_TYPE_VIDEO_MULTIVIEW_FLAGS);
-@@ -405,7 +405,7 @@ gst_video_multiview_guess_half_aspect (GstVideoMultiviewMode mv_mode,
- GType
- gst_video_multiview_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;
-   static const gchar *tags[] =
-       { GST_META_TAG_VIDEO_STR, GST_META_TAG_MEMORY_STR,
-     NULL
-diff --git a/gst-libs/gst/video/video-overlay-composition.c b/gst-libs/gst/video/video-overlay-composition.c
-index 315e91f7e1..3984647dfd 100644
---- a/gst-libs/gst/video/video-overlay-composition.c
-+++ b/gst-libs/gst/video/video-overlay-composition.c
-@@ -236,7 +236,7 @@ gst_video_overlay_composition_meta_transform (GstBuffer * dest, GstMeta * meta,
- GType
- gst_video_overlay_composition_meta_api_get_type (void)
- {
--  static volatile GType type = 0;
-+  static GType type = 0;
-   static const gchar *tags[] = { NULL };

-   if (g_once_init_enter (&type)) {
-diff --git a/gst/adder/gstadder.h b/gst/adder/gstadder.h
-index 369209cbdb..cb20979860 100644
---- a/gst/adder/gstadder.h
-+++ b/gst/adder/gstadder.h
-@@ -53,8 +53,8 @@ struct _GstAdder {

-   /* sink event handling */
-   GstSegment      segment;
--  volatile gboolean new_segment_pending;
--  volatile gboolean flush_stop_pending;
-+  gboolean new_segment_pending;
-+  gboolean flush_stop_pending;

-   /* current caps */
-   GstCaps *current_caps;
-diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c
-index 1f354cfbf6..f5f314e2d9 100644
---- a/gst/encoding/gstencodebin.c
-+++ b/gst/encoding/gstencodebin.c
-@@ -266,7 +266,7 @@ gst_encodebin_flags_get_type (void)
-           "conversion elements", "no-video-conversion"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-diff --git a/gst/playback/gstplay-enum.c b/gst/playback/gstplay-enum.c
-index c1b666d608..ccef2f09ad 100644
---- a/gst/playback/gstplay-enum.c
-+++ b/gst/playback/gstplay-enum.c
-@@ -32,7 +32,7 @@ gst_autoplug_select_result_get_type (void)
-     {C_ENUM (GST_AUTOPLUG_SELECT_SKIP), "GST_AUTOPLUG_SELECT_SKIP", "skip"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -74,7 +74,7 @@ gst_play_flags_get_type (void)
-         "force-sw-decoders"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-diff --git a/gst/videorate/gstvideorate.h b/gst/videorate/gstvideorate.h
-index cafff0dd24..c17f98a24b 100644
---- a/gst/videorate/gstvideorate.h
-+++ b/gst/videorate/gstvideorate.h
-@@ -70,7 +70,7 @@ struct _GstVideoRate
-   gboolean drop_only;
-   guint64 average_period_set;

--  volatile int max_rate;
-+  int max_rate;
-   gdouble rate;
-   gdouble pending_rate;
- };
-diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
-index f73950c367..ff080628c8 100644
---- a/gst/videoscale/gstvideoscale.c
-+++ b/gst/videoscale/gstvideoscale.c
-@@ -161,7 +161,7 @@ static GstCaps *
- gst_video_scale_get_capslist (void)
- {
-   static GstCaps *caps = NULL;
--  static volatile gsize inited = 0;
-+  static gsize inited = 0;

-   if (g_once_init_enter (&inited)) {
-     caps = gst_static_caps_get (&gst_video_scale_format_caps);
--- 
-2.31.1
-
</del></span></pre></div>
<a id="trunkToolsbuildstreampatchesgstpluginsbase0001gstglFixbuildwhenMeson0580rc1patch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/buildstream/patches/gst-plugins-base-0001-gstgl-Fix-build-when-Meson-0.58.0rc1.patch (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/patches/gst-plugins-base-0001-gstgl-Fix-build-when-Meson-0.58.0rc1.patch 2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/patches/gst-plugins-base-0001-gstgl-Fix-build-when-Meson-0.58.0rc1.patch    2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-From 90903917a8185e0f9add7af8153ae2fc9875fdcb Mon Sep 17 00:00:00 2001
-From: Xavier Claessens <xavier.claessens@collabora.com>
-Date: Mon, 26 Apr 2021 14:25:03 -0400
-Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1
-
-"implicit_include_directories: false" now also means that current build
-directory is not added to include paths by default any more. We have to
-add it manually because we have some custom_target() that generate
-headers in current build directory.
-
-See https://github.com/mesonbuild/meson/issues/8700.
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1127>
----
- gst-libs/gst/gl/meson.build | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
-index db11c5e89b..731ee9f5ea 100644
---- a/gst-libs/gst/gl/meson.build
-+++ b/gst-libs/gst/gl/meson.build
-@@ -989,11 +989,20 @@ if build_gstgl
-     command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@'])
-   gen_sources = [gl_enumtypes_h]

-+  common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL']
-+
-+  # We have custom_target() that generate headers in the current build dir,
-+  # but with implicit_include_directories: false, meson >= 0.58.0 won't include
-+  # it by default. We cannot use include_directories('.') here because it would
-+  # also include current source dir which is what we want to avoid because
-+  # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h.
-+  common_args += '-I@0@'.format(meson.current_build_dir())
-+
-   gstgl = library('gstgl-' + api_version,
-     gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h,
--    c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
--    cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
--    objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'],
-+    c_args : common_args,
-+    cpp_args : common_args,
-+    objc_args : common_args + gl_objc_args,
-     include_directories : [configinc, libsinc, gl_includes],
-     version : libversion,
-     soversion : soversion,
--- 
-2.31.1
-
</del></span></pre></div>
<a id="trunkToolsbuildstreampatchesgstpluginsgood0001gstdontusevolatiletomeanatomicpatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/buildstream/patches/gst-plugins-good-0001-gst-don-t-use-volatile-to-mean-atomic.patch (286289 => 286290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/buildstream/patches/gst-plugins-good-0001-gst-don-t-use-volatile-to-mean-atomic.patch        2021-11-30 11:46:38 UTC (rev 286289)
+++ trunk/Tools/buildstream/patches/gst-plugins-good-0001-gst-don-t-use-volatile-to-mean-atomic.patch   2021-11-30 11:47:24 UTC (rev 286290)
</span><span class="lines">@@ -1,315 +0,0 @@
</span><del>-From a1bf3d8d540a25268d612a489e1e836d6ea737b0 Mon Sep 17 00:00:00 2001
-From: Matthew Waters <matthew@centricular.com>
-Date: Thu, 18 Mar 2021 19:52:53 +1100
-Subject: [PATCH] gst: don't use volatile to mean atomic
-
-volatile is not sufficient to provide atomic guarantees and real atomics
-should be used instead.  GCC 11 has started warning about using volatile
-with atomic operations.
-
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
-
-Discovered in https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/868
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/941>
----
- ext/jack/gstjack.c             |  6 +++---
- ext/jack/gstjackaudiosink.c    |  2 +-
- ext/jack/gstjackaudiosrc.c     |  2 +-
- ext/pulse/pulsesink.h          |  2 +-
- ext/qt/gstqsgtexture.cc        |  2 +-
- ext/qt/gstqtglutility.cc       |  2 +-
- ext/qt/qtglrenderer.cc         |  6 +++---
- ext/qt/qtitem.cc               |  2 +-
- ext/qt/qtwindow.cc             |  4 ++--
- ext/vpx/gstvpxdec.c            |  2 +-
- ext/vpx/gstvpxenc.c            | 14 +++++++-------
- gst/audioparsers/gstac3parse.h |  2 +-
- sys/rpicamsrc/gstrpicamsrc.c   |  2 +-
- sys/ximage/ximageutil.c        |  2 +-
- 14 files changed, 25 insertions(+), 25 deletions(-)
-
-diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
-index ca98dc405..fdd507d87 100644
---- a/ext/jack/gstjack.c
-+++ b/ext/jack/gstjack.c
-@@ -28,7 +28,7 @@
- GType
- gst_jack_connect_get_type (void)
- {
--  static volatile gsize jack_connect_type = 0;
-+  static gsize jack_connect_type = 0;

-   if (g_once_init_enter (&jack_connect_type)) {
-     static const GEnumValue jack_connect_enums[] = {
-@@ -50,7 +50,7 @@ gst_jack_connect_get_type (void)
- GType
- gst_jack_transport_get_type (void)
- {
--  static volatile gsize type = 0;
-+  static gsize type = 0;

-   if (g_once_init_enter (&type)) {
-     static const GFlagsValue flag_values[] = {
-@@ -84,7 +84,7 @@ gst_jack_client_free (gpointer jclient)
- GType
- gst_jack_client_get_type (void)
- {
--  static volatile gsize jack_client_type = 0;
-+  static gsize jack_client_type = 0;

-   if (g_once_init_enter (&jack_client_type)) {
-     /* hackish, but makes it show up nicely in gst-inspect */
-diff --git a/ext/jack/gstjackaudiosink.c b/ext/jack/gstjackaudiosink.c
-index ee7cea8c0..6e8d04ae5 100644
---- a/ext/jack/gstjackaudiosink.c
-+++ b/ext/jack/gstjackaudiosink.c
-@@ -131,7 +131,7 @@ gst_jack_audio_sink_free_channels (GstJackAudioSink * sink)
- static GType
- gst_jack_ring_buffer_get_type (void)
- {
--  static volatile gsize ringbuffer_type = 0;
-+  static gsize ringbuffer_type = 0;

-   if (g_once_init_enter (&ringbuffer_type)) {
-     static const GTypeInfo ringbuffer_info = {
-diff --git a/ext/jack/gstjackaudiosrc.c b/ext/jack/gstjackaudiosrc.c
-index 1d2cf82ee..d43a447a7 100644
---- a/ext/jack/gstjackaudiosrc.c
-+++ b/ext/jack/gstjackaudiosrc.c
-@@ -151,7 +151,7 @@ gst_jack_audio_src_free_channels (GstJackAudioSrc * src)
- static GType
- gst_jack_ring_buffer_get_type (void)
- {
--  static volatile gsize ringbuffer_type = 0;
-+  static gsize ringbuffer_type = 0;

-   if (g_once_init_enter (&ringbuffer_type)) {
-     static const GTypeInfo ringbuffer_info = { sizeof (GstJackRingBufferClass),
-diff --git a/ext/pulse/pulsesink.h b/ext/pulse/pulsesink.h
-index 86f3dcdbb..51ec86a25 100644
---- a/ext/pulse/pulsesink.h
-+++ b/ext/pulse/pulsesink.h
-@@ -72,7 +72,7 @@ struct _GstPulseSink
-   GstStructure *properties;
-   pa_proplist *proplist;

--  volatile gint format_lost;
-+  gint format_lost;
-   GstClockTime format_lost_time;
- };

-diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc
-index a05d26edd..bfa79cda0 100644
---- a/ext/qt/gstqsgtexture.cc
-+++ b/ext/qt/gstqsgtexture.cc
-@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);

- GstQSGTexture::GstQSGTexture ()
- {
--  static volatile gsize _debug;
-+  static gsize _debug;

-   initializeOpenGLFunctions();

-diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc
-index acb89b6e1..d2c092202 100644
---- a/ext/qt/gstqtglutility.cc
-+++ b/ext/qt/gstqtglutility.cc
-@@ -66,7 +66,7 @@ gst_qt_get_gl_display ()
- {
-   GstGLDisplay *display = NULL;
-   QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
--  static volatile gsize _debug;
-+  static gsize _debug;

-   g_assert (app != NULL);

-diff --git a/ext/qt/qtglrenderer.cc b/ext/qt/qtglrenderer.cc
-index 2ad5601fc..52965fd0b 100644
---- a/ext/qt/qtglrenderer.cc
-+++ b/ext/qt/qtglrenderer.cc
-@@ -22,7 +22,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
- static void
- init_debug (void)
- {
--  static volatile gsize _debug;
-+  static gsize _debug;

-   if (g_once_init_enter (&_debug)) {
-     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglrenderer", 0,
-@@ -115,7 +115,7 @@ typedef enum

- struct SharedRenderData
- {
--  volatile int refcount;
-+  int refcount;
-   SharedRenderDataState state;
-   GMutex lock;
-   GCond cond;
-@@ -130,7 +130,7 @@ shared_render_data_new (void)
- {
-   struct SharedRenderData *ret = g_new0 (struct SharedRenderData, 1);

--  ret->refcount = 1;
-+  g_atomic_int_set (&ret->refcount, 1);
-   g_mutex_init (&ret->lock);

-   return ret;
-diff --git a/ext/qt/qtitem.cc b/ext/qt/qtitem.cc
-index 7659800b6..bc99639b4 100644
---- a/ext/qt/qtitem.cc
-+++ b/ext/qt/qtitem.cc
-@@ -104,7 +104,7 @@ void InitializeSceneGraph::run()

- QtGLVideoItem::QtGLVideoItem()
- {
--  static volatile gsize _debug;
-+  static gsize _debug;

-   if (g_once_init_enter (&_debug)) {
-     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget");
-diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc
-index 9360c3337..7c44ac54e 100644
---- a/ext/qt/qtwindow.cc
-+++ b/ext/qt/qtwindow.cc
-@@ -103,7 +103,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) :
-   QQuickWindow( parent ), source (src)
- {
-   QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
--  static volatile gsize _debug;
-+  static gsize _debug;

-   g_assert (app != NULL);

-@@ -152,7 +152,7 @@ QtGLWindow::beforeRendering()

-   g_mutex_lock (&this->priv->lock);

--  static volatile gsize once = 0;
-+  static gsize once = 0;
-   if (g_once_init_enter(&once)) {
-     this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch();
-     g_once_init_leave(&once,1);
-diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c
-index e92aa85c7..74cc3c970 100644
---- a/ext/vpx/gstvpxdec.c
-+++ b/ext/vpx/gstvpxdec.c
-@@ -79,7 +79,7 @@ gst_vpx_dec_post_processing_flags_get_type (void)
-     {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-diff --git a/ext/vpx/gstvpxenc.c b/ext/vpx/gstvpxenc.c
-index cd5b30d14..4b3b4f770 100644
---- a/ext/vpx/gstvpxenc.c
-+++ b/ext/vpx/gstvpxenc.c
-@@ -165,7 +165,7 @@ gst_vpx_enc_end_usage_get_type (void)
-     {VPX_CQ, "Constant Quality Mode (CQ) mode", "cq"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -188,7 +188,7 @@ gst_vpx_enc_multipass_mode_get_type (void)
-     {VPX_RC_LAST_PASS, "Last pass of multipass encoding", "last-pass"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -210,7 +210,7 @@ gst_vpx_enc_kf_mode_get_type (void)
-     {VPX_KF_DISABLED, "Don't automatically place keyframes", "disabled"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -232,7 +232,7 @@ gst_vpx_enc_tuning_get_type (void)
-     {VP8_TUNE_SSIM, "Tune for SSIM", "ssim"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -256,7 +256,7 @@ gst_vpx_enc_scaling_mode_get_type (void)
-     {VP8E_ONETWO, "1:2", "1:2"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -280,7 +280,7 @@ gst_vpx_enc_token_partitions_get_type (void)
-     {VP8_EIGHT_TOKENPARTITION, "Eight token partitions", "8"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-@@ -303,7 +303,7 @@ gst_vpx_enc_er_flags_get_type (void)
-         "Allow partitions to be decoded independently", "partitions"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;

-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-diff --git a/gst/audioparsers/gstac3parse.h b/gst/audioparsers/gstac3parse.h
-index 0e7af5acd..81e2104d5 100644
---- a/gst/audioparsers/gstac3parse.h
-+++ b/gst/audioparsers/gstac3parse.h
-@@ -62,7 +62,7 @@ struct _GstAc3Parse {
-   gint                  blocks;
-   gboolean              eac;
-   gboolean              sent_codec_tag;
--  volatile gint         align;
-+  gint                  align;
-   GstPadChainFunction   baseparse_chainfunc;
- };

-diff --git a/sys/rpicamsrc/gstrpicamsrc.c b/sys/rpicamsrc/gstrpicamsrc.c
-index a148d4106..f719acb4c 100644
---- a/sys/rpicamsrc/gstrpicamsrc.c
-+++ b/sys/rpicamsrc/gstrpicamsrc.c
-@@ -292,7 +292,7 @@ gst_rpi_cam_src_sensor_mode_get_type (void)
-         "640x480 4:3 60.1-90fps", "640x480-fast"},
-     {0, NULL, NULL}
-   };
--  static volatile GType id = 0;
-+  static GType id = 0;
-   if (g_once_init_enter ((gsize *) & id)) {
-     GType _id;
-     _id = g_enum_register_static ("GstRpiCamSrcSensorMode", values);
-diff --git a/sys/ximage/ximageutil.c b/sys/ximage/ximageutil.c
-index 57c9392c7..018b60515 100644
---- a/sys/ximage/ximageutil.c
-+++ b/sys/ximage/ximageutil.c
-@@ -26,7 +26,7 @@
- GType
- gst_meta_ximage_api_get_type (void)
- {
--  static volatile GType type;
-+  static GType type;
-   static const gchar *tags[] = { "memory", NULL };

-   if (g_once_init_enter (&type)) {
--- 
-2.31.1
-
</del></span></pre>
</div>
</div>

</body>
</html>