- replace "with qt" by "with qt5"

- reenable qt6 for TW
- add patch chromium-133-bring_back_and_disable_allowlist.patch
  trying to fix issues with YT playback (bsc#1237071)

OBS-URL: https://build.opensuse.org/package/show/network:chromium/chromium?expand=0&rev=2076
This commit is contained in:
Ruediger Oertel
2025-02-18 16:14:33 +00:00
committed by Git OBS Bridge
parent e913355479
commit b872072220
3 changed files with 14 additions and 13 deletions

View File

@@ -25,14 +25,6 @@
BASE_FEATURE(kAudioOffload, "AudioOffload", base::FEATURE_DISABLED_BY_DEFAULT); BASE_FEATURE(kAudioOffload, "AudioOffload", base::FEATURE_DISABLED_BY_DEFAULT);
--- chromium-133.0.6943.98/media/ffmpeg/ffmpeg_common.cc 2025/02/18 16:03:18 1.1 --- chromium-133.0.6943.98/media/ffmpeg/ffmpeg_common.cc 2025/02/18 16:03:18 1.1
+++ chromium-133.0.6943.98/media/ffmpeg/ffmpeg_common.cc 2025/02/18 16:04:02 +++ chromium-133.0.6943.98/media/ffmpeg/ffmpeg_common.cc 2025/02/18 16:04:02
@@ -19,6 +19,7 @@
#include "media/base/audio_decoder_config.h"
#include "media/base/decoder_buffer.h"
#include "media/base/encryption_scheme.h"
+#include "media/base/media_switches.h"
#include "media/base/media_util.h"
#include "media/base/supported_types.h"
#include "media/base/video_aspect_ratio.h"
@@ -76,7 +76,8 @@ @@ -76,7 +76,8 @@
void ApplyCodecContextSecuritySettings(AVCodecContext* codec_context) { void ApplyCodecContextSecuritySettings(AVCodecContext* codec_context) {
// Future versions of ffmpeg may copy the allow list from the format // Future versions of ffmpeg may copy the allow list from the format

View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Feb 18 17:12:14 CET 2025 - ro@suse.de
- replace "with qt" by "with qt5"
- reenable qt6 for TW
- add patch chromium-133-bring_back_and_disable_allowlist.patch
trying to fix issues with YT playback (bsc#1237071)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 14 09:12:39 UTC 2025 - Antonio Larrosa <alarrosa@suse.com> Fri Feb 14 09:12:39 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>

View File

@@ -27,10 +27,10 @@
# suse_version 1699 tw # suse_version 1699 tw
%if 0%{?suse_version} >= 1600 || 0%{?sle_version} >= 150400 %if 0%{?suse_version} >= 1600 || 0%{?sle_version} >= 150400
%bcond_without gtk4 %bcond_without gtk4
%bcond_without qt %bcond_without qt5
%else %else
%bcond_with gtk4 %bcond_with gtk4
%bcond_with qt %bcond_with qt5
%endif %endif
%ifarch aarch64 %ifarch aarch64
%bcond_with swiftshader %bcond_with swiftshader
@@ -45,7 +45,7 @@
# //chrome/browser/ui/lens:unit_tests(//build/toolchain/linux/unbundle:default) # //chrome/browser/ui/lens:unit_tests(//build/toolchain/linux/unbundle:default)
# needs //third_party/icu:icuuc_public(//build/toolchain/linux/unbundle:default) # needs //third_party/icu:icuuc_public(//build/toolchain/linux/unbundle:default)
#bcond_without system_icu #bcond_without system_icu
%bcond_with qt6 %bcond_without qt6
%bcond_without ffmpeg_51 %bcond_without ffmpeg_51
%define ffmpeg_version 59 %define ffmpeg_version 59
%else %else
@@ -163,6 +163,7 @@ Patch364: chromium-129-revert-AVFMT_FLAG_NOH264PARSE.patch
Patch368: chromium-131-clang-stack-protector.patch Patch368: chromium-131-clang-stack-protector.patch
Patch369: chromium-132-pdfium-explicit-template.patch Patch369: chromium-132-pdfium-explicit-template.patch
Patch370: fix-build-with-pipewire-1.3.82.patch Patch370: fix-build-with-pipewire-1.3.82.patch
Patch371: chromium-133-bring_back_and_disable_allowlist.patch
# conditionally applied patches # conditionally applied patches
# patch where ffmpeg < 5 # patch where ffmpeg < 5
Patch1001: chromium-94-ffmpeg-roll.patch Patch1001: chromium-94-ffmpeg-roll.patch
@@ -358,7 +359,7 @@ BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libavif) BuildRequires: pkgconfig(libavif)
BuildRequires: pkgconfig(libyuv) BuildRequires: pkgconfig(libyuv)
%endif %endif
%if %{with qt} %if %{with qt5}
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Widgets)
@@ -992,7 +993,7 @@ myconf_gn+=" safe_browsing_use_unrar=false"
%if %{with gtk4} %if %{with gtk4}
myconf_gn+=" gtk_version=4" myconf_gn+=" gtk_version=4"
%endif %endif
%if %{without qt} %if %{without qt5}
myconf_gn+=" use_qt=false" myconf_gn+=" use_qt=false"
%else %else
myconf_gn+=" moc_qt5_path=\"%{_libqt5_bindir}\"" myconf_gn+=" moc_qt5_path=\"%{_libqt5_bindir}\""