* [PR PATCH] PrismLauncher: update to 5.2.
@ 2022-11-17 12:08 oynqr
2022-11-17 13:02 ` DioEgizio
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: oynqr @ 2022-11-17 12:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is a new pull request by oynqr against master on the void-packages repository
https://github.com/oynqr/void-packages PrismLauncher
https://github.com/void-linux/void-packages/pull/40571
PrismLauncher: update to 5.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40571.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrismLauncher-40571.patch --]
[-- Type: text/x-diff, Size: 1123 bytes --]
From 0546ed49ad46c394cbb96c7f796948888d77b9b3 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Thu, 17 Nov 2022 10:26:28 +0100
Subject: [PATCH] PrismLauncher: update to 5.2.
---
srcpkgs/PrismLauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2297e84437dd..2a863c5960a2 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,6 +1,6 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
-version=5.1
+version=5.2
revision=1
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="GPL-3.0-only"
homepage="https://prismlauncher.org/"
distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=d5774911c2fde98f6b663c76084e49e8f664a0f21e13da9196072d38191a7d1e
+checksum=307257f34ddf664d1cf33ad5ba6ad2e08cf23392f58065a223e90448235ad556
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTING=0"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: PrismLauncher: update to 5.2.
2022-11-17 12:08 [PR PATCH] PrismLauncher: update to 5.2 oynqr
@ 2022-11-17 13:02 ` DioEgizio
2022-11-18 8:05 ` [PR PATCH] [Updated] " oynqr
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: DioEgizio @ 2022-11-17 13:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New comment by DioEgizio on void-packages repository
https://github.com/void-linux/void-packages/pull/40571#issuecomment-1318603057
Comment:
aarch64 build is failing because of a toml++ regression btw, you can downgrade toml++ though
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] PrismLauncher: update to 5.2.
2022-11-17 12:08 [PR PATCH] PrismLauncher: update to 5.2 oynqr
2022-11-17 13:02 ` DioEgizio
@ 2022-11-18 8:05 ` oynqr
2022-12-16 9:49 ` oynqr
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: oynqr @ 2022-11-18 8:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by oynqr against master on the void-packages repository
https://github.com/oynqr/void-packages PrismLauncher
https://github.com/void-linux/void-packages/pull/40571
PrismLauncher: update to 5.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40571.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrismLauncher-40571.patch --]
[-- Type: text/x-diff, Size: 16658 bytes --]
From 3f670c8b1c8da50aaf75a43cf74b4fdfa832c0e6 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Thu, 17 Nov 2022 10:26:28 +0100
Subject: [PATCH] PrismLauncher: update to 5.2.
---
.../patches/00-fix-aarch64-build.patch | 413 ++++++++++++++++++
srcpkgs/PrismLauncher/template | 4 +-
2 files changed, 415 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/PrismLauncher/patches/00-fix-aarch64-build.patch
diff --git a/srcpkgs/PrismLauncher/patches/00-fix-aarch64-build.patch b/srcpkgs/PrismLauncher/patches/00-fix-aarch64-build.patch
new file mode 100644
index 000000000000..f1d19637d3c9
--- /dev/null
+++ b/srcpkgs/PrismLauncher/patches/00-fix-aarch64-build.patch
@@ -0,0 +1,413 @@
+Backport of the following commits to fix building on aarch64:
+https://github.com/marzer/tomlplusplus/commit/0a90913abf9390b9e08ab6d3b40ac11634553f38
+https://github.com/PrismLauncher/PrismLauncher/commit/c1763cc4b0871230a86e58aad07aacaf7b19182c
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -44,6 +44,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_DEPRECATED_WARNINGS=Y")
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_DISABLE_DEPRECATED_BEFORE=0x050C00")
+
++# Fix aarch64 build for toml++
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTOML_ENABLE_FLOAT16=0")
++
+ # set CXXFLAGS for build targets
+ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -D_FORTIFY_SOURCE=2 ${CMAKE_CXX_FLAGS_RELEASE}")
+
+--- a/libraries/tomlplusplus/include/toml++/impl/forward_declarations.h
++++ b/libraries/tomlplusplus/include/toml++/impl/forward_declarations.h
+@@ -625,9 +625,9 @@ TOML_IMPL_NAMESPACE_START
+ template <typename T>
+ struct float_traits : float_traits_base<T, std::numeric_limits<T>::digits, std::numeric_limits<T>::digits10>
+ {};
+-#ifdef TOML_FLOAT16
++#if TOML_ENABLE_FLOAT16
+ template <>
+- struct float_traits<TOML_FLOAT16> : float_traits_base<TOML_FLOAT16, __FLT16_MANT_DIG__, __FLT16_DIG__>
++ struct float_traits<_Float16> : float_traits_base<_Float16, __FLT16_MANT_DIG__, __FLT16_DIG__>
+ {};
+ #endif
+ #ifdef TOML_FLOAT128
+@@ -646,9 +646,9 @@ TOML_IMPL_NAMESPACE_START
+ template <>
+ struct value_traits<long double> : float_traits<long double>
+ {};
+-#ifdef TOML_FLOAT16
++#if TOML_ENABLE_FLOAT16
+ template <>
+- struct value_traits<TOML_FLOAT16> : float_traits<TOML_FLOAT16>
++ struct value_traits<_Float16> : float_traits<_Float16>
+ {};
+ #endif
+ #ifdef TOML_FLOAT128
+--- a/libraries/tomlplusplus/include/toml++/impl/preprocessor.h
++++ b/libraries/tomlplusplus/include/toml++/impl/preprocessor.h
+@@ -1055,7 +1055,34 @@ TOML_ENABLE_WARNINGS;
+ //# FLOAT16
+ //#=====================================================================================================================
+
+-#if TOML_CLANG
++#ifndef TOML_ENABLE_FLOAT16
++
++#ifdef __FLT16_MANT_DIG__
++#define TOML_FLOAT16_MANT_DIG __FLT16_MANT_DIG__
++#define TOML_FLOAT16_DIG __FLT16_DIG__
++#define TOML_FLOAT16_MIN_EXP __FLT16_MIN_EXP__
++#define TOML_FLOAT16_MIN_10_EXP __FLT16_MIN_10_EXP__
++#define TOML_FLOAT16_MAX_EXP __FLT16_MAX_EXP__
++#define TOML_FLOAT16_MAX_10_EXP __FLT16_MAX_10_EXP__
++#else
++#define TOML_FLOAT16_MANT_DIG 0
++#define TOML_FLOAT16_DIG 0
++#define TOML_FLOAT16_MIN_EXP 0
++#define TOML_FLOAT16_MIN_10_EXP 0
++#define TOML_FLOAT16_MAX_EXP 0
++#define TOML_FLOAT16_MAX_10_EXP 0
++#endif
++
++#if (TOML_FLOAT16_MANT_DIG && TOML_FLOAT16_DIG && TOML_FLOAT16_MIN_EXP && TOML_FLOAT16_MIN_10_EXP \
++ && TOML_FLOAT16_MAX_EXP && TOML_FLOAT16_MAX_10_EXP)
++#define TOML_FLOAT16_LIMITS_SET 1
++#else
++#define TOML_FLOAT16_LIMITS_SET 0
++#endif
++
++#if TOML_FLOAT16_LIMITS_SET
++
++#if TOML_CLANG // >= 15
+ //# {{
+ // Excerpt from https://clang.llvm.org/docs/LanguageExtensions.html:
+ //
+@@ -1069,9 +1096,10 @@ TOML_ENABLE_WARNINGS;
+ // X86 as long as SSE2 is available
+ //
+ //# }}
+-#if (TOML_ARCH_ARM || TOML_ARCH_X86 || TOML_ARCH_AMD64) && defined(__FLT16_MANT_DIG__)
+-#define TOML_FLOAT16 _Float16
++#if (TOML_ARCH_ARM || TOML_ARCH_AMD64 || TOML_ARCH_X86)
++#define TOML_ENABLE_FLOAT16 1
+ #endif
++
+ #elif TOML_GCC
+ //# {{
+ // Excerpt from https://gcc.gnu.org/onlinedocs/gcc/Floating-Types.html:
+@@ -1082,13 +1110,25 @@ TOML_ENABLE_WARNINGS;
+ //
+ // *** except: the bit about x86 seems incorrect?? ***
+ //# }}
+-/*
++#if (TOML_ARCH_ARM || TOML_ARCH_AMD64 /* || TOML_ARCH_X86*/)
++#define TOML_ENABLE_FLOAT16 1
++#endif
+
+- */
+-#if (TOML_ARCH_ARM /*|| TOML_ARCH_X86 || TOML_ARCH_AMD64*/) && defined(__FLT16_MANT_DIG__)
+-#define TOML_FLOAT16 _Float16
+-#endif
++#endif // clang/gcc
++
++#endif // TOML_FLOAT16_LIMITS_SET
++
++#endif // !defined(TOML_ENABLE_FLOAT16)
++
++#ifndef TOML_ENABLE_FLOAT16
++#define TOML_ENABLE_FLOAT16 0
+ #endif
++//# {{
++/// \def TOML_ENABLE_FLOAT16
++/// \brief Enable support for the built-in `_Float16` type.
++/// \detail Default behaviour is to try to determine support based on compiler, architecture and built-in defines, but
++/// you can override it to force-enable/disable support.
++//# }}
+
+ //#=====================================================================================================================
+ //# FLOAT128
+--- a/libraries/tomlplusplus/include/toml++/toml.h
++++ b/libraries/tomlplusplus/include/toml++/toml.h
+@@ -90,8 +90,8 @@ TOML_POP_WARNINGS;
+ #undef TOML_ANON_NAMESPACE
+ #undef TOML_ANON_NAMESPACE_END
+ #undef TOML_ANON_NAMESPACE_START
+-#undef TOML_ARCH_ARM
+ #undef TOML_ARCH_AMD64
++#undef TOML_ARCH_ARM
+ #undef TOML_ARCH_ARM32
+ #undef TOML_ARCH_ARM64
+ #undef TOML_ARCH_ITANIUM
+@@ -131,7 +131,13 @@ TOML_POP_WARNINGS;
+ #undef TOML_FLAGS_ENUM
+ #undef TOML_FLOAT_CHARCONV
+ #undef TOML_FLOAT128
+-#undef TOML_FLOAT16
++#undef TOML_FLOAT16_DIG
++#undef TOML_FLOAT16_LIMITS_SET
++#undef TOML_FLOAT16_MANT_DIG
++#undef TOML_FLOAT16_MAX_10_EXP
++#undef TOML_FLOAT16_MAX_EXP
++#undef TOML_FLOAT16_MIN_10_EXP
++#undef TOML_FLOAT16_MIN_EXP
+ #undef TOML_GCC
+ #undef TOML_HAS_ATTR
+ #undef TOML_HAS_BUILTIN
+--- a/libraries/tomlplusplus/meson.build
++++ b/libraries/tomlplusplus/meson.build
+@@ -319,27 +319,11 @@ compiler_supports_consteval_properly = compiler_supports_consteval and not compi
+ )
+
+ #######################################################################################################################
+-# __fp16 and _Float16 checks
++# _Float16 checks
+ #######################################################################################################################
+
+-compiler_supports_float16_args = []
+-if is_gcc
+- compiler_supports_float16_args += '-mfp16-format=ieee'
+-endif
+-compiler_supports_fp16 = compiler.links('''
+- int main()
+- {
+- static_assert(sizeof(__fp16) == 2);
+- __fp16 f = static_cast<__fp16>(1);
+- const auto f2 = static_cast<float>(f);
+- const auto f3 = static_cast<__fp16>(0.2L);
+- return 0;
+- }
+- ''',
+- name: 'supports __fp16',
+- args: compiler_supports_float16_args
+-)
+-compiler_supports_float16 = compiler.links('''
++compiler_supports_float16_args = compiler.get_supported_arguments('-mfp16-format=ieee')
++compiler_supports_float16 = get_option('float16') and compiler.links('''
+ int main()
+ {
+ static_assert(sizeof(_Float16) == 2);
+@@ -352,7 +336,7 @@ compiler_supports_float16 = compiler.links('''
+ name: 'supports _Float16',
+ args: compiler_supports_float16_args
+ )
+-if compiler_supports_fp16 or compiler_supports_float16
++if compiler_supports_float16
+ devel_args += compiler_supports_float16_args
+ endif
+
+@@ -411,8 +395,8 @@ compiler_supports_float128 = compiler.links('''
+ name: 'supports __float128'
+ )
+
+-if compiler_supports_float128 and is_gcc and not is_subproject
+- add_global_arguments('-fext-numeric-literals', language: 'cpp')
++if compiler_supports_float16 or compiler_supports_float128 or compiler_supports_int128
++ devel_args += compiler.get_supported_arguments('-fext-numeric-literals')
+ endif
+
+ #######################################################################################################################
+--- a/libraries/tomlplusplus/meson_options.txt
++++ b/libraries/tomlplusplus/meson_options.txt
+@@ -11,3 +11,4 @@ option('build_tt_encoder', type: 'boolean', value: false, description: 'Enable
+ option('build_tt_decoder', type: 'boolean', value: false, description: 'Enable to build the toml-test decoder.')
+ option('compile_library', type: 'boolean', value: false, description: 'Compile as a library')
+ option('use_vendored_libs', type: 'boolean', value: true, description: 'Use the libs from the vendor dir when building tests.')
++option('float16', type: 'boolean', value: true, description: 'Use _Float16 automatically where available.')
+--- a/libraries/tomlplusplus/src/meson.build
++++ b/libraries/tomlplusplus/src/meson.build
+@@ -6,6 +6,15 @@ lib_args = ['-DTOML_HEADER_ONLY=0']
+ if get_option('default_library') != 'static'
+ lib_args += '-DTOML_SHARED_LIB=1'
+ endif
++if compiler_supports_float16
++ lib_args += compiler_supports_float16_args
++ lib_args += '-DTOML_ENABLE_FLOAT16=1'
++else
++ lib_args += '-DTOML_ENABLE_FLOAT16=0'
++endif
++if compiler_supports_float16 or compiler_supports_float128 or compiler_supports_int128
++ lib_args += compiler.get_supported_arguments('-fext-numeric-literals')
++endif
+
+ lib = library(
+ meson.project_name(),
+--- a/libraries/tomlplusplus/tests/impl_toml.cpp
++++ b/libraries/tomlplusplus/tests/impl_toml.cpp
+@@ -64,8 +64,8 @@ namespace toml
+ CHECK_CAN_REPRESENT_NATIVE(TOML_INT128, true);
+ CHECK_CAN_REPRESENT_NATIVE(TOML_UINT128, false);
+ #endif
+-#ifdef TOML_FLOAT16
+- CHECK_CAN_REPRESENT_NATIVE(TOML_FLOAT16, false);
++#if TOML_ENABLE_FLOAT16
++ CHECK_CAN_REPRESENT_NATIVE(_Float16, false);
+ #endif
+ #ifdef TOML_FLOAT128
+ CHECK_CAN_REPRESENT_NATIVE(TOML_FLOAT128, true);
+@@ -289,8 +289,8 @@ namespace toml
+ CHECK_INSERTED_AS(uint32_t, value<int64_t>);
+ CHECK_INSERTED_AS(float, value<double>);
+ CHECK_INSERTED_AS(double, value<double>);
+-#ifdef TOML_FLOAT16
+- CHECK_INSERTED_AS(TOML_FLOAT16, value<double>);
++#if TOML_ENABLE_FLOAT16
++ CHECK_INSERTED_AS(_Float16, value<double>);
+ #endif
+
+ #define CHECK_NODE_REF_TYPE(T) \
+--- a/libraries/tomlplusplus/tests/meson.build
++++ b/libraries/tomlplusplus/tests/meson.build
+@@ -39,13 +39,7 @@ endif
+ # fast math check
+ #######################################################################################################################
+
+-compiler_supports_fast_math_args = []
+-if is_gcc or is_clang
+- compiler_supports_fast_math_args += '-ffast-math'
+- compiler_supports_fast_math_args += '-ffp-contract=fast'
+-elif is_msvc or is_icc_cl
+- compiler_supports_fast_math_args += '/fp:fast'
+-endif
++compiler_supports_fast_math_args = compiler.get_supported_arguments('-ffast-math', '-ffp-contract=fast', '/fp:fast')
+ compiler_supports_fast_math = compiler.links('''
+ #include <cmath>
+ #include <iostream>
+@@ -58,7 +52,6 @@ compiler_supports_fast_math = compiler.links('''
+ name: 'supports fast-math',
+ args: compiler_supports_fast_math_args
+ )
+-
+ #######################################################################################################################
+ # do the thing!
+ #######################################################################################################################
+--- a/libraries/tomlplusplus/tests/tests.h
++++ b/libraries/tomlplusplus/tests/tests.h
+@@ -11,8 +11,8 @@
+ #else
+ #include "../include/toml++/toml.h"
+ #endif
+-#if defined(TOML_FLOAT16) ^ SHOULD_HAVE_FLOAT16
+-#error TOML_FLOAT16 was not deduced correctly
++#if TOML_ENABLE_FLOAT16 ^ SHOULD_HAVE_FLOAT16
++#error TOML_ENABLE_FLOAT16 was not deduced correctly
+ #endif
+ #if defined(TOML_FLOAT128) ^ SHOULD_HAVE_FLOAT128
+ #error TOML_FLOAT128 was not deduced correctly
+--- a/libraries/tomlplusplus/toml.hpp
++++ b/libraries/tomlplusplus/toml.hpp
+@@ -930,17 +930,51 @@ TOML_ENABLE_WARNINGS;
+ TOML_REQUIRES(condition)
+ #define TOML_HIDDEN_CONSTRAINT(condition, ...) TOML_CONSTRAINED_TEMPLATE(condition, __VA_ARGS__)
+
+-#if TOML_CLANG
+-#if (TOML_ARCH_ARM || TOML_ARCH_X86 || TOML_ARCH_AMD64) && defined(__FLT16_MANT_DIG__)
+-#define TOML_FLOAT16 _Float16
+-#endif
+-#elif TOML_GCC
+-/*
++#ifndef TOML_ENABLE_FLOAT16
+
+- */
+-#if (TOML_ARCH_ARM /*|| TOML_ARCH_X86 || TOML_ARCH_AMD64*/) && defined(__FLT16_MANT_DIG__)
+-#define TOML_FLOAT16 _Float16
++#ifdef __FLT16_MANT_DIG__
++#define TOML_FLOAT16_MANT_DIG __FLT16_MANT_DIG__
++#define TOML_FLOAT16_DIG __FLT16_DIG__
++#define TOML_FLOAT16_MIN_EXP __FLT16_MIN_EXP__
++#define TOML_FLOAT16_MIN_10_EXP __FLT16_MIN_10_EXP__
++#define TOML_FLOAT16_MAX_EXP __FLT16_MAX_EXP__
++#define TOML_FLOAT16_MAX_10_EXP __FLT16_MAX_10_EXP__
++#else
++#define TOML_FLOAT16_MANT_DIG 0
++#define TOML_FLOAT16_DIG 0
++#define TOML_FLOAT16_MIN_EXP 0
++#define TOML_FLOAT16_MIN_10_EXP 0
++#define TOML_FLOAT16_MAX_EXP 0
++#define TOML_FLOAT16_MAX_10_EXP 0
+ #endif
++
++#if (TOML_FLOAT16_MANT_DIG && TOML_FLOAT16_DIG && TOML_FLOAT16_MIN_EXP && TOML_FLOAT16_MIN_10_EXP \
++ && TOML_FLOAT16_MAX_EXP && TOML_FLOAT16_MAX_10_EXP)
++#define TOML_FLOAT16_LIMITS_SET 1
++#else
++#define TOML_FLOAT16_LIMITS_SET 0
++#endif
++
++#if TOML_FLOAT16_LIMITS_SET
++
++#if TOML_CLANG // >= 15
++#if (TOML_ARCH_ARM || TOML_ARCH_AMD64 || TOML_ARCH_X86)
++#define TOML_ENABLE_FLOAT16 1
++#endif
++
++#elif TOML_GCC
++#if (TOML_ARCH_ARM || TOML_ARCH_AMD64 /* || TOML_ARCH_X86*/)
++#define TOML_ENABLE_FLOAT16 1
++#endif
++
++#endif // clang/gcc
++
++#endif // TOML_FLOAT16_LIMITS_SET
++
++#endif // !defined(TOML_ENABLE_FLOAT16)
++
++#ifndef TOML_ENABLE_FLOAT16
++#define TOML_ENABLE_FLOAT16 0
+ #endif
+
+ #if defined(__SIZEOF_FLOAT128__) && defined(__FLT128_MANT_DIG__) && defined(__LDBL_MANT_DIG__) \
+@@ -1700,9 +1734,9 @@ TOML_IMPL_NAMESPACE_START
+ template <typename T>
+ struct float_traits : float_traits_base<T, std::numeric_limits<T>::digits, std::numeric_limits<T>::digits10>
+ {};
+-#ifdef TOML_FLOAT16
++#if TOML_ENABLE_FLOAT16
+ template <>
+- struct float_traits<TOML_FLOAT16> : float_traits_base<TOML_FLOAT16, __FLT16_MANT_DIG__, __FLT16_DIG__>
++ struct float_traits<_Float16> : float_traits_base<_Float16, __FLT16_MANT_DIG__, __FLT16_DIG__>
+ {};
+ #endif
+ #ifdef TOML_FLOAT128
+@@ -1721,9 +1755,9 @@ TOML_IMPL_NAMESPACE_START
+ template <>
+ struct value_traits<long double> : float_traits<long double>
+ {};
+-#ifdef TOML_FLOAT16
++#if TOML_ENABLE_FLOAT16
+ template <>
+- struct value_traits<TOML_FLOAT16> : float_traits<TOML_FLOAT16>
++ struct value_traits<_Float16> : float_traits<_Float16>
+ {};
+ #endif
+ #ifdef TOML_FLOAT128
+@@ -17072,8 +17106,8 @@ TOML_POP_WARNINGS;
+ #undef TOML_ANON_NAMESPACE
+ #undef TOML_ANON_NAMESPACE_END
+ #undef TOML_ANON_NAMESPACE_START
+-#undef TOML_ARCH_ARM
+ #undef TOML_ARCH_AMD64
++#undef TOML_ARCH_ARM
+ #undef TOML_ARCH_ARM32
+ #undef TOML_ARCH_ARM64
+ #undef TOML_ARCH_ITANIUM
+@@ -17113,7 +17147,13 @@ TOML_POP_WARNINGS;
+ #undef TOML_FLAGS_ENUM
+ #undef TOML_FLOAT_CHARCONV
+ #undef TOML_FLOAT128
+-#undef TOML_FLOAT16
++#undef TOML_FLOAT16_DIG
++#undef TOML_FLOAT16_LIMITS_SET
++#undef TOML_FLOAT16_MANT_DIG
++#undef TOML_FLOAT16_MAX_10_EXP
++#undef TOML_FLOAT16_MAX_EXP
++#undef TOML_FLOAT16_MIN_10_EXP
++#undef TOML_FLOAT16_MIN_EXP
+ #undef TOML_GCC
+ #undef TOML_HAS_ATTR
+ #undef TOML_HAS_BUILTIN
+--- a/libraries/tomlplusplus/tools/generate_single_header.py
++++ b/libraries/tomlplusplus/tools/generate_single_header.py
+@@ -215,6 +215,7 @@ def main():
+ r'TOML_ENABLE_SIMD',
+ r'TOML_ENABLE_UNRELEASED_FEATURES',
+ r'TOML_ENABLE_WINDOWS_COMPAT',
++ r'TOML_ENABLE_FLOAT16',
+ r'TOML_EXCEPTIONS',
+ r'TOML_EXPORTED_CLASS',
+ r'TOML_EXPORTED_FREE_FUNCTION',
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2297e84437dd..2a863c5960a2 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,6 +1,6 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
-version=5.1
+version=5.2
revision=1
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="GPL-3.0-only"
homepage="https://prismlauncher.org/"
distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=d5774911c2fde98f6b663c76084e49e8f664a0f21e13da9196072d38191a7d1e
+checksum=307257f34ddf664d1cf33ad5ba6ad2e08cf23392f58065a223e90448235ad556
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTING=0"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] PrismLauncher: update to 5.2.
2022-11-17 12:08 [PR PATCH] PrismLauncher: update to 5.2 oynqr
2022-11-17 13:02 ` DioEgizio
2022-11-18 8:05 ` [PR PATCH] [Updated] " oynqr
@ 2022-12-16 9:49 ` oynqr
2022-12-18 17:01 ` [PR PATCH] [Updated] PrismLauncher: update to 6.0 oynqr
2022-12-18 21:34 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: oynqr @ 2022-12-16 9:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by oynqr against master on the void-packages repository
https://github.com/oynqr/void-packages PrismLauncher
https://github.com/void-linux/void-packages/pull/40571
PrismLauncher: update to 5.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40571.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrismLauncher-40571.patch --]
[-- Type: text/x-diff, Size: 1123 bytes --]
From 34527f4490249d9b43592e45e00b36b81129fa4f Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Thu, 17 Nov 2022 10:26:28 +0100
Subject: [PATCH] PrismLauncher: update to 6.0.
---
srcpkgs/PrismLauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2297e84437dd..7c8c167be4b3 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,6 +1,6 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
-version=5.1
+version=6.0
revision=1
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="GPL-3.0-only"
homepage="https://prismlauncher.org/"
distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=d5774911c2fde98f6b663c76084e49e8f664a0f21e13da9196072d38191a7d1e
+checksum=4b8845186e509f62564f47f48b04f8abb3e35523ba8b33c5413475724e49e1dc
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTING=0"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] PrismLauncher: update to 6.0.
2022-11-17 12:08 [PR PATCH] PrismLauncher: update to 5.2 oynqr
` (2 preceding siblings ...)
2022-12-16 9:49 ` oynqr
@ 2022-12-18 17:01 ` oynqr
2022-12-18 21:34 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: oynqr @ 2022-12-18 17:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is an updated pull request by oynqr against master on the void-packages repository
https://github.com/oynqr/void-packages PrismLauncher
https://github.com/void-linux/void-packages/pull/40571
PrismLauncher: update to 6.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/40571.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrismLauncher-40571.patch --]
[-- Type: text/x-diff, Size: 1123 bytes --]
From eae7cb953767e944311dcf6d3cf0c423a65b3c07 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Thu, 17 Nov 2022 10:26:28 +0100
Subject: [PATCH] PrismLauncher: update to 6.0.
---
srcpkgs/PrismLauncher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/PrismLauncher/template b/srcpkgs/PrismLauncher/template
index 2297e84437dd..7c8c167be4b3 100644
--- a/srcpkgs/PrismLauncher/template
+++ b/srcpkgs/PrismLauncher/template
@@ -1,6 +1,6 @@
# Template file for 'PrismLauncher'
pkgname=PrismLauncher
-version=5.1
+version=6.0
revision=1
build_style=cmake
configure_args="-DLauncher_BUILD_PLATFORM=Void"
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
license="GPL-3.0-only"
homepage="https://prismlauncher.org/"
distfiles="https://github.com/PrismLauncher/PrismLauncher/releases/download/${version}/PrismLauncher-${version}.tar.gz"
-checksum=d5774911c2fde98f6b663c76084e49e8f664a0f21e13da9196072d38191a7d1e
+checksum=4b8845186e509f62564f47f48b04f8abb3e35523ba8b33c5413475724e49e1dc
if [ -z "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTING=0"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: PrismLauncher: update to 6.0.
2022-11-17 12:08 [PR PATCH] PrismLauncher: update to 5.2 oynqr
` (3 preceding siblings ...)
2022-12-18 17:01 ` [PR PATCH] [Updated] PrismLauncher: update to 6.0 oynqr
@ 2022-12-18 21:34 ` classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2022-12-18 21:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1090 bytes --]
There's a merged pull request on the void-packages repository
PrismLauncher: update to 6.0.
https://github.com/void-linux/void-packages/pull/40571
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-12-18 21:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-17 12:08 [PR PATCH] PrismLauncher: update to 5.2 oynqr
2022-11-17 13:02 ` DioEgizio
2022-11-18 8:05 ` [PR PATCH] [Updated] " oynqr
2022-12-16 9:49 ` oynqr
2022-12-18 17:01 ` [PR PATCH] [Updated] PrismLauncher: update to 6.0 oynqr
2022-12-18 21:34 ` [PR PATCH] [Merged]: " classabbyamp
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).