Diff
Modified: trunk/Tools/ChangeLog (250770 => 250771)
--- trunk/Tools/ChangeLog 2019-10-07 02:30:41 UTC (rev 250770)
+++ trunk/Tools/ChangeLog 2019-10-07 08:53:00 UTC (rev 250771)
@@ -1,3 +1,16 @@
+2019-10-07 Philippe Normand <pnorm...@igalia.com>
+
+ [GStreamer][JHBuild] Update to 1.16.1
+ https://bugs.webkit.org/show_bug.cgi?id=202619
+
+ Reviewed by Žan Doberšek.
+
+ * flatpak/org.webkit.CommonModules.yaml:
+ * gstreamer/jhbuild.modules:
+ * gstreamer/patches/gst-plugins-bad-do-not-retry-downloads-during-shutdown.patch: Removed.
+ * gstreamer/patches/gst-plugins-good-glibc-2.30-compat.patch: Removed.
+ * gstreamer/patches/gst-plugins-good-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch: Removed.
+
2019-10-04 Saam Barati <sbar...@apple.com>
Allow OSR exit to the LLInt
Modified: trunk/Tools/flatpak/org.webkit.CommonModules.yaml (250770 => 250771)
--- trunk/Tools/flatpak/org.webkit.CommonModules.yaml 2019-10-07 02:30:41 UTC (rev 250770)
+++ trunk/Tools/flatpak/org.webkit.CommonModules.yaml 2019-10-07 08:53:00 UTC (rev 250771)
@@ -133,7 +133,7 @@
sources:
- type: git
url: https://gitlab.freedesktop.org/gstreamer/gstreamer.git
- branch: 1.16.0
+ branch: 1.16.1
config-opts:
- -Dgtk_doc=disabled
- -Dintrospection=disabled
@@ -144,7 +144,11 @@
sources:
- type: git
url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base.git
- branch: 1.16.0
+ branch: 1.16.1
+ - type: patch
+ path: ../gstreamer/patches/base-0001-playbin-Handle-error-message-with-redirection-indica.patch
+ - type: patch
+ path: ../gstreamer/patches/base-0001-glupload-Add-VideoMetas-and-GLSyncMeta-to-the-raw-up.patch
config-opts:
- -Dgtk_doc=disabled
- -Dintrospection=disabled
@@ -155,9 +159,9 @@
sources:
- type: git
url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-good.git
- branch: 1.16.0
+ branch: 1.16.1
- type: patch
- path: ../gstreamer/patches/gst-plugins-good-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch
+ path: ../gstreamer/patches/good-0001-qtdemux-Specify-REDIRECT-information-in-error-messag.patch
config-opts:
- -Dgtk_doc=disabled
- -Dintrospection=disabled
@@ -187,7 +191,9 @@
sources:
- type: git
url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad.git
- branch: 1.16.0
+ branch: 1.16.1
+ - type: patch
+ path: ../gstreamer/patches/gst-plugins-bad-0001-h264parse-Post-a-WARNING-when-data-is-broken.patch
config-opts:
- -Dgtk_doc=disabled
- -Dintrospection=disabled
@@ -241,8 +247,8 @@
builddir: true
sources:
- type: archive
- url: https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.0.tar.xz
- sha256: dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a
+ url: https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.16.1.tar.xz
+ sha256: e8a5748ae9a4a7be9696512182ea9ffa6efe0be9b7976916548e9d4381ca61c4
config-opts:
- -Dgtk_doc=disabled
Modified: trunk/Tools/gstreamer/jhbuild.modules (250770 => 250771)
--- trunk/Tools/gstreamer/jhbuild.modules 2019-10-07 02:30:41 UTC (rev 250770)
+++ trunk/Tools/gstreamer/jhbuild.modules 2019-10-07 08:53:00 UTC (rev 250771)
@@ -26,9 +26,9 @@
<repository type="tarball" name="ffmpeg" href=""
<meson id="orc" mesonargs="-Dgtk_doc=disabled">
- <branch module="orc/orc-${version}.tar.xz" version="0.4.29"
+ <branch module="orc/orc-${version}.tar.xz" version="0.4.30"
repo="gstreamer"
- hash="sha256:4f8901f9144b5ec17dffdb33548b5f4c7f8049b0d1023be3462cdd64ec5a3ab2"/>
+ hash="sha256:ba41b92146a5691cd102eb79c026757d39e9d3b81a65810d2946a1786a1c4972"/>
</meson>
<autotools id="openh264" supports-non-srcdir-builds="no" autogen-sh="pseudo-configure">
@@ -57,7 +57,7 @@
<dependencies>
<dep package="orc"/>
</dependencies>
- <branch hash="sha256:0e8e2f7118be437cba879353970cf83c2acced825ecb9275ba05d9186ef07c00" module="gstreamer/gstreamer-${version}.tar.xz" repo="gstreamer" version="1.16.0">
+ <branch hash="sha256:02211c3447c4daa55919c5c0f43a82a6fbb51740d57fc3af0639d46f1cf4377d" module="gstreamer/gstreamer-${version}.tar.xz" repo="gstreamer" version="1.16.1">
</branch>
</meson>
@@ -68,7 +68,7 @@
<dependencies>
<dep package="gstreamer"/>
</dependencies>
- <branch hash="sha256:4093aa7b51e28fb24dfd603893fead8d1b7782f088b05ed0f22a21ef176fb5ae" module="gst-plugins-base/gst-plugins-base-${version}.tar.xz" repo="gstreamer" version="1.16.0" >
+ <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 -->
</branch>
@@ -80,9 +80,7 @@
<dep package="libvpx"/>
</dependencies>
- <branch hash="sha256:654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd" module="gst-plugins-good/gst-plugins-good-${version}.tar.xz" repo="gstreamer" version="1.16.0">
- <patch file="gst-plugins-good-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch" strip="1"/> <!-- Merged upstream, should be shipped in 1.16.1 -->
- <patch file="gst-plugins-good-glibc-2.30-compat.patch" strip="1"/> <!-- Merged upstream, should be shipped in 1.16.1 -->
+ <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 -->
</branch>
</meson>
@@ -95,8 +93,7 @@
<dep package="aom"/>
<dep package="libsrtp"/>
</dependencies>
- <branch hash="sha256:22139de35626ada6090bdfa3423b27b7fc15a0198331d25c95e6b12cb1072b05" module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" repo="gstreamer" version="1.16.0">
- <patch file="gst-plugins-bad-do-not-retry-downloads-during-shutdown.patch" strip="1"/> <!-- Merged, discussing backporting: https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/427 -->
+ <branch hash="sha256:56481c95339b8985af13bac19b18bc8da7118c2a7d9440ed70e7dcd799c2adb5" module="gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" repo="gstreamer" version="1.16.1">
<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-->
</branch>
</meson>
@@ -110,11 +107,11 @@
<dep package="gst-plugins-base"/>
<dep package="ffmpeg"/>
</dependencies>
- <branch hash="sha256:dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a" module="gst-libav/gst-libav-${version}.tar.xz" repo="gstreamer" version="1.16.0" />
+ <branch hash="sha256:e8a5748ae9a4a7be9696512182ea9ffa6efe0be9b7976916548e9d4381ca61c4" module="gst-libav/gst-libav-${version}.tar.xz" repo="gstreamer" version="1.16.1" />
</meson>
<meson id="gstreamer-vaapi" mesonargs="-Dgtk_doc=disabled -Dexamples=disabled">
- <branch hash="sha256:4e7fce626ee0590dca74b5a8341d25bac76307945131a970b414fc5895f5171f" module="gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" repo="gstreamer" version="1.16.0" />
+ <branch hash="sha256:cb570f6f1e78cb364fbe3c4fb8751824ee9db0c942ba61b62380b9b5abb7603a" module="gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" repo="gstreamer" version="1.16.1" />
<dependencies>
<dep package="gstreamer"/>
<dep package="gst-plugins-base"/>
Deleted: trunk/Tools/gstreamer/patches/gst-plugins-bad-do-not-retry-downloads-during-shutdown.patch (250770 => 250771)
--- trunk/Tools/gstreamer/patches/gst-plugins-bad-do-not-retry-downloads-during-shutdown.patch 2019-10-07 02:30:41 UTC (rev 250770)
+++ trunk/Tools/gstreamer/patches/gst-plugins-bad-do-not-retry-downloads-during-shutdown.patch 2019-10-07 08:53:00 UTC (rev 250771)
@@ -1,89 +0,0 @@
-From 4c21593e5fcd1337b433119b8c7800dc5565f514 Mon Sep 17 00:00:00 2001
-From: Charlie Turner <ctur...@igalia.com>
-Date: Tue, 2 Jul 2019 12:27:40 +0100
-Subject: [PATCH] WIP: adaptivedemux: do not retry downloads during shutdown.
-
----
- ext/hls/gsthlsdemux.c | 15 +++++++++++++--
- ext/hls/gsthlsdemux.h | 4 ++++
- 2 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c
-index 4317d65c3..f9583ad1a 100644
---- a/ext/hls/gsthlsdemux.c
-+++ b/ext/hls/gsthlsdemux.c
-@@ -73,6 +73,7 @@ static gboolean gst_hls_demux_update_playlist (GstHLSDemux * demux,
- gboolean update, GError ** err);
- static gchar *gst_hls_src_buf_to_utf8_playlist (GstBuffer * buf);
-
-+/* FIXME: the return value is never used? */
- static gboolean gst_hls_demux_change_playlist (GstHLSDemux * demux,
- guint max_bitrate, gboolean * changed);
- static GstBuffer *gst_hls_demux_decrypt_fragment (GstHLSDemux * demux,
-@@ -193,6 +194,8 @@ gst_hls_demux_init (GstHLSDemux * demux)
-
- demux->keys = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
- g_mutex_init (&demux->keys_lock);
-+
-+ demux->cancelling_downloads = FALSE;
- }
-
- static GstStateChangeReturn
-@@ -205,6 +208,11 @@ gst_hls_demux_change_state (GstElement * element, GstStateChange transition)
- case GST_STATE_CHANGE_READY_TO_PAUSED:
- gst_hls_demux_reset (GST_ADAPTIVE_DEMUX_CAST (demux));
- break;
-+ case GST_STATE_CHANGE_PAUSED_TO_READY:
-+ GST_DEBUG_OBJECT (demux, "PAUSED->READY cancelling downloads");
-+ demux->cancelling_downloads = TRUE;
-+ gst_uri_downloader_cancel (GST_ADAPTIVE_DEMUX (demux)->downloader);
-+ break;
- default:
- break;
- }
-@@ -1158,6 +1166,8 @@ gst_hls_demux_reset (GstAdaptiveDemux * ademux)
- {
- GstHLSDemux *demux = GST_HLS_DEMUX_CAST (ademux);
-
-+ GST_DEBUG_OBJECT (demux, "resetting");
-+
- GST_M3U8_CLIENT_LOCK (hlsdemux->client);
- if (demux->master) {
- gst_hls_master_playlist_unref (demux->master);
-@@ -1379,7 +1389,8 @@ retry:
- if (download == NULL) {
- gchar *base_uri;
-
-- if (!update || main_checked || demux->master->is_simple) {
-+ if (!update || main_checked || demux->master->is_simple
-+ || demux->cancelling_downloads) {
- g_free (uri);
- return FALSE;
- }
-@@ -1612,7 +1623,7 @@ retry_failover_protection:
- if (changed)
- *changed = TRUE;
- stream->discont = TRUE;
-- } else {
-+ } else if (!demux->cancelling_downloads) {
- GstHLSVariantStream *failover_variant = NULL;
- GList *failover;
-
-diff --git a/ext/hls/gsthlsdemux.h b/ext/hls/gsthlsdemux.h
-index 0cab19627..9c0decabf 100644
---- a/ext/hls/gsthlsdemux.h
-+++ b/ext/hls/gsthlsdemux.h
-@@ -147,6 +147,10 @@ struct _GstHLSDemux
- GstHLSMasterPlaylist *master;
-
- GstHLSVariantStream *current_variant;
-+
-+ /* Set when the parent is state-changing down from PAUSED to avoid
-+ making further network requests. */
-+ gboolean cancelling_downloads;
- };
-
- struct _GstHLSDemuxClass
---
-2.17.1
-
Deleted: trunk/Tools/gstreamer/patches/gst-plugins-good-glibc-2.30-compat.patch (250770 => 250771)
--- trunk/Tools/gstreamer/patches/gst-plugins-good-glibc-2.30-compat.patch 2019-10-07 02:30:41 UTC (rev 250770)
+++ trunk/Tools/gstreamer/patches/gst-plugins-good-glibc-2.30-compat.patch 2019-10-07 08:53:00 UTC (rev 250771)
@@ -1,51 +0,0 @@
-From 45b6514f33b280842a381e700acc08a17cb9893c Mon Sep 17 00:00:00 2001
-From: Nicolas Dufresne <nicolas.dufre...@collabora.com>
-Date: Tue, 6 Aug 2019 22:27:40 -0400
-Subject: [PATCH] v4l2: Fix type compatibility issue with glibc 2.30
-
-From now on, we will use linux/types.h on Linux, and use typedef of the
-various flavour of BSD.
-
-Fixes #635
----
- sys/v4l2/ext/types-compat.h | 21 ++++++++++++++-------
- 1 file changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/sys/v4l2/ext/types-compat.h b/sys/v4l2/ext/types-compat.h
-index d3673dd49..ea21c9513 100644
---- a/sys/v4l2/ext/types-compat.h
-+++ b/sys/v4l2/ext/types-compat.h
-@@ -24,6 +24,11 @@
- #ifndef __TYPES_COMPAT_H__
- #define __TYPES_COMPAT_H__
-
-+#ifdef __linux__
-+#include <linux/types.h>
-+#include <asm/ioctl.h>
-+
-+#else /* One of the BSDs */
- /* From linux/types.h */
- #ifndef __bitwise__
- # ifdef __CHECKER__
-@@ -41,12 +46,14 @@
- # endif
- #endif
-
--#define __u64 guint64
--#define __u32 guint32
--#define __u16 guint16
--#define __u8 guint8
--#define __s64 gint64
--#define __s32 gint32
--#define __le32 guint32 __bitwise
-+typedef guint8 __u8;
-+typedef guint16 __u16;
-+typedef gint32 __s32;
-+typedef guint32 __u32;
-+typedef gint64 __s64;
-+typedef guint64 __u64;
-+typedef guint32 __bitwise __le32;
-+
-+#endif
-
- #endif /* __TYPES_COMPAT_H__ */
Deleted: trunk/Tools/gstreamer/patches/gst-plugins-good-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch (250770 => 250771)
--- trunk/Tools/gstreamer/patches/gst-plugins-good-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch 2019-10-07 02:30:41 UTC (rev 250770)
+++ trunk/Tools/gstreamer/patches/gst-plugins-good-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch 2019-10-07 08:53:00 UTC (rev 250771)
@@ -1,36 +0,0 @@
-From 7be2aa6f42d89ee784d5bef1c27387bda71f2cc7 Mon Sep 17 00:00:00 2001
-From: Philippe Normand <ph...@igalia.com>
-Date: Tue, 23 Apr 2019 10:10:01 +0100
-Subject: [PATCH] scaletempo: Advertise interleaved layout in caps templates
-
-Scaletempo doesn't support non-interleaved layout. Not explicitely stating this
-would trigger critical warnings and a caps negotiation failure when scaletempo
-is used as playbin audio-filter.
-
-Patch suggested by George Kiagiadakis <george.kiagiada...@collabora.com>.
-
-https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/591
----
- gst/audiofx/gstscaletempo.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gst/audiofx/gstscaletempo.c b/gst/audiofx/gstscaletempo.c
-index 3a719719a..83ee8fe24 100644
---- a/gst/audiofx/gstscaletempo.c
-+++ b/gst/audiofx/gstscaletempo.c
-@@ -93,9 +93,9 @@ enum
-
- #define SUPPORTED_CAPS \
- GST_STATIC_CAPS ( \
-- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) "; " \
-- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) "; " \
-- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) \
-+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) ", layout=(string)interleaved; " \
-+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) ", layout=(string)interleaved; " \
-+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) ", layout=(string)interleaved" \
- )
-
- static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
---
-2.20.1
-
