<!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>[260442] trunk/Tools</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/260442">260442</a></dd>
<dt>Author</dt> <dd>lmoura@igalia.com</dd>
<dt>Date</dt> <dd>2020-04-21 10:50:56 -0700 (Tue, 21 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GStreamer][JHBuild] Update to 1.16.2
https://bugs.webkit.org/show_bug.cgi?id=210730

Reviewed by Philippe Normand.

Moving the bots closer to the flatpak SDK versions.

* gstreamer/jhbuild.modules:
* gstreamer/patches/base-0001-glupload-Add-VideoMetas-and-GLSyncMeta-to-the-raw-up.patch: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgstreamerjhbuildmodules">trunk/Tools/gstreamer/jhbuild.modules</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsgstreamerpatchesbase0001gluploadAddVideoMetasandGLSyncMetatotherawuppatch">trunk/Tools/gstreamer/patches/base-0001-glupload-Add-VideoMetas-and-GLSyncMeta-to-the-raw-up.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (260441 => 260442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2020-04-21 17:48:03 UTC (rev 260441)
+++ trunk/Tools/ChangeLog       2020-04-21 17:50:56 UTC (rev 260442)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2020-04-21  Lauro Moura  <lmoura@igalia.com>
+
+        [GStreamer][JHBuild] Update to 1.16.2
+        https://bugs.webkit.org/show_bug.cgi?id=210730
+
+        Reviewed by Philippe Normand.
+
+        Moving the bots closer to the flatpak SDK versions.
+
+        * gstreamer/jhbuild.modules:
+        * gstreamer/patches/base-0001-glupload-Add-VideoMetas-and-GLSyncMeta-to-the-raw-up.patch: Removed.
+
</ins><span class="cx"> 2020-04-21  Alexey Proskuryakov  <ap@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Correct the path to libclang_rt.asan_iossim_dynamic.dylib in LC_RPATH
</span></span></pre></div>
<a id="trunkToolsgstreamerjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gstreamer/jhbuild.modules (260441 => 260442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gstreamer/jhbuild.modules    2020-04-21 17:48:03 UTC (rev 260441)
+++ trunk/Tools/gstreamer/jhbuild.modules       2020-04-21 17:50:56 UTC (rev 260442)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">     <dependencies>
</span><span class="cx">       <dep package="orc"/>
</span><span class="cx">     </dependencies>
</span><del>-    <branch hash="sha256:02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" module="gstreamer/gstreamer-${version}.tar.xz" repo="gstreamer" version="1.16.1">
</del><ins>+    <branch hash="sha256:e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e" module="gstreamer/gstreamer-${version}.tar.xz" repo="gstreamer" version="1.16.2">
</ins><span class="cx">     </branch>
</span><span class="cx">   </meson>
</span><span class="cx"> 
</span><span class="lines">@@ -63,9 +63,8 @@
</span><span class="cx">     <dependencies>
</span><span class="cx">       <dep package="gstreamer"/>
</span><span class="cx">     </dependencies>
</span><del>-    <branch hash="sha256:5c3cc489933d0597087c9bc6ba251c93693d64554bcc563539a084fa2d5fcb2b" module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" repo="gstreamer" version="1.16.1">
-      <patch file="base-0001-playbin-Handle-error-message-with-redirection-indica.patch" strip="1"/>
-      <patch file="base-0001-glupload-Add-VideoMetas-and-GLSyncMeta-to-the-raw-up.patch" strip="1"/> <!-- Merged upstream, should be shipped in 1.16.2 -->
</del><ins>+    <branch hash="sha256:b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a" module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" repo="gstreamer" version="1.16.2">
+      <patch file="base-0001-playbin-Handle-error-message-with-redirection-indica.patch" strip="1"/> <!-- Merged upstream, should be shipped in 1.16.3 -->
</ins><span class="cx">     </branch>
</span><span class="cx">   </meson>
</span><span class="cx"> 
</span><span class="lines">@@ -74,8 +73,8 @@
</span><span class="cx">       <dep package="gst-plugins-base"/>
</span><span class="cx">     </dependencies>
</span><span class="cx"> 
</span><del>-    <branch hash="sha256:9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f" module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" repo="gstreamer" version="1.16.1">
-      <patch file="good-0001-qtdemux-Specify-REDIRECT-information-in-error-messag.patch" strip="1"/> <!-- Merged upstream, should be shipped in 1.16.2 -->
</del><ins>+    <branch hash="sha256:40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319" module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" repo="gstreamer" version="1.16.2">
+      <patch file="good-0001-qtdemux-Specify-REDIRECT-information-in-error-messag.patch" strip="1"/> <!-- Merged upstream, should be shipped in 1.16.3 -->
</ins><span class="cx">     </branch>
</span><span class="cx">   </meson>
</span><span class="cx"> 
</span><span class="lines">@@ -87,7 +86,7 @@
</span><span class="cx">       <dep package="aom"/>
</span><span class="cx">       <dep package="libsrtp"/>
</span><span class="cx">     </dependencies>
</span><del>-    <branch hash="sha256:56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" repo="gstreamer" version="1.16.1">
</del><ins>+    <branch hash="sha256:f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74" module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" repo="gstreamer" version="1.16.2">
</ins><span class="cx">       <patch file="gst-plugins-bad-0001-h264parse-Post-a-WARNING-when-data-is-broken.patch" strip="1"/> <!-- Merged, discussing backporting https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/386-->
</span><span class="cx">     </branch>
</span><span class="cx">   </meson>
</span><span class="lines">@@ -101,13 +100,13 @@
</span><span class="cx">       <dep package="gst-plugins-base"/>
</span><span class="cx">       <dep package="ffmpeg"/>
</span><span class="cx">     </dependencies>
</span><del>-    <branch hash="sha256:e8a5748ae9a4a7be9696512182ea9ffa6efe0be9b7976916548e9d4381ca61c4" module="gst-libav/gst-libav-${version}.tar.xz" repo="gstreamer" version="1.16.1">
</del><ins>+    <branch hash="sha256:c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2" module="gst-libav/gst-libav-${version}.tar.xz" repo="gstreamer" version="1.16.2">
</ins><span class="cx">       <patch file="libav-0001-gstavviddec-Limit-default-number-of-decoder-threads.patch" strip="1"/> <!-- Merged, should be shipped in 1.16.3 https://gitlab.freedesktop.org/gstreamer/gst-libav/merge_requests/56 -->
</span><span class="cx">     </branch>
</span><span class="cx">   </meson>
</span><span class="cx"> 
</span><span class="cx">   <meson id="gstreamer-vaapi" mesonargs="-Dgtk_doc=disabled -Dexamples=disabled">
</span><del>-    <branch hash="sha256:cb570f6f1e78cb364fbe3c4fb8751824ee9db0c942ba61b62380b9b5abb7603a" module="gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" repo="gstreamer" version="1.16.1" />
</del><ins>+    <branch hash="sha256:191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601" module="gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" repo="gstreamer" version="1.16.2" />
</ins><span class="cx">     <dependencies>
</span><span class="cx">       <dep package="gstreamer"/>
</span><span class="cx">       <dep package="gst-plugins-base"/>
</span></span></pre></div>
<a id="trunkToolsgstreamerpatchesbase0001gluploadAddVideoMetasandGLSyncMetatotherawuppatch"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/gstreamer/patches/base-0001-glupload-Add-VideoMetas-and-GLSyncMeta-to-the-raw-up.patch (260441 => 260442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gstreamer/patches/base-0001-glupload-Add-VideoMetas-and-GLSyncMeta-to-the-raw-up.patch       2020-04-21 17:48:03 UTC (rev 260441)
+++ trunk/Tools/gstreamer/patches/base-0001-glupload-Add-VideoMetas-and-GLSyncMeta-to-the-raw-up.patch  2020-04-21 17:50:56 UTC (rev 260442)
</span><span class="lines">@@ -1,82 +0,0 @@
</span><del>-From 7c30b4ac59a9cb69221a86f2f0723f5fdf035b2a Mon Sep 17 00:00:00 2001
-From: Thibault Saunier <tsaunier@igalia.com>
-Date: Fri, 27 Sep 2019 11:10:43 -0300
-Subject: [PATCH] glupload: Add VideoMetas and GLSyncMeta to the raw uploaded
- buffers
-
-This is done by reusing `gst_gl_memory_setup_buffer` avoiding to
-duplicate code.
-
-Without a VideoMeta, mapping those buffers lead to GstBuffer mapping the
-buffer in system memory even when specifying the GL flags (through the
-buffer merging mechanism) making the result totally broken.
----
- gst-libs/gst/gl/gstglupload.c  | 32 +++++++++++---------------------
- tests/check/libs/gstglupload.c |  2 ++
- 2 files changed, 13 insertions(+), 21 deletions(-)
-
-diff --git a/gst-libs/gst/gl/gstglupload.c b/gst-libs/gst/gl/gstglupload.c
-index bc6db7e0a..67ec4f4e9 100644
---- a/gst-libs/gst/gl/gstglupload.c
-+++ b/gst-libs/gst/gl/gstglupload.c
-@@ -1293,33 +1293,23 @@ _raw_data_upload_perform (gpointer impl, GstBuffer * buffer,
-       (raw->upload->context));

-   /* FIXME Use a buffer pool to cache the generated textures */
--  /* FIXME: multiview support with separated left/right frames? */
-   *outbuf = gst_buffer_new ();
--  for (i = 0; i < n_mem; i++) {
--    GstGLBaseMemory *tex;
--
--    raw->params->parent.wrapped_data = raw->in_frame->frame.data[i];
--    raw->params->plane = i;
--    raw->params->tex_format =
--        gst_gl_format_from_video_info (raw->upload->context, in_info, i);
--
--    tex =
--        gst_gl_base_memory_alloc (allocator,
--        (GstGLAllocationParams *) raw->params);
--    if (!tex) {
--      gst_buffer_unref (*outbuf);
--      *outbuf = NULL;
--      GST_ERROR_OBJECT (raw->upload, "Failed to allocate wrapped texture");
--      return GST_GL_UPLOAD_ERROR;
--    }
-+  raw->params->parent.context = raw->upload->context;
-+  if (gst_gl_memory_setup_buffer ((GstGLMemoryAllocator *) allocator, *outbuf,
-+          raw->params, NULL, raw->in_frame->frame.data, n_mem)) {

--    _raw_upload_frame_ref (raw->in_frame);
--    gst_buffer_append_memory (*outbuf, (GstMemory *) tex);
-+    for (i = 0; i < n_mem; i++)
-+      _raw_upload_frame_ref (raw->in_frame);
-+    gst_buffer_add_gl_sync_meta (raw->upload->context, *outbuf);
-+  } else {
-+    GST_ERROR_OBJECT (raw->upload, "Failed to allocate wrapped texture");
-+    gst_buffer_unref (*outbuf);
-+    return GST_GL_UPLOAD_ERROR;
-   }
-   gst_object_unref (allocator);
--
-   _raw_upload_frame_unref (raw->in_frame);
-   raw->in_frame = NULL;
-+
-   return GST_GL_UPLOAD_DONE;
- }

-diff --git a/tests/check/libs/gstglupload.c b/tests/check/libs/gstglupload.c
-index 74bff2b83..eff2f18ba 100644
---- a/tests/check/libs/gstglupload.c
-+++ b/tests/check/libs/gstglupload.c
-@@ -281,6 +281,8 @@ GST_START_TEST (test_upload_data)
-   res = gst_gl_upload_perform_with_buffer (upload, inbuf, &outbuf);
-   fail_unless (res == GST_GL_UPLOAD_DONE, "Failed to upload buffer");
-   fail_unless (GST_IS_BUFFER (outbuf));
-+  fail_unless (gst_buffer_get_video_meta (outbuf));
-+  fail_unless (gst_buffer_get_gl_sync_meta (outbuf));

-   res = gst_buffer_map (outbuf, &map_info, GST_MAP_READ | GST_MAP_GL);
-   fail_if (res == FALSE, "Failed to map gl memory");
--- 
-2.21.0
-
</del></span></pre>
</div>
</div>

</body>
</html>