Accepting request 1184234 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/1184234
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gstreamer-plugins-base?expand=0&rev=105

MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch

@@ -1,10 +1,10 @@
 https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/221
 
-Index: gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.c
+Index: gst-plugins-base-1.24.5/gst-libs/gst/video/video-anc.c
 ===================================================================
---- gst-plugins-base-1.22.0.orig/gst-libs/gst/video/video-anc.c
+--- gst-plugins-base-1.24.5.orig/gst-libs/gst/video/video-anc.c
-+++ gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.c
++++ gst-plugins-base-1.24.5/gst-libs/gst/video/video-anc.c
-@@ -1017,6 +1017,8 @@ gst_buffer_add_video_caption_meta (GstBu
+@@ -1022,6 +1022,8 @@ gst_buffer_add_video_caption_meta (GstBu
    switch (caption_type) {
      case GST_VIDEO_CAPTION_TYPE_CEA608_RAW:
      case GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A:
@@ -13,7 +13,7 @@ Index: gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.c
      case GST_VIDEO_CAPTION_TYPE_CEA708_RAW:
      case GST_VIDEO_CAPTION_TYPE_CEA708_CDP:
        break;
-@@ -1066,6 +1068,10 @@ gst_video_caption_type_from_caps (const
+@@ -1071,6 +1073,10 @@ gst_video_caption_type_from_caps (const
        return GST_VIDEO_CAPTION_TYPE_CEA608_RAW;
      } else if (g_strcmp0 (format, "s334-1a") == 0) {
        return GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A;
@@ -24,7 +24,7 @@ Index: gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.c
      }
    } else if (gst_structure_has_name (s, "closedcaption/x-cea-708")) {
      if (g_strcmp0 (format, "cc_data") == 0) {
-@@ -1103,6 +1109,14 @@ gst_video_caption_type_to_caps (GstVideo
+@@ -1108,6 +1114,14 @@ gst_video_caption_type_to_caps (GstVideo
        caption_caps = gst_caps_new_simple ("closedcaption/x-cea-608",
            "format", G_TYPE_STRING, "s334-1a", NULL);
        break;
@@ -39,11 +39,11 @@ Index: gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.c
      case GST_VIDEO_CAPTION_TYPE_CEA708_RAW:
        caption_caps = gst_caps_new_simple ("closedcaption/x-cea-708",
            "format", G_TYPE_STRING, "cc_data", NULL);
-Index: gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.h
+Index: gst-plugins-base-1.24.5/gst-libs/gst/video/video-anc.h
 ===================================================================
---- gst-plugins-base-1.22.0.orig/gst-libs/gst/video/video-anc.h
+--- gst-plugins-base-1.24.5.orig/gst-libs/gst/video/video-anc.h
-+++ gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.h
++++ gst-plugins-base-1.24.5/gst-libs/gst/video/video-anc.h
-@@ -345,7 +345,53 @@ GstVideoBarMeta *gst_buffer_add_video_ba
+@@ -490,7 +490,53 @@ GstVideoBarMeta *gst_buffer_add_video_ba
   *      offset relative to the base-line of the original image format (line 9
   *      for 525-line field 1, line 272 for 525-line field 2, line 5 for
   *      625-line field 1 and line 318 for 625-line field 2).
@@ -98,7 +98,7 @@ Index: gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.h
   *      can also contain 608-in-708 and the first byte of each triplet has to
   *      be inspected for detecting the type.
   * @GST_VIDEO_CAPTION_TYPE_CEA708_CDP: CEA-708 (and optionally CEA-608) in
-@@ -361,7 +407,9 @@ typedef enum {
+@@ -506,7 +552,9 @@ typedef enum {
    GST_VIDEO_CAPTION_TYPE_CEA608_RAW		= 1,
    GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A		= 2,
    GST_VIDEO_CAPTION_TYPE_CEA708_RAW		= 3,

add_wayland_dep_to_tests.patch

@@ -1,8 +1,8 @@
-Index: gst-plugins-base-1.22.0/tests/check/meson.build
+Index: gst-plugins-base-1.24.5/tests/check/meson.build
 ===================================================================
---- gst-plugins-base-1.22.0.orig/tests/check/meson.build
+--- gst-plugins-base-1.24.5.orig/tests/check/meson.build
-+++ gst-plugins-base-1.22.0/tests/check/meson.build
++++ gst-plugins-base-1.24.5/tests/check/meson.build
-@@ -135,7 +135,7 @@ if build_gstgl
+@@ -138,7 +138,7 @@ if build_gstgl
    test_defines += ['-DTEST_GST_GL_ABI_CHECK']
  endif
  

gst-plugins-base-1.24.5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e33ec9b59eef5ef3a6a53bbd55c44340e681d0000910caca12541a73db38a7d
+size 2430552

gst-plugins-base-audiobasesink-gap.patch

@@ -1,20 +0,0 @@
-diff --git a/gst-libs/gst/audio/gstaudiobasesink.c b/gst-libs/gst/audio/gstaudiobasesink.c
-index 1f843ac..891941d 100644
---- a/gst-libs/gst/audio/gstaudiobasesink.c
-+++ b/gst-libs/gst/audio/gstaudiobasesink.c
-@@ -1124,15 +1124,6 @@ gst_audio_base_sink_wait_event (GstBaseSink * bsink, GstEvent * event)
-       /* Make sure the ringbuffer will start again if interrupted during event_wait() */
-       g_atomic_int_set (&sink->eos_rendering, 1);
-       clear_force_start_flag = TRUE;
--
--      /* For gap events, don't actually wait for the clock to
--       * reach that time, or it will drain the ringbuffer, just
--       * ensure we're prerolled and let the next actual buffer
--       * get rendered where it belongs */
--      if (GST_EVENT_TYPE (event) == GST_EVENT_GAP) {
--        ret = gst_base_sink_do_preroll (bsink, GST_MINI_OBJECT_CAST (event));
--        goto done;
--      }
-       break;
-     default:
-       break;

gstreamer-plugins-base-CVE-2024-4453.patch

@@ -1,53 +0,0 @@
-commit e68eccff103ab0e91e6d77a892f57131b33902f5
-Author: Sebastian Dröge <sebastian@centricular.com>
-Date:   Thu Apr 25 15:21:20 2024 +0300
-
-    exiftag: Prevent integer overflows and out of bounds reads when handling undefined tags
-    
-    Fixes ZDI-CAN-23896
-    Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3483
-    
-    Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6766>
-
-diff -Nura gst-plugins-base-1.24.0/gst-libs/gst/tag/gstexiftag.c gst-plugins-base-1.24.0_new/gst-libs/gst/tag/gstexiftag.c
---- gst-plugins-base-1.24.0/gst-libs/gst/tag/gstexiftag.c	2024-03-05 07:51:42.000000000 +0800
-+++ gst-plugins-base-1.24.0_new/gst-libs/gst/tag/gstexiftag.c	2024-05-27 19:25:58.227183616 +0800
-@@ -1383,6 +1383,7 @@
- 
-   if (count > 4) {
-     GstMapInfo info;
-+    gsize alloc_size;
- 
-     if (offset < reader->base_offset) {
-       GST_WARNING ("Offset is smaller (%u) than base offset (%u)", offset,
-@@ -1404,14 +1405,28 @@
-       return;
-     }
- 
-+    if (info.size - real_offset < count) {
-+      GST_WARNING ("Invalid size %u for buffer of size %" G_GSIZE_FORMAT
-+          ", not adding tag %s", count, info.size, tag->gst_tag);
-+      gst_buffer_unmap (reader->buffer, &info);
-+      return;
-+    }
-+
-+    if (!g_size_checked_add (&alloc_size, count, 1)) {
-+      GST_WARNING ("Invalid size %u for buffer of size %" G_GSIZE_FORMAT
-+          ", not adding tag %s", real_offset, info.size, tag->gst_tag);
-+      gst_buffer_unmap (reader->buffer, &info);
-+      return;
-+    }
-+
-     /* +1 because it could be a string without the \0 */
--    data = malloc (sizeof (guint8) * count + 1);
-+    data = malloc (alloc_size);
-     memcpy (data, info.data + real_offset, count);
-     data[count] = 0;
- 
-     gst_buffer_unmap (reader->buffer, &info);
-   } else {
--    data = malloc (sizeof (guint8) * count + 1);
-+    data = malloc (count + 1);
-     memcpy (data, (guint8 *) offset_as_data, count);
-     data[count] = 0;
-   }

gstreamer-plugins-base.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Thu Jun 27 18:20:13 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.24.5:
+  + Highlighted bugfixes:
+    - webrtcsink: Support for AV1 via nvav1enc, av1enc or rav1enc
+      encoders
+    - AV1 RTP payloader/depayloader fixes to work correctly with
+      Chrome and Pion WebRTC
+    - av1parse, av1dec error handling/robustness improvements
+    - av1enc: Handle force-keyunit events properly for WebRTC
+    - decodebin3: selection and collection handling improvements
+    - hlsdemux2: Various fixes for discontinuities, variant
+      switching, playlist updates
+    - qml6glsink: fix RGB format support
+    - rtspsrc: more control URL handling fixes
+    - v4l2src: Interpret V4L2 report of sync loss as video signal
+      loss
+    - d3d12 encoder, memory and videosink fixes
+    - vtdec: more robust error handling, fix regression
+    - ndi: support for NDI SDK v6
+    - Various bug fixes, memory leak fixes, and other stability and
+      reliability improvements
+- Please see https://gstreamer.freedesktop.org/releases/1.24/ for
+  changes between 1.24.0 and this version and even more in-depth
+  info.
+- Refresh patches with quilt.
+- Drop gst-plugins-base-audiobasesink-gap.patch and
+  gstreamer-plugins-base-CVE-2024-4453.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Wed May 22 12:45:03 UTC 2024 - Cliff Zhao <qzhao@suse.com>
 

gstreamer-plugins-base.spec

@@ -20,7 +20,7 @@
 %define gst_branch 1.0
 %define gstreamer_req_version %(echo %{version} | sed -e "s/+.*//")
 Name:           gstreamer-plugins-base
-Version:        1.24.0
+Version:        1.24.5
 Release:        0
 Summary:        GStreamer Streaming-Media Framework Plug-Ins
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -31,10 +31,7 @@ Source1:        gstreamer-plugins-base.appdata.xml
 Source2:        baselibs.conf
 Patch1:         add_wayland_dep_to_tests.patch
 Patch2:         MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch
-# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3303
+
-Patch3:         gst-plugins-base-audiobasesink-gap.patch
-# PATCH-FIX-UPSTREAM gstreamer-plugins-base-CVE-2024-4453.patch CVE-2024-4453 ZDI-24-467 ZDI-CAN-23896 bsc#1224806 qzhao@suse.com -- Prevent integer overflows and out of bounds reads when handling undefined tags.
-Patch4:         gstreamer-plugins-base-CVE-2024-4453.patch
 BuildRequires:  Mesa-libGLESv3-devel
 BuildRequires:  cdparanoia-devel
 BuildRequires:  gcc-c++