- Use original tarball

- Build with internal FFmpeg

.chromium.metadata

@@ -1 +1 @@
-fd2911fdfa23a66d699b4f09abaea2f5ebe6cbfe  SOURCES/chromium-114.0.5735.198-clean.tar.xz
+8d093d534d9a67b1a3c88d97bd47d6b326f3fa71  SOURCES/chromium-114.0.5735.198.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/chromium-114.0.5735.198-clean.tar.xz
+SOURCES/chromium-114.0.5735.198.tar.xz

SPECS/chromium.spec

@@ -112,6 +112,8 @@
 %global chromium_menu_name Chromium
 %global chromium_browser_channel chromium-browser%{chromium_channel}
 %global chromium_path %{_libdir}/chromium-browser%{chromium_channel}
+# To be compatible with Yandex Browser and other proprietary staff
+%global chromium_lib %{_prefix}/lib/chromium-browser%{chromium_channel}
 %global crd_path %{_libdir}/chrome-remote-desktop
 
 # We don't want any libs in these directories to generate Provides
@@ -123,7 +125,7 @@
 # make sure there is not a trailing | at the end of the list
 # We always filter provides. We only filter Requires when building shared.
 %global __provides_exclude_from ^(%{chromium_path}/.*\\.so|%{chromium_path}/.*\\.so.*)$
-%global __requires_exclude ^(%{chromium_path}/.*\\.so|%{chromium_path}/.*\\.so.*)$
+%global __requires_exclude ^(%{chromium_path}/.*\\.so|%{chromium_path}/.*\\.so.*|libffmpeg\\.so*)$
 
 # enable clang by default
 %global clang 1
@@ -241,7 +243,7 @@
 
 Name:	chromium%{chromium_channel}
 Version: 114.0.5735.198
-Release: 1%{?dist}.inferit
+Release: 1%{?dist}.inferit.1
 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)
@@ -376,7 +378,7 @@ Patch500: 0001-Yandex-as-default-search-engine.patch
 # For Chromium Fedora use chromium-latest.py --stable --ffmpegclean --ffmpegarm
 # If you want to include the ffmpeg arm sources append the --ffmpegarm switch
 # https://commondatastorage.googleapis.com/chromium-browser-official/chromium-%%{version}.tar.xz
-Source0: chromium-%{version}-clean.tar.xz
+Source0: chromium-%{version}.tar.xz
 Source1: README.fedora
 Source2: chromium.conf
 Source3: chromium-browser.sh
@@ -426,13 +428,14 @@ BuildRequires: binutils
 %endif
 %endif
 
-# build with system ffmpeg-free
+## Build with internal FFmpeg
-%if ! %{bundleffmpegfree}
+## build with system ffmpeg-free
-BuildRequires: pkgconfig(libavcodec)
+#if ! %{bundleffmpegfree}
-BuildRequires: pkgconfig(libavfilter)
+#BuildRequires: pkgconfig(libavcodec)
-BuildRequires: pkgconfig(libavformat)
+#BuildRequires: pkgconfig(libavfilter)
-BuildRequires: pkgconfig(libavutil)
+#BuildRequires: pkgconfig(libavformat)
-%endif
+#BuildRequires: pkgconfig(libavutil)
+#endif
 
 # build with system libaom
 %if ! %{bundlelibaom}
@@ -930,14 +933,14 @@ udev.
 %patch -P12 -p1 -b .fedora-user-agent
 %endif
 
-%if ! %{bundleffmpegfree}
+#%if ! %{bundleffmpegfree}
-%patch -P114 -p1 -b .system-ffmppeg
+#%patch -P114 -p1 -b .system-ffmppeg
-%patch -P115 -p1 -b .prop-codecs
+#%patch -P115 -p1 -b .prop-codecs
-%patch -P116 -p1 -b .first_dts
+#%patch -P116 -p1 -b .first_dts
-%if 0%{?fedora} == 36
+#%if 0%{?fedora} == 36
-%patch -P117 -p1 -b .revert-new-channel-layout-api
+#%patch -P117 -p1 -b .revert-new-channel-layout-api
-%endif
+#%endif
-%endif
+#%endif
 
 # EPEL specific patches
 %if 0%{?rhel} == 7
@@ -1167,8 +1170,8 @@ CHROMIUM_BROWSER_GN_DEFINES+=' ffmpeg_branding="Chrome" proprietary_codecs=true
 %else
 CHROMIUM_BROWSER_GN_DEFINES+=' ffmpeg_branding="Chromium" proprietary_codecs=false is_component_ffmpeg=false enable_ffmpeg_video_decoders=false media_use_ffmpeg=true'
 %endif
-CHROMIUM_BROWSER_GN_DEFINES+=' media_use_openh264=false'
+#CHROMIUM_BROWSER_GN_DEFINES+=' media_use_openh264=true'
-CHROMIUM_BROWSER_GN_DEFINES+=' rtc_use_h264=false'
+#CHROMIUM_BROWSER_GN_DEFINES+=' rtc_use_h264=true'
 CHROMIUM_BROWSER_GN_DEFINES+=' use_kerberos=true'
 
 %if 0%{?rhel} == 8
@@ -1226,9 +1229,6 @@ build/linux/unbundle/replace_gn_files.py --system-libraries \
 %if ! %{bundlefontconfig}
 	fontconfig \
 %endif
-%if ! %{bundleffmpegfree}
-	ffmpeg \
-%endif
 %if ! %{bundlefreetype}
 	freetype \
 %endif
@@ -1298,6 +1298,7 @@ mkdir -p %{builddir} && cp -a %{_bindir}/gn %{builddir}/
 %build_target %{builddir} chrome
 %build_target %{builddir} chrome_sandbox
 %build_target %{builddir} chromedriver
+%build_target %{builddir} libffmpeg.so
 
 %if %{build_clear_key_cdm}
 %build_target %{builddir} clear_key_cdm
@@ -1347,7 +1348,12 @@ ln -s ../..%{chromium_path}/%{chromium_browser_channel}.sh %{buildroot}%{_bindir
 mkdir -p %{buildroot}%{_mandir}/man1/
 
 pushd %{builddir}
-	cp -a chrom*.pak resources.pak icudtl.dat %{buildroot}%{chromium_path}
+	cp -a chrom*.pak resources.pak icudtl.dat libffmpeg.so %{buildroot}%{chromium_path}
+    # To be compatible with Yandex Browser and other proprietary staff
+    %if "%{_lib}" != "lib"
+        mkdir -p %{buildroot}%{chromium_lib}
+        ln -sr %{buildroot}%{chromium_path}/libffmpeg.so %{buildroot}%{chromium_lib}/libffmpeg.so
+    %endif
 	cp -a locales/*.pak %{buildroot}%{chromium_path}/locales/
 	%ifarch x86_64 aarch64
 		cp -a libvk_swiftshader.so %{buildroot}%{chromium_path}
@@ -1543,6 +1549,8 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{chromium_path}/chrome_*.pak
 %{chromium_path}/chrome_crashpad_handler
 %{chromium_path}/resources.pak
+%{chromium_path}/libffmpeg.so
+%{chromium_lib}/libffmpeg.so
 %{chromium_path}/%{chromium_browser_channel}
 %{chromium_path}/%{chromium_browser_channel}.sh
 %attr(4755, root, root) %{chromium_path}/chrome-sandbox
@@ -1666,6 +1674,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %{chromium_path}/chromedriver
 
 %changelog
+* Fri Jul 21 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 114.0.5735.198-1.inferit.1
+- Use original tarball
+- Build with internal FFmpeg
+
 * Mon Jul 10 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 114.0.5735.198-1.inferit
 - Update to 114.0.5735.198