enable system opus

epel8
Than Ngo 2 years ago
parent 8d5a9ea420
commit e1d2ad7d48

@ -0,0 +1,12 @@
diff -up chromium-108.0.5359.124/media/audio/audio_opus_encoder.h.me chromium-108.0.5359.124/media/audio/audio_opus_encoder.h
--- chromium-108.0.5359.124/media/audio/audio_opus_encoder.h.me 2022-12-31 09:49:17.100277502 +0100
+++ chromium-108.0.5359.124/media/audio/audio_opus_encoder.h 2022-12-31 09:49:57.101016710 +0100
@@ -12,7 +12,7 @@
#include "media/base/audio_converter.h"
#include "media/base/audio_encoder.h"
#include "media/base/audio_timestamp_helper.h"
-#include "third_party/opus/src/include/opus.h"
+#include <opus/opus.h>
namespace media {

@ -161,7 +161,7 @@ BuildRequires: libicu-devel >= 5.4
%else %else
# Chromium really wants to use its bundled harfbuzz. Sigh. # Chromium really wants to use its bundled harfbuzz. Sigh.
%global bundleharfbuzz 1 %global bundleharfbuzz 1
%global bundleopus 1 %global bundleopus 0
%global bundlelibusbx 0 %global bundlelibusbx 0
%global bundlelibwebp 0 %global bundlelibwebp 0
%global bundlelibpng 0 %global bundlelibpng 0
@ -311,6 +311,9 @@ Patch89: chromium-108-system-brotli.patch
# when using the address bar media player button # when using the address bar media player button
Patch90: chromium-108-disable-GlobalMediaControlsCastStartStop.patch Patch90: chromium-108-disable-GlobalMediaControlsCastStartStop.patch
# patch for using system opus
Patch91: chromium-108-system-opus.patch
# Fix extra qualification error # Fix extra qualification error
Patch97: chromium-107.0.5304.110-remoting-extra-qualification.patch Patch97: chromium-107.0.5304.110-remoting-extra-qualification.patch
@ -519,9 +522,7 @@ BuildRequires: elfutils
BuildRequires: elfutils-libelf-devel BuildRequires: elfutils-libelf-devel
BuildRequires: flac-devel BuildRequires: flac-devel
%if 0%{?bundlefreetype} %if ! 0%{?bundlefreetype}
# nothing
%else
BuildRequires: freetype-devel BuildRequires: freetype-devel
%endif %endif
@ -532,25 +533,22 @@ BuildRequires: kernel-headers
BuildRequires: libevent-devel BuildRequires: libevent-devel
BuildRequires: libffi-devel BuildRequires: libffi-devel
%if 0%{?bundleicu} %if ! 0%{?bundleicu}
# If this is true, we're using the bundled icu. # If this is true, we're using the bundled icu.
# We'd like to use the system icu every time, but we cannot always do that. # We'd like to use the system icu every time, but we cannot always do that.
%else
# Not newer than 54 (at least not right now) # Not newer than 54 (at least not right now)
BuildRequires: libicu-devel = 54.1 BuildRequires: libicu-devel = 54.1
%endif %endif
%if 0%{?bundlelibjpeg} %if ! 0%{?bundlelibjpeg}
# If this is true, we're using the bundled libjpeg # If this is true, we're using the bundled libjpeg
# which we need to do because the RHEL 7 libjpeg doesn't work for chromium anymore # which we need to do because the RHEL 7 libjpeg doesn't work for chromium anymore
%else
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
%endif %endif
%if 0%{?bundlelibpng} %if ! 0%{?bundlelibpng}
# If this is true, we're using the bundled libpng # If this is true, we're using the bundled libpng
# which we need to do because the RHEL 7 libpng doesn't work right anymore # which we need to do because the RHEL 7 libpng doesn't work right anymore
%else
BuildRequires: libpng-devel BuildRequires: libpng-devel
%endif %endif
@ -560,11 +558,9 @@ BuildRequires: libsrtp-devel >= 1.4.4
%endif %endif
BuildRequires: libudev-devel BuildRequires: libudev-devel
%if %{bundlelibusbx} %if ! %{bundlelibusbx}
# Do nothing Requires: libusbx >= 1.0.21-0.1.git448584a
%else BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
Requires: libusbx >= 1.0.21-0.1.git448584a
BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
%endif %endif
%if 0%{use_vaapi} %if 0%{use_vaapi}
@ -574,9 +570,7 @@ BuildRequires: libva-devel
# We don't use libvpx anymore because Chromium loves to # We don't use libvpx anymore because Chromium loves to
# use bleeding edge revisions here that break other things # use bleeding edge revisions here that break other things
# ... so we just use the bundled libvpx. # ... so we just use the bundled libvpx.
%if %{bundlelibwebp} %if ! %{bundlelibwebp}
# Do nothing
%else
BuildRequires: libwebp-devel BuildRequires: libwebp-devel
%endif %endif
@ -587,9 +581,7 @@ BuildRequires: libxshmfence-devel
# BuildRequires: libyuv-devel # BuildRequires: libyuv-devel
BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGL-devel
%if %{bundleopus} %if ! %{bundleopus}
# Do nothing
%else
BuildRequires: opus-devel BuildRequires: opus-devel
%endif %endif
@ -606,9 +598,7 @@ BuildRequires: python3-devel
BuildRequires: python3-zipp BuildRequires: python3-zipp
BuildRequires: python3-simplejson BuildRequires: python3-simplejson
%if 0%{?bundlepylibs} %if ! 0%{?bundlepylibs}
# Using bundled bits, do nothing.
%else
%if 0%{?fedora} || 0%{?rhel} >= 8 %if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: python3-beautifulsoup4 BuildRequires: python3-beautifulsoup4
BuildRequires: python3-html5lib BuildRequires: python3-html5lib
@ -622,13 +612,19 @@ BuildRequires: python-ply
%endif %endif
%endif %endif
%if 0%{?bundlere2} %if ! 0%{?bundlere2}
# Using bundled bits, do nothing.
%else
Requires: re2 >= 20160401 Requires: re2 >= 20160401
BuildRequires: re2-devel >= 20160401 BuildRequires: re2-devel >= 20160401
%endif %endif
%if ! 0%{?bundlebrotli}
BuildRequires: brotli-devel
%endif
%if ! %{bundleopus}
BuildRequires: opus-devel
%endif
BuildRequires: speech-dispatcher-devel BuildRequires: speech-dispatcher-devel
BuildRequires: yasm BuildRequires: yasm
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -731,9 +727,11 @@ Provides: bundled(angle) = 2422
Provides: bundled(bintrees) = 1.0.1 Provides: bundled(bintrees) = 1.0.1
# This is a fork of openssl. # This is a fork of openssl.
Provides: bundled(boringssl) Provides: bundled(boringssl)
%if 0%{?bundlebrotli} %if 0%{?bundlebrotli}
Provides: bundled(brotli) = 222564a95d9ab58865a096b8d9f7324ea5f2e03e Provides: bundled(brotli) = 222564a95d9ab58865a096b8d9f7324ea5f2e03e
%endif %endif
Provides: bundled(bspatch) Provides: bundled(bspatch)
Provides: bundled(cacheinvalidation) = 20150720 Provides: bundled(cacheinvalidation) = 20150720
Provides: bundled(colorama) = 799604a104 Provides: bundled(colorama) = 799604a104
@ -741,8 +739,12 @@ Provides: bundled(crashpad)
Provides: bundled(dmg_fp) Provides: bundled(dmg_fp)
Provides: bundled(expat) = 2.2.0 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 %{?bundleffmpeg}
Provides: bundled(ffmpeg) = 5.1.2 Provides: bundled(ffmpeg) = 5.1.2
%endif
Provides: bundled(fips181) = 2.2.3 Provides: bundled(fips181) = 2.2.3
%if 0%{?bundlefontconfig} %if 0%{?bundlefontconfig}
@ -754,6 +756,7 @@ Provides: bundled(freetype) = 2.11.0git
%endif %endif
Provides: bundled(gperftools) = svn144 Provides: bundled(gperftools) = svn144
%if 0%{?bundleharfbuzz} %if 0%{?bundleharfbuzz}
Provides: bundled(harfbuzz) = 2.4.0 Provides: bundled(harfbuzz) = 2.4.0
%endif %endif
@ -960,6 +963,11 @@ udev.
%endif %endif
%patch90 -p1 -b .disable-GlobalMediaControlsCastStartStop %patch90 -p1 -b .disable-GlobalMediaControlsCastStartStop
%if ! 0%{?bundleopus}
%patch91 -p1 -b .system-opus
%endif
%patch97 -p1 -b .remoting-extra-qualification %patch97 -p1 -b .remoting-extra-qualification
%patch98 -p1 -b .InkDropHost-crash %patch98 -p1 -b .InkDropHost-crash
%patch99 -p1 -b .enable-WebRTCPipeWireCapturer-byDefault %patch99 -p1 -b .enable-WebRTCPipeWireCapturer-byDefault

Loading…
Cancel
Save