Accepting request 1061506 from home:alarrosa:branches:multimedia:libs

- 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.

OBS-URL: https://build.opensuse.org/request/show/1061506
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer-plugins-base?expand=0&rev=190
This commit is contained in:
Bjørn Lie 2023-01-27 12:32:44 +00:00 committed by Git OBS Bridge
parent 0ca41589e4
commit a34b87f9e2
3 changed files with 36 additions and 1 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Jan 27 10:10:31 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
- 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 <bjorn.lie@gmail.com>

View File

@ -32,6 +32,7 @@ Source2: baselibs.conf
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
@ -44,7 +45,7 @@ BuildRequires: libXext-devel
BuildRequires: libXv-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: meson >= 0.62
BuildRequires: meson >= 0.61
BuildRequires: orc >= 0.4.24
BuildRequires: pkgconfig
BuildRequires: python3-base
@ -493,6 +494,7 @@ to compile and link applications that use gstreamer-plugins-base.
%autosetup -n %{_name}-%{version} -N
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
export PYTHON=%{_bindir}/python3
@ -508,6 +510,15 @@ export PYTHON=%{_bindir}/python3
%{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

View File

@ -0,0 +1,12 @@
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' ])