From bbe0f7919c12fd5ee6eb33a3960a90c1b262c912a17fcb5d2c3c5b2ecef4361d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 2 Jul 2019 09:54:55 +0000 Subject: [PATCH] Accepting request 712800 from home:Andreas_Schwab:Factory - Use libunwind only if available OBS-URL: https://build.opensuse.org/request/show/712800 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer?expand=0&rev=139 --- gstreamer.changes | 5 +++++ gstreamer.spec | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gstreamer.changes b/gstreamer.changes index a3f803d..4f82571 100644 --- a/gstreamer.changes +++ b/gstreamer.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 1 09:45:51 UTC 2019 - Andreas Schwab + +- Use libunwind only if available + ------------------------------------------------------------------- Wed Jun 12 20:08:46 UTC 2019 - mgorse@suse.com diff --git a/gstreamer.spec b/gstreamer.spec index 56bc1a4..964cad7 100644 --- a/gstreamer.spec +++ b/gstreamer.spec @@ -64,7 +64,10 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.40.0 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libdw) +%define libunwind_archs %{ix86} ia64 x86_64 %{arm} ppc ppc64 ppc64le aarch64 +%ifarch %{libunwind_archs} BuildRequires: pkgconfig(libunwind) +%endif # Ensure that the documentation corresponds with the installed version: Requires: libgstreamer-1_0-0 = %{version} @@ -85,8 +88,8 @@ installing new plug-ins. %package -n libgstreamer-1_0-0 Summary: Streaming-Media Framework Runtime -# We want to have core modules installed: Group: System/Libraries +# We want to have core modules installed: Requires: %{name} %description -n libgstreamer-1_0-0 @@ -126,8 +129,8 @@ installing new plug-ins. %package utils Summary: Streaming-Media Framework Runtime -# Generic name, never used in SuSE: Group: Productivity/Multimedia/Other +# Generic name, never used in SuSE: Provides: gstreamer:%{_bindir}/gst-launch-%{gst_branch} = %{version} # Symbol for unversioned wrappers: Provides: gstreamer-utils_versioned = %{version} @@ -179,6 +182,9 @@ sed -i "s/^executable('gst-plugin-scanner',/executable('gst-plugin-scanner-%{_ta -Dexamples=disabled \ -Dtests=disabled \ -Ddbghelp=disabled \ +%ifnarch %{libunwind_archs} + -Dlibunwind=disabled \ +%endif %{nil} %{meson_build} %else