[qmmp-plugins-freeworld] version bump to 1.5.1
by Karel Volný
commit ae31dd328e25ea0bdd9bdd6601ab8387401adbfd
Author: Karel Volný <kvolny(a)redhat.com>
Date: Mon Jul 19 15:37:52 2021 +0200
version bump to 1.5.1
.gitignore | 1 +
qmmp-plugins-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ddfb40..61bea5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ qmmp-0.9.6.tar.bz2
/qmmp-1.4.5.tar.bz2
/qmmp-1.4.6.tar.bz2
/qmmp-1.5.0.tar.bz2
+/qmmp-1.5.1.tar.bz2
diff --git a/qmmp-plugins-freeworld.spec b/qmmp-plugins-freeworld.spec
index c86583b..f9c9d8d 100644
--- a/qmmp-plugins-freeworld.spec
+++ b/qmmp-plugins-freeworld.spec
@@ -1,5 +1,5 @@
Name: qmmp-plugins-freeworld
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
@@ -170,6 +170,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-ffmpeg-enque
%changelog
+* Mon Jul 19 2021 Karel Volný <kvolny(a)redhat.com> 1.5.1-1
+- version bump to 1.5.1
+
* Tue Jun 08 2021 Karel Volný <kvolny(a)redhat.com> 1.5.0-1
- version bump to 1.5.0
diff --git a/sources b/sources
index 7fac15e..3702f80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qmmp-1.5.0.tar.bz2) = b8a29bf6b2f6da08e1ff2801c973821663570de436562ba79b40212b8b8522f0e25ea79c941bfacf252904851ed477cbfa66d7f145b172f93a105127894d5e04
+SHA512 (qmmp-1.5.1.tar.bz2) = 4b866e7b53ea1757a94e028730dd99bab3b56917e6835b46284cce148e779e00a5fe0a396667283aa13c980a9ee33d0fe76df0198320f1897ec3b73bcd1f275e
3 years
[qt5-qtwebengine-freeworld] new-sources
by Rex Dieter
commit ef6c174d44e1a6451d8e6c10e783e4666b3b8442
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Jul 14 16:28:02 2021 -0500
new-sources
.gitignore | 1 +
sources | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index 8f4a1eb..debe59b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/qtwebengine-everywhere-src-5.15.0.tar.xz
/qtwebengine-everywhere-src-5.15.1.tar.xz
/qtwebengine-everywhere-src-5.15.2.tar.xz
+/qtwebengine-everywhere-src-5.15.5.tar.xz
diff --git a/sources b/sources
index 8a68363..1d84758 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
-SHA512 (qtwebengine-everywhere-src-5.15.2.tar.xz) = de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
+SHA512 (qtwebengine-everywhere-src-5.15.5.tar.xz) = 411f022a64539540e0e61311cc7a0d7c3a9657a34ffa4ac232c28bd77cabd76639edbb9f9a88b4d04bee381fe0e851ddbb92f57da33ac5d9a40927599b64e5df
3 years
[qt5-qtwebengine-freeworld] 5.15.5
by Rex Dieter
commit 93b74be6ab5f4cd983ae8531ac0b2ca452ee0d31
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Jul 14 16:00:29 2021 -0500
5.15.5
qt5-qtwebengine-freeworld.spec | 86 +++++++------
qtwebengine-5.14-1-QT_DEPRECATED_VERSION.patch | 17 ---
qtwebengine-5.15.0-QT_DEPRECATED_VERSION.patch | 17 +++
qtwebengine-everywhere-5.13.2-use-python2.patch | 13 --
qtwebengine-everywhere-5.15.5-use-python2.patch | 24 ++++
qtwebengine-everywhere-src-5.10.0-linux-pri.patch | 24 ----
...verywhere-src-5.12.0-gn-bootstrap-verbose.patch | 13 --
...ngine-everywhere-src-5.15.0-no-icudtl-dat.patch | 15 +--
qtwebengine-everywhere-src-5.15.2-#1904652.patch | 141 ---------------------
...ywhere-src-5.15.2-sandbox-time64-syscalls.patch | 89 -------------
qtwebengine-everywhere-src-5.15.5-#1904652.patch | 141 +++++++++++++++++++++
qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch | 24 ++++
qtwebengine-everywhere-src-5.15.5-TRUE.patch | 12 ++
...ywhere-src-5.15.5-sandbox-time64-syscalls.patch | 85 +++++++++++++
qtwebengine-gcc11.patch | 52 --------
15 files changed, 358 insertions(+), 395 deletions(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index d414786..695d3e9 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -7,20 +7,24 @@
# work around missing macro in the RPM Fusion build system (matches list in macros.qt5-srpm)
%{!?qt5_qtwebengine_arches:%global qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el}
-%if 0%{?fedora} > 29
+%if 0%{?fedora}
# need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e)
%global use_system_libvpx 1
%endif
-# need libwebp >= 0.6.0
+%if 0%{?fedora} > 30 || 0%{?epel} > 7
%global use_system_libwebp 1
+%global use_system_jsoncpp 1
+%global use_system_re2 1
+%endif
+
%if 0%{?use_system_libwebp}
# only supported when using also libwebp from the system (see configure.json)
# FTBFS: appears to be https://bugreports.qt.io/browse/QTBUG-65086
%global use_system_ffmpeg 1
%endif
-%if 0%{?fedora} > 31
-# need libicu >= 64, only currently available on f32+
+%if 0%{?fedora} > 32
+# need libicu >= 65, only currently available on f33+
%global use_system_libicu 1
%endif
@@ -46,8 +50,8 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
-Version: 5.15.2
-Release: 3%{?dist}
+Version: 5.15.5
+Release: 1%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -62,13 +66,11 @@ Source0: http://download.qt.io/official_releases/qt/%{major_minor}/%{version}/su
# pulseaudio headers
Source20: pulseaudio-12.2-headers.tar.gz
-# some tweaks to linux.pri (system yasm, link libpci, run unbundling script)
-Patch0: qtwebengine-everywhere-src-5.10.0-linux-pri.patch
# quick hack to avoid checking for the nonexistent icudtl.dat and silence the
# resulting warnings - not upstreamable as is because it removes the fallback
# mechanism for the ICU data directory (which is not used in our builds because
# we use the system ICU, which embeds the data statically) completely
-Patch1: qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
+Patch1: qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch
# fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the
# ARM flags with our %%qmake_qt5 macro, including for the next patch
Patch2: qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch
@@ -78,21 +80,23 @@ Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch
# workaround FTBFS against kernel-headers-5.2.0+
Patch4: qtwebengine-SIOCGSTAMP.patch
# fix build when using qt < 5.14
-Patch5: qtwebengine-5.14-1-QT_DEPRECATED_VERSION.patch
+Patch5: qtwebengine-5.15.0-QT_DEPRECATED_VERSION.patch
# remove Android dependencies from openmax_dl ARM NEON detection (detect.c)
Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
-# Force verbose output from the GN bootstrap process
-Patch21: qtwebengine-everywhere-src-5.12.0-gn-bootstrap-verbose.patch
# Fix/workaround FTBFS on aarch64 with newer glibc
Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
# Use Python2
-Patch26: qtwebengine-everywhere-5.13.2-use-python2.patch
-# Missing #includes for gcc-11
-Patch27: qtwebengine-gcc11.patch
+Patch26: qtwebengine-everywhere-5.15.5-use-python2.patch
# Fix sandbox issue breaking text rendering with glibc >= 2.33 (#1904652)
-Patch28: qtwebengine-everywhere-src-5.15.2-#1904652.patch
+# https://bugs.chromium.org/p/chromium/issues/detail?id=1164975
+Patch28: qtwebengine-everywhere-src-5.15.5-#1904652.patch
# Fix sandbox issue on 32-bit architectures with glibc >= 2.31 (from Debian)
-Patch29: qtwebengine-everywhere-src-5.15.2-sandbox-time64-syscalls.patch
+Patch29: qtwebengine-everywhere-src-5.15.5-sandbox-time64-syscalls.patch
+# don't assume type-ness of SIGSTKSZ,
+# https://bugzilla.redhat.com/show_bug.cgi?id=1945595
+Patch30: qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch
+# FTBFS TRUE/FALSE undeclared
+Patch31: qtwebengine-everywhere-src-5.15.5-TRUE.patch
## Upstream patches:
# qtwebengine-chromium
@@ -132,7 +136,10 @@ BuildRequires: krb5-devel
BuildRequires: libicu-devel >= 64
%endif
BuildRequires: libjpeg-devel
+BuildRequires: nodejs
+%if 0%{?use_system_re2}
BuildRequires: re2-devel
+%endif
BuildRequires: snappy-devel
%ifarch %{ix86} x86_64
BuildRequires: yasm
@@ -144,7 +151,9 @@ BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(egl)
+%if 0%{?use_system_jsoncpp}
BuildRequires: pkgconfig(jsoncpp)
+%endif
%if 0%{?use_system_ffmpeg}
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
@@ -165,6 +174,7 @@ BuildRequires: pkgconfig(zlib)
%if 0%{?fedora} && 0%{?fedora} < 30
BuildRequires: pkgconfig(minizip)
%else
+BuildConflicts: minizip-devel
Provides: bundled(minizip) = 1.2
%endif
BuildRequires: pkgconfig(x11)
@@ -186,6 +196,7 @@ BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(nss)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(xkbcommon)
+BuildRequires: pkgconfig(xkbfile)
## https://bugreports.qt.io/browse/QTBUG-59094
#BuildRequires: pkgconfig(libxslt) pkgconfig(libxml-2.0)
BuildRequires: perl-interpreter
@@ -198,6 +209,8 @@ BuildRequires: %{__python2}
BuildRequires: python2
BuildRequires: python2-rpm-macros
%endif
+## HACK, seems patch26 is not 100% complete
+BuildRequires: %{_bindir}/python
%if 0%{?use_system_libvpx}
BuildRequires: pkgconfig(vpx) >= 1.7.0
%endif
@@ -342,7 +355,6 @@ mv pulse src/3rdparty/chromium/
pushd src/3rdparty/chromium
popd
-%patch0 -p1 -b .linux-pri
%if 0%{?use_system_libicu}
%patch1 -p1 -b .no-icudtl-dat
%endif
@@ -354,15 +366,13 @@ popd
#patch5 -p1 -b .QT_DEPRECATED_VERSION
## upstream patches
-
#patch10 -p1 -b .openmax-dl-neon
-## NEEDSWORK
-#patch21 -p1 -b .gn-bootstrap-verbose
%patch24 -p1 -b .aarch64-new-stat
%patch26 -p1 -b .use-python2
-%patch27 -p1 -b .gcc11
%patch28 -p1 -b .rh#1904652
%patch29 -p1 -b .sandbox-time64-syscalls
+%patch30 -p1 -b .SIGSTKSZ
+%patch31 -p1 -b .TRUE
# the xkbcommon config/feature was renamed in 5.12, so need to adjust QT_CONFIG references
# when building on older Qt releases
@@ -370,25 +380,11 @@ popd
sed -i -e 's|QT_CONFIG(xkbcommon)|QT_CONFIG(xkbcommon_evdev)|g' src/core/web_event_factory.cpp
%endif
-# fix // in #include in content/renderer/gpu to avoid debugedit failure
-#sed -i -e 's!gpu//!gpu/!g' \
-# src/3rdparty/chromium/content/renderer/gpu/compositor_forwarding_message_filter.cc
-# and another one in 2 files in WebRTC
-sed -i -e 's!audio_processing//!audio_processing/!g' \
- src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft.cc \
- src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/utility/ooura_fft_sse2.cc
-# remove ./ from #line commands in ANGLE to avoid debugedit failure (?)
-#sed -i -e 's!\./!!g' \
-# src/3rdparty/chromium/third_party/angle/src/compiler/preprocessor/Tokenizer.cpp \
-# src/3rdparty/chromium/third_party/angle/src/compiler/translator/glslang_lex.cpp
-# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
-# never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
-sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
- src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
-
+%if 0%{?use_system_re2}
# http://bugzilla.redhat.com/1337585
# can't just delete, but we'll overwrite with system headers to be on the safe side
cp -bv /usr/include/re2/*.h src/3rdparty/chromium/third_party/re2/src/re2/
+%endif
%if 0
#ifarch x86_64
@@ -414,6 +410,17 @@ popd
# copy the Chromium license so it is installed with the appropriate name
cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium
+# consider doing this as part of the tarball creation step instead? rdieter
+# fix/workaround
+# fatal error: QtWebEngineCore/qtwebenginecoreglobal.h: No such file or directory
+if [ ! -f "./include/QtWebEngineCore/qtwebenginecoreglobal.h" ]; then
+%_qt5_bindir/syncqt.pl -version %{version}
+fi
+
+# abort if this doesn't get created by syncqt.pl
+test -f "./include/QtWebEngineCore/qtwebenginecoreglobal.h"
+
+
%build
export STRIP=strip
export NINJAFLAGS="%{__ninja_common_opts}"
@@ -457,6 +464,9 @@ echo "%{_libdir}/%{name}" \
%changelog
+* Wed Jul 14 2021 Rex Dieter <rdieter(a)fedoraproject.org> - 5.15.5-1
+- 5.15.5
+
* Sun Feb 07 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 5.15.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/qtwebengine-5.15.0-QT_DEPRECATED_VERSION.patch b/qtwebengine-5.15.0-QT_DEPRECATED_VERSION.patch
new file mode 100644
index 0000000..3771308
--- /dev/null
+++ b/qtwebengine-5.15.0-QT_DEPRECATED_VERSION.patch
@@ -0,0 +1,17 @@
+diff -up qtwebengine-everywhere-src-5.15.5/src/webenginewidgets/api/qwebenginedownloaditem.h.QT_DEPRECATED_VERSION qtwebengine-everywhere-src-5.15.5/src/webenginewidgets/api/qwebenginedownloaditem.h
+--- qtwebengine-everywhere-src-5.15.5/src/webenginewidgets/api/qwebenginedownloaditem.h.QT_DEPRECATED_VERSION 2021-06-24 07:34:27.991417071 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/webenginewidgets/api/qwebenginedownloaditem.h 2021-06-24 07:36:28.996937357 -0500
+@@ -120,9 +120,13 @@ public:
+ QString mimeType() const;
+ #if QT_DEPRECATED_SINCE(5, 14)
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
++#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+ QT_DEPRECATED_VERSION_X(5, 14, "Use downloadDirectory() and downloadFileName() instead")
++#endif
+ QString path() const;
++#if QT_VERSION >= QT_VERSION_CHECK(5,14,0)
+ QT_DEPRECATED_VERSION_X(5, 14, "Use setDownloadDirectory() and setDownloadFileName() instead")
++#endif
+ void setPath(QString path);
+ #else
+ QT_DEPRECATED_X("Use downloadDirectory() and downloadFileName() instead")
diff --git a/qtwebengine-everywhere-5.15.5-use-python2.patch b/qtwebengine-everywhere-5.15.5-use-python2.patch
new file mode 100644
index 0000000..12c53ea
--- /dev/null
+++ b/qtwebengine-everywhere-5.15.5-use-python2.patch
@@ -0,0 +1,24 @@
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.use-python2 qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.use-python2 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2021-06-23 15:27:45.771765298 -0500
+@@ -83,7 +83,7 @@ def _MinifyJS(input_js):
+
+ with tempfile.NamedTemporaryFile() as _:
+ args = [
+- 'python',
++ 'python2',
+ rjsmin_path
+ ]
+ p = subprocess.Popen(args,
+diff -up qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro.use-python2 qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro
+--- qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro.use-python2 2021-06-11 00:31:04.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/webengine/module.pro 2021-06-23 15:26:48.897435095 -0500
+@@ -76,7 +76,7 @@ qtConfig(webengine-testsupport) {
+ python = $$pythonPathForShell()
+ chromium_attributions.commands = \
+ cd $$shell_quote($$shell_path($$PWD/../3rdparty)) && \
+- $$python chromium/tools/licenses.py \
++ python2 chromium/tools/licenses.py \
+ --file-template ../../tools/about_credits.tmpl \
+ --entry-template ../../tools/about_credits_entry.tmpl credits \
+ $$shell_quote($$shell_path($$OUT_PWD/chromium_attributions.qdoc))
diff --git a/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch b/qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch
similarity index 71%
rename from qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
rename to qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch
index e035dff..a83367e 100644
--- a/qtwebengine-everywhere-src-5.11.0-no-icudtl-dat.patch
+++ b/qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch
@@ -1,15 +1,15 @@
-diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
-index 1c8316430..a1c27d28f 100644
---- a/src/core/web_engine_library_info.cpp
-+++ b/src/core/web_engine_library_info.cpp
-@@ -259,29 +259,12 @@ QString dictionariesPath()
+diff -up qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp.no-icudtl-dat qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp
+--- qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp.no-icudtl-dat 2021-06-24 07:26:58.976486102 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp 2021-06-24 07:32:19.272863523 -0500
+@@ -273,7 +273,6 @@ QString dictionariesPath()
QString resourcesDataPath()
{
- static bool initialized = false;
static QString potentialResourcesPath =
- #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD)
+ #if defined(OS_MAC) && defined(QT_MAC_FRAMEWORK_BUILD)
getResourcesPath(frameworkBundle());
+@@ -282,21 +281,6 @@ QString resourcesDataPath()
#else
QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources");
#endif
@@ -28,7 +28,6 @@ index 1c8316430..a1c27d28f 100644
- potentialResourcesPath = fallbackDir();
- }
- }
--
+
return potentialResourcesPath;
}
- } // namespace
diff --git a/qtwebengine-everywhere-src-5.15.5-#1904652.patch b/qtwebengine-everywhere-src-5.15.5-#1904652.patch
new file mode 100644
index 0000000..7951e6b
--- /dev/null
+++ b/qtwebengine-everywhere-src-5.15.5-#1904652.patch
@@ -0,0 +1,141 @@
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.rh#1904652 qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.rh#1904652 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-06-24 08:34:07.566783935 -0500
+@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+ return RestrictKillTarget(current_pid, sysno);
+ }
+
++#if defined(__NR_newfstatat)
++ if (sysno == __NR_newfstatat) {
++ return RewriteFstatatSIGSYS();
++ }
++#endif
++
++#if defined(__NR_fstatat64)
++ if (sysno == __NR_fstatat64) {
++ return RewriteFstatatSIGSYS();
++ }
++#endif
++
+ if (SyscallSets::IsFileSystem(sysno) ||
+ SyscallSets::IsCurrentDirectory(sysno)) {
+ return Error(fs_denied_errno);
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.rh#1904652 qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.rh#1904652 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc 2021-06-24 08:40:08.552334787 -0500
+@@ -6,6 +6,8 @@
+
+ #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
+
++#include <errno.h>
++#include <fcntl.h>
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <string.h>
+@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct
+ return -ENOSYS;
+ }
+
++intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
++ void* aux) {
++ switch (args.nr) {
++#if defined(__NR_newfstatat)
++ case __NR_newfstatat:
++#endif
++#if defined(__NR_fstatat64)
++ case __NR_fstatat64:
++#endif
++#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
++ if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
++ && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
++ return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
++ reinterpret_cast<struct stat64 *>(args.args[2]));
++ } else {
++ errno = EACCES;
++ return -1;
++ }
++ break;
++#endif
++ }
++
++ CrashSIGSYS_Handler(args, aux);
++
++ // Should never be reached.
++ RAW_CHECK(false);
++ return -ENOSYS;
++}
++
+ bpf_dsl::ResultExpr CrashSIGSYS() {
+ return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
+ }
+@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()
+ return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
+ }
+
++bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
++ return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
++}
++
+ void AllocateCrashKeys() {
+ #if !defined(OS_NACL_NONSFI)
+ if (seccomp_crash_key)
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.rh#1904652 qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.rh#1904652 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h 2021-06-24 08:39:31.205174337 -0500
+@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
+ // sched_setparam(), sched_setscheduler()
+ SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
+ void* aux);
++// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
++// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
++SANDBOX_EXPORT intptr_t
++ SIGSYSFstatatHandler(const struct arch_seccomp_data& args, void* aux);
+
+ // Variants of the above functions for use with bpf_dsl.
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
+@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
+ SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
++SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
+
+ // Allocates a crash key so that Seccomp information can be recorded.
+ void AllocateCrashKeys();
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc.rh#1904652 qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc.rh#1904652 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.cc 2021-06-24 08:34:07.567783940 -0500
+@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
+
+ #endif // defined(MEMORY_SANITIZER)
+
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
++{
++#if defined(__NR_fstat64)
++ return syscall(__NR_fstat64, fd, buf);
++#else
++ return syscall(__NR_fstat, fd, buf);
++#endif
++}
++
+ } // namespace sandbox
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h.rh#1904652 qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h.rh#1904652 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/services/syscall_wrappers.h 2021-06-24 08:34:07.568783944 -0500
+@@ -17,6 +17,7 @@ struct sock_fprog;
+ struct rlimit64;
+ struct cap_hdr;
+ struct cap_data;
++struct stat64;
+
+ namespace sandbox {
+
+@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig
+ const struct sigaction* act,
+ struct sigaction* oldact);
+
++// Recent glibc rewrites fstat to fstatat.
++SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
++
+ } // namespace sandbox
+
+ #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
diff --git a/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch b/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch
new file mode 100644
index 0000000..2f32049
--- /dev/null
+++ b/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch
@@ -0,0 +1,24 @@
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.SIGSTKSZ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.SIGSTKSZ 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2021-06-24 09:14:27.365186590 -0500
+@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
+ #else
+ const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
+ #endif
+- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
++ size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
+ defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
+ // Account for sanitizer instrumentation requiring additional stack space.
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.SIGSTKSZ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.SIGSTKSZ 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-06-24 09:15:54.012558815 -0500
+@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
+ // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
+ // the alternative stack. Ensure that the size of the alternative stack is
+ // large enough.
+- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
++ static const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ);
+
+ // Only set an alternative stack if there isn't already one, or if the current
+ // one is too small.
diff --git a/qtwebengine-everywhere-src-5.15.5-TRUE.patch b/qtwebengine-everywhere-src-5.15.5-TRUE.patch
new file mode 100644
index 0000000..b61c923
--- /dev/null
+++ b/qtwebengine-everywhere-src-5.15.5-TRUE.patch
@@ -0,0 +1,12 @@
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c 2021-06-24 09:44:41.592468805 -0500
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler
+ #ifdef LIBXML_ICU_ENABLED
+ else if (handler->uconv_out != NULL) {
+ ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+- TRUE);
++ 1);
+ }
+ #endif /* LIBXML_ICU_ENABLED */
+ else {
diff --git a/qtwebengine-everywhere-src-5.15.5-sandbox-time64-syscalls.patch b/qtwebengine-everywhere-src-5.15.5-sandbox-time64-syscalls.patch
new file mode 100644
index 0000000..1a14bc9
--- /dev/null
+++ b/qtwebengine-everywhere-src-5.15.5-sandbox-time64-syscalls.patch
@@ -0,0 +1,85 @@
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.sandbox-time64-syscalls qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.sandbox-time64-syscalls 2021-06-24 10:36:45.687826522 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-06-24 10:36:45.692826524 -0500
+@@ -157,7 +157,14 @@ ResultExpr EvaluateSyscallImpl(int fs_de
+ return Allow();
+ #endif
+
+- if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
++ if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep
++#if defined(__NR_clock_gettime64)
++ || sysno == __NR_clock_gettime64
++#endif
++#if defined(__NR_clock_nanosleep_time64)
++ || sysno == __NR_clock_nanosleep_time64
++#endif
++ ) {
+ return RestrictClockID();
+ }
+
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc.sandbox-time64-syscalls qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc.sandbox-time64-syscalls 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc 2021-06-24 10:36:45.692826524 -0500
+@@ -60,6 +60,12 @@ class RestrictClockIdPolicy : public bpf
+ case __NR_clock_gettime:
+ case __NR_clock_getres:
+ case __NR_clock_nanosleep:
++#if defined(__NR_clock_nanosleep_time64)
++ case __NR_clock_nanosleep_time64:
++#endif
++#if defined(__NR_clock_gettime64)
++ case __NR_clock_gettime64:
++#endif
+ return RestrictClockID();
+ default:
+ return Allow();
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.sandbox-time64-syscalls qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc.sandbox-time64-syscalls 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc 2021-06-24 10:36:45.693826524 -0500
+@@ -39,6 +39,12 @@ bool SyscallSets::IsAllowedGettime(int s
+ // filtered by RestrictClokID().
+ case __NR_clock_gettime: // Parameters filtered by RestrictClockID().
+ case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID().
++#if defined(__NR_clock_gettime64)
++ case __NR_clock_gettime64: // Parameters filtered by RestrictClockID().
++#endif
++#if defined(__NR_clock_nanosleep_time64)
++ case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID().
++#endif
+ case __NR_clock_settime: // Privileged.
+ #if defined(__i386__) || \
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h.sandbox-time64-syscalls qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h.sandbox-time64-syscalls 2021-06-24 10:36:45.694826524 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h 2021-06-24 10:37:50.383852263 -0500
+@@ -1441,6 +1441,14 @@
+ #define __NR_io_pgetevents (__NR_SYSCALL_BASE+399)
+ #endif
+
++#if !defined(__NR_clock_gettime64)
++#define __NR_clock_gettime64 (__NR_SYSCALL_BASE+403)
++#endif
++
++#if !defined(__NR_clock_nanosleep_time64)
++#define __NR_clock_nanosleep_time64 (__NR_SYSCALL_BASE+407)
++#endif
++
+ // ARM private syscalls.
+ #if !defined(__ARM_NR_BASE)
+ #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h.sandbox-time64-syscalls qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h
+--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h.sandbox-time64-syscalls 2021-05-28 07:05:45.000000000 -0500
++++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h 2021-06-24 10:36:45.695826525 -0500
+@@ -1433,4 +1433,12 @@
+ #define __NR_memfd_create (__NR_Linux + 354)
+ #endif
+
++#if !defined(__NR_clock_gettime64)
++#define __NR_clock_gettime64 (__NR_Linux + 403)
++#endif
++
++#if !defined(__NR_clock_nanosleep_time64)
++#define __NR_clock_nanosleep_time64 (__NR_Linux + 407)
++#endif
++
+ #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_
3 years
[vdr-markad/f33] Update to 3.0.7
by Martin Gansser
Summary of changes:
25c55fa... Update to 3.0.7 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years
[vdr-markad/f34] Update to 3.0.7
by Martin Gansser
Summary of changes:
25c55fa... Update to 3.0.7 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years
[vdr-markad] Update to 3.0.7
by Martin Gansser
commit 25c55fa5b1f0e1a97849e40f3aaedd78c9fbc203
Author: Martin Gansser <mgansser(a)online.de>
Date: Wed Jul 14 14:18:11 2021 +0200
Update to 3.0.7
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2879dd5..d76d07f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-3.0.4.tar.gz
/vdr-markad-3.0.5.tar.gz
/vdr-markad-3.0.6.tar.gz
+/vdr-markad-3.0.7.tar.gz
diff --git a/sources b/sources
index cb007ab..6bb88a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-3.0.6.tar.gz) = 597860ab4221bd82412892235c9689de08231270ac007ddb5ea73d9ae33875fc7b40a591e3e629e88869b29092d273bb2e57a3368e1d7c54adc129bc2ad15ceb
+SHA512 (vdr-markad-3.0.7.tar.gz) = e0cf1ca5ab9f752d749e4a9c9799b8819d294e519864e38bc513faff7920b644d4a72740beae63de0c7e3ab9b455fa0941d690ca09abb7ac8e64777530b0f378
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 45a49aa..db58199 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -1,5 +1,5 @@
Name: vdr-markad
-Version: 3.0.6
+Version: 3.0.7
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -25,7 +25,7 @@ sed -i -e 's|/LC_MESSAGES/markad.mo|/LC_MESSAGES/vdr-markad.mo|' command/Makefil
%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all
%install
-make install DESTDIR=%{buildroot}
+%make_install
install -dm 755 %{buildroot}%{vdr_plugindir}
install -Dpm 644 %{SOURCE1} \
@@ -48,6 +48,9 @@ fi
%{vdr_vardir}/markad/
%changelog
+* Wed Jul 14 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 3.0.7-1
+- Update to 3.0.7
+
* Wed Jun 30 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 3.0.6-1
- Update to 3.0.6
3 years
[kodi] Patch for new fmt version
by Leigh Scott
commit 5e011cbf49b82eda014998bf52fa8f4012de2848
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 11 22:13:53 2021 +0100
Patch for new fmt version
kodi-19-fmt.patch | 26 ++++++++++++++++++++++++++
kodi.spec | 4 ++++
2 files changed, 30 insertions(+)
---
diff --git a/kodi-19-fmt.patch b/kodi-19-fmt.patch
new file mode 100644
index 0000000..458666c
--- /dev/null
+++ b/kodi-19-fmt.patch
@@ -0,0 +1,26 @@
+From 18ff80a9c169fb969b75e2143d9f1f234b71a730 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews(a)integralblue.com>
+Date: Thu, 24 Jun 2021 20:41:11 -0400
+Subject: [PATCH] [utils] include fmt/xchar.h
+
+fmt 8 moved wchar/custom char overloads to xchar.h, so for fmt 8 compatibility, xchar.h must be included
+
+See https://github.com/fmtlib/fmt/commit/76ee490468212f8705a1421b4c88f8f814b2...
+---
+ xbmc/utils/StringUtils.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h
+index ca6f82953d90a..2dc5c3f03af2f 100644
+--- a/xbmc/utils/StringUtils.h
++++ b/xbmc/utils/StringUtils.h
+@@ -36,6 +36,9 @@
+ #if FMT_VERSION >= 40000
+ #include <fmt/printf.h>
+ #endif
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
+
+ #include "XBDateTime.h"
+ #include "utils/params_check_macros.h"
diff --git a/kodi.spec b/kodi.spec
index 5726ae8..c28406d 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -89,6 +89,9 @@ Patch4: kodi-18-brp-mangle-shebangs.patch
# FFmpeg 4.4 support (RFBZ#6000)
Patch5: kodi-19-ffmpeg-4-4.patch
+# Fix for new fmt version
+Patch6: kodi-19-fmt.patch
+
%ifarch x86_64 i686
%global _with_crystalhd 1
%endif
@@ -329,6 +332,7 @@ This package contains FirewallD files for Kodi.
%patch3 -p1 -b.innobinfix
%patch4 -p1 -b.brp-mangle-shebangs
%patch5 -p1 -b.ffmpeg-4-4
+%patch6 -p1 -b.new-fmt
# Fix up Python shebangs
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" \
3 years
[kodi-pvr-wmc/f33] Update to 6.1.2
by Mohamed ElMorabity
commit 56b8e2780ef92a60d7aadc527d8d33cba72378c6
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Jul 11 16:40:48 2021 +0200
Update to 6.1.2
.gitignore | 1 +
kodi-pvr-wmc.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e6ff4d6..52a315e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/pvr.wmc-5.0.2.tar.gz
/pvr.wmc-6.0.0.tar.gz
/pvr.wmc-6.1.1.tar.gz
+/pvr.wmc-6.1.2.tar.gz
diff --git a/kodi-pvr-wmc.spec b/kodi-pvr-wmc.spec
index dae7f94..3c9cfc3 100644
--- a/kodi-pvr-wmc.spec
+++ b/kodi-pvr-wmc.spec
@@ -6,7 +6,7 @@ Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
Epoch: 1
-Version: 6.1.1
+Version: 6.1.2
Release: 1%{?dist}
Summary: WMC PVR for Kodi
@@ -45,6 +45,9 @@ ExcludeArch: %{power64} ppc64le
%changelog
+* Sun Jul 11 2021 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:6.1.2-1
+- Update to 6.1.2
+
* Fri Jan 29 2021 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:6.1.1-1
- Update to 6.1.1
diff --git a/sources b/sources
index caeb541..ac3209a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pvr.wmc-6.1.1.tar.gz) = 4d9adbe042e6b9a0f8b03be2d3981255199a76960d1a94541f0d2bee64efec76de24c8a387b3ae867f0e1d4633d25890a3870e85dc7d683f2db904e006a52df4
+SHA512 (pvr.wmc-6.1.2.tar.gz) = b0e53c8494a5c811182358afbc7834b7cc51104839c7b4bf59047ef00e4b9bbf013368d94f095fa384dd4aa590a1f64c0235328b652962cd39430273c8e41c0b
3 years
[kodi-pvr-vuplus/f33] Update to 7.4.5
by Mohamed ElMorabity
commit bbfbf5d4a813f28f6aecb7641546fd3d5e13b42b
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Jul 11 16:39:35 2021 +0200
Update to 7.4.5
.gitignore | 1 +
kodi-pvr-vuplus.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 064f8b4..9f86655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/pvr.vuplus-6.1.1.tar.gz
/pvr.vuplus-7.1.0.tar.gz
/pvr.vuplus-7.3.1.tar.gz
+/pvr.vuplus-7.4.5.tar.gz
diff --git a/kodi-pvr-vuplus.spec b/kodi-pvr-vuplus.spec
index 92109d5..022d809 100644
--- a/kodi-pvr-vuplus.spec
+++ b/kodi-pvr-vuplus.spec
@@ -6,7 +6,7 @@ Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
Epoch: 1
-Version: 7.3.1
+Version: 7.4.5
Release: 1%{?dist}
Summary: Vu+ PVR for Kodi
@@ -50,6 +50,9 @@ ExcludeArch: %{power64} ppc64le
%changelog
+* Sun Jul 11 2021 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:7.4.5-1
+- Update to 7.4.5
+
* Fri Jan 29 2021 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:7.3.1-1
- Update to 7.3.1
diff --git a/sources b/sources
index 09f4c91..39f9887 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pvr.vuplus-7.3.1.tar.gz) = 982503d87ba7bbf8e9756be2aa6602f7e4293044a1ec754165b30caa565a494bddc2d7e2ab6ff4ef83a0787f8e108f10452a5c25870589b8866c16ab3806209a
+SHA512 (pvr.vuplus-7.4.5.tar.gz) = 04ba9ab1b7aee4418c305538ac880aae80c1523fed10d7104dce8a294c072d6be87469016fc673e4d54cc1faaab0074cd15f6edf3207ad88a962d4a41844985b
3 years
[kodi-pvr-vdr-vnsi/f33] Update to 8.2.3
by Mohamed ElMorabity
commit 24cc6cf0151ea54b37006fc117bb08a4bc353759
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Jul 11 16:38:25 2021 +0200
Update to 8.2.3
.gitignore | 1 +
kodi-pvr-vdr-vnsi.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c89bfa..7167aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/pvr.vdr.vnsi-6.0.0.tar.gz
/pvr.vdr.vnsi-8.1.0.tar.gz
/pvr.vdr.vnsi-8.2.2.tar.gz
+/pvr.vdr.vnsi-8.2.3.tar.gz
diff --git a/kodi-pvr-vdr-vnsi.spec b/kodi-pvr-vdr-vnsi.spec
index 8eaac1b..c5645d3 100644
--- a/kodi-pvr-vdr-vnsi.spec
+++ b/kodi-pvr-vdr-vnsi.spec
@@ -6,7 +6,7 @@ Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
Epoch: 1
-Version: 8.2.2
+Version: 8.2.3
Release: 1%{?dist}
Summary: VDR PVR for Kodi
@@ -50,6 +50,9 @@ ExcludeArch: %{power64} ppc64le
%changelog
+* Sun Jul 11 2021 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:8.2.3-1
+- Update to 8.2.3
+
* Fri Jan 29 2021 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:8.2.2-1
- Update to 8.2.2
diff --git a/sources b/sources
index bd76522..ba3f7a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pvr.vdr.vnsi-8.2.2.tar.gz) = e5ad58926058473feb089ad96acb4b348c674fc77ec412449cde36d508c75409bc6bfb24bd804b5f50a202e83a8a01b6fd823a1667de368c1f4b768512d519d8
+SHA512 (pvr.vdr.vnsi-8.2.3.tar.gz) = 9fbb3e988fe6352fde230ce072b35e591d69015bbfd93a4e61b2719a1f36ef495d23db30d44a6c611dcc1b4e36339b454138902c3f815940c5a77ff2b3d9c62a
3 years