than pushed to rpms/chromium (f37). "- disable
GlobalMediaControlsCastStartStop to avoid crash when using the address bar
media player button (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 12:59:37 UTC
From 8d5a9ea42095c39e2b282ce4b8bb962b03365c94 Mon Sep 17 00:00:00 2001
From: Than Ngo <than(a)redhat.com>
Date: Dec 30 2022 21:24:17 +0000
Subject: - disable GlobalMediaControlsCastStartStop to avoid crash when using the address bar media player button
- enable system brotli
---
diff --git a/chromium-108-disable-GlobalMediaControlsCastStartStop.patch b/chromium-108-disable-GlobalMediaControlsCastStartStop.patch
new file mode 100644
index 0000000..ccf52a9
--- /dev/null
+++ b/chromium-108-disable-GlobalMediaControlsCastStartStop.patch
@@ -0,0 +1,20 @@
+diff -up chromium-108.0.5359.124/chrome/browser/media/router/media_router_feature.cc.me chromium-108.0.5359.124/chrome/browser/media/router/media_router_feature.cc
+--- chromium-108.0.5359.124/chrome/browser/media/router/media_router_feature.cc.me 2022-12-30 13:05:24.520593426 +0100
++++ chromium-108.0.5359.124/chrome/browser/media/router/media_router_feature.cc 2022-12-30 14:03:08.996254352 +0100
+@@ -46,16 +46,9 @@ BASE_FEATURE(kDialEnforceUrlIPAddress,
+ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
+ "MediaRemotingWithoutFullscreen",
+ base::FEATURE_DISABLED_BY_DEFAULT);
+-
+-#if BUILDFLAG(IS_CHROMEOS)
+ BASE_FEATURE(kGlobalMediaControlsCastStartStop,
+ "GlobalMediaControlsCastStartStop",
+ base::FEATURE_DISABLED_BY_DEFAULT);
+-#else
+-BASE_FEATURE(kGlobalMediaControlsCastStartStop,
+- "GlobalMediaControlsCastStartStop",
+- base::FEATURE_ENABLED_BY_DEFAULT);
+-#endif // BUILDFLAG(IS_CHROMEOS)
+
+ #endif // !BUILDFLAG(IS_ANDROID)
+
diff --git a/chromium-108-system-brotli.patch b/chromium-108-system-brotli.patch
new file mode 100644
index 0000000..a5a4ecc
--- /dev/null
+++ b/chromium-108-system-brotli.patch
@@ -0,0 +1,36 @@
+diff -up chromium-108.0.5359.124/net/filter/brotli_source_stream.cc.me chromium-108.0.5359.124/net/filter/brotli_source_stream.cc
+--- chromium-108.0.5359.124/net/filter/brotli_source_stream.cc.me 2022-12-30 16:00:58.320318310 +0100
++++ chromium-108.0.5359.124/net/filter/brotli_source_stream.cc 2022-12-30 16:01:24.928581631 +0100
+@@ -10,7 +10,7 @@
+ #include "base/memory/raw_ptr.h"
+ #include "base/metrics/histogram_macros.h"
+ #include "net/base/io_buffer.h"
+-#include "third_party/brotli/include/brotli/decode.h"
++#include <brotli/decode.h>
+
+ namespace net {
+
+diff -up chromium-108.0.5359.124/net/ssl/cert_compression.cc.me chromium-108.0.5359.124/net/ssl/cert_compression.cc
+--- chromium-108.0.5359.124/net/ssl/cert_compression.cc.me 2022-12-30 15:57:59.859543993 +0100
++++ chromium-108.0.5359.124/net/ssl/cert_compression.cc 2022-12-30 16:00:48.560221723 +0100
+@@ -9,7 +9,7 @@
+ #include "third_party/boringssl/src/include/openssl/ssl.h"
+
+ #if !defined(NET_DISABLE_BROTLI)
+-#include "third_party/brotli/include/brotli/decode.h"
++#include <brotli/decode.h>
+ #endif
+
+ namespace net {
+diff -up chromium-108.0.5359.124/ui/base/resource/resource_bundle.cc.me chromium-108.0.5359.124/ui/base/resource/resource_bundle.cc
+--- chromium-108.0.5359.124/ui/base/resource/resource_bundle.cc.me 2022-12-30 21:12:27.058346797 +0100
++++ chromium-108.0.5359.124/ui/base/resource/resource_bundle.cc 2022-12-30 21:13:58.363183795 +0100
+@@ -31,7 +31,7 @@
+ #include "build/build_config.h"
+ #include "net/filter/gzip_header.h"
+ #include "skia/ext/image_operations.h"
+-#include "third_party/brotli/include/brotli/decode.h"
++#include <brotli/decode.h>
+ #include "third_party/skia/include/core/SkBitmap.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "third_party/zlib/google/compression_utils.h"
diff --git a/chromium.spec b/chromium.spec
index 8d5662f..0c23c08 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -109,6 +109,9 @@
# enable clang by default
%global clang 1
+# enable system brotli
+%global bundlebrotli 0
+
# set bundleffmpeg 0 to enable system ffmpeg-free
%global bundleffmpeg 1
@@ -301,6 +304,13 @@ Patch87: chromium-99.0.4844.84-markdownsafe-soft_str.patch
# drop build dependency on python3-importlib-metadata
Patch88: chromium-108-drop-python-importlib-metadata.patch
+# patch for using system brotli
+Patch89: chromium-108-system-brotli.patch
+
+# disable GlobalMediaControlsCastStartStop to avoid crash
+# when using the address bar media player button
+Patch90: chromium-108-disable-GlobalMediaControlsCastStartStop.patch
+
# Fix extra qualification error
Patch97: chromium-107.0.5304.110-remoting-extra-qualification.patch
@@ -721,7 +731,9 @@ Provides: bundled(angle) = 2422
Provides: bundled(bintrees) = 1.0.1
# This is a fork of openssl.
Provides: bundled(boringssl)
+%if 0%{?bundlebrotli}
Provides: bundled(brotli) = 222564a95d9ab58865a096b8d9f7324ea5f2e03e
+%endif
Provides: bundled(bspatch)
Provides: bundled(cacheinvalidation) = 20150720
Provides: bundled(colorama) = 799604a104
@@ -942,6 +954,12 @@ udev.
%endif
%patch88 -p1 -b .drop-build-dep-on-python3-importlib-metadata
+
+%if ! 0%{?bundlebrotli}
+%patch89 -p1 -b .system-brotli
+%endif
+
+%patch90 -p1 -b .disable-GlobalMediaControlsCastStartStop
%patch97 -p1 -b .remoting-extra-qualification
%patch98 -p1 -b .InkDropHost-crash
%patch99 -p1 -b .enable-WebRTCPipeWireCapturer-byDefault
@@ -953,9 +971,7 @@ udev.
%patch113 -p1 -b .memset
-%if 0%{?bundleffmpeg}
-# nothing
-%else
+%if ! 0%{?bundleffmpeg}
%patch114 -p1 -b .system-ffmppeg
%patch115 -p1 -b .prop-codecs
%endif
@@ -1243,63 +1259,52 @@ CHROMIUM_HEADLESS_GN_DEFINES+=' use_pulseaudio=false use_udev=false use_gtk=fals
export CHROMIUM_HEADLESS_GN_DEFINES
build/linux/unbundle/replace_gn_files.py --system-libraries \
-%if 0%{?bundlefontconfig}
-%else
+%if ! 0%{?bundlebrotli}
+ brotli \
+%endif
+%if ! 0%{?bundlefontconfig}
fontconfig \
%endif
-%if 0%{?bundlefreetype}
-%else
+%if ! 0%{?bundleffmpeg}
+ ffmpeg \
+%endif
+%if ! 0%{?bundlefreetype}
freetype \
%endif
-%if 0%{?bundleharfbuzz}
-%else
+%if ! 0%{?bundleharfbuzz}
harfbuzz-ng \
%endif
-%if 0%{?bundleicu}
-%else
+%if ! 0%{?bundleicu}
icu \
%endif
-%if %{bundlelibdrm}
-%else
+%if ! %{bundlelibdrm}
libdrm \
%endif
-%if %{bundlelibjpeg}
-%else
+%if ! %{bundlelibjpeg}
libjpeg \
%endif
-%if %{bundlelibpng}
-%else
+%if !%{bundlelibpng}
libpng \
%endif
-%if %{bundlelibusbx}
-%else
+%if !%{bundlelibusbx}
libusb \
%endif
-%if %{bundlelibwebp}
-%else
+%if ! %{bundlelibwebp}
libwebp \
%endif
-%if %{bundlelibxml}
-%else
+%if ! %{bundlelibxml}
libxml \
%endif
libxslt \
-%if %{bundleopus}
-%else
+%if ! %{bundleopus}
opus \
%endif
-%if 0%{?bundlere2}
-%else
+%if ! 0%{?bundlere2}
re2 \
%endif
-%if 0%{?bundleminizip}
-%else
+%if ! 0%{?bundleminizip}
zlib \
%endif
-%if 0%{?bundleffmpeg}
-%else
- ffmpeg \
-%endif
flac
# Check that there is no system 'google' module, shadowing bundled ones:
https://src.fedoraproject.org/rpms/chromium/c/8d5a9ea42095c39e2b282ce4b8b...
1Â year, 4Â months
than pushed to rpms/chromium (f37). "enable system opus"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 12:59:37 UTC
From e1d2ad7d482410d0a417a637e054889c8d9247d5 Mon Sep 17 00:00:00 2001
From: Than Ngo <than(a)redhat.com>
Date: Dec 31 2022 12:57:34 +0000
Subject: enable system opus
---
diff --git a/chromium-108-system-opus.patch b/chromium-108-system-opus.patch
new file mode 100644
index 0000000..3c7d9f2
--- /dev/null
+++ b/chromium-108-system-opus.patch
@@ -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 {
+
diff --git a/chromium.spec b/chromium.spec
index 0c23c08..417ac57 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -161,7 +161,7 @@ BuildRequires: libicu-devel >= 5.4
%else
# Chromium really wants to use its bundled harfbuzz. Sigh.
%global bundleharfbuzz 1
-%global bundleopus 1
+%global bundleopus 0
%global bundlelibusbx 0
%global bundlelibwebp 0
%global bundlelibpng 0
@@ -311,6 +311,9 @@ Patch89: chromium-108-system-brotli.patch
# when using the address bar media player button
Patch90: chromium-108-disable-GlobalMediaControlsCastStartStop.patch
+# patch for using system opus
+Patch91: chromium-108-system-opus.patch
+
# Fix extra qualification error
Patch97: chromium-107.0.5304.110-remoting-extra-qualification.patch
@@ -519,9 +522,7 @@ BuildRequires: elfutils
BuildRequires: elfutils-libelf-devel
BuildRequires: flac-devel
-%if 0%{?bundlefreetype}
-# nothing
-%else
+%if ! 0%{?bundlefreetype}
BuildRequires: freetype-devel
%endif
@@ -532,25 +533,22 @@ BuildRequires: kernel-headers
BuildRequires: libevent-devel
BuildRequires: libffi-devel
-%if 0%{?bundleicu}
+%if ! 0%{?bundleicu}
# 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.
-%else
# Not newer than 54 (at least not right now)
BuildRequires: libicu-devel = 54.1
%endif
-%if 0%{?bundlelibjpeg}
+%if ! 0%{?bundlelibjpeg}
# 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
-%else
BuildRequires: libjpeg-devel
%endif
-%if 0%{?bundlelibpng}
+%if ! 0%{?bundlelibpng}
# 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
-%else
BuildRequires: libpng-devel
%endif
@@ -560,11 +558,9 @@ BuildRequires: libsrtp-devel >= 1.4.4
%endif
BuildRequires: libudev-devel
-%if %{bundlelibusbx}
-# Do nothing
-%else
-Requires: libusbx >= 1.0.21-0.1.git448584a
-BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
+%if ! %{bundlelibusbx}
+Requires: libusbx >= 1.0.21-0.1.git448584a
+BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
%endif
%if 0%{use_vaapi}
@@ -574,9 +570,7 @@ BuildRequires: libva-devel
# We don't use libvpx anymore because Chromium loves to
# use bleeding edge revisions here that break other things
# ... so we just use the bundled libvpx.
-%if %{bundlelibwebp}
-# Do nothing
-%else
+%if ! %{bundlelibwebp}
BuildRequires: libwebp-devel
%endif
@@ -587,9 +581,7 @@ BuildRequires: libxshmfence-devel
# BuildRequires: libyuv-devel
BuildRequires: mesa-libGL-devel
-%if %{bundleopus}
-# Do nothing
-%else
+%if ! %{bundleopus}
BuildRequires: opus-devel
%endif
@@ -606,9 +598,7 @@ BuildRequires: python3-devel
BuildRequires: python3-zipp
BuildRequires: python3-simplejson
-%if 0%{?bundlepylibs}
-# Using bundled bits, do nothing.
-%else
+%if ! 0%{?bundlepylibs}
%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: python3-beautifulsoup4
BuildRequires: python3-html5lib
@@ -622,13 +612,19 @@ BuildRequires: python-ply
%endif
%endif
-%if 0%{?bundlere2}
-# Using bundled bits, do nothing.
-%else
+%if ! 0%{?bundlere2}
Requires: re2 >= 20160401
BuildRequires: re2-devel >= 20160401
%endif
+%if ! 0%{?bundlebrotli}
+BuildRequires: brotli-devel
+%endif
+
+%if ! %{bundleopus}
+BuildRequires: opus-devel
+%endif
+
BuildRequires: speech-dispatcher-devel
BuildRequires: yasm
BuildRequires: zlib-devel
@@ -731,9 +727,11 @@ Provides: bundled(angle) = 2422
Provides: bundled(bintrees) = 1.0.1
# This is a fork of openssl.
Provides: bundled(boringssl)
+
%if 0%{?bundlebrotli}
Provides: bundled(brotli) = 222564a95d9ab58865a096b8d9f7324ea5f2e03e
%endif
+
Provides: bundled(bspatch)
Provides: bundled(cacheinvalidation) = 20150720
Provides: bundled(colorama) = 799604a104
@@ -741,8 +739,12 @@ Provides: bundled(crashpad)
Provides: bundled(dmg_fp)
Provides: bundled(expat) = 2.2.0
Provides: bundled(fdmlibm) = 5.3
+
# Don't get too excited. MPEG and other legally problematic stuff is stripped out.
+%if %{?bundleffmpeg}
Provides: bundled(ffmpeg) = 5.1.2
+%endif
+
Provides: bundled(fips181) = 2.2.3
%if 0%{?bundlefontconfig}
@@ -754,6 +756,7 @@ Provides: bundled(freetype) = 2.11.0git
%endif
Provides: bundled(gperftools) = svn144
+
%if 0%{?bundleharfbuzz}
Provides: bundled(harfbuzz) = 2.4.0
%endif
@@ -960,6 +963,11 @@ udev.
%endif
%patch90 -p1 -b .disable-GlobalMediaControlsCastStartStop
+
+%if ! 0%{?bundleopus}
+%patch91 -p1 -b .system-opus
+%endif
+
%patch97 -p1 -b .remoting-extra-qualification
%patch98 -p1 -b .InkDropHost-crash
%patch99 -p1 -b .enable-WebRTCPipeWireCapturer-byDefault
https://src.fedoraproject.org/rpms/chromium/c/e1d2ad7d482410d0a417a637e05...
1Â year, 4Â months
than pushed to rpms/chromium (f37). "added missing patches"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 12:59:37 UTC
From 35c60c80e15dfc8778102ca94031058ae4e9fc1b Mon Sep 17 00:00:00 2001
From: Than Ngo <than(a)redhat.com>
Date: Dec 28 2022 18:05:33 +0000
Subject: added missing patches
---
diff --git a/chromium-107-ffmpeg-duration.patch b/chromium-107-ffmpeg-duration.patch
new file mode 100644
index 0000000..ee01cd9
--- /dev/null
+++ b/chromium-107-ffmpeg-duration.patch
@@ -0,0 +1,16 @@
+diff -up chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me chromium-107.0.5304.121/media/filters/audio_file_reader.cc
+--- chromium-107.0.5304.121/media/filters/audio_file_reader.cc.me 2022-12-17 08:27:12.204753071 +0100
++++ chromium-107.0.5304.121/media/filters/audio_file_reader.cc 2022-12-17 08:28:40.908211808 +0100
+@@ -243,10 +243,10 @@ bool AudioFileReader::OnNewFrame(
+ // silence from being output. In the case where we are also discarding some
+ // portion of the packet (as indicated by a negative pts), we further want to
+ // adjust the duration downward by however much exists before zero.
+- if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
++ if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
+ const base::TimeDelta pkt_duration = ConvertFromTimeBase(
+ glue_->format_context()->streams[stream_index_]->time_base,
+- frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
++ frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
+ const base::TimeDelta frame_duration =
+ base::Seconds(frames_read / static_cast<double>(sample_rate_));
+
diff --git a/chromium-107-proprietary-codecs.patch b/chromium-107-proprietary-codecs.patch
new file mode 100644
index 0000000..94b95b6
--- /dev/null
+++ b/chromium-107-proprietary-codecs.patch
@@ -0,0 +1,16 @@
+diff -up chromium-107.0.5304.121/media/BUILD.gn.me chromium-107.0.5304.121/media/BUILD.gn
+--- chromium-107.0.5304.121/media/BUILD.gn.me 2022-12-17 12:35:44.546779129 +0100
++++ chromium-107.0.5304.121/media/BUILD.gn 2022-12-17 12:35:59.296047028 +0100
+@@ -64,12 +64,6 @@ buildflag_header("media_buildflags") {
+ }
+ }
+
+-if (proprietary_codecs && media_use_ffmpeg) {
+- assert(
+- ffmpeg_branding != "Chromium",
+- "proprietary codecs and ffmpeg_branding set to Chromium are incompatible")
+-}
+-
+ # Common configuration for targets in the media directory; these must not be
+ # exported since things like USE_NEON and USE_CRAS have different meanings
+ # elsewhere in the code base.
https://src.fedoraproject.org/rpms/chromium/c/35c60c80e15dfc8778102ca9403...
1Â year, 4Â months
mtasaka pushed to rpms/ngspice (git-develop). "update to the latest git"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 12:59:35 UTC
From e1a02e16ae6adf677889b337194db923b4987c63 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Dec 31 2022 12:59:25 +0000
Subject: update to the latest git
---
diff --git a/ngspice.spec b/ngspice.spec
index dfc2f5d..ee58da9 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -5,8 +5,8 @@
# - Provides tclspice capabilities
# Chitlesh Goorah
-%global userelease 1
-%global usegitbare 0
+%global userelease 0
+%global usegitbare 1
%if 0%{?usegitbare} < 1
# force
@@ -18,15 +18,15 @@
%undefine prever
%global prerpmver %(echo "%{?prever}" | sed -e 's|-||g')
-%global mainrel 1
+%global mainrel 1.1
%if 0%{?usegitbare} >= 1
-%global gitcommit c8ac00e87a524b756f0548cfbb249bcf79c5ec79
-%global gitdate 20221028
+%global gitcommit 4bcd4daf559e70f268b5540bdf6afdf38e458e13
+%global gitdate 20221227
%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
-%global tarballdate 20221029
-%global tarballtime 2236
+%global tarballdate 20221231
+%global tarballtime 2138
%endif
%if 0%{?userelease} >= 1
diff --git a/sources b/sources
index 9823660..3cb6951 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ngspice-38.tar.gz) = 66490b251671eceda8ea0a7e216a08d90c7afa3828972d32fb1f6dbeb3223dc2e57584b1fc7f4c9e51fe385019b29b0942a30c1d87e90b004d7d932515ea9c3b
+SHA512 (ngspice-20221231T2138.tar.gz) = 49f49c0b5ab47b83ec87fa503f3c3613bb45cc185ad6b033ea41e8eb9a906c8329553228a2dabccc351a6984f661eb9be2de84cd4953dafb906f96ad9cc17f0a
SHA512 (ngspice-38-manual.pdf) = 6a871636418a7a4c9695b7aa8319539b8d23e9d7a7ab9bf34bd9d14db9af88b8750231ac29e2aee9df7d0efc8c848aead3fdd69159f1ac0035f387df0dd32507
SHA512 (ngspice-adms-va.7z) = e0bab0a275ad781ee29d2ac982075079af1d9a2d0acc7f901783cb873e1a471b2aa62c08e51448ef2e4e57623ba2e4ae3549eb882e2c625c20b8141b8109b26a
https://src.fedoraproject.org/rpms/ngspice/c/e1a02e16ae6adf677889b337194d...
1Â year, 4Â months
than pushed to rpms/chromium (rawhide). "enable system opus"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 12:58:04 UTC
From e1d2ad7d482410d0a417a637e054889c8d9247d5 Mon Sep 17 00:00:00 2001
From: Than Ngo <than(a)redhat.com>
Date: Dec 31 2022 12:57:34 +0000
Subject: enable system opus
---
diff --git a/chromium-108-system-opus.patch b/chromium-108-system-opus.patch
new file mode 100644
index 0000000..3c7d9f2
--- /dev/null
+++ b/chromium-108-system-opus.patch
@@ -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 {
+
diff --git a/chromium.spec b/chromium.spec
index 0c23c08..417ac57 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -161,7 +161,7 @@ BuildRequires: libicu-devel >= 5.4
%else
# Chromium really wants to use its bundled harfbuzz. Sigh.
%global bundleharfbuzz 1
-%global bundleopus 1
+%global bundleopus 0
%global bundlelibusbx 0
%global bundlelibwebp 0
%global bundlelibpng 0
@@ -311,6 +311,9 @@ Patch89: chromium-108-system-brotli.patch
# when using the address bar media player button
Patch90: chromium-108-disable-GlobalMediaControlsCastStartStop.patch
+# patch for using system opus
+Patch91: chromium-108-system-opus.patch
+
# Fix extra qualification error
Patch97: chromium-107.0.5304.110-remoting-extra-qualification.patch
@@ -519,9 +522,7 @@ BuildRequires: elfutils
BuildRequires: elfutils-libelf-devel
BuildRequires: flac-devel
-%if 0%{?bundlefreetype}
-# nothing
-%else
+%if ! 0%{?bundlefreetype}
BuildRequires: freetype-devel
%endif
@@ -532,25 +533,22 @@ BuildRequires: kernel-headers
BuildRequires: libevent-devel
BuildRequires: libffi-devel
-%if 0%{?bundleicu}
+%if ! 0%{?bundleicu}
# 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.
-%else
# Not newer than 54 (at least not right now)
BuildRequires: libicu-devel = 54.1
%endif
-%if 0%{?bundlelibjpeg}
+%if ! 0%{?bundlelibjpeg}
# 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
-%else
BuildRequires: libjpeg-devel
%endif
-%if 0%{?bundlelibpng}
+%if ! 0%{?bundlelibpng}
# 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
-%else
BuildRequires: libpng-devel
%endif
@@ -560,11 +558,9 @@ BuildRequires: libsrtp-devel >= 1.4.4
%endif
BuildRequires: libudev-devel
-%if %{bundlelibusbx}
-# Do nothing
-%else
-Requires: libusbx >= 1.0.21-0.1.git448584a
-BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
+%if ! %{bundlelibusbx}
+Requires: libusbx >= 1.0.21-0.1.git448584a
+BuildRequires: libusbx-devel >= 1.0.21-0.1.git448584a
%endif
%if 0%{use_vaapi}
@@ -574,9 +570,7 @@ BuildRequires: libva-devel
# We don't use libvpx anymore because Chromium loves to
# use bleeding edge revisions here that break other things
# ... so we just use the bundled libvpx.
-%if %{bundlelibwebp}
-# Do nothing
-%else
+%if ! %{bundlelibwebp}
BuildRequires: libwebp-devel
%endif
@@ -587,9 +581,7 @@ BuildRequires: libxshmfence-devel
# BuildRequires: libyuv-devel
BuildRequires: mesa-libGL-devel
-%if %{bundleopus}
-# Do nothing
-%else
+%if ! %{bundleopus}
BuildRequires: opus-devel
%endif
@@ -606,9 +598,7 @@ BuildRequires: python3-devel
BuildRequires: python3-zipp
BuildRequires: python3-simplejson
-%if 0%{?bundlepylibs}
-# Using bundled bits, do nothing.
-%else
+%if ! 0%{?bundlepylibs}
%if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: python3-beautifulsoup4
BuildRequires: python3-html5lib
@@ -622,13 +612,19 @@ BuildRequires: python-ply
%endif
%endif
-%if 0%{?bundlere2}
-# Using bundled bits, do nothing.
-%else
+%if ! 0%{?bundlere2}
Requires: re2 >= 20160401
BuildRequires: re2-devel >= 20160401
%endif
+%if ! 0%{?bundlebrotli}
+BuildRequires: brotli-devel
+%endif
+
+%if ! %{bundleopus}
+BuildRequires: opus-devel
+%endif
+
BuildRequires: speech-dispatcher-devel
BuildRequires: yasm
BuildRequires: zlib-devel
@@ -731,9 +727,11 @@ Provides: bundled(angle) = 2422
Provides: bundled(bintrees) = 1.0.1
# This is a fork of openssl.
Provides: bundled(boringssl)
+
%if 0%{?bundlebrotli}
Provides: bundled(brotli) = 222564a95d9ab58865a096b8d9f7324ea5f2e03e
%endif
+
Provides: bundled(bspatch)
Provides: bundled(cacheinvalidation) = 20150720
Provides: bundled(colorama) = 799604a104
@@ -741,8 +739,12 @@ Provides: bundled(crashpad)
Provides: bundled(dmg_fp)
Provides: bundled(expat) = 2.2.0
Provides: bundled(fdmlibm) = 5.3
+
# Don't get too excited. MPEG and other legally problematic stuff is stripped out.
+%if %{?bundleffmpeg}
Provides: bundled(ffmpeg) = 5.1.2
+%endif
+
Provides: bundled(fips181) = 2.2.3
%if 0%{?bundlefontconfig}
@@ -754,6 +756,7 @@ Provides: bundled(freetype) = 2.11.0git
%endif
Provides: bundled(gperftools) = svn144
+
%if 0%{?bundleharfbuzz}
Provides: bundled(harfbuzz) = 2.4.0
%endif
@@ -960,6 +963,11 @@ udev.
%endif
%patch90 -p1 -b .disable-GlobalMediaControlsCastStartStop
+
+%if ! 0%{?bundleopus}
+%patch91 -p1 -b .system-opus
+%endif
+
%patch97 -p1 -b .remoting-extra-qualification
%patch98 -p1 -b .InkDropHost-crash
%patch99 -p1 -b .enable-WebRTCPipeWireCapturer-byDefault
https://src.fedoraproject.org/rpms/chromium/c/e1d2ad7d482410d0a417a637e05...
1Â year, 4Â months
smani pushed to rpms/mingw-filesystem (f37). "Fix mingw-find-lang.sh
exit code"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 12:40:37 UTC
From d897e0bb98731e5536c551be2cf401f1ced71138 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Dec 31 2022 12:39:47 +0000
Subject: Fix mingw-find-lang.sh exit code
---
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 557b4bb..0de0c45 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,7 +9,7 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: mingw-filesystem
-Version: 144
+Version: 145
Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment
@@ -376,6 +376,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
%dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
%changelog
+* Sat Dec 31 2022 Sandro Mani <manisandro(a)gmail.com> - 145-1
+- Fix mingw-find-lang.sh exit code
+
* Fri Dec 23 2022 Sandro Mani <manisandro(a)gmail.com> - 144-1
- Add mingw-qmake-qt6 macros, drop mingw-cmake-kde4 macros
diff --git a/mingw-find-lang.sh b/mingw-find-lang.sh
index 55b9adb..81421fd 100755
--- a/mingw-find-lang.sh
+++ b/mingw-find-lang.sh
@@ -21,3 +21,4 @@ for target in $targets; do
done
test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang
+exit 0
https://src.fedoraproject.org/rpms/mingw-filesystem/c/d897e0bb98731e5536c...
1Â year, 4Â months
smani pushed to rpms/mingw-filesystem (rawhide). "Fix
mingw-find-lang.sh exit code"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-12-31 12:39:57 UTC
From d897e0bb98731e5536c551be2cf401f1ced71138 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Dec 31 2022 12:39:47 +0000
Subject: Fix mingw-find-lang.sh exit code
---
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 557b4bb..0de0c45 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,7 +9,7 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: mingw-filesystem
-Version: 144
+Version: 145
Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment
@@ -376,6 +376,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
%dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
%changelog
+* Sat Dec 31 2022 Sandro Mani <manisandro(a)gmail.com> - 145-1
+- Fix mingw-find-lang.sh exit code
+
* Fri Dec 23 2022 Sandro Mani <manisandro(a)gmail.com> - 144-1
- Add mingw-qmake-qt6 macros, drop mingw-cmake-kde4 macros
diff --git a/mingw-find-lang.sh b/mingw-find-lang.sh
index 55b9adb..81421fd 100755
--- a/mingw-find-lang.sh
+++ b/mingw-find-lang.sh
@@ -21,3 +21,4 @@ for target in $targets; do
done
test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang
+exit 0
https://src.fedoraproject.org/rpms/mingw-filesystem/c/d897e0bb98731e5536c...
1Â year, 4Â months