Hello community,
here is the log from the commit of package gstreamer-plugins-bad for
openSUSE:Factory checked in at 2019-07-29 17:24:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-bad (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-bad"
Mon Jul 29 17:24:46 2019 rev:92 rq:717658 version:1.16.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/gstreamer-plugins-bad/gstreamer-plugins-bad.changes
2019-07-13 14:00:22.986898263 +0200
+++
/work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new.4126/gstreamer-plugins-bad.changes
2019-07-29 17:24:47.742337651 +0200
@@ -1,0 +2,31 @@
+Mon Jul 22 07:26:09 UTC 2019 - Martin Liška <[email protected]>
+
+- Update fix-Werror=return-type.patch to upstream version.
+
+-------------------------------------------------------------------
+Wed Jul 17 01:49:58 UTC 2019 - Rich Coe <[email protected]>
+
+- Add gst-plugins-bad-do-not-retry-downloads-during-shutdown.patch for hang
(bwo#197558)
+
+-------------------------------------------------------------------
+Mon Jul 15 16:09:54 UTC 2019 - Bjørn Lie <[email protected]>
+
+- Drop pkgconfig(vdpau) BuildRequires and libgstvdpau sub-package.
+ Obsolete it from the main gstreamer-plugins-bad package. Upstream
+ have now dropped the package from master, and currently it only
+ supports mpeg2 and poorly even that one. It will not make a
+ comeback, so obsolete all versions.
+
+-------------------------------------------------------------------
+Mon Jul 15 14:46:20 UTC 2019 - Bjørn Lie <[email protected]>
+
+- Add gst-bad-Fix-compilation-with-openh264-v2.0.patch: Fix build
+ with openh264 version 2.0 and newer.
+
+-------------------------------------------------------------------
+Mon Jul 15 11:15:14 UTC 2019 - Martin Liška <[email protected]>
+
+- Fix -Werror=return-type error in configure script
+ (fix-Werror=return-type.patch).
+
+-------------------------------------------------------------------
New:
----
fix-Werror=return-type.patch
gst-bad-Fix-compilation-with-openh264-v2.0.patch
gst-plugins-bad-do-not-retry-downloads-during-shutdown.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-bad.spec ++++++
--- /var/tmp/diff_new_pack.hPJj5z/_old 2019-07-29 17:24:48.490337375 +0200
+++ /var/tmp/diff_new_pack.hPJj5z/_new 2019-07-29 17:24:48.494337373 +0200
@@ -38,8 +38,13 @@
Source:
https://gstreamer.freedesktop.org/src/gst-plugins-bad/%{_name}-%{version}.tar.xz
Source2: gstreamer-plugins-bad.appdata.xml
Source99: baselibs.conf
+
# PATCH-FIX-OPENSUSE gst-bad-revert-automake-autoconf-versions.patch
[email protected] -- Revert the autoconf and automake version bump
Patch1: gst-bad-revert-automake-autoconf-versions.patch
+Patch2: fix-Werror=return-type.patch
+# PATCH-FIX-UPSTREAM gst-bad-Fix-compilation-with-openh264-v2.0.patch -- Fix
build with openh264 version 2.0 and newer
+Patch3: gst-bad-Fix-compilation-with-openh264-v2.0.patch
+Patch4: gst-plugins-bad-do-not-retry-downloads-during-shutdown.patch
BuildRequires: Mesa-libGLESv3-devel
BuildRequires: fdupes
@@ -112,7 +117,6 @@
BuildRequires: pkgconfig(soundtouch)
BuildRequires: pkgconfig(spandsp) >= 0.0.6
BuildRequires: pkgconfig(srt)
-BuildRequires: pkgconfig(vdpau)
BuildRequires: pkgconfig(webrtc-audio-processing) >= 0.2
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb) >= 1.10
@@ -181,6 +185,7 @@
BuildRequires: pkgconfig(vo-amrwbenc) >= 0.1.0
BuildRequires: pkgconfig(x265)
%endif
+Obsoletes: libgstvdpau >= %{version}
%if 0%{?BUILD_ORIG}
%if 0%{?BUILD_ORIG_ADDON}
Provides: patched_subset
@@ -356,17 +361,6 @@
videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new plug-ins.
-%package -n libgstvdpau
-Summary: GStreamer Streaming-Media Framework Plug-Ins
-Group: System/Libraries
-
-%description -n libgstvdpau
-GStreamer is a streaming media framework based on graphs of filters
-that operate on media data. Applications using this library can do
-anything media-related,from real-time sound processing to playing
-videos. Its plug-in-based architecture means that new data types or
-processing capabilities can be added simply by installing new plug-ins.
-
%package devel
Summary: GStreamer Streaming-Media Framework Plug-Ins
Group: Development/Libraries/C and C++
@@ -475,7 +469,7 @@
%lang_package
%prep
-%autosetup -n %{_name}-%{version} -p1
+%autosetup -p1 -n %{_name}-%{version}
%build
export PYTHON=%{_bindir}/python3
@@ -798,9 +792,6 @@
%files -n libgstwebrtc-1_0-0
%{_libdir}/libgstwebrtc-%{gst_branch}.so.0*
-%files -n libgstvdpau
-%{_libdir}/gstreamer-%{gst_branch}/libgstvdpau.so
-
%if 0%{?suse_version} >= 1500
%files -n libgstwayland-1_0-0
%{_libdir}/libgstwayland-1.0.so.*
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.hPJj5z/_old 2019-07-29 17:24:48.542337355 +0200
+++ /var/tmp/diff_new_pack.hPJj5z/_new 2019-07-29 17:24:48.542337355 +0200
@@ -13,6 +13,5 @@
libgstplayer-1_0-0
libgstsctp-1_0-0
libgsturidownloader-1_0-0
-libgstvdpau
libgstwayland-1_0-0
libgstwebrtc-1_0-0
++++++ fix-Werror=return-type.patch ++++++
>From feb93b516fb9a1547c652972e5ebc5fc7b538e06 Mon Sep 17 00:00:00 2001
From: Martin Liska <[email protected]>
Date: Mon, 15 Jul 2019 16:05:05 +0200
Subject: [PATCH] Fix -Werror=return-type error in configure.
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 988242835..16f3fd6d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1655,9 +1655,9 @@ main (int argc,
TestOutputStream () : OutputStream () { }
void Write (uint8_t *a, unsigned int b) { }
void NextSegment () { }
- uint64_t SegmentSize () { }
+ uint64_t SegmentSize () { return 0; }
void Close () { }
- int Open () { }
+ int Open () { return 0; }
};
MultiplexJob *job = new MultiplexJob ();
vector<IBitStream *> inputs;
--
2.22.0
++++++ gst-bad-Fix-compilation-with-openh264-v2.0.patch ++++++
>From d2f6facbfb89f13a891e710b44e1561570de006a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
<[email protected]>
Date: Wed, 8 May 2019 13:35:25 +0200
Subject: [PATCH] openh264enc: Fix compilation with openh264 v2.0
As OpenH264 increased its version to 2.0 the guard for structure
member is not valid.
This patch will fix the compilation with gst-build and openh264.
---
ext/openh264/gstopenh264enc.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/openh264/gstopenh264enc.cpp b/ext/openh264/gstopenh264enc.cpp
index aa8138d7d..11be2a5b6 100644
--- a/ext/openh264/gstopenh264enc.cpp
+++ b/ext/openh264/gstopenh264enc.cpp
@@ -739,7 +739,7 @@ gst_openh264enc_set_format (GstVideoEncoder * encoder,
enc_params.bEnableSceneChangeDetect = openh264enc->scene_change_detection;
enc_params.bEnableFrameSkip = openh264enc->enable_frame_skip;
enc_params.bEnableLongTermReference = 0;
-#if OPENH264_MINOR >= 4
+#if (OPENH264_MAJOR > 1 || (OPENH264_MAJOR == 1 && OPENH264_MINOR >= 4))
enc_params.eSpsPpsIdStrategy = CONSTANT_ID;
#else
enc_params.bEnableSpsPpsIdAddition = 0;
--
2.21.0
++++++ gst-plugins-bad-do-not-retry-downloads-during-shutdown.patch ++++++
>From 4c21593e5fcd1337b433119b8c7800dc5565f514 Mon Sep 17 00:00:00 2001
From: Charlie Turner <[email protected]>
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
