Dominique Leuenberger 2021-09-20 21:32:07 +00:00 committed by Git OBS Bridge
commit 2b39c74cec
6 changed files with 56 additions and 58 deletions

View File

@ -1,48 +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

View File

@ -9,7 +9,7 @@
<!--
<param name="changesgenerate">enable</param>
-->
<param name="revision">1.18.4</param>
<param name="revision">1.18.5</param>
<param name="scm">git</param>
</service>
<service name="recompress" mode="disabled">

View File

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

View File

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

View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Thu Sep 16 01:48:48 UTC 2021 - Stanislav Brabec <sbrabec@suse.com>
- Remove obsolete translation-update-upstream support (PM-2938).
-------------------------------------------------------------------
Wed Sep 15 08:46:50 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 1.18.5:
+ appsrc: Don't leak buffer list while wrongly unreffing buffer
on EOS/flushing
+ audioaggregator:
- Don't overwrite already written samples
- Resync on the next buffer when dropping a buffer on discont
resyncing
+ audiobasesink: Fix of double lock release
+ audiobasesrc: Fix divide by zero assertion
+ clockoverlay: Fix broken string formatting by strftime() on
Windows
+ compositor: Fix NV12 blend operation
+ giosrc: Don't leak scheme string in gst_gio_src_query()
+ giobasesink: Handle incomplete writes in
gst_gio_base_sink_render()
+ gl/wayland:
- Use consistent wl_display when creating work queue for proxy
wrapper
- Provide a dummy global_remove function
+ gl: Fix build when Meson >= 0.58.0rc1
+ playbin2: fix base_time selection when flush seeking live (such
as with RTSP)
+ rtspconnection:
- Add IPv6 support for tunneled mode
- Consistently translate GIOError to GstRTSPResult (for
rtspsrc)
+ rawbaseparse: check destination format correctly
+ uridecodebin: Don't force floating reference for future
reusable decodebin
+ parsebin: Put stream flags in GstStream
+ splitmuxsink: always use factory property when set
+ video-converter: Set up matrix tables only once.
+ videoscale: Performance degradation from 1.16.2 -> 1.18.4
+ videotestsrc: Fix a leak when computing alpha caps
+ audio/video-converter: Plug some minor leaks
+ audio,video-format: Make generate_raw_formats idempotent for
assertions
+ Don't use volatile to mean atomic (fixes compiler warnings with
gcc 11)
+ Fix build issue on MinGW64
- Drop 90903917.patch: Fixed upstream.
-------------------------------------------------------------------
Sat Jul 17 09:57:52 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -20,7 +20,7 @@
%define gst_branch 1.0
%define gstreamer_req_version %(echo %{version} | sed -e "s/+.*//")
Name: gstreamer-plugins-base
Version: 1.18.4
Version: 1.18.5
Release: 0
Summary: GStreamer Streaming-Media Framework Plug-Ins
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -31,12 +31,11 @@ URL: https://gstreamer.freedesktop.org
Source0: %{_name}-%{version}.tar.xz
Source1: gstreamer-plugins-base.appdata.xml
Source2: baselibs.conf
# PATCH-FIX-UPSTREAM 90903917.patch dimstar@opensuse.org -- Fix build when Meson >= 0.58.0rc1
Patch0: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/90903917.patch
# PATCH-FIX-OPENSUSE gstreamer-plugins-base-gl-deps.patch dimstar@opensuse.org -- Local workaround for https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/735
Patch3: gstreamer-plugins-base-gl-deps.patch
Patch4: add_wayland_dep_to_tests.patch
Patch5: MR-221-video-anc-add-two-new-CEA-608-caption-formats.patch
BuildRequires: Mesa-libGLESv3-devel
BuildRequires: cdparanoia-devel
BuildRequires: fdupes
@ -56,7 +55,6 @@ BuildRequires: orc >= 0.4.24
BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: python3-xml
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(alsa) >= 0.9.1
BuildRequires: pkgconfig(egl)
@ -510,8 +508,6 @@ package.
%prep
%autosetup -n %{_name}-%{version} -p1
translation-update-upstream po gst-plugins-base-%{gst_branch}
%build
export PYTHON=%{_bindir}/python3
# TODO: tremor needs libvorbisidec