Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gstreamer-plugins-base for
openSUSE:Factory checked in at 2023-02-02 18:06:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-base (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-base.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-base"
Thu Feb 2 18:06:57 2023 rev:89 rq:1061545 version:1.22.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/gstreamer-plugins-base/gstreamer-plugins-base.changes
2022-12-25 15:14:29.153248429 +0100
+++
/work/SRC/openSUSE:Factory/.gstreamer-plugins-base.new.32243/gstreamer-plugins-base.changes
2023-02-02 18:25:13.674307402 +0100
@@ -1,0 +2,21 @@
+Fri Jan 27 10:10:31 UTC 2023 - Antonio Larrosa <[email protected]>
+
+- Add patch to reduce the required meson version to 0.61.0 since
+ that's what we have in SLE 15:
+ * reduce-required-meson.patch
+- Probably because of a problem in SLE's meson, the generated
+ pkgconfig files are missing some variables that are needed by
+ rpm to generate the pkgconfig(...) provides correctly. In order
+ to fix this, we now check for those variables and insert them
+ in the pc files before installation if they're missing.
+
+-------------------------------------------------------------------
+Tue Jan 24 16:57:20 UTC 2023 - Bjørn Lie <[email protected]>
+
+- 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.
+
+-------------------------------------------------------------------
Old:
----
gst-plugins-base-1.20.5.tar.xz
New:
----
gst-plugins-base-1.22.0.tar.xz
reduce-required-meson.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-base.spec ++++++
--- /var/tmp/diff_new_pack.yHhnHi/_old 2023-02-02 18:25:14.098309986 +0100
+++ /var/tmp/diff_new_pack.yHhnHi/_new 2023-02-02 18:25:14.102310010 +0100
@@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%define gst_branch 1.0
%define gstreamer_req_version %(echo %{version} | sed -e "s/+.*//")
Name: gstreamer-plugins-base
-Version: 1.20.5
+Version: 1.22.0
Release: 0
Summary: GStreamer Streaming-Media Framework Plug-Ins
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -32,11 +32,12 @@
Patch4: add_wayland_dep_to_tests.patch
Patch5: MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch
+Patch6: reduce-required-meson.patch
BuildRequires: Mesa-libGLESv3-devel
BuildRequires: cdparanoia-devel
BuildRequires: gcc-c++
-BuildRequires: glib2-devel >= 2.40.0
+BuildRequires: glib2-devel >= 2.62.0
BuildRequires: gobject-introspection-devel >= 1.31.1
BuildRequires: libICE-devel
BuildRequires: libSM-devel
@@ -44,7 +45,7 @@
BuildRequires: libXv-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: meson >= 0.59
+BuildRequires: meson >= 0.61
BuildRequires: orc >= 0.4.24
BuildRequires: pkgconfig
BuildRequires: python3-base
@@ -81,6 +82,7 @@
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(x11-xcb)
BuildRequires: pkgconfig(xext)
+BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(zlib)
Requires: gstreamer >= %{gstreamer_req_version}
@@ -492,6 +494,7 @@
%autosetup -n %{_name}-%{version} -N
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
export PYTHON=%{_bindir}/python3
@@ -507,6 +510,15 @@
%{nil}
%meson_build
+# meson 0.61.4 in SLE 15 SP5 doesn't generate all variables needed in the pc
files
+# As a result the pkgconfig(...) provides are not generated in the rpm file so
+# we have to add the variables to the pc files if they're missing
+for pc in *-suse-linux/meson-private/*.pc ; do
+ grep -q ^datarootdir= $pc || sed -ie "/^pluginsdir=.*/a
datarootdir=\${prefix}\/share" $pc ;
+ grep -q ^datadir= $pc || sed -ie "/^datarootdir=.*/a
datadir=\${datarootdir}" $pc ;
+ grep -q ^libexecdir= $pc || sed -ie "/^datadir=.*/a
libexecdir=\${prefix}\/libexec" $pc ;
+done
+
%install
%meson_install
if [ -f %{buildroot}%{_datadir}/appdata/gstreamer-plugins-base.appdata.xml ];
then
@@ -567,9 +579,8 @@
%{_libdir}/gstreamer-%{gst_branch}/libgsttcp.so
%{_libdir}/gstreamer-%{gst_branch}/libgsttheora.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}/libgstvideoscale.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvideotestsrc.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvolume.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvorbis.so
++++++ MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch ++++++
--- /var/tmp/diff_new_pack.yHhnHi/_old 2023-02-02 18:25:14.126310156 +0100
+++ /var/tmp/diff_new_pack.yHhnHi/_new 2023-02-02 18:25:14.130310181 +0100
@@ -1,10 +1,10 @@
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
102240ba003586ce9d29e5c2951f20751068c36a..3d6054477a61564bbc0a7b6f51374de200c71b6d
100644
---- a/gst-libs/gst/video/video-anc.c
-+++ b/gst-libs/gst/video/video-anc.c
-@@ -1028,6 +1028,8 @@ gst_buffer_add_video_caption_meta (GstBuffer * buffer,
+Index: gst-plugins-base-1.22.0/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.22.0/gst-libs/gst/video/video-anc.c
+@@ -1017,6 +1017,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 @@
case GST_VIDEO_CAPTION_TYPE_CEA708_RAW:
case GST_VIDEO_CAPTION_TYPE_CEA708_CDP:
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;
} else if (g_strcmp0 (format, "s334-1a") == 0) {
return GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A;
@@ -24,7 +24,7 @@
}
} else if (gst_structure_has_name (s, "closedcaption/x-cea-708")) {
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",
"format", G_TYPE_STRING, "s334-1a", NULL);
break;
@@ -39,11 +39,11 @@
case GST_VIDEO_CAPTION_TYPE_CEA708_RAW:
caption_caps = gst_caps_new_simple ("closedcaption/x-cea-708",
"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
bb5883c5207e88314467ead1209f76f64c8c4dc0..f3a1d69b9a6300acda45fa2c30371043e7f1d0cd
100644
---- a/gst-libs/gst/video/video-anc.h
-+++ b/gst-libs/gst/video/video-anc.h
-@@ -357,7 +357,53 @@ GstVideoBarMeta *gst_buffer_add_video_bar_meta (GstBuffer
* buffer, guint8 field
+Index: gst-plugins-base-1.22.0/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.22.0/gst-libs/gst/video/video-anc.h
+@@ -345,7 +345,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 @@
* 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
-@@ -373,7 +419,9 @@ typedef enum {
+@@ -361,7 +407,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 ++++++
--- /var/tmp/diff_new_pack.yHhnHi/_old 2023-02-02 18:25:14.138310229 +0100
+++ /var/tmp/diff_new_pack.yHhnHi/_new 2023-02-02 18:25:14.142310254 +0100
@@ -1,12 +1,14 @@
---- orig-gst-plugins-base-1.19.90/tests/check/meson.build 2022-01-28
15:28:42.000000000 +0100
-+++ gst-plugins-base-1.19.90/tests/check/meson.build 2022-01-29
22:32:03.705900464 +0100
-@@ -134,7 +134,7 @@
+Index: gst-plugins-base-1.22.0/tests/check/meson.build
+===================================================================
+--- 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']
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,
wayland_client_dep, audio_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]
++++++ gst-plugins-base-1.20.5.tar.xz -> gst-plugins-base-1.22.0.tar.xz ++++++
++++ 235877 lines of diff (skipped)
++++++ reduce-required-meson.patch ++++++
Index: gst-plugins-base-1.22.0/meson.build
===================================================================
--- gst-plugins-base-1.22.0.orig/meson.build
+++ gst-plugins-base-1.22.0/meson.build
@@ -1,6 +1,6 @@
project('gst-plugins-base', 'c',
version : '1.22.0',
- meson_version : '>= 0.62',
+ meson_version : '>= 0.61',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
