From 47bd203e8da93ab4bad3704642a6df7ebbffc9cb Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Sun, 5 May 2024 12:09:06 +0200
Subject: [PATCH] - fixed build errors on el8 - refreshed clean_ffmpeg.sh -
 added missing files for bundle ffmpeg

---
 chromium.spec      |  9 ++++++++-
 clean_ffmpeg.sh    |  9 +++++++++
 ffmpeg-clean.patch | 14 ++++++++++++++
 sources            |  2 +-
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 ffmpeg-clean.patch

diff --git a/chromium.spec b/chromium.spec
index 37821ea1..bbc71182 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -239,6 +239,8 @@
 %global bundlelibXNVCtrl 1
 %global bundlelibxml 1
 %global bundlelibevent 1
+%global bundlehighway 1
+%global bundledav1d 1
 %else
 %if 0%{?fedora} > 38 || 0%{?rhel} > 9
 %global bundlebrotli 0
@@ -308,7 +310,7 @@
 
 Name:	chromium%{chromium_channel}
 Version: 124.0.6367.118
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
 License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@@ -2113,6 +2115,11 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %endif
 
 %changelog
+* Sun May 05 2024 Than Ngo <than@redhat.com> - 124.0.6367.118-2
+- fixed build errors on el8
+- refreshed clean_ffmpeg.sh
+- added missing files for bundle ffmpeg
+
 * Wed May 01 2024 Than Ngo <than@redhat.com> - 124.0.6367.118-1
 - update to 124.0.6367.118
   * High CVE-2024-4331: Use after free in Picture In Picture
diff --git a/clean_ffmpeg.sh b/clean_ffmpeg.sh
index 2f0561c2..417245aa 100755
--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Copyright 2013-2015 Tomas Popela <tpopela@redhat.com>
+# Copyright 2022-2024 Than Ngo <than@redhat.com>
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -42,6 +43,10 @@ function copy_files() {
 
 where=$(pwd)
 
+pushd $1
+patch -p0 < ../ffmpeg-clean.patch
+popd
+
 if ! generated_files=$(./get_free_ffmpeg_source_files.py "$1" "$2"); then
 	exit 1
 fi
@@ -175,6 +180,9 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavformat/version.h \
 		libavformat/version_major.h \
 		libavformat/w64.h \
+		libavformat/iamf_parse.h \
+		libavformat/iamf_reader.h \
+		libavformat/iamf.h \
 		libavutil/aarch64/cpu.h \
 		libavutil/x86/asm.h \
 		libavutil/x86/bswap.h \
@@ -215,6 +223,7 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavutil/timestamp.h \
 		libavutil/tx_priv.h \
 		libavutil/version.h \
+		libavutil/sfc64.h \
 		libswresample/swresample.h \
 		libswresample/version.h \
 		libswresample/version_major.h \
diff --git a/ffmpeg-clean.patch b/ffmpeg-clean.patch
new file mode 100644
index 00000000..31ceba8a
--- /dev/null
+++ b/ffmpeg-clean.patch
@@ -0,0 +1,14 @@
+diff -up third_party/ffmpeg/ffmpeg_generated.gni.me third_party/ffmpeg/ffmpeg_generated.gni
+--- third_party/ffmpeg/ffmpeg_generated.gni.me	2024-05-05 00:45:53.017100841 +0200
++++ third_party/ffmpeg/ffmpeg_generated.gni	2024-05-05 00:46:20.244559951 +0200
+@@ -17,8 +17,8 @@ use_linux_config = is_linux || is_chrome
+ if ((is_android && current_cpu == "arm" && arm_use_neon) ||
+     (is_android && current_cpu == "arm64") ||
+     (is_android && current_cpu == "x64") ||
+-    (is_android && current_cpu == "x86") || is_apple || is_win ||
+-    use_linux_config) {
++    (is_android && current_cpu == "x86") || (is_apple) || (is_win) ||
++    (use_linux_config)) {
+   ffmpeg_c_sources += [
+     "libavcodec/ac3_channel_layout_tab.c",
+     "libavcodec/ac3_parser.c",
diff --git a/sources b/sources
index c7ee2f89..b7afd66e 100644
--- a/sources
+++ b/sources
@@ -2,4 +2,4 @@ SHA512 (node-v20.6.1-linux-arm64.tar.xz) = adfcaf2c22614797fd69fb46d94c1cbf64dea
 SHA512 (node-v20.6.1-linux-x64.tar.xz) = 7e15c05041a9a50f0046266aadb2e092a5aefbec19be1c7c809471add520cb57c7df3c47d88b1888b29bf2979dca3c92adddfd965370fa2a9da4ea02186464fd
 SHA512 (linux-arm64-0.19.2.tgz) = 8a0d8fec6786fffcd6954d00820037a55d61e60762c74300df0801f8db27057562c221a063bedfb8df56af9ba80abb366336987e881782c5996e6f871abd3dc6
 SHA512 (linux-x64-0.19.2.tgz) = a31cc74c4bfa54f9b75d735a1cfc944d3b5efb7c06bfba9542da9a642ae0b2d235ea00ae84d3ad0572c406405110fe7b61377af0fd15803806ef78d20fc6f05d
-SHA512 (chromium-124.0.6367.118-clean.tar.xz) = 203d0abe379aceee628f8e38b8e57265d984aba260a319bf9c2c718aa71bc211dc7a38ca443d01d3fb5f0867debb4cc49fcda0b9b8e4b12aef68af2cfba90e06
+SHA512 (chromium-124.0.6367.118-clean.tar.xz) = 770060a81051cdace4c60ae4fc32c1dcb233bfac61b1ec149d640736c0db4bfb6d50692033d6b927ca6fa4a0437fc432537cc0bd6d3468254168239f3836a06e