Fix build with internal ffmpeg

i8e changed/i9e/chromium-126.0.6478.55-1.el9.inferit
Arkady L. Shane 6 months ago
parent 6a63230b11
commit e2c6da0952
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

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

Loading…
Cancel
Save