From cd58963c06fbd11930870512ae5958138ae12e9a Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 19 Mar 2021 11:20:27 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gstreamer1-plugins-good.git#f912930a7c12782a210add92a091e68d8984f8fe
---
 .gitignore                   |  1 +
 gstreamer1-plugins-good.spec | 15 +++++++++++++--
 sources                      |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f251ab..031566c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@
 /gst-plugins-good-1.18.0.tar.xz
 /gst-plugins-good-1.18.1.tar.xz
 /gst-plugins-good-1.18.2.tar.xz
+/gst-plugins-good-1.18.4.tar.xz
diff --git a/gstreamer1-plugins-good.spec b/gstreamer1-plugins-good.spec
index 4cb0c5b..6a5fbc5 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
@@ -14,8 +16,8 @@
 #global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
 
 Name:           gstreamer1-plugins-good
-Version:        1.18.2
-Release:        2%{?gitcommit:.git%{shortcommit}}%{?dist}
+Version:        1.18.4
+Release:        1%{?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,12 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 
 
 %changelog
+* Tue Mar 16 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-1
+- Update to 1.18.4
+
+* Tue Feb 23 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.2-3
+- use only nasm on fedora
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 7749d2b..1eb9279 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-plugins-good-1.18.2.tar.xz) = 97de3822d5381864f1295362bac8e564977b4e1519cbecf6e6ed5351966bee472c535c5f9ac7d6688d471bf0ea16c37ac690463196a1e7dda8b565096d1604fd
+SHA512 (gst-plugins-good-1.18.4.tar.xz) = 764c66383c93e57f9c5e7742002013e07e7b25750d6974d6c07744433e8ceb7570e829e68278e2bc5214f77158311a6b3bfb013d615cf66205d8d7a9e2d54b86