From 93deb36d798bf7d9e2c5072bf587747e6a293282 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 23 Feb 2021 12:24:18 +0100 Subject: [PATCH] use only nasm on fedora --- gstreamer1-plugins-good.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gstreamer1-plugins-good.spec b/gstreamer1-plugins-good.spec index 4cb0c5b..acb7bc8 100644 --- a/gstreamer1-plugins-good.spec +++ b/gstreamer1-plugins-good.spec @@ -3,8 +3,10 @@ # Only build extras on fedora %if 0%{?fedora} %bcond_without extras +%bcond_without nasm %else %bcond_with extras +%bcond_with nasm %endif %bcond_without qt @@ -15,7 +17,7 @@ Name: gstreamer1-plugins-good Version: 1.18.2 -Release: 2%{?gitcommit:.git%{shortcommit}}%{?dist} +Release: 3%{?gitcommit:.git%{shortcommit}}%{?dist} Summary: GStreamer plugins with good code and licensing License: LGPLv2+ @@ -69,7 +71,9 @@ BuildRequires: mesa-libEGL-devel BuildRequires: lame-devel BuildRequires: mpg123-devel BuildRequires: twolame-devel +%if %{with nasm} BuildRequires: nasm +%endif BuildRequires: libgudev-devel %ifnarch s390 s390x @@ -168,6 +172,7 @@ to be installed. -D package-name='Fedora GStreamer-plugins-good package' \ -D package-origin='http://download.fedoraproject.org' \ -D doc=disabled \ + -D asm=%{?with_nasm:enabled}%{!?with_nasm:disabled} \ -D gtk_doc=disabled \ -D orc=enabled \ -D monoscope=disabled \ @@ -294,6 +299,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %changelog +* Tue Feb 23 2021 Wim Taymans - 1.18.2-3 +- use only nasm on fedora + * Tue Jan 26 2021 Fedora Release Engineering - 1.18.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild