From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] fmt: update to 8.0.1. [ci skip]
Date: Sun, 15 Aug 2021 23:38:14 +0200 [thread overview]
Message-ID: <20210815213814.qTv67NZtN8AKS7ucJbt45KprQOGYAFaL2oJvHIKtiuE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32176@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1847 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/skmpz/void-packages fmt-8.0.1
https://github.com/void-linux/void-packages/pull/32176
fmt: update to 8.0.1. [ci skip]
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [x] i686
- [x] x86_64-musl
- [x] armv7l (cross x86_64)
- [x] aarch64-musl (cross x86_64-musl)
- [x] armv6l-musl (cross x86_64-musl)
Packages built (compile+tests):
- [x] fmt
- [x] spdlog
- [x] cherrytree
- [x] cryfs
- [x] gerbera
- [x] Waybar
- [x] mkvtoolnix
- [x] nheko
- [x] 0ad
- [x] kodi
A patch file from https://github.com/void-linux/void-packages/pull/32176.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fmt-8.0.1-32176.patch --]
[-- Type: text/x-diff, Size: 29857 bytes --]
From 42d6a0e6079c2742c9ea316394854fb875e9480b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:43 +0400
Subject: [PATCH 01/10] fmt: update to 8.0.1.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 42fd333f33b9..d24c2bacbc9e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3498,7 +3498,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.7 fmt-7.0.3_1
+libfmt.so.8 fmt-8.0.1_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.20 libtls-3.2.4_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index ba9ae5c4ee49..41a50a0f8e0e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,15 +1,16 @@
# Template file for 'fmt'
pkgname=fmt
-version=7.1.3
+version=8.0.1
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
short_desc="Modern formatting library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/fmtlib/fmt"
+changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
+checksum=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
post_install() {
vlicense LICENSE.rst LICENSE
From f165adb9672f165afce563c2023cf06b3095f0fd Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:12 +0400
Subject: [PATCH 02/10] spdlog: update to 1.9.1.
---
srcpkgs/spdlog/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 184a4d891698..4e34e8a58322 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.8.2
-revision=2
+version=1.9.1
+revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
@@ -9,11 +9,11 @@ hostmakedepends="pkg-config"
makedepends="fmt-devel"
depends="libspdlog>=${version}_${revision} fmt-devel"
short_desc="Fast C++ logging library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
license="MIT"
homepage="https://github.com/gabime/spdlog"
distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz"
-checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5
+checksum=9a452cfa24408baccc9b2bc2d421d68172a7630c99e9504a14754be840d31a62
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
From 718fbe04a91e4198b9600038a4940956426b3129 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 03/10] cherrytree: rebuild against libfmt.so.8
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 8789cd37dba7..55512e3b5ef7 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=0.99.39
-revision=1
+revision=2
wrksrc="${pkgname}_${version}"
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
From bf9ab89b402dc9606a45ccc8256cb3bb9b4340f8 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 04/10] Waybar: rebuild for libfmt.so.8.
---
.../patches/libfmt8-compatibility.patch | 40 +++++++++++++++++++
srcpkgs/Waybar/template | 2 +-
2 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch
diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
new file mode 100644
index 000000000000..4ae9ee619e3a
--- /dev/null
+++ b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch
@@ -0,0 +1,40 @@
+From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
+From: John Helmert III <jchelmert3@posteo.net>
+Date: Tue, 29 Jun 2021 21:29:12 -0500
+Subject: [PATCH] libfmt >=8.0.0 compatibility
+
+---
+ include/util/format.hpp | 4 ++++
+ src/modules/clock.cpp | 3 +++
+ 2 files changed, 7 insertions(+)
+
+diff --git a/include/util/format.hpp b/include/util/format.hpp
+index 288d8f0cd..543a100fb 100644
+--- a/Waybar-0.9.7/include/util/format.hpp
++++ b/Waybar-0.9.7/include/util/format.hpp
+@@ -35,7 +35,11 @@ namespace fmt {
+ // The rationale for ignoring it is that the only reason to specify
+ // an alignment and a with is to get a fixed width bar, and ">" is
+ // sufficient in this implementation.
++#if FMT_VERSION < 80000
+ width = parse_nonnegative_int(it, end, ctx);
++#else
++ width = detail::parse_nonnegative_int(it, end, -1);
++#endif
+ }
+ return it;
+ }
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 22bedc783..82c570102 100644
+--- a/Waybar-0.9.7/src/modules/clock.cpp
++++ b/Waybar-0.9.7/src/modules/clock.cpp
+@@ -196,6 +196,9 @@ template <>
+ struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
+ template <typename FormatContext>
+ auto format(const waybar_time& t, FormatContext& ctx) {
++#if FMT_VERSION >= 80000
++ auto& tm_format = specs;
++#endif
+ return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
+ }
+ };
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 5d6538e66982..699c4baddb59 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.7
-revision=1
+revision=2
_date_version=3.0.0
create_wrksrc=yes
build_wrksrc=${pkgname}-${version}
From 3c18459d47c413a1ad13924f97c1fc7c656dcca9 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 05/10] gerbera: rebuild against libfmt.so.8
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 13ff8252378d..7ae7950c72fb 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.6.4
-revision=3
+revision=4
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From b12b7f17afa15447abea76d5b38d4c37e1da5bfa Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 06/10] kodi: fold kodi-rpi into it, rebuild for libfmt.so.8
We don't want to maintain kodi 18.x into eternity (which would start
with patching it correctly for libfmt.so.8), and, as explained in
9f8647640b3ce3e4a99f0ba7022eb6d55ba77c97, current kodi can't be built
for rpi specifically anymore. We will assume normal kodi is enough.
---
srcpkgs/kodi-rpi | 1 +
srcpkgs/kodi-rpi/INSTALL | 6 -
srcpkgs/kodi-rpi/REMOVE | 5 -
srcpkgs/kodi-rpi/files/xbmc-standalone/run | 3 -
.../patches/add-missing-cassert.patch | 20 ---
.../patches/add-missing-includes.patch | 10 --
srcpkgs/kodi-rpi/patches/crossguid-0.2.patch | 37 ------
.../disable-static-texturepacker-build.patch | 11 --
srcpkgs/kodi-rpi/patches/fix-fileemu.patch | 74 -----------
srcpkgs/kodi-rpi/patches/fix-musl.patch | 11 --
.../kodi-rpi/patches/fortify-source-fix.patch | 11 --
srcpkgs/kodi-rpi/patches/ppc64.patch | 15 ---
.../kodi-rpi/patches/remove-filewrap.patch | 40 ------
srcpkgs/kodi-rpi/template | 119 ------------------
srcpkgs/kodi-rpi/update | 1 -
srcpkgs/kodi/patches/fmt8-support.patch | 7 ++
srcpkgs/kodi/template | 8 +-
17 files changed, 15 insertions(+), 364 deletions(-)
create mode 120000 srcpkgs/kodi-rpi
delete mode 100644 srcpkgs/kodi-rpi/INSTALL
delete mode 100644 srcpkgs/kodi-rpi/REMOVE
delete mode 100755 srcpkgs/kodi-rpi/files/xbmc-standalone/run
delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
delete mode 100644 srcpkgs/kodi-rpi/patches/add-missing-includes.patch
delete mode 100644 srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
delete mode 100644 srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
delete mode 100644 srcpkgs/kodi-rpi/patches/fix-fileemu.patch
delete mode 100644 srcpkgs/kodi-rpi/patches/fix-musl.patch
delete mode 100644 srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
delete mode 100644 srcpkgs/kodi-rpi/patches/ppc64.patch
delete mode 100644 srcpkgs/kodi-rpi/patches/remove-filewrap.patch
delete mode 100644 srcpkgs/kodi-rpi/template
delete mode 100644 srcpkgs/kodi-rpi/update
create mode 100644 srcpkgs/kodi/patches/fmt8-support.patch
diff --git a/srcpkgs/kodi-rpi b/srcpkgs/kodi-rpi
new file mode 120000
index 000000000000..355d1b91e520
--- /dev/null
+++ b/srcpkgs/kodi-rpi
@@ -0,0 +1 @@
+kodi
\ No newline at end of file
diff --git a/srcpkgs/kodi-rpi/INSTALL b/srcpkgs/kodi-rpi/INSTALL
deleted file mode 100644
index 9f9deaf27059..000000000000
--- a/srcpkgs/kodi-rpi/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "${ACTION}" in
-post)
- mkdir -p var/lib/xbmc
- chown xbmc:xbmc var/lib/xbmc
- ;;
-esac
diff --git a/srcpkgs/kodi-rpi/REMOVE b/srcpkgs/kodi-rpi/REMOVE
deleted file mode 100644
index 83d2c7e37677..000000000000
--- a/srcpkgs/kodi-rpi/REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case "${ACTION}" in
-purge)
- rm -rf var/lib/xbmc
- ;;
-esac
diff --git a/srcpkgs/kodi-rpi/files/xbmc-standalone/run b/srcpkgs/kodi-rpi/files/xbmc-standalone/run
deleted file mode 100755
index e4fc93b47edb..000000000000
--- a/srcpkgs/kodi-rpi/files/xbmc-standalone/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PATH=$PATH:/opt/vc/bin
-exec chpst -P sudo LD_LIBRARY_PATH=/opt/vc/lib -u xbmc -- /usr/lib/kodi/kodi-rbpi --standalone
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch b/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
deleted file mode 100644
index 1e9d86040829..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-cassert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/xbmc/windowing/GraphicContext.cpp 2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/windowing/GraphicContext.cpp 2020-01-16 21:15:35.293001948 +0100
-@@ -6,6 +6,7 @@
- * See LICENSES/README.md for more information.
- */
-
-+#include <cassert>
- #include "GraphicContext.h"
- #include "WinSystem.h"
- #include "Application.h"
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp 2019-11-16 12:12:49.000000000 +0100
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp 2020-01-16 21:47:47.500101629 +0100
-@@ -8,6 +8,7 @@
-
- #include "GUIDialogProfileSettings.h"
-
-+#include <cassert>
- #include <utility>
-
- #include "dialogs/GUIDialogFileBrowser.h"
diff --git a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch b/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
deleted file mode 100644
index 236bfa6fd0e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/add-missing-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/xbmc/filesystem/ZipManager.h.orig
-+++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
- #include <string>
- #include <vector>
- #include <map>
-+#include <stdint.h>
-
- class CURL;
-
diff --git a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch b/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
deleted file mode 100644
index 1c18a84c72ab..000000000000
--- a/srcpkgs/kodi-rpi/patches/crossguid-0.2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/modules/FindCrossGUID.cmake 2019-01-30 18:31:51.519546398 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake 2019-01-30 18:32:51.197608565 +0100
-@@ -49,10 +49,10 @@
- set(CROSSGUID_LIBRARIES ${CROSSGUID_LIBRARY})
- set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR})
- else()
-- find_path(CROSSGUID_INCLUDE_DIR NAMES guid.h)
-+ find_path(CROSSGUID_INCLUDE_DIR NAMES Guid.hpp)
-
-- find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid)
-- find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd)
-+ find_library(CROSSGUID_LIBRARY_RELEASE NAMES xg)
-+ find_library(CROSSGUID_LIBRARY_DEBUG NAMES xg)
-
- include(SelectLibraryConfigurations)
- select_library_configurations(CROSSGUID)
---- a/xbmc/utils/StringUtils.cpp 2019-01-30 18:35:42.588517593 +0100
-+++ b/xbmc/utils/StringUtils.cpp 2019-01-30 18:37:38.058555463 +0100
-@@ -16,7 +16,7 @@
- //
- //------------------------------------------------------------------------
-
--#include <guid.h>
-+#include <Guid.hpp>
-
- #if defined(TARGET_ANDROID)
- #include <androidjni/JNIThreading.h>
-@@ -1126,8 +1126,7 @@
-
- std::string StringUtils::CreateUUID()
- {
-- static GuidGenerator guidGenerator;
-- auto guid = guidGenerator.newGuid();
-+ auto guid = xg::newGuid();
-
- std::stringstream strGuid; strGuid << guid;
- return strGuid.str();
diff --git a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
deleted file mode 100644
index 369f1b24d76d..000000000000
--- a/srcpkgs/kodi-rpi/patches/disable-static-texturepacker-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/depends/native/TexturePacker/Makefile 2016-04-24 08:48:30.000000000 +0200
-+++ b/tools/depends/native/TexturePacker/Makefile 2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
- -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
- cd $(PLATFORM); cp -a $(SOURCE)/* .
- cd $(PLATFORM); ./autogen.sh
-- cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-+ cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)"
-
-
- $(APP): $(PLATFORM)
diff --git a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch b/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
deleted file mode 100644
index 6cce7a4d3524..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-fileemu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h 2019-01-30 19:20:09.336910851 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h 2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
- #define _onexit_t void*
- #endif
-
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/wrapper.c 2019-01-30 19:24:16.396348561 +0100
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c 2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
- #include <dlfcn.h>
-
--#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- typedef off_t __off_t;
- typedef int64_t off64_t;
- typedef off64_t __off64_t;
---- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp 2019-01-30 19:29:02.249253971 +0100
-+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp 2019-01-30 19:39:34.911053272 +0100
-@@ -38,6 +38,7 @@
- #include <fcntl.h>
- #include <time.h>
- #include <signal.h>
-+#include <paths.h>
- #ifdef TARGET_POSIX
- #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
- int ret;
-
- ret = dll_fgetpos64(stream, &tmpPos);
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- *pos = (fpos_t)tmpPos;
- #else
- pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
- CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
- if (pFile != NULL)
- {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-- *pos = pFile->GetPosition();
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+ uint64_t *ppos = (uint64_t *) pos;
-+ *ppos = pFile->GetPosition();
- #else
- pos->__pos = pFile->GetPosition();
- #endif
-@@ -1509,8 +1511,9 @@
- int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
- if (fd >= 0)
- {
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-- if (dll_lseeki64(fd, *pos, SEEK_SET) >= 0)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
-+ const uint64_t *ppos = (const uint64_t *) pos;
-+ if (dll_lseeki64(fd, *ppos, SEEK_SET) >= 0)
- #else
- if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
- #endif
-@@ -1532,7 +1535,7 @@
- if (fd >= 0)
- {
- fpos64_t tmpPos;
--#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
-+#if !defined(TARGET_POSIX) || defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID) || !defined(__GLIBC__)
- tmpPos= *pos;
- #else
- tmpPos.__pos = (off64_t)(pos->__pos);
diff --git a/srcpkgs/kodi-rpi/patches/fix-musl.patch b/srcpkgs/kodi-rpi/patches/fix-musl.patch
deleted file mode 100644
index 98fa08aaffba..000000000000
--- a/srcpkgs/kodi-rpi/patches/fix-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/ldt_keeper.c 2019-01-30 20:08:15.532823846 +0100
-+++ b/xbmc/cores/DllLoader/ldt_keeper.c 2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
- #ifdef __cplusplus
- extern "C" {
- #endif
--#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt)
-+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt)
- #define modify_ldt(a,b,c) syscall( __NR_modify_ldt, a, b, c);
- #else
- int modify_ldt(int func, void *ptr, unsigned long bytecount);
diff --git a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch b/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
deleted file mode 100644
index 5717746e09e1..000000000000
--- a/srcpkgs/kodi-rpi/patches/fortify-source-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xbmc/cores/DllLoader/exports/wrapper.c.orig
-+++ b/xbmc/cores/DllLoader/exports/wrapper.c
-@@ -462,7 +462,7 @@
- // are actually #defines which are inlined when compiled with -O. Those defines
- // actally call __*chk (for example, __fread_chk). We need to bypass this whole
- // thing to actually call our wrapped functions.
--#if _FORTIFY_SOURCE > 1
-+#if defined(__GLIBC__) && _FORTIFY_SOURCE > 1
-
- size_t __wrap___fread_chk(void * ptr, size_t ptrlen, size_t size, size_t n, FILE * stream)
- {
diff --git a/srcpkgs/kodi-rpi/patches/ppc64.patch b/srcpkgs/kodi-rpi/patches/ppc64.patch
deleted file mode 100644
index ab008d445a99..000000000000
--- a/srcpkgs/kodi-rpi/patches/ppc64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/cmake/scripts/linux/ArchSetup.cmake 2019-01-30 21:03:03.146025973 +0100
-+++ b/cmake/scripts/linux/ArchSetup.cmake 2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
- elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
- set(ARCH aarch64)
- set(NEON True)
-+ elseif(CPU MATCHES ppc64le)
-+ set(ARCH ppc64le-linux)
-+ set(NEON False)
-+ elseif(CPU MATCHES ppc64)
-+ set(ARCH ppc64-linux)
-+ set(NEON False)
- else()
- message(SEND_ERROR "Unknown CPU: ${CPU}")
- endif()
diff --git a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch b/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
deleted file mode 100644
index 76f6602063aa..000000000000
--- a/srcpkgs/kodi-rpi/patches/remove-filewrap.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp 2019-01-30 19:51:15.744119125 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.cpp 2019-01-30 19:54:51.940377340 +0100
-@@ -17,10 +17,6 @@
- #include "platform/android/activity/XBMCApp.h"
- #endif // TARGET_ANDROID
-
--struct FILEWRAP : public FILE
--{};
--
--
- CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
- m_file(NULL)
- { }
-@@ -40,7 +36,7 @@
- (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
- (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
-
-- m_file = (FILEWRAP*)fopen(logFilename.c_str(), "wb");
-+ m_file = fopen(logFilename.c_str(), "wb");
- if (!m_file)
- return false; // error, can't open log file
-
---- a/xbmc/platform/posix/utils/PosixInterfaceForCLog.h 2019-01-30 19:55:21.460002043 +0100
-+++ b/xbmc/platform/posix/utils/PosixInterfaceForCLog.h 2019-01-30 19:55:36.156814572 +0100
-@@ -10,8 +10,6 @@
-
- #include <string>
-
--struct FILEWRAP; // forward declaration, wrapper for FILE
--
- class CPosixInterfaceForCLog
- {
- public:
-@@ -23,5 +21,5 @@
- void PrintDebugString(const std::string& debugString);
- static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
- private:
-- FILEWRAP* m_file;
-+ FILE* m_file;
- };
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
deleted file mode 100644
index d92a4f6217d8..000000000000
--- a/srcpkgs/kodi-rpi/template
+++ /dev/null
@@ -1,119 +0,0 @@
-# Template file for 'kodi-rpi'
-pkgname=kodi-rpi
-version=18.8
-revision=6
-_codename="Leia"
-wrksrc="xbmc-${version}-${_codename}"
-build_style=cmake
-short_desc="Software media player and entertainment hub for digital media (RPi)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.kodi.tv/"
-distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2
-
-nopie=yes
-archs="armv6l* armv7l*"
-
-hostmakedepends="
- automake libtool pkg-config gperf cmake zip unzip nasm yasm
- gettext-devel libltdl-devel python-devel libmariadbclient-devel
- SDL2_image-devel lzo-devel flatbuffers swig openjdk11"
-makedepends="
- libatomic-devel eudev-libudev-devel pcre-devel expat-devel libpng-devel
- libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
- libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
- fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
- fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
- enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
- librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
- libxslt-devel libuuid-devel giflib-devel libcec-devel libmicrohttpd-devel
- libcdio-devel python-devel libssh-devel rpi-userland-devel dcadec-devel
- flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson crossguid
- libinput-devel libxkbcommon-devel libcdio-paranoia"
-
-# gold broken with musl
-case "$XBPS_MACHINE" in
- *-musl) configure_args+=" -DENABLE_LDGOLD=Off";;
-esac
-
-configure_args="
- -DCORE_PLATFORM_NAME=rbpi
- -DENABLE_OPENGL=OFF
- -DENABLE_OPENGLES=ON
- -DENABLE_X11=OFF
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_VAAPI=OFF
- -DENABLE_VDPAU=OFF
- -DWITH_FFMPEG=/usr
- -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
- -DCMAKE_INSTALL_RPATH=/opt/vc/lib
-"
-case "$XBPS_TARGET_MACHINE" in
- armv6*) configure_args+=" -DWITH_CPU=arm1176jzf-s -DCMAKE_EXE_LINKER_FLAGS=-latomic"
- LDFLAGS+=" -latomic";;
- armv7*) configure_args+=" -DWITH_CPU=cortex-a7";;
- aarch64*) configure_args+=" -DWITH_CPU=cortex-a53";;
-esac
-
-# The following dependencies are dlopen(3)ed.
-depends="libmad libogg libcurl libflac libmodplug libass libmpeg2 lame
- librtmp libnfs>=1.9.7 libplist>=1.12 libssh"
-depends+=" hicolor-icon-theme desktop-file-utils"
-
-provides="kodi-${version}_${revision}"
-
-# Create xbmc system user to launch xbmc-standalone.
-system_accounts="xbmc"
-xbmc_homedir="/var/lib/xbmc"
-xbmc_groups="audio,input,video"
-
-pre_configure() {
- find -type f | \
- grep "configure\.ac\|Makefile\|cmake\|config\.site" | \
- xargs sed -i -e "s;-isystem;-I;g"
-
- . /etc/profile.d/10_openjdk11.sh
-
- if [ "$CROSS_BUILD" ]; then
- for i in JsonSchemaBuilder TexturePacker; do
- cat > cmake/modules/Find$i.cmake <<EOF
- add_executable($i::$i IMPORTED GLOBAL)
- set_target_properties($i::$i PROPERTIES
- IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
- set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
- done
- fi
-}
-
-pre_build() {
- if [ "$CROSS_BUILD" ]; then
- for i in JsonSchemaBuilder TexturePacker; do
- CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
- make -C tools/depends/native/$i
- done
- fi
-}
-
-post_build() {
- # Rebuild for target
- if [ "$CROSS_BUILD" ]; then
- for i in JsonSchemaBuilder TexturePacker; do
- make -C tools/depends/native/$i clean all \
- CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
- CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
- CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
- done
- fi
-}
-
-post_install() {
- # remove unused stuff
- rm -rf ${DESTDIR}/usr/include
- find ${DESTDIR}/usr/lib -name "*.cmake" -delete
- vsv xbmc-standalone
-}
diff --git a/srcpkgs/kodi-rpi/update b/srcpkgs/kodi-rpi/update
deleted file mode 100644
index c002e80531ce..000000000000
--- a/srcpkgs/kodi-rpi/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern="\d+\.[\d.]+(?=-\w+\.tar\.gz)"
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
new file mode 100644
index 000000000000..0c6fc3eafdb9
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt8-support.patch
@@ -0,0 +1,7 @@
+--- a/xbmc/utils/StringUtils.h 2021-02-19 02:17:59.000000000 +0400
++++ b/xbmc/utils/StringUtils.h 2021-07-29 01:23:03.569130175 +0400
+@@ -39,0 +40,4 @@
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
++
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 8f10f4f04887..16f5089a29aa 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.0
-revision=2
+revision=3
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
@@ -156,3 +156,9 @@ kodi-devel_package() {
vmove usr/share/kodi/cmake
}
}
+
+kodi-rpi_package() {
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+ depends="${sourcepkg}>=${version}_${revision}"
+}
From 5366fa548af4641ff55838868100a7f9797a356a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:11 +0400
Subject: [PATCH 07/10] mkvtoolnix: rebuild against libfmt.so.8
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0875991a872f..0ebfc4daa9a9 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=60.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From b81c7934c012af9715a0e3221a3baa0cc244e036 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 24 Jul 2021 22:51:12 +0400
Subject: [PATCH 08/10] nheko: rebuild against libfmt.so.8
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index a32ac2a6117e..7b7c6bfbf6e1 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.8.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From 34c73d51dfa655f9dab297232f29dc556c871fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 8 Aug 2021 18:38:31 -0300
Subject: [PATCH 09/10] cryfs: rebuild against libfmt.so.8
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d8f855a80af..ef585572fbec 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.10.2
-revision=3
+revision=4
create_wrksrc=yes
build_style=cmake
configure_args="-DCRYFS_UPDATE_CHECKS=off
From 07d5bbe473b295216c1aef23fedef33c0156c5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 15 Aug 2021 18:31:05 -0300
Subject: [PATCH 10/10] 0ad: rebuild against libfmt.so.8
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 2e095d293a6a..66083eaae67a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.25
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
next prev parent reply other threads:[~2021-08-15 21:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-24 18:52 [PR PATCH] fmt: update to 8.0.1 skmpz
2021-07-24 19:28 ` [PR PATCH] [Updated] [WIP] " skmpz
2021-07-24 19:58 ` [PR PATCH] [Closed]: " skmpz
2021-07-28 20:16 ` [PR PATCH] [Updated] [WIP] fmt: update to 8.0.1. [ci skip] skmpz
2021-07-28 20:54 ` ericonr
2021-07-29 4:28 ` [PR PATCH] [Updated] " skmpz
2021-07-29 4:29 ` skmpz
2021-08-08 21:31 ` ericonr
2021-08-08 21:36 ` ericonr
2021-08-08 21:38 ` ericonr
2021-08-08 21:43 ` ericonr
2021-08-09 2:21 ` ericonr
2021-08-09 2:22 ` [PR PATCH] [Updated] " ericonr
2021-08-09 2:23 ` ericonr
2021-08-15 21:38 ` ericonr [this message]
2021-08-15 22:17 ` [PR PATCH] [Merged]: " ericonr
2021-08-15 22:17 ` ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210815213814.qTv67NZtN8AKS7ucJbt45KprQOGYAFaL2oJvHIKtiuE@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).