pool/gstreamer-plugins-base
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1061312 from GNOME:Next

Browse Source 
- Update to version 1.22.0:
  + Please see changes in gstreamer main package, major version
    bump.
- Rebase patches with quilt.
- Add pkgconfig(xi) BuildRequires: New dependency.

OBS-URL: https://build.opensuse.org/request/show/1061312
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer-plugins-base?expand=0&rev=189
This commit is contained in:
Bjørn Lie 2023-01-26 17:25:25 +00:00 committed by Git OBS Bridge
parent e5a4e7f5cb
commit 0ca41589e4
6 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/221 https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/221
diff --git a/gst-libs/gst/video/video-anc.c b/gst-libs/gst/video/video-anc.c Index: gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.c
index 102240ba003586ce9d29e5c2951f20751068c36a..3d6054477a61564bbc0a7b6f51374de200c71b6d 100644 ===================================================================
--- a/gst-libs/gst/video/video-anc.c --- gst-plugins-base-1.22.0.orig/gst-libs/gst/video/video-anc.c
+++ b/gst-libs/gst/video/video-anc.c +++ gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.c
@@ -1028,6 +1028,8 @@ gst_buffer_add_video_caption_meta (GstBuffer * buffer, @@ -1017,6 +1017,8 @@ gst_buffer_add_video_caption_meta (GstBu
switch (caption_type) { switch (caption_type) {
case GST_VIDEO_CAPTION_TYPE_CEA608_RAW: case GST_VIDEO_CAPTION_TYPE_CEA608_RAW:
case GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A: case GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A:
@ -13,7 +13,7 @@ index 102240ba003586ce9d29e5c2951f20751068c36a..3d6054477a61564bbc0a7b6f51374de2
case GST_VIDEO_CAPTION_TYPE_CEA708_RAW: case GST_VIDEO_CAPTION_TYPE_CEA708_RAW:
case GST_VIDEO_CAPTION_TYPE_CEA708_CDP: case GST_VIDEO_CAPTION_TYPE_CEA708_CDP:
break; break;
@@ -1077,6 +1079,10 @@ gst_video_caption_type_from_caps (const GstCaps * caps) @@ -1066,6 +1068,10 @@ gst_video_caption_type_from_caps (const
return GST_VIDEO_CAPTION_TYPE_CEA608_RAW; return GST_VIDEO_CAPTION_TYPE_CEA608_RAW;
} else if (g_strcmp0 (format, "s334-1a") == 0) { } else if (g_strcmp0 (format, "s334-1a") == 0) {
return GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A; return GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A;
@ -24,7 +24,7 @@ index 102240ba003586ce9d29e5c2951f20751068c36a..3d6054477a61564bbc0a7b6f51374de2
} }
} else if (gst_structure_has_name (s, "closedcaption/x-cea-708")) { } else if (gst_structure_has_name (s, "closedcaption/x-cea-708")) {
if (g_strcmp0 (format, "cc_data") == 0) { if (g_strcmp0 (format, "cc_data") == 0) {
@@ -1114,6 +1120,14 @@ gst_video_caption_type_to_caps (GstVideoCaptionType type) @@ -1103,6 +1109,14 @@ gst_video_caption_type_to_caps (GstVideo
caption_caps = gst_caps_new_simple ("closedcaption/x-cea-608", caption_caps = gst_caps_new_simple ("closedcaption/x-cea-608",
"format", G_TYPE_STRING, "s334-1a", NULL); "format", G_TYPE_STRING, "s334-1a", NULL);
break; break;
@ -39,11 +39,11 @@ index 102240ba003586ce9d29e5c2951f20751068c36a..3d6054477a61564bbc0a7b6f51374de2
case GST_VIDEO_CAPTION_TYPE_CEA708_RAW: case GST_VIDEO_CAPTION_TYPE_CEA708_RAW:
caption_caps = gst_caps_new_simple ("closedcaption/x-cea-708", caption_caps = gst_caps_new_simple ("closedcaption/x-cea-708",
"format", G_TYPE_STRING, "cc_data", NULL); "format", G_TYPE_STRING, "cc_data", NULL);
diff --git a/gst-libs/gst/video/video-anc.h b/gst-libs/gst/video/video-anc.h Index: gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.h
index bb5883c5207e88314467ead1209f76f64c8c4dc0..f3a1d69b9a6300acda45fa2c30371043e7f1d0cd 100644 ===================================================================
--- a/gst-libs/gst/video/video-anc.h --- gst-plugins-base-1.22.0.orig/gst-libs/gst/video/video-anc.h
+++ b/gst-libs/gst/video/video-anc.h +++ gst-plugins-base-1.22.0/gst-libs/gst/video/video-anc.h
@@ -357,7 +357,53 @@ GstVideoBarMeta *gst_buffer_add_video_bar_meta (GstBuffer * buffer, guint8 field @@ -345,7 +345,53 @@ GstVideoBarMeta *gst_buffer_add_video_ba
* offset relative to the base-line of the original image format (line 9 * 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 * 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). * 625-line field 1 and line 318 for 625-line field 2).
@ -98,7 +98,7 @@ index bb5883c5207e88314467ead1209f76f64c8c4dc0..f3a1d69b9a6300acda45fa2c30371043
* can also contain 608-in-708 and the first byte of each triplet has to * can also contain 608-in-708 and the first byte of each triplet has to
* be inspected for detecting the type. * be inspected for detecting the type.
* @GST_VIDEO_CAPTION_TYPE_CEA708_CDP: CEA-708 (and optionally CEA-608) in * @GST_VIDEO_CAPTION_TYPE_CEA708_CDP: CEA-708 (and optionally CEA-608) in
@@ -373,7 +419,9 @@ typedef enum { @@ -361,7 +407,9 @@ typedef enum {
GST_VIDEO_CAPTION_TYPE_CEA608_RAW = 1, GST_VIDEO_CAPTION_TYPE_CEA608_RAW = 1,
GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A = 2, GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A = 2,
GST_VIDEO_CAPTION_TYPE_CEA708_RAW = 3, GST_VIDEO_CAPTION_TYPE_CEA708_RAW = 3,

10
add_wayland_dep_to_tests.patch
View File

@ -1,11 +1,13 @@
--- orig-gst-plugins-base-1.19.90/tests/check/meson.build 2022-01-28 15:28:42.000000000 +0100 Index: gst-plugins-base-1.22.0/tests/check/meson.build
+++ gst-plugins-base-1.19.90/tests/check/meson.build 2022-01-29 22:32:03.705900464 +0100 ===================================================================
@@ -134,7 +134,7 @@ --- gst-plugins-base-1.22.0.orig/tests/check/meson.build
+++ gst-plugins-base-1.22.0/tests/check/meson.build
@@ -135,7 +135,7 @@ if build_gstgl
test_defines += ['-DTEST_GST_GL_ABI_CHECK'] test_defines += ['-DTEST_GST_GL_ABI_CHECK']
endif endif
-test_deps = [gst_dep, gst_base_dep, gst_net_dep, gst_check_dep, audio_dep, -test_deps = [gst_dep, gst_base_dep, gst_net_dep, gst_check_dep, audio_dep,
+test_deps = [gst_dep, gst_base_dep, gst_net_dep, gst_check_dep, wayland_client_dep, audio_dep, +test_deps = [gst_dep, gst_base_dep, gst_net_dep, gst_check_dep, wayland_client_dep, audio_dep,
video_dep, pbutils_dep, rtp_dep, rtsp_dep, tag_dep, allocators_dep, app_dep, video_dep, pbutils_dep, rtp_dep, rtsp_dep, tag_dep, allocators_dep, app_dep,
fft_dep, riff_dep, sdp_dep, gio_dep, valgrind_dep] + glib_deps fft_dep, riff_dep, sdp_dep, gio_dep, valgrind_dep]

3
gst-plugins-base-1.20.5.tar.xz
View File

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

3
gst-plugins-base-1.22.0.tar.xz Normal file
View File

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

9
gstreamer-plugins-base.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Jan 24 16:57:20 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 1.22.0:
+ Please see changes in gstreamer main package, major version
bump.
- Rebase patches with quilt.
- Add pkgconfig(xi) BuildRequires: New dependency.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 23 18:59:40 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com> Fri Dec 23 18:59:40 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

12
gstreamer-plugins-base.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gstreamer-plugins-base # spec file for package gstreamer-plugins-base
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
%define gst_branch 1.0 %define gst_branch 1.0
%define gstreamer_req_version %(echo %{version} | sed -e "s/+.*//") %define gstreamer_req_version %(echo %{version} | sed -e "s/+.*//")
Name: gstreamer-plugins-base Name: gstreamer-plugins-base
Version: 1.20.5 Version: 1.22.0
Release: 0 Release: 0
Summary: GStreamer Streaming-Media Framework Plug-Ins Summary: GStreamer Streaming-Media Framework Plug-Ins
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -36,7 +36,7 @@ Patch5: MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch
BuildRequires: Mesa-libGLESv3-devel BuildRequires: Mesa-libGLESv3-devel
BuildRequires: cdparanoia-devel BuildRequires: cdparanoia-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: glib2-devel >= 2.40.0 BuildRequires: glib2-devel >= 2.62.0
BuildRequires: gobject-introspection-devel >= 1.31.1 BuildRequires: gobject-introspection-devel >= 1.31.1
BuildRequires: libICE-devel BuildRequires: libICE-devel
BuildRequires: libSM-devel BuildRequires: libSM-devel
@ -44,7 +44,7 @@ BuildRequires: libXext-devel
BuildRequires: libXv-devel BuildRequires: libXv-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: meson >= 0.59 BuildRequires: meson >= 0.62
BuildRequires: orc >= 0.4.24 BuildRequires: orc >= 0.4.24
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3-base BuildRequires: python3-base
@ -81,6 +81,7 @@ BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
Requires: gstreamer >= %{gstreamer_req_version} Requires: gstreamer >= %{gstreamer_req_version}
@ -567,9 +568,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/gstreamer-%{gst_branch}/libgsttcp.so %{_libdir}/gstreamer-%{gst_branch}/libgsttcp.so
%{_libdir}/gstreamer-%{gst_branch}/libgsttheora.so %{_libdir}/gstreamer-%{gst_branch}/libgsttheora.so
%{_libdir}/gstreamer-%{gst_branch}/libgsttypefindfunctions.so %{_libdir}/gstreamer-%{gst_branch}/libgsttypefindfunctions.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvideoconvert.so %{_libdir}/gstreamer-%{gst_branch}/libgstvideoconvertscale.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvideorate.so %{_libdir}/gstreamer-%{gst_branch}/libgstvideorate.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvideoscale.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvideotestsrc.so %{_libdir}/gstreamer-%{gst_branch}/libgstvideotestsrc.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvolume.so %{_libdir}/gstreamer-%{gst_branch}/libgstvolume.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvorbis.so %{_libdir}/gstreamer-%{gst_branch}/libgstvorbis.so