[chromium-freeworld/f34] (6 commits) ...Update to 98.0.4758.80
by Leigh Scott
Summary of changes:
26cf781... fix (*)
cc8b5b5... Bundle ffmpeg for f36+ (*)
d264bef... Bundle ffmpeg for f36+ (*)
dcdc7ee... Bundle ffmpeg for f36+ (*)
e604e20... undefine _auto_set_build_flags (*)
ac79e17... Update to 98.0.4758.80 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 3 months
[chromium-freeworld/f35] (6 commits) ...Update to 98.0.4758.80
by Leigh Scott
Summary of changes:
26cf781... fix (*)
cc8b5b5... Bundle ffmpeg for f36+ (*)
d264bef... Bundle ffmpeg for f36+ (*)
dcdc7ee... Bundle ffmpeg for f36+ (*)
e604e20... undefine _auto_set_build_flags (*)
ac79e17... Update to 98.0.4758.80 (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 3 months
[chromium-freeworld] Update to 98.0.4758.80
by Leigh Scott
commit ac79e177f0bd02251f33c96f30ad0f8c8ef4dc63
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 2 09:35:52 2022 +0000
Update to 98.0.4758.80
chromium-91-sql-standard-layout-type.patch | 94 +++++++++++-----------
...rash.patch => chromium-98-EnumTable-crash.patch | 16 ++--
chromium-98-system-libdrm.patch | 34 ++++++++
chromium-freeworld.spec | 14 ++--
sources | 4 +-
5 files changed, 100 insertions(+), 62 deletions(-)
---
diff --git a/chromium-91-sql-standard-layout-type.patch b/chromium-91-sql-standard-layout-type.patch
index 21643c1..3364d41 100644
--- a/chromium-91-sql-standard-layout-type.patch
+++ b/chromium-91-sql-standard-layout-type.patch
@@ -1,30 +1,29 @@
-From 80368f8ba7a8bab13440463a254888311efe3986 Mon Sep 17 00:00:00 2001
+From 144479ad7b4287bee4067f95e4218f614798a865 Mon Sep 17 00:00:00 2001
From: Stephan Hartmann <stha09(a)googlemail.com>
-Date: Tue, 4 May 2021 15:00:19 +0000
+Date: Sun, 16 Jan 2022 19:15:26 +0000
Subject: [PATCH] sql: make VirtualCursor standard layout type
sql::recover::VirtualCursor needs to be a standard layout type, but
has members of type std::unique_ptr. However, std::unique_ptr is not
guaranteed to be standard layout. Compiling with clang combined with
-gcc-11 libstdc++ fails because of this. Replace std::unique_ptr with
-raw pointers.
+gcc-11 libstdc++ fails because of this.
Bug: 1189788
Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c
---
- sql/recover_module/btree.cc | 21 +++++++++++++++------
- sql/recover_module/btree.h | 17 +++++++++++++----
+ sql/recover_module/btree.cc | 18 ++++++++++++------
+ sql/recover_module/btree.h | 21 +++++++++++++++------
sql/recover_module/cursor.cc | 24 ++++++++++++------------
sql/recover_module/cursor.h | 2 +-
- sql/recover_module/pager.cc | 7 +++----
- sql/recover_module/pager.h | 5 +++--
- 6 files changed, 47 insertions(+), 29 deletions(-)
+ sql/recover_module/pager.cc | 5 ++---
+ sql/recover_module/pager.h | 6 +++---
+ 6 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
-index 9ecaafe8a3..839318abf9 100644
+index cc9420e5c05..f12d8fa32a2 100644
--- a/sql/recover_module/btree.cc
+++ b/sql/recover_module/btree.cc
-@@ -135,16 +135,25 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value,
+@@ -136,16 +136,22 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value,
"Move the destructor to the .cc file if it's non-trival");
#endif // !DCHECK_IS_ON()
@@ -34,46 +33,47 @@ index 9ecaafe8a3..839318abf9 100644
- cell_count_(ComputeCellCount(db_reader)),
- next_read_index_(0),
- last_record_size_(0) {
++LeafPageDecoder::LeafPageDecoder() noexcept = default;
++
+void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
-+ DCHECK(db_reader);
- DCHECK(IsOnValidPage(db_reader));
+ page_id_ = db_reader->page_id();
+ db_reader_ = db_reader;
+ cell_count_ = ComputeCellCount(db_reader);
+ next_read_index_ = 0;
+ last_record_size_ = 0;
+ DCHECK(IsOnValidPage(db_reader));
DCHECK(DatabasePageReader::IsValidPageId(page_id_));
}
+void LeafPageDecoder::Reset() {
+ db_reader_ = nullptr;
-+ page_id_ = 0;
-+ cell_count_ = 0;
-+ next_read_index_ = 0;
-+ last_record_size_ = 0;
+}
+
bool LeafPageDecoder::TryAdvance() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK(CanAdvance());
diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
-index d76d076bf6..33114b01fa 100644
+index eaa087a5c52..df0e0c937c0 100644
--- a/sql/recover_module/btree.h
+++ b/sql/recover_module/btree.h
-@@ -102,7 +102,7 @@ class LeafPageDecoder {
+@@ -101,9 +101,7 @@ class LeafPageDecoder {
+ public:
+ // Creates a decoder for a DatabasePageReader's last read page.
//
- // |db_reader| must have been used to read an inner page of a table B-tree.
- // |db_reader| must outlive this instance.
+- // |db_reader| must have been used to read an inner page of a table B-tree.
+- // |db_reader| must outlive this instance.
- explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
-+ explicit LeafPageDecoder() noexcept = default;
++ LeafPageDecoder() noexcept;
~LeafPageDecoder() noexcept = default;
LeafPageDecoder(const LeafPageDecoder&) = delete;
-@@ -150,6 +150,15 @@ class LeafPageDecoder {
+@@ -151,6 +149,17 @@ class LeafPageDecoder {
// read as long as CanAdvance() returns true.
bool TryAdvance();
+ // Initialize with DatabasePageReader
++ // |db_reader| must have been used to read an inner page of a table B-tree.
++ // |db_reader| must outlive this instance.
+ void Initialize(DatabasePageReader* db_reader);
+
+ // Reset internal DatabasePageReader
@@ -85,7 +85,7 @@ index d76d076bf6..33114b01fa 100644
// True if the given reader may point to an inner page in a table B-tree.
//
// The last ReadPage() call on |db_reader| must have succeeded.
-@@ -163,14 +172,14 @@ class LeafPageDecoder {
+@@ -164,14 +173,14 @@ class LeafPageDecoder {
static int ComputeCellCount(DatabasePageReader* db_reader);
// The number of the B-tree page this reader is reading.
@@ -104,10 +104,10 @@ index d76d076bf6..33114b01fa 100644
// The reader's cursor state.
//
diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
-index 0029ff9295..42548bc4b5 100644
+index 4f827edf1b4..240de4999fe 100644
--- a/sql/recover_module/cursor.cc
+++ b/sql/recover_module/cursor.cc
-@@ -26,7 +26,7 @@ VirtualCursor::~VirtualCursor() {
+@@ -28,7 +28,7 @@ VirtualCursor::~VirtualCursor() {
int VirtualCursor::First() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
inner_decoders_.clear();
@@ -116,7 +116,7 @@ index 0029ff9295..42548bc4b5 100644
AppendPageDecoder(table_->root_page_id());
return Next();
-@@ -36,18 +36,18 @@ int VirtualCursor::Next() {
+@@ -38,18 +38,18 @@ int VirtualCursor::Next() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
record_reader_.Reset();
@@ -142,7 +142,7 @@ index 0029ff9295..42548bc4b5 100644
continue;
}
if (!record_reader_.Initialize())
-@@ -99,13 +99,13 @@ int VirtualCursor::ReadColumn(int column_index,
+@@ -101,13 +101,13 @@ int VirtualCursor::ReadColumn(int column_index,
int64_t VirtualCursor::RowId() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK(record_reader_.IsInitialized());
@@ -159,7 +159,7 @@ index 0029ff9295..42548bc4b5 100644
<< __func__
<< " must only be called when the current path has no leaf decoder";
-@@ -113,7 +113,7 @@ void VirtualCursor::AppendPageDecoder(int page_id) {
+@@ -115,7 +115,7 @@ void VirtualCursor::AppendPageDecoder(int page_id) {
return;
if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
@@ -169,10 +169,10 @@ index 0029ff9295..42548bc4b5 100644
}
diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
-index afcd6900e1..b15c31d425 100644
+index 845b7852648..cc4e85f83f9 100644
--- a/sql/recover_module/cursor.h
+++ b/sql/recover_module/cursor.h
-@@ -129,7 +129,7 @@ class VirtualCursor {
+@@ -130,7 +130,7 @@ class VirtualCursor {
std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
// Decodes the leaf page containing records.
@@ -182,7 +182,7 @@ index afcd6900e1..b15c31d425 100644
SEQUENCE_CHECKER(sequence_checker_);
};
diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
-index 58e75de270..5fe96204e5 100644
+index 58e75de2704..69d98cef98d 100644
--- a/sql/recover_module/pager.cc
+++ b/sql/recover_module/pager.cc
@@ -23,8 +23,7 @@ static_assert(DatabasePageReader::kMaxPageId <= std::numeric_limits<int>::max(),
@@ -191,34 +191,34 @@ index 58e75de270..5fe96204e5 100644
DatabasePageReader::DatabasePageReader(VirtualTable* table)
- : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
- table_(table) {
-+ : page_data_(), table_(table) {
++ : page_data_(table->page_size()), table_(table) {
DCHECK(table != nullptr);
DCHECK(IsValidPageSize(table->page_size()));
}
-@@ -57,8 +56,8 @@ int DatabasePageReader::ReadPage(int page_id) {
- std::numeric_limits<int64_t>::max(),
+@@ -58,7 +57,7 @@ int DatabasePageReader::ReadPage(int page_id) {
"The |read_offset| computation above may overflow");
-- int sqlite_status =
+ int sqlite_status =
- RawRead(sqlite_file, read_size, read_offset, page_data_.get());
-+ int sqlite_status = RawRead(sqlite_file, read_size, read_offset,
-+ const_cast<uint8_t*>(page_data_.data()));
++ RawRead(sqlite_file, read_size, read_offset, page_data_.data());
// |page_id_| needs to be set to kInvalidPageId if the read failed.
// Otherwise, future ReadPage() calls with the previous |page_id_| value
diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
-index 0e388ddc3b..99314e30ff 100644
+index 07cac3cb989..d08f0932fab 100644
--- a/sql/recover_module/pager.h
+++ b/sql/recover_module/pager.h
-@@ -5,6 +5,7 @@
- #ifndef SQL_RECOVER_MODULE_PAGER_H_
+@@ -6,8 +6,8 @@
#define SQL_RECOVER_MODULE_PAGER_H_
-+#include <array>
#include <cstdint>
- #include <memory>
+-#include <memory>
#include <ostream>
-@@ -71,7 +72,7 @@ class DatabasePageReader {
++#include <vector>
+
+ #include "base/check_op.h"
+ #include "base/memory/raw_ptr.h"
+@@ -72,7 +72,7 @@ class DatabasePageReader {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK_NE(page_id_, kInvalidPageId)
<< "Successful ReadPage() required before accessing pager state";
@@ -227,12 +227,12 @@ index 0e388ddc3b..99314e30ff 100644
}
// The number of bytes in the page read by the last ReadPage() call.
-@@ -138,7 +139,7 @@ class DatabasePageReader {
+@@ -139,7 +139,7 @@ class DatabasePageReader {
int page_id_ = kInvalidPageId;
// Stores the bytes of the last page successfully read by ReadPage().
// The content is undefined if the last call to ReadPage() did not succeed.
- const std::unique_ptr<uint8_t[]> page_data_;
-+ const std::array<uint8_t, kMaxPageSize> page_data_;
++ std::vector<uint8_t> page_data_;
// Raw pointer usage is acceptable because this instance's owner is expected
// to ensure that the VirtualTable outlives this.
- VirtualTable* const table_;
+ const raw_ptr<VirtualTable> table_;
diff --git a/chromium-96-EnumTable-crash.patch b/chromium-98-EnumTable-crash.patch
similarity index 90%
rename from chromium-96-EnumTable-crash.patch
rename to chromium-98-EnumTable-crash.patch
index 9736739..f058ec1 100644
--- a/chromium-96-EnumTable-crash.patch
+++ b/chromium-98-EnumTable-crash.patch
@@ -1,5 +1,5 @@
diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
-index aad9e08..2f3fcad 100644
+index 842553a..89de703 100644
--- a/components/cast_channel/enum_table.h
+++ b/components/cast_channel/enum_table.h
@@ -8,6 +8,7 @@
@@ -9,8 +9,8 @@ index aad9e08..2f3fcad 100644
+#include <vector>
#include "base/check_op.h"
- #include "base/macros.h"
-@@ -188,7 +189,6 @@ class
+ #include "base/notreached.h"
+@@ -187,7 +188,6 @@ class
inline constexpr GenericEnumTableEntry(int32_t value);
inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
@@ -18,7 +18,7 @@ index aad9e08..2f3fcad 100644
GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
private:
-@@ -254,7 +254,6 @@ class EnumTable {
+@@ -253,7 +253,6 @@ class EnumTable {
constexpr Entry(E value, base::StringPiece str)
: GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
@@ -26,7 +26,7 @@ index aad9e08..2f3fcad 100644
Entry& operator=(const Entry&) = delete;
};
-@@ -313,15 +312,14 @@ class EnumTable {
+@@ -312,15 +311,14 @@ class EnumTable {
if (is_sorted_) {
const std::size_t index = static_cast<std::size_t>(value);
if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
@@ -44,7 +44,7 @@ index aad9e08..2f3fcad 100644
}
// This overload of GetString is designed for cases where the argument is a
-@@ -349,8 +347,7 @@ class EnumTable {
+@@ -348,8 +346,7 @@ class EnumTable {
// enum value directly.
absl::optional<E> GetEnum(base::StringPiece str) const {
auto* entry = GenericEnumTableEntry::FindByString(
@@ -54,7 +54,7 @@ index aad9e08..2f3fcad 100644
return entry ? static_cast<E>(entry->value) : absl::optional<E>();
}
-@@ -365,7 +362,7 @@ class EnumTable {
+@@ -364,7 +361,7 @@ class EnumTable {
// Align the data on a cache line boundary.
alignas(64)
#endif
@@ -63,7 +63,7 @@ index aad9e08..2f3fcad 100644
bool is_sorted_;
constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
-@@ -377,8 +374,8 @@ class EnumTable {
+@@ -376,8 +373,8 @@ class EnumTable {
for (std::size_t i = 0; i < data.size(); i++) {
for (std::size_t j = i + 1; j < data.size(); j++) {
diff --git a/chromium-98-system-libdrm.patch b/chromium-98-system-libdrm.patch
new file mode 100644
index 0000000..f2f18be
--- /dev/null
+++ b/chromium-98-system-libdrm.patch
@@ -0,0 +1,34 @@
+diff --git a/media/gpu/chromeos/BUILD.gn b/media/gpu/chromeos/BUILD.gn
+index a5c8945..d742d80 100644
+--- a/media/gpu/chromeos/BUILD.gn
++++ b/media/gpu/chromeos/BUILD.gn
+@@ -32,6 +32,7 @@ source_set("chromeos") {
+
+ if (use_vaapi) {
+ deps += [
++ "//build/config/linux/libdrm",
+ "//media/gpu/vaapi",
+ "//media/gpu/vaapi:common",
+ ]
+diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc
+index 2d77cd9..1883fd4 100644
+--- a/media/gpu/chromeos/video_decoder_pipeline.cc
++++ b/media/gpu/chromeos/video_decoder_pipeline.cc
+@@ -4,6 +4,9 @@
+
+ #include "media/gpu/chromeos/video_decoder_pipeline.h"
+
++#if BUILDFLAG(USE_VAAPI)
++#include <drm_fourcc.h>
++#endif
+ #include <memory>
+
+ #include "base/bind.h"
+@@ -28,7 +31,6 @@
+
+ #if BUILDFLAG(USE_VAAPI)
+ #include "media/gpu/vaapi/vaapi_video_decoder.h"
+-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
+ #elif BUILDFLAG(USE_V4L2_CODEC)
+ #include "media/gpu/v4l2/v4l2_video_decoder.h"
+ #else
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 2f98e89..88e6ebd 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -35,7 +35,7 @@
%global system_re2 1
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 97.0.4692.99
+Version: 98.0.4758.80
Release: 1%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -43,7 +43,7 @@ URL: https://www.chromium.org/Home
Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
# Patchset composed by Stephan Hartmann.
-%global patchset_revision chromium-97-patchset-4
+%global patchset_revision chromium-98-patchset-5
Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c...
# The following two source files are copied and modified from the chromium source
@@ -150,8 +150,9 @@ Recommends: libva-utils
ExclusiveArch: x86_64 aarch64
# Gentoo patches:
-Patch201: chromium-96-EnumTable-crash.patch
+Patch201: chromium-98-EnumTable-crash.patch
Patch202: chromium-InkDropHost-crash.patch
+Patch203: chromium-98-system-libdrm.patch
# Arch Linux patches:
Patch1226: chromium-93-ffmpeg-4.4.patch
@@ -195,8 +196,8 @@ Patch1406: chromium-rpm-fusion-brand.patch
%patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch
%patchset_apply chromium-95-libyuv-aarch64.patch
-%patchset_apply chromium-97-Point-constexpr.patch
-%patchset_apply chromium-97-ScrollView-reference.patch
+%patchset_apply chromium-98-MiraclePtr-gcc-ice.patch
+%patchset_apply chromium-98-WaylandFrameManager-check.patch
# Apply patches up to #1000 from this spec.
@@ -735,6 +736,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/vk_swiftshader_icd.json
#########################################changelogs#################################################
%changelog
+* Wed Feb 02 2022 Leigh Scott <leigh123linux(a)gmail.com> - 98.0.4758.80-1
+- Update to 98.0.4758.80
+
* Thu Jan 20 2022 Leigh Scott <leigh123linux(a)gmail.com> - 97.0.4692.99-1
- Update to 97.0.4692.99
diff --git a/sources b/sources
index 5887a2e..3653bca 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (chromium-97.0.4692.99.tar.xz) = 928684286b5bbc15b0e60bdf3b1eb5d644f31d13baa0b55c652b9e302f48776fac367af99d89b85ff8258455551846f7efb4f11772b182aa743c6beff844e7d5
-SHA512 (chromium-patches-chromium-97-patchset-4.tar.gz) = d5e5e4ed005c12ca973f01d8d6d657d67a36b6b20ab4d0b5bef005a5094012ea41a436a49439954ffe70fd01bbd9abad21c83d1894bbd6b3f80c5737e494ec7d
+SHA512 (chromium-98.0.4758.80.tar.xz) = 34eea957e8e67214c368dc9109a8d582ea7092b24f99467652dbda1cb236330ac2c6b3a394cc7f0389a673958019a7e59621d3eafe8c6beb69a8397ba76a4b88
+SHA512 (chromium-patches-chromium-98-patchset-5.tar.gz) = 9da2ea41698b2bcab5b143d5aa733a46e8d9aaa83217a0b9f9a4d8528ba1ef05381b43b38fcbd9d5befa1f9df200827b0fd6cea408babe6b42b36320f133eb62
2 years, 3 months
[chromium-freeworld] undefine _auto_set_build_flags
by Leigh Scott
commit e604e2032e4905689b11879976acdfb515d03da8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 2 08:33:30 2022 +0000
undefine _auto_set_build_flags
chromium-freeworld.spec | 47 ++++++++++-------------------------------------
1 file changed, 10 insertions(+), 37 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 66d6b4a..2f98e89 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -1,6 +1,4 @@
#Global Libraries
-#Do not turn it on in Fedora copr!
-%global freeworld 1
%global menu_name Chromium (Freeworld)
%global xdg_subdir chromium
%ifarch aarch64
@@ -19,7 +17,7 @@
%global __provides_exclude_from %{chromiumdir}/.*\\.so
#######################################CONFIGS###########################################
# System libraries to use.
-%if 0%{?fedora} > 35
+%if 0%{?fedora} >= 36
%global system_ffmpeg 0
%else
%global system_ffmpeg 1
@@ -42,24 +40,7 @@ Release: 1%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
URL: https://www.chromium.org/Home
-
-%if %{freeworld}
Source0: https://commondatastorage.googleapis.com/chromium-browser-official/chromi...
-%else
-# Unfortunately, Fedora & Copr forbids uploading sources with patent-encumbered
-# ffmpeg code even if they are never compiled and linked to target binaries,
-# so we must repackage upstream tarballs to satisfy this requirement. However,
-# we cannot simply delete all code of ffmpeg because this will disable support
-# for some commonly-used free codecs such as Ogg Theora. Instead, helper
-# scripts included in official Fedora packages are copied, modified, and used
-# to automate the repackaging work.
-# Get those helper scripts from https://src.fedoraproject.org/rpms/chromium
-# If you don't use Fedora services, Just set the value of freeworld in this spec file
-# to 1 to use the upstreanm packaged source.
-# The repackaged source tarball used here is produced by:
-# ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar
-Source0: chromium-%{version}-clean.tar.xz
-%endif
# Patchset composed by Stephan Hartmann.
%global patchset_revision chromium-97-patchset-4
@@ -236,9 +217,7 @@ Patch1406: chromium-rpm-fusion-brand.patch
%patch1303 -p1
%endif
-%if %{freeworld}
%patch1406 -p1
-%endif
#Let's change the default shebang of python files.
find -type f -exec sed -iE '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' {} +
@@ -545,6 +524,9 @@ ln -s %{_bindir}/true buildtools/third_party/eu-strip/bin/eu-strip || die
zlib
%endif
+# Too much debuginfo
+sed -i 's|-g2|-g0|g' build/config/compiler/BUILD.gn
+
sed -i 's|//third_party/usb_ids|/usr/share/hwdata|g' \
services/device/public/cpp/usb/BUILD.gn
@@ -566,26 +548,19 @@ export CXX=clang++
export AR=llvm-ar
export NM=llvm-nm
export CXXFLAGS="$CXXFLAGS -fpermissive"
-export CFLAGS="$CFLAGS -w"
-export CXXFLAGS="$CXXFLAGS -w"
-export CFLAGS="$CFLAGS -g0"
-export CXXFLAGS="$CXXFLAGS -g0"
gn_args=(
'rpm_fusion_package_name="%{name}"'
'rpm_fusion_menu_name="%{menu_name}"'
- is_debug=false
use_vaapi=true
is_component_build=false
is_official_build=true
use_sysroot=false
- use_custom_libcxx=false
use_aura=true
'system_libdir="%{_lib}"'
use_cups=true
use_gnome_keyring=true
use_gio=true
- use_gold=false
use_kerberos=true
use_libpci=true
use_pulseaudio=true
@@ -597,18 +572,13 @@ gn_args=(
%if %{system_harfbuzz}
use_system_harfbuzz=true
%endif
-%if %{freeworld}
'ffmpeg_branding="Chrome"'
proprietary_codecs=true
-%else
- 'ffmpeg_branding="Chromium"'
- proprietary_codecs=false
-%endif
enable_nacl=false
-%if 0%{?fedora} < 34
- chrome_pgo_phase=0
-%endif
enable_hangout_services_extension=true
+%ifarch aarch64
+ 'target_cpu="arm64"'
+%endif
fatal_linker_warnings=false
treat_warnings_as_errors=false
disable_fieldtrial_testing_config=true
@@ -627,8 +597,11 @@ gn_args+=(
gn_args+=(
+ is_debug=false
is_clang=true
clang_use_chrome_plugins=false
+ use_custom_libcxx=false
+ use_gold=false
use_thin_lto=false
use_lld=false
is_cfi=false
2 years, 3 months
[mixxx/f34] Fix missing release date in AppStream metadata
by Uwe Klotz
commit 7b85f8b2696791d04eb393f21e12f35d4e62432d
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Feb 2 00:06:05 2022 +0100
Fix missing release date in AppStream metadata
appstream_metainfo.patch | 13 +++++++++++++
mixxx.spec | 6 +++++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/appstream_metainfo.patch b/appstream_metainfo.patch
new file mode 100644
index 0000000..ca4b9ee
--- /dev/null
+++ b/appstream_metainfo.patch
@@ -0,0 +1,13 @@
+diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
+index 7564218812..c752890071 100644
+--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
++++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
+@@ -98,7 +98,7 @@
+ Do not edit it manually.
+ -->
+ <releases>
+- <release version="2.3.2" type="development">
++ <release version="2.3.2" type="stable" date="2022-01-31" timestamp="1643587200">
+ <description>
+ <ul>
+ <li>
diff --git a/mixxx.spec b/mixxx.spec
index dcbabf6..78861e9 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -25,7 +25,7 @@
Name: mixxx
Version: 2.3.2
-Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
@@ -33,6 +33,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{
# Append the actual downloaded file name with a preceding slash '/'
# as a fragment identifier to the URL to populate SOURCE1 correctly
Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder...
+Patch0: appstream_metainfo.patch
# Build Tools
BuildRequires: desktop-file-utils
@@ -207,6 +208,9 @@ appstreamcli \
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
+* Tue Feb 01 2022 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.2-2
+- Fix missing release date in AppStream metadata
+
* Mon Jan 31 2022 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.2-1
- New upstream release 2.3.2
2 years, 3 months
[mixxx/f35] Fix missing release date in AppStream metadata
by Uwe Klotz
commit 0f00e26fe54b7426331c61782d102c8682b7e5f2
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Feb 2 00:06:05 2022 +0100
Fix missing release date in AppStream metadata
appstream_metainfo.patch | 13 +++++++++++++
mixxx.spec | 6 +++++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/appstream_metainfo.patch b/appstream_metainfo.patch
new file mode 100644
index 0000000..ca4b9ee
--- /dev/null
+++ b/appstream_metainfo.patch
@@ -0,0 +1,13 @@
+diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
+index 7564218812..c752890071 100644
+--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
++++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
+@@ -98,7 +98,7 @@
+ Do not edit it manually.
+ -->
+ <releases>
+- <release version="2.3.2" type="development">
++ <release version="2.3.2" type="stable" date="2022-01-31" timestamp="1643587200">
+ <description>
+ <ul>
+ <li>
diff --git a/mixxx.spec b/mixxx.spec
index 920603d..12e5a83 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -25,7 +25,7 @@
Name: mixxx
Version: 2.3.2
-Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
@@ -33,6 +33,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{
# Append the actual downloaded file name with a preceding slash '/'
# as a fragment identifier to the URL to populate SOURCE1 correctly
Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder...
+Patch0: appstream_metainfo.patch
# Build Tools
BuildRequires: desktop-file-utils
@@ -207,6 +208,9 @@ appstreamcli \
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
+* Tue Feb 01 2022 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.2-2
+- Fix missing release date in AppStream metadata
+
* Mon Jan 31 2022 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.2-1
- New upstream release 2.3.2
2 years, 3 months
[nvidia-xconfig] Update to 510.47.03 release
by Leigh Scott
commit e782a7331f77190f023eca50ff2b0938289eba6f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Feb 1 20:30:18 2022 +0000
Update to 510.47.03 release
.gitignore | 1 +
nvidia-xconfig.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 02293ff..1c6ad30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ nvidia-xconfig-*.tar.bz2
/nvidia-xconfig-465.27.tar.gz
/nvidia-xconfig-495.46.tar.gz
/nvidia-xconfig-510.39.01.tar.gz
+/nvidia-xconfig-510.47.03.tar.gz
diff --git a/nvidia-xconfig.spec b/nvidia-xconfig.spec
index 77764ca..f055dfb 100644
--- a/nvidia-xconfig.spec
+++ b/nvidia-xconfig.spec
@@ -1,6 +1,6 @@
Name: nvidia-xconfig
Epoch: 3
-Version: 510.39.01
+Version: 510.47.03
Release: 1%{?dist}
Summary: NVIDIA X configuration file editor
@@ -52,6 +52,9 @@ mkdir -p %{buildroot}%{_sbindir}
%changelog
+* Tue Feb 01 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:510.47.03-1
+- Update to 510.47.03 release
+
* Wed Jan 12 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:510.39.01-1
- Update to 510.39.01 beta
diff --git a/sources b/sources
index 1417029..fb75569 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nvidia-xconfig-510.39.01.tar.gz) = 5df57348f502ee7e38cc0559542aaf4d526f5204dad6890d8f57d6b5627fc7611175195dc528e3d3cef98925db8ec63a3bf8787916638ad3cd2d2833836a3c58
+SHA512 (nvidia-xconfig-510.47.03.tar.gz) = 1c3f37fc3aba2482ad408d4e29a2c33e8672a60a1531ef7c5c95adaa262697cc678a9de24e2ddecd425af53237caa46fdd8771a49eccc70fb8b4766fd04f881b
2 years, 3 months