Merge branch 'i9e' into i8e

SPECS/chromium.spec

@@ -693,6 +693,7 @@ BuildRequires: binutils
 
 BuildRequires: rustc
 
+# We do not need to do this with internal build of libffmpeg.so
 # build with system ffmpeg-free
 #%%if ! %%{bundleffmpegfree}
 #BuildRequires: pkgconfig(libavcodec)
@@ -1034,9 +1035,9 @@ Provides: bundled(expat) = 2.2.0
 Provides: bundled(fdmlibm) = 5.3
 
 # Don't get too excited. MPEG and other legally problematic stuff is stripped out.
-%if %{bundleffmpegfree}
-Provides: bundled(ffmpeg) = 6.0
-%endif
+#%%if %%{bundleffmpegfree}
+#Provides: bundled(ffmpeg) = 6.0
+#%%endif
 
 %if %{bundlelibaom}
 Provides: bundled(libaom)
@@ -1332,14 +1333,15 @@ cp /opt/rh/%{toolset}-%{dts_version}/root/usr/include/c++/%{dts_version}/optiona
 %patch -P141 -p1 -b .dma_buf_export_sync_file-conflict
 %endif
 
-%if 0%{?rhel} == 9
-%if %{bundleffmpegfree}
-%patch -P129 -p1 -R -b .ffmpeg-5.x-reordered_opaque
-%patch -P130 -p1 -b .revert-av1enc
-%patch -P133 -p1 -b .system-old-ffmpeg
-%patch -P134 -p1 -b .disable-FFmpegAllowLists
-%endif
-%endif
+# We do not need to patch ffmpeg with internal build of libffmpeg.so
+#%%if 0%%{?rhel} == 9
+#%%if %%{bundleffmpegfree}
+#%%patch -P129 -p1 -R -b .ffmpeg-5.x-reordered_opaque
+#%%patch -P130 -p1 -b .revert-av1enc
+#%%patch -P133 -p1 -b .system-old-ffmpeg
+#%%patch -P134 -p1 -b .disable-FFmpegAllowLists
+#%%endif
+#%%endif
 
 %if 0%{?rhel} > 9 || 0%{?fedora} > 39            
 %patch -P150 -p1 -b .qt6            
@@ -1952,6 +1954,10 @@ pushd %{chromebuilddir}
 %if %{bundleicu}
 	cp -a icudtl.dat %{buildroot}%{chromium_path}
 %endif
+
+    # Always copy libffmpeg to chromium directory
+	cp -a libffmpeg.so %{buildroot}%{chromium_path}
+
 	cp -a chrom*.pak resources.pak %{buildroot}%{chromium_path}
 	cp -a locales/*.pak %{buildroot}%{chromium_path}/locales/
 	%ifarch x86_64 aarch64 ppc64le