From 4ac00db3c040cf172f56a3756f242bb8a961c3ce Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 21 Aug 2024 12:22:44 +0200
Subject: [PATCH] 1.24.6

---
 .gitignore                   |  1 +
 gstreamer1-plugins-good.spec | 50 +++++++++++++++++++++++++++++++-----
 sources                      |  2 +-
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1aaf2e..4cba93e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,4 @@
 /gst-plugins-good-1.22.8.tar.xz
 /gst-plugins-good-1.22.9.tar.xz
 /gst-plugins-good-1.22.12.tar.xz
+/gst-plugins-good-1.24.6.tar.xz
diff --git a/gstreamer1-plugins-good.spec b/gstreamer1-plugins-good.spec
index 9307463..c56d30d 100644
--- a/gstreamer1-plugins-good.spec
+++ b/gstreamer1-plugins-good.spec
@@ -9,6 +9,13 @@
 %bcond_with nasm
 %endif
 
+# Only build amrnb/amrwbdec on fedora
+%if 0%{?fedora}
+%bcond_without amr
+%else
+%bcond_with amr
+%endif
+
 # RHEL 10 will provide Qt 6 and drop Qt 5
 %if 0%{?rhel} >= 10
 %bcond_with qt5
@@ -27,8 +34,8 @@
 #global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
 
 Name:           gstreamer1-plugins-good
-Version:        1.22.12
-Release:        2%{?dist}
+Version:        1.24.6
+Release:        1%{?dist}
 Summary:        GStreamer plugins with good code and licensing
 
 License:        CC0-1.0 AND GPL-2.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND xlock AND MIT AND BSD-3-Clause AND CC-BY-3.0 
@@ -86,6 +93,9 @@ BuildRequires:  qt6-qtshadertools
 BuildRequires:  nasm
 %endif
 BuildRequires:  libgudev-devel
+%if %{with amr}
+BuildRequires:  opencore-amr-devel
+%endif
 
 # extras
 %if %{with extras}
@@ -219,6 +229,8 @@ to be installed.
   -D aalib=disabled \
   -D libcaca=disabled \
   -D rpicamsrc=disabled \
+  -D amrnb=%{?with_amr:enabled}%{!?with_amr:disabled} \
+  -D amrwbdec=%{?with_amr:enabled}%{!?with_amr:disabled} \
   -D jack=%{?with_extras:enabled}%{!?with_extras:disabled} \
 %ifarch s390 s390x
   -D dv=disabled -D dv1394=disabled \
@@ -329,6 +341,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 %{_libdir}/gstreamer-%{majorminor}/libgstmpg123.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttwolame.so
 
+%if %{with amr}
+%{_libdir}/gstreamer-%{majorminor}/libgstamrnb.so
+%{_libdir}/gstreamer-%{majorminor}/libgstamrwbdec.so
+%{_datadir}/gstreamer-%{majorminor}/presets/GstAmrnbEnc.prs
+%endif
 
 %files gtk
 # Plugins with external dependencies
@@ -356,11 +373,32 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
 
 
 %changelog
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.22.12-2
-- Bump release for June 2024 mass rebuild
+* Mon Jul 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.6-1
+- 1.24.6
 
-* Fri Jun 14 2024 Wim Taymans <wtaymans@redhat.com> - 1.22.12-1
-- Update to 1.22.12
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jun 21 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.5-1
+- 1.24.5
+
+* Wed May 29 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.4-1
+- 1.24.4
+
+* Tue Apr 30 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.24.3-1
+- 1.24.3
+
+* Thu Apr 04 2024 Jan Grulich <jgrulich@redhat.com> - 1.24.0-2
+- Rebuild (qt6)
+
+* Tue Mar 05 2024 Wim Taymans <wtaymans@redhat.com> - 1.24.0-1
+- Update to 1.24.0
+
+* Fri Feb 16 2024 Jan Grulich <jgrulich@redhat.com> - 1.22.9-3
+- Rebuild (qt6)
+
+* Tue Feb 13 2024 Pete Walter <pwalter@fedoraproject.org> - 1.22.9-2
+- Rebuild for libvpx 1.14.x
 
 * Thu Jan 25 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.22.9-1
 - 1.22.9
diff --git a/sources b/sources
index 0c9b610..1779866 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-plugins-good-1.22.12.tar.xz) = 06edbec1981681eef13852f21814666ccd9b664892795109d605015e0fe351d9cc3159af3e0ff92aa0d6bf085af8a749333d128544a2ce8b545067b95b7e09c0
+SHA512 (gst-plugins-good-1.24.6.tar.xz) = d8a8f6b99368c76a1cb49d5d007324d24b781a14179534fe1c89540516ad0ed0a679bead36382eb75f3affd1610e733ab127fd9968f0dc1bc1ada91e3d0ddce9