Merge branch 'fasttrack/3.0' into kkaitepalli/tensorflow-CVEs

microsoft · Jan 30, 2025 · 7421183 · 7421183
2 parents 960d719 + 1a8c4a7
commit 7421183
Show file tree

Hide file tree

Showing 18 changed files with 356 additions and 19,476 deletions.
diff --git a/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md b/LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md
diff --git a/LICENSES-AND-NOTICES/SPECS/data/licenses.json b/LICENSES-AND-NOTICES/SPECS/data/licenses.json
@@ -221,7 +221,6 @@
                 "facter",
                 "fakechroot",
                 "fakeroot",
-                "fdk-aac-free",
                 "fdupes",
                 "fence-virt",
                 "fetchmail",
@@ -1073,8 +1072,6 @@
                 "openssl-pkcs11",
                 "openwsman",
                 "optipng",
-                "opus",
-                "opusfile",
                 "orangefs",
                 "ORBit2",
                 "orc",

diff --git a/SPECS-EXTENDED/fdk-aac-free/fdk-aac-free.signatures.json b/SPECS-EXTENDED/fdk-aac-free/fdk-aac-free.signatures.json
diff --git a/SPECS-EXTENDED/fdk-aac-free/fdk-aac-free.spec b/SPECS-EXTENDED/fdk-aac-free/fdk-aac-free.spec
diff --git a/SPECS-EXTENDED/gstreamer1-plugins-base/gstreamer1-plugins-base.spec b/SPECS-EXTENDED/gstreamer1-plugins-base/gstreamer1-plugins-base.spec
@@ -3,7 +3,7 @@
 Summary:        GStreamer streaming media framework base plugins
 Name:           gstreamer1-plugins-base
 Version:        1.20.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -26,7 +26,6 @@ BuildRequires:  libXv-devel
 BuildRequires:  orc-devel >= 0.4.18
 BuildRequires:  pango-devel
 BuildRequires:  pkgconfig
-BuildRequires:  opus-devel
 BuildRequires:  gdk-pixbuf2-devel
 BuildRequires:  gtk3-devel
 BuildRequires:  libjpeg-turbo-devel
@@ -93,7 +92,8 @@ for developing applications that use %{name}.
   -D orc=enabled \
   -D tremor=disabled \
   -D tests=disabled \
-  -D examples=disabled
+  -D examples=disabled \
+  -D opus=disabled
 %meson_build
 
 %install
@@ -222,7 +222,6 @@ rm %{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner
 %{_libdir}/gstreamer-%{majorminor}/libgstopengl.so
 %{_libdir}/gstreamer-%{majorminor}/libgstlibvisual.so
 %{_libdir}/gstreamer-%{majorminor}/libgstogg.so
-%{_libdir}/gstreamer-%{majorminor}/libgstopus.so
 %{_libdir}/gstreamer-%{majorminor}/libgstpango.so
 %{_libdir}/gstreamer-%{majorminor}/libgsttheora.so
 %{_libdir}/gstreamer-%{majorminor}/libgstvorbis.so
@@ -416,6 +415,9 @@ rm %{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jan 22 2025 Andrew Phelps <[email protected]> - 1.20.4-3
+- Remove dependency on opus
+
 * Wed Nov 23 2022 Sumedh Sharma <[email protected]> - 1.20.4-2
 - Initial CBL-Mariner import from Fedora 37 (license: MIT)
 - License verified

diff --git a/SPECS-EXTENDED/opus/opus.signatures.json b/SPECS-EXTENDED/opus/opus.signatures.json