[rpm] Drop unnecessary patch. Fixes JB#37201

rpm/0003-Supply-source-uri-to-gstreamer-pipeline.patch → rpm/0001-Supply-source-uri-to-gstreamer-pipeline.patch

@@ -1,34 +1,26 @@
-From 648ae6d7ff8557b7973d30e679085ae64fa8d584 Mon Sep 17 00:00:00 2001
+From 18fcd34edd565be0a0b59e7191481e1c96d22471 Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:10:46 +0300
-Subject: [PATCH 03/18] Supply source uri to gstreamer pipeline
+Subject: [PATCH 01/11] Supply source uri to gstreamer pipeline
 
 See bug JB19511
 
 Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
 ---
- dom/media/gstreamer/GStreamerFormatHelper.cpp      | 11 ++++-
+ dom/media/gstreamer/GStreamerFormatHelper.cpp      |  9 +++-
  dom/media/gstreamer/GStreamerFunctionList.h        |  8 +++
  dom/media/gstreamer/GStreamerLoader.cpp            |  6 ++-
  dom/media/gstreamer/GStreamerReader.cpp            | 57 ++++++++++++++++++++++
  dom/media/gstreamer/GStreamerReader.h              | 11 +++++
  netwerk/mime/nsMimeTypes.h                         |  1 +
  toolkit/components/mediasniffer/nsMediaSniffer.cpp |  4 +-
- 7 files changed, 93 insertions(+), 5 deletions(-)
+ 7 files changed, 92 insertions(+), 4 deletions(-)
 
 diff --git a/dom/media/gstreamer/GStreamerFormatHelper.cpp b/dom/media/gstreamer/GStreamerFormatHelper.cpp
-index ebd12c2..a4b82ba 100644
+index fd545ac..64a097c 100644
 --- a/dom/media/gstreamer/GStreamerFormatHelper.cpp
 +++ b/dom/media/gstreamer/GStreamerFormatHelper.cpp
-@@ -35,13 +35,17 @@ void GStreamerFormatHelper::Shutdown() {
-   gInstance = nullptr;
- }
-
--static char const *const sContainers[6][2] = {
-+static char const *const sContainers[10][2] = {
-   {"video/mp4", "video/quicktime"},
-   {"video/quicktime", "video/quicktime"},
-   {"audio/mp4", "audio/x-m4a"},
+@@ -48,6 +48,10 @@ static char const *const sContainers[][2] = {
    {"audio/x-m4a", "audio/x-m4a"},
    {"audio/mpeg", "audio/mpeg, mpegversion=(int)1"},
    {"audio/mp3", "audio/mpeg, mpegversion=(int)1"},
@@ -39,7 +31,7 @@ index ebd12c2..a4b82ba 100644
  };
 
  static char const *const sCodecs[9][2] = {
-@@ -62,7 +66,10 @@ static char const * const sDefaultCodecCaps[][2] = {
+@@ -69,7 +73,10 @@ static char const * const sDefaultCodecCaps[][2] = {
    {"audio/mp4", "audio/mpeg, mpegversion=(int)4"},
    {"audio/x-m4a", "audio/mpeg, mpegversion=(int)4"},
    {"audio/mp3", "audio/mpeg, layer=(int)3"},
@@ -50,9 +42,9 @@ index ebd12c2..a4b82ba 100644
 +  {"application/vnd.apple.mpegurl", "video/x-h264"},
  };
 
- static char const * const sPluginBlacklist[] = {
+ static char const * const sPluginBlockList[] = {
 diff --git a/dom/media/gstreamer/GStreamerFunctionList.h b/dom/media/gstreamer/GStreamerFunctionList.h
-index ebdeeb6..4b77e15 100644
+index 75f352e..827e610 100644
 --- a/dom/media/gstreamer/GStreamerFunctionList.h
 +++ b/dom/media/gstreamer/GStreamerFunctionList.h
 @@ -18,6 +18,7 @@ GST_FUNC(LIBGSTAPP, gst_app_src_set_callbacks)
@@ -63,7 +55,7 @@ index ebdeeb6..4b77e15 100644
  GST_FUNC(LIBGSTREAMER, gst_bin_get_by_name)
  GST_FUNC(LIBGSTREAMER, gst_bin_get_type)
  GST_FUNC(LIBGSTREAMER, gst_bin_iterate_recurse)
-@@ -57,11 +58,13 @@ GST_FUNC(LIBGSTREAMER, gst_object_get_name)
+@@ -58,11 +59,13 @@ GST_FUNC(LIBGSTREAMER, gst_object_get_name)
  GST_FUNC(LIBGSTREAMER, gst_object_get_parent)
  GST_FUNC(LIBGSTREAMER, gst_object_unref)
  GST_FUNC(LIBGSTREAMER, gst_pad_get_element_private)
@@ -77,7 +69,7 @@ index ebdeeb6..4b77e15 100644
  GST_FUNC(LIBGSTREAMER, gst_plugin_feature_get_type)
  GST_FUNC(LIBGSTREAMER, gst_registry_feature_filter)
  GST_FUNC(LIBGSTREAMER, gst_registry_get_feature_list_cookie)
-@@ -73,6 +76,9 @@ GST_FUNC(LIBGSTREAMER, gst_structure_get_fraction)
+@@ -74,6 +77,9 @@ GST_FUNC(LIBGSTREAMER, gst_structure_get_fraction)
  GST_FUNC(LIBGSTREAMER, gst_structure_get_int)
  GST_FUNC(LIBGSTREAMER, gst_structure_get_value)
  GST_FUNC(LIBGSTREAMER, gst_structure_new)
@@ -87,15 +79,15 @@ index ebdeeb6..4b77e15 100644
  GST_FUNC(LIBGSTREAMER, gst_util_uint64_scale)
 
  #if GST_VERSION_MAJOR == 0
-@@ -89,6 +95,7 @@ GST_FUNC(LIBGSTREAMER, gst_pad_add_event_probe)
+@@ -90,6 +96,7 @@ GST_FUNC(LIBGSTREAMER, gst_pad_add_event_probe)
  GST_FUNC(LIBGSTREAMER, gst_pad_alloc_buffer)
  GST_FUNC(LIBGSTREAMER, gst_pad_get_negotiated_caps)
  GST_FUNC(LIBGSTREAMER, gst_pad_set_bufferalloc_function)
 +GST_FUNC(LIBGSTREAMER, gst_pad_set_query_function)
  GST_FUNC(LIBGSTREAMER, gst_plugin_feature_get_name)
  GST_FUNC(LIBGSTREAMER, gst_registry_get_default)
  GST_FUNC(LIBGSTREAMER, gst_segment_set_newsegment)
-@@ -132,6 +139,7 @@ GST_FUNC(LIBGSTREAMER, gst_object_get_type)
+@@ -133,6 +140,7 @@ GST_FUNC(LIBGSTREAMER, gst_object_get_type)
  GST_FUNC(LIBGSTREAMER, gst_pad_add_probe)
  GST_FUNC(LIBGSTREAMER, gst_pad_get_current_caps)
  GST_FUNC(LIBGSTREAMER, gst_pad_probe_info_get_query)
@@ -130,10 +122,10 @@ index 8182f68..796a993 100644
 
    for (size_t i = 0; i < sizeof(handles) / sizeof(handles[0]); i++) {
 diff --git a/dom/media/gstreamer/GStreamerReader.cpp b/dom/media/gstreamer/GStreamerReader.cpp
-index 8940032..707427a 100644
+index 45a14ae..cfb56a5 100644
 --- a/dom/media/gstreamer/GStreamerReader.cpp
 +++ b/dom/media/gstreamer/GStreamerReader.cpp
-@@ -135,6 +135,11 @@ GStreamerReader::GStreamerReader(AbstractMediaDecoder* aDecoder)
+@@ -131,6 +131,11 @@ GStreamerReader::GStreamerReader(AbstractMediaDecoder* aDecoder)
 
    gst_segment_init(&mVideoSegment, GST_FORMAT_UNDEFINED);
    gst_segment_init(&mAudioSegment, GST_FORMAT_UNDEFINED);
@@ -145,7 +137,7 @@ index 8940032..707427a 100644
  }
 
  GStreamerReader::~GStreamerReader()
-@@ -312,6 +317,51 @@ void GStreamerReader::PlayBinSourceSetupCb(GstElement* aPlayBin,
+@@ -308,6 +313,51 @@ void GStreamerReader::PlayBinSourceSetupCb(GstElement* aPlayBin,
    g_object_get(aPlayBin, "source", &source, nullptr);
    reader->PlayBinSourceSetup(GST_APP_SRC(source));
  }
@@ -197,7 +189,7 @@ index 8940032..707427a 100644
 
  void GStreamerReader::PlayBinSourceSetup(GstAppSrc* aSource)
  {
-@@ -344,6 +394,13 @@ void GStreamerReader::PlayBinSourceSetup(GstAppSrc* aSource)
+@@ -339,6 +389,13 @@ void GStreamerReader::PlayBinSourceSetup(GstAppSrc* aSource)
      gst_app_src_set_stream_type(mSource, GST_APP_STREAM_TYPE_SEEKABLE);
    }
 
@@ -212,10 +204,10 @@ index 8940032..707427a 100644
    GstCaps *caps =
      GStreamerFormatHelper::ConvertFormatsToCaps(mDecoder->GetResource()->GetContentType().get(),
 diff --git a/dom/media/gstreamer/GStreamerReader.h b/dom/media/gstreamer/GStreamerReader.h
-index d455954..8746198c 100644
+index 3738b57..5b78b82 100644
 --- a/dom/media/gstreamer/GStreamerReader.h
 +++ b/dom/media/gstreamer/GStreamerReader.h
-@@ -118,6 +118,15 @@ private:
+@@ -105,6 +105,15 @@ private:
                               GstCaps *aCaps,
                               GValueArray *aFactories);
 
@@ -231,20 +223,20 @@ index d455954..8746198c 100644
    /* Called on the source-setup signal emitted by playbin. Used to
     * configure appsrc .
     */
-@@ -266,6 +275,8 @@ private:
- #endif
-   int fpsNum;
-   int fpsDen;
+@@ -256,6 +265,8 @@ private:
+
+   MediaResourceIndex mResource;
+   MediaByteRangeSet mLastCachedRanges;
 +
 +  nsAutoCString mUri;
  };
 
  } // namespace mozilla
 diff --git a/netwerk/mime/nsMimeTypes.h b/netwerk/mime/nsMimeTypes.h
-index 447148c..0057cff 100644
+index c10f020..063fd48 100644
 --- a/netwerk/mime/nsMimeTypes.h
 +++ b/netwerk/mime/nsMimeTypes.h
-@@ -152,6 +152,7 @@
+@@ -160,6 +160,7 @@
  #define VIDEO_MPEG_TS                       "video/mp2t"
  #define VIDEO_AVI                           "video/avi"
  #define VIDEO_MATROSKA                      "video/x-matroska"
@@ -253,10 +245,10 @@ index 447148c..0057cff 100644
 
  /* x-uuencode-apple-single. QuickMail made me do this. */
 diff --git a/toolkit/components/mediasniffer/nsMediaSniffer.cpp b/toolkit/components/mediasniffer/nsMediaSniffer.cpp
-index fc45831..25818c2 100644
+index 9460c56..b63a761 100644
 --- a/toolkit/components/mediasniffer/nsMediaSniffer.cpp
 +++ b/toolkit/components/mediasniffer/nsMediaSniffer.cpp
-@@ -35,7 +35,9 @@ nsMediaSniffer::nsMediaSnifferEntry nsMediaSniffer::sSnifferEntries[] = {
+@@ -35,7 +35,9 @@ nsMediaSnifferEntry nsMediaSniffer::sSnifferEntries[] = {
    // The string RIFF, followed by four bytes, followed by the string WAVE
    PATTERN_ENTRY("\xFF\xFF\xFF\xFF\x00\x00\x00\x00\xFF\xFF\xFF\xFF", "RIFF\x00\x00\x00\x00WAVE", AUDIO_WAV),
    // mp3 with ID3 tags, the string "ID3".
@@ -266,7 +258,7 @@ index fc45831..25818c2 100644
 +  PATTERN_ENTRY("\xFF\xFF\xFF\xFF\xFF\xFF\xFF", "#EXTM3U", VIDEO_M3U8)
  };
 
- static bool MatchesMP4orISOBrand(const uint8_t aData[4])
+ // For a complete list of file types, see http://www.ftyps.com/index.html
 -- 
 2.7.4
 

rpm/0004-Workaround-for-late-access-message-loop.patch → rpm/0002-Workaround-for-late-access-message-loop.patch

@@ -1,7 +1,7 @@
-From 0ec7be7fb5e164cdf6c598a7e4406d3404d6eb03 Mon Sep 17 00:00:00 2001
+From 202a74031531c4d6dd895281302474869cdfb34c Mon Sep 17 00:00:00 2001
 From: Dmitry Rozhkov <dmitry.rozhkov@jolla.com>
 Date: Mon, 11 May 2015 13:12:04 +0300
-Subject: [PATCH 04/18] Workaround for late access message loop.
+Subject: [PATCH 02/11] Workaround for late access message loop.
 
 See bug JB10381
 
@@ -11,10 +11,10 @@ Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/ipc/glue/MessagePump.cpp b/ipc/glue/MessagePump.cpp
-index d402720..43f8dbc 100644
+index 3079195..1f0b70a 100644
 --- a/ipc/glue/MessagePump.cpp
 +++ b/ipc/glue/MessagePump.cpp
-@@ -226,6 +226,9 @@ DoWorkRunnable::Run()
+@@ -213,6 +213,9 @@ DoWorkRunnable::Run()
  {
    MessageLoop* loop = MessageLoop::current();
    MOZ_ASSERT(loop);