From 89f58c839c881e9224a2bc96dc965b09df5056a3 Mon Sep 17 00:00:00 2001 From: "lauren n. liberda" Date: Fri, 12 Jan 2024 14:23:35 +0100 Subject: [PATCH] community/chromium: unvendor ffmpeg back, fix opus Bug: https://gitlab.alpinelinux.org/alpine/aports/-/issues/15669 --- community/chromium/APKBUILD | 6 ++++-- community/chromium/fix-opus.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 community/chromium/fix-opus.patch diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD index 33f85e9a0cc..2c4248846b1 100644 --- a/community/chromium/APKBUILD +++ b/community/chromium/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: lauren n. liberda pkgname=chromium pkgver=120.0.6099.216 -pkgrel=0 +pkgrel=1 _extra_patches=120 # https://source.chromium.org/chromium/chromium/src/+/main:third_party/test_fonts/test_fonts.tar.gz.sha1 # (for the given version, when it changes) @@ -126,6 +126,7 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom disable-failing-tests.patch fc-cache-version.patch fix-missing-cstdint-include-musl.patch + fix-opus.patch fstatat-32bit.patch gdbinit.patch generic-sensor-include.patch @@ -517,12 +518,12 @@ prepare() { # libavif - https://github.com/AOMediaCodec/libavif/commit/4d2776a3 # libaom - https://aomedia.googlesource.com/aom/+/706ee36dcc82%5E%21/ # jsoncpp, re2, snappy, swiftshader-spirv, woff2 - requires use_custom_libcxx=false - # ffmpeg - https://gitlab.alpinelinux.org/alpine/aports/-/issues/15585 local use_system=" brotli crc32c dav1d double-conversion + ffmpeg flac fontconfig freetype @@ -864,6 +865,7 @@ bbc928e99ebcd4d953b982688b01526cb754bad018f67be9e777a4f8ac51cdd3e01374e5a63faf55 111bc22fb704d97759988268a40d6b356c51b0bd7a8119a694e905ffe21850ff64e91566cd0dd0c9d62fcb46dca8acc821436c34eb0ba78be872ee4f7ec88a7b disable-failing-tests.patch 5fc5c012c1db6cf1ba82f38c6f3f4f5ca3a209e47ac708a74de379b018e0649b7694877c9571ef79002dde875ffc07b458a3355425f1c01867f362c66c2bc1bf fc-cache-version.patch 9200f78bad70e95c648a5e8392d50642190600f655c6baa366ff6467ebad52d3b3f305dad58f3610da67136f4b723557653b174ec5c25be8d8737ee04d9ee09f fix-missing-cstdint-include-musl.patch +b24563e9a738c00fce7ff2fbdee3d7c024d9125d7c74d9ab90af6bdb16f7ec8419f2c8aa78c0640f6d5d81c17dc2c673a194401d354f466749672729b48ed068 fix-opus.patch c63dee5044353eb306a39ca1526158c0f003ab310ecb03d1c368dc2a979454590c84b8d3c15484517d5e66bb8add9b231da9abbadf2e50850abd72ac1345c4ab fstatat-32bit.patch 33ee60863cc438ef57ffef92ba4cf67a856a5ffc16138bce241bcf87e47b15154aa86918e793c26f7ec4dc62a445257ad5673ed7001daf22c4043cf6cc57da7f gdbinit.patch 36a764fa73443b47d38050b52dbe6ad2fa8d67201ff4ccdbad13b52308ef165ca046aac6f9609fe35890a6485f0f3e672e78cc41e3e44f3cdc7f145e540524e8 generic-sensor-include.patch diff --git a/community/chromium/fix-opus.patch b/community/chromium/fix-opus.patch new file mode 100644 index 00000000000..8841a32d728 --- /dev/null +++ b/community/chromium/fix-opus.patch @@ -0,0 +1,12 @@ +--- a/media/filters/ffmpeg_glue.cc ++++ b/media/filters/ffmpeg_glue.cc +@@ -142,7 +142,7 @@ const char* FFmpegGlue::GetAllowedAudioDecoders() { + static const base::NoDestructor kAllowedAudioCodecs([]() { + // This should match the configured lists in //third_party/ffmpeg. + std::string allowed_decoders( +- "vorbis,libopus,flac,pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le," ++ "vorbis,opus,libopus,flac,pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le," + "mp3,pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw"); + #if BUILDFLAG(USE_PROPRIETARY_CODECS) + allowed_decoders += ",aac"; +