update to 1.20.3
This commit is contained in:
parent
8416150450
commit
816fb9dc4d
@ -1,47 +0,0 @@
|
||||
From 90903917a8185e0f9add7af8153ae2fc9875fdcb Mon Sep 17 00:00:00 2001
|
||||
From: Xavier Claessens <xavier.claessens@collabora.com>
|
||||
Date: Mon, 26 Apr 2021 14:25:03 -0400
|
||||
Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1
|
||||
|
||||
"implicit_include_directories: false" now also means that current build
|
||||
directory is not added to include paths by default any more. We have to
|
||||
add it manually because we have some custom_target() that generate
|
||||
headers in current build directory.
|
||||
|
||||
See https://github.com/mesonbuild/meson/issues/8700.
|
||||
|
||||
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1127>
|
||||
---
|
||||
gst-libs/gst/gl/meson.build | 15 ++++++++++++---
|
||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
|
||||
index db11c5e89..731ee9f5e 100644
|
||||
--- a/gst-libs/gst/gl/meson.build
|
||||
+++ b/gst-libs/gst/gl/meson.build
|
||||
@@ -989,11 +989,20 @@ if build_gstgl
|
||||
command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@'])
|
||||
gen_sources = [gl_enumtypes_h]
|
||||
|
||||
+ common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL']
|
||||
+
|
||||
+ # We have custom_target() that generate headers in the current build dir,
|
||||
+ # but with implicit_include_directories: false, meson >= 0.58.0 won't include
|
||||
+ # it by default. We cannot use include_directories('.') here because it would
|
||||
+ # also include current source dir which is what we want to avoid because
|
||||
+ # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h.
|
||||
+ common_args += '-I@0@'.format(meson.current_build_dir())
|
||||
+
|
||||
gstgl = library('gstgl-' + api_version,
|
||||
gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h,
|
||||
- c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
|
||||
- cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'],
|
||||
- objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'],
|
||||
+ c_args : common_args,
|
||||
+ cpp_args : common_args,
|
||||
+ objc_args : common_args + gl_objc_args,
|
||||
include_directories : [configinc, libsinc, gl_includes],
|
||||
version : libversion,
|
||||
soversion : soversion,
|
||||
--
|
||||
GitLab
|
||||
Binary file not shown.
BIN
gst-plugins-base-1.20.3.tar.xz
Normal file
BIN
gst-plugins-base-1.20.3.tar.xz
Normal file
Binary file not shown.
@ -2,14 +2,13 @@
|
||||
%global gst_mm gstreamer-%{majorminor}
|
||||
|
||||
Name: gstreamer1-plugins-base
|
||||
Version: 1.18.4
|
||||
Release: 3
|
||||
Version: 1.20.3
|
||||
Release: 1
|
||||
Summary: GStreamer streaming media framework base plugins
|
||||
License: LGPLv2+
|
||||
URL: http://gstreamer.freedesktop.org/
|
||||
Source0: http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.xz
|
||||
Patch0: 0001-missing-plugins-Remove-the-mpegaudioversion-field.patch
|
||||
Patch6000: backport-xclaesse-fix-meson-0-58.patch
|
||||
|
||||
BuildRequires: gcc-c++ gstreamer1-devel >= %{version} gobject-introspection-devel >= 1.31.1 iso-codes-devel alsa-lib-devel
|
||||
BuildRequires: cdparanoia-devel libogg-devel >= 1.0 libtheora-devel >= 1.1 libvisual-devel libvorbis-devel >= 1.0 libXv-devel
|
||||
@ -31,6 +30,7 @@ GStreamer is a graphics library for built-in media processing components. BasePl
|
||||
%package devel
|
||||
Summary: GStreamer Base Plugins Development files
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: gstreamer1-devel>= %{version}-%{release}
|
||||
Provides: tools
|
||||
|
||||
%description devel
|
||||
@ -48,7 +48,6 @@ This package provides manual for developpers.
|
||||
%prep
|
||||
%setup -q -n gst-plugins-base-%{version}
|
||||
%patch0 -p1
|
||||
%patch6000 -p1
|
||||
|
||||
%build
|
||||
%meson -D doc=disabled -D orc=enabled \
|
||||
@ -93,8 +92,7 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-base.appdata.xml <<EOF
|
||||
EOF
|
||||
|
||||
%find_lang gst-plugins-base-%{majorminor}
|
||||
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
|
||||
%delete_la
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
@ -215,6 +213,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
|
||||
%{_includedir}/%{gst_mm}/gst/tag/tag-enumtypes.h
|
||||
%{_includedir}/%{gst_mm}/gst/tag/xmpwriter.h
|
||||
%dir %{_includedir}/%{gst_mm}/gst/video
|
||||
%{_includedir}/%{gst_mm}/gst/video/gstvideocodecalphameta.h
|
||||
%{_includedir}/%{gst_mm}/gst/video/colorbalance.h
|
||||
%{_includedir}/%{gst_mm}/gst/video/colorbalancechannel.h
|
||||
%{_includedir}/%{gst_mm}/gst/video/gstvideoaffinetransformationmeta.h
|
||||
@ -258,12 +257,15 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%files help
|
||||
%doc AUTHORS README REQUIREMENTS
|
||||
%doc AUTHORS README.md REQUIREMENTS
|
||||
%{_mandir}/man1/gst-discoverer-*.gz
|
||||
%{_mandir}/man1/gst-play-*.gz
|
||||
%{_mandir}/man1/gst-device-monitor-*.gz
|
||||
|
||||
%changelog
|
||||
* Sat Jun 25 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.20.3-1
|
||||
- update to 1.20.3
|
||||
|
||||
* Mon Jun 20 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.18.4-3
|
||||
- remove meson option gtk_doc
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user