* [PR PATCH] Spdlog 1.11.0
@ 2022-11-12 20:06 skmpz
2022-11-14 4:05 ` [PR PATCH] [Updated] spdlog: update to 1.11.0 skmpz
2022-11-24 6:07 ` [PR PATCH] [Merged]: " classabbyamp
0 siblings, 2 replies; 3+ messages in thread
From: skmpz @ 2022-11-12 20:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]
There is a new pull request by skmpz against master on the void-packages repository
https://github.com/skmpz/void-packages spdlog-1.11.0
https://github.com/void-linux/void-packages/pull/40493
Spdlog 1.11.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/40493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spdlog-1.11.0-40493.patch --]
[-- Type: text/x-diff, Size: 18180 bytes --]
From 1e5ac9a611d88f767887693a070f1fba74bda153 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:28:48 +0400
Subject: [PATCH 01/10] spdlog: update to 1.11.0.
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 76512744735e..485a186674e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4036,7 +4036,7 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1
libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
libwayland-egl++.so.0 libwaylandpp-0.2.8_1
libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
-libspdlog.so.1 libspdlog-1.8.2_2
+libspdlog.so.1.11 libspdlog-1.11.0_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index ef1ee76ffcca..045f86def2cc 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.10.0
-revision=2
+version=1.11.0
+revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
@@ -13,7 +13,7 @@ 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=697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224
+checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
From bfc772748f93713c5c2d81173c4a7e535d893bfc Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:07 +0400
Subject: [PATCH 02/10] Bear: rebuild against libspdlog.so.1.11
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 2e0914bbe66a..3ffe702993fd 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.0.20
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 1716e7b72bac5258b517488f300ac838b680893a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:07 +0400
Subject: [PATCH 03/10] coeurl: rebuild against libspdlog.so.1.11
---
srcpkgs/coeurl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index a23fbef9951f..2edd2c9ee56e 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.1.1
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config"
makedepends="spdlog libevent-devel libcurl-devel"
From b07f11b9c610db125a7dd052d0663608fa1c9793 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 04/10] cryfs: rebuild against libspdlog.so.1.11
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 1affee1d8f03..0349066cb88d 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.2
-revision=1
+revision=2
create_wrksrc=yes
build_style=cmake
configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
From a0e76e2d60f998fc551a723046a4b7eff0999f78 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 05/10] gerbera: rebuild against libspdlog.so.1.11
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 43051044540c..d37296cd049b 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=4
+revision=5
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From ac2b678f80ed10a6e795b053ad94c8f669c60f30 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 06/10] gnuradio: rebuild against libspdlog.so.1.11, add patch
for i686 tests
---
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ++++++++++++++++++
srcpkgs/gnuradio/template | 2 +-
2 files changed, 267 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
new file mode 100644
index 000000000000..43094abeb976
--- /dev/null
+++ b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
@@ -0,0 +1,266 @@
+From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Fri, 14 Oct 2022 15:39:20 -0400
+Subject: [PATCH] blocks: Allow for floating point error in moving average test
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-blocks/python/blocks/qa_moving_average.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
+index 8f4169d05cf..6aa3ba3df35 100644
+--- a/gr-blocks/python/blocks/qa_moving_average.py
++++ b/gr-blocks/python/blocks/qa_moving_average.py
+@@ -147,7 +147,7 @@ def test_vector_complex(self):
+ ref_data = ref_dst.data()
+
+ # make sure result is close to zero
+- self.assertEqual(dut_data, ref_data)
++ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
+
+ def test_complex_scalar(self):
+ tb = self.tb
+
+From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Fri, 14 Oct 2022 15:52:54 -0400
+Subject: [PATCH] fft: Increase tolerance in qa_window test
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-fft/python/fft/qa_window.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
+index 93ab1a9f93f..ec4877f7867 100644
+--- a/gr-fft/python/fft/qa_window.py
++++ b/gr-fft/python/fft/qa_window.py
+@@ -35,7 +35,7 @@ def test_normwin(self):
+ 21,
+ normalize=True)
+ power = numpy.sum([x * x for x in win]) / len(win)
+- self.assertAlmostEqual(power, 1.0)
++ self.assertAlmostEqual(power, 1.0, places=6)
+
+
+ if __name__ == '__main__':
+
+From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Fri, 14 Oct 2022 17:29:30 -0400
+Subject: [PATCH 1/2] digital: Account for floating point error in loop
+ conditions
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-digital/lib/constellation.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
+index 609b4546b83..4235d17f202 100644
+--- a/gr-digital/lib/constellation.cc
++++ b/gr-digital/lib/constellation.cc
+@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
+ float maxd = 1.0f;
+ float step = (2.0f * maxd) / (d_lut_scale - 1);
+ float y = -maxd;
+- while (y < maxd + step) {
++ while (y < maxd + (step / 2)) {
+ float x = -maxd;
+- while (x < maxd + step) {
++ while (x < maxd + (step / 2)) {
+ gr_complex pt = gr_complex(x, y);
+ d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
+ x += step;
+
+From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Fri, 14 Oct 2022 17:31:33 -0400
+Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-digital/python/digital/qa_constellation.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
+index 7345f782a2c..1ad86a8d263 100644
+--- a/gr-digital/python/digital/qa_constellation.py
++++ b/gr-digital/python/digital/qa_constellation.py
+@@ -117,10 +117,10 @@ def threed_constell():
+ def slicer(x):
+ ret = []
+ for xi in x:
+- if(xi < 0):
++ if xi < 0:
+ ret.append(0.0)
+- else:
+- ret.append(1.0)
++ else:
++ ret.append(1.0)
+ return ret
+
+
+From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Sat, 15 Oct 2022 10:44:37 -0400
+Subject: [PATCH] fec: Fix LDPC output size calculation
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
+ gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
+index a76bd76bae2..56a7aeab4c5 100644
+--- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
++++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
+@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
+
+ d_frame_size = frame_size;
+
+- d_output_size = static_cast<int>(d_rate * d_frame_size);
++ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
+
+ return ret;
+ }
+diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
+index f9aaa1b65b4..1475aba70d4 100644
+--- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
++++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
+@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
+
+ d_frame_size = frame_size;
+
+- d_output_size = static_cast<int>(d_rate * d_frame_size);
++ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
+
+ return ret;
+ }
+
+From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Sun, 16 Oct 2022 08:22:48 -0400
+Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
+ 1 file changed, 45 insertions(+), 17 deletions(-)
+
+From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Sun, 16 Oct 2022 08:22:48 -0400
+Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
+ 1 file changed, 45 insertions(+), 17 deletions(-)
+
+diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
+index 6151641aa3c..195e19ab9a3 100644
+--- a/gr-analog/python/analog/qa_ctcss_squelch.py
++++ b/gr-analog/python/analog/qa_ctcss_squelch.py
+@@ -9,6 +9,8 @@
+ #
+
+
++import math
++import random
+ from gnuradio import gr, gr_unittest, analog, blocks
+
+
+@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
+
+ def test_ctcss_squelch_002(self):
+ # Test runtime, gate=True
+- rate = 1
++ rate = 8000
+ freq = 100
+- level = 0.0
+- length = 1
+- ramp = 1
++ other_freq = 103.5
++ level = 0.01
++ length = 0
++ ramp = 0
+ gate = True
+
+- src_data = [float(x) / 10.0 for x in range(1, 40)]
+- expected_result = src_data
+- expected_result[0] = 0
++ random.seed(1)
++ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
++
++ # First half-second has incorrect CTCSS tone
++ for x in range(0, int(rate * 0.500)):
++ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
++
++ # Second half-second has correct CTCSS tone
++ for x in range(int(rate * 0.500), rate):
++ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
+
+ src = blocks.vector_source_f(src_data)
+ op = analog.ctcss_squelch_ff(rate, freq, level,
+@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
+ self.tb.run()
+
+ result_data = dst.data()
+- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
++
++ # Squelch should open ~100 ms after the correct CTCSS tone appears
++ # so ~400 ms of audio should make it past the gate
++ self.assertGreater(len(result_data), rate * 0.390)
++ self.assertLess(len(result_data), rate * 0.410)
++ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
+
+ def test_ctcss_squelch_003(self):
+ # Test runtime, gate=False
+- rate = 1
++ rate = 8000
+ freq = 100
+- level = 0.5
+- length = 1
+- ramp = 1
++ other_freq = 103.5
++ level = 0.01
++ length = 0
++ ramp = 0
+ gate = False
+
+- src_data = [float(x) / 10.0 for x in range(1, 40)]
++ random.seed(1)
++ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
++
++ # First half-second has incorrect CTCSS tone
++ for x in range(0, rate // 2):
++ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
++
++ # Second half-second has correct CTCSS tone
++ for x in range(rate // 2, rate):
++ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
++
+ src = blocks.vector_source_f(src_data)
+ op = analog.ctcss_squelch_ff(rate, freq, level,
+ length, ramp, gate)
+@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
+ self.tb.connect(op, dst)
+ self.tb.run()
+
+- expected_result = src_data
+- expected_result[0:5] = [0, 0, 0, 0, 0]
+-
+ result_data = dst.data()
+- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
++
++ # Squelch should open ~100 ms after the correct CTCSS tone appears
++ min_zero_samples = int(rate * 0.590)
++ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
++ max_zero_samples = int(rate * 0.610)
++ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
+
+
+ if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 360a948b5d38..5012ef4f62e7 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From cd80c2b60de653a4dd889fca022f9f313ce6fe22 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 07/10] MangoHud: rebuild against libspdlog.so.1.11
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 87901b74cb5a..84c0163f92c9 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,8 +1,8 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.6.7.1
+revision=4
_version="${version%.*}-${version##*.}"
-revision=3
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled"
From cf0ab269a56d2dae07776eea2fa3d7a67df94e37 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 08/10] mtxclient: rebuild against libspdlog.so.1.11
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 6c404f3eb5b1..d058574dbacd 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.8.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 5825a9a44721e8b3f44e3db9253c09d80d7360cf Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 09/10] nheko: rebuild against libspdlog.so.1.11
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 0aca78272dc8..ac1a40659c75 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.10.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From e80ec8d10556688c7b915218e248bcce14c0c131 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:09 +0400
Subject: [PATCH 10/10] Waybar: rebuild against libspdlog.so.1.11
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index b85ddcfc35a7..38a2261341ff 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.13
-revision=2
+revision=3
_date_version=3.0.0
create_wrksrc=yes
build_style=meson
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] spdlog: update to 1.11.0.
2022-11-12 20:06 [PR PATCH] Spdlog 1.11.0 skmpz
@ 2022-11-14 4:05 ` skmpz
2022-11-24 6:07 ` [PR PATCH] [Merged]: " classabbyamp
1 sibling, 0 replies; 3+ messages in thread
From: skmpz @ 2022-11-14 4:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]
There is an updated pull request by skmpz against master on the void-packages repository
https://github.com/skmpz/void-packages spdlog-1.11.0
https://github.com/void-linux/void-packages/pull/40493
spdlog: update to 1.11.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/40493.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spdlog-1.11.0-40493.patch --]
[-- Type: text/x-diff, Size: 18180 bytes --]
From 1e5ac9a611d88f767887693a070f1fba74bda153 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:28:48 +0400
Subject: [PATCH 01/10] spdlog: update to 1.11.0.
---
common/shlibs | 2 +-
srcpkgs/spdlog/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 76512744735e..485a186674e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4036,7 +4036,7 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1
libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
libwayland-egl++.so.0 libwaylandpp-0.2.8_1
libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
-libspdlog.so.1 libspdlog-1.8.2_2
+libspdlog.so.1.11 libspdlog-1.11.0_1
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
libldacBT_enc.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index ef1ee76ffcca..045f86def2cc 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
-version=1.10.0
-revision=2
+version=1.11.0
+revision=1
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
@@ -13,7 +13,7 @@ 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=697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224
+checksum=ca5cae8d6cac15dae0ec63b21d6ad3530070650f68076f3a4a862ca293a858bb
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON"
From bfc772748f93713c5c2d81173c4a7e535d893bfc Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:07 +0400
Subject: [PATCH 02/10] Bear: rebuild against libspdlog.so.1.11
---
srcpkgs/Bear/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index 2e0914bbe66a..3ffe702993fd 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
version=3.0.20
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
From 1716e7b72bac5258b517488f300ac838b680893a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:07 +0400
Subject: [PATCH 03/10] coeurl: rebuild against libspdlog.so.1.11
---
srcpkgs/coeurl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index a23fbef9951f..2edd2c9ee56e 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.1.1
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config"
makedepends="spdlog libevent-devel libcurl-devel"
From b07f11b9c610db125a7dd052d0663608fa1c9793 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 04/10] cryfs: rebuild against libspdlog.so.1.11
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 1affee1d8f03..0349066cb88d 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.11.2
-revision=1
+revision=2
create_wrksrc=yes
build_style=cmake
configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
From a0e76e2d60f998fc551a723046a4b7eff0999f78 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 05/10] gerbera: rebuild against libspdlog.so.1.11
---
srcpkgs/gerbera/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 43051044540c..d37296cd049b 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=4
+revision=5
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From ac2b678f80ed10a6e795b053ad94c8f669c60f30 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 06/10] gnuradio: rebuild against libspdlog.so.1.11, add patch
for i686 tests
---
srcpkgs/gnuradio/patches/fix-i686-tests.patch | 266 ++++++++++++++++++
srcpkgs/gnuradio/template | 2 +-
2 files changed, 267 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnuradio/patches/fix-i686-tests.patch
diff --git a/srcpkgs/gnuradio/patches/fix-i686-tests.patch b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
new file mode 100644
index 000000000000..43094abeb976
--- /dev/null
+++ b/srcpkgs/gnuradio/patches/fix-i686-tests.patch
@@ -0,0 +1,266 @@
+From b7323c09566416187bad7728c547c336ffa49253 Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Fri, 14 Oct 2022 15:39:20 -0400
+Subject: [PATCH] blocks: Allow for floating point error in moving average test
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-blocks/python/blocks/qa_moving_average.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
+index 8f4169d05cf..6aa3ba3df35 100644
+--- a/gr-blocks/python/blocks/qa_moving_average.py
++++ b/gr-blocks/python/blocks/qa_moving_average.py
+@@ -147,7 +147,7 @@ def test_vector_complex(self):
+ ref_data = ref_dst.data()
+
+ # make sure result is close to zero
+- self.assertEqual(dut_data, ref_data)
++ self.assertListAlmostEqual(dut_data, ref_data, tol=3)
+
+ def test_complex_scalar(self):
+ tb = self.tb
+
+From e3e7b41a1f014ca39ec5d244eed01e1caa7cc4cb Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Fri, 14 Oct 2022 15:52:54 -0400
+Subject: [PATCH] fft: Increase tolerance in qa_window test
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-fft/python/fft/qa_window.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gr-fft/python/fft/qa_window.py b/gr-fft/python/fft/qa_window.py
+index 93ab1a9f93f..ec4877f7867 100644
+--- a/gr-fft/python/fft/qa_window.py
++++ b/gr-fft/python/fft/qa_window.py
+@@ -35,7 +35,7 @@ def test_normwin(self):
+ 21,
+ normalize=True)
+ power = numpy.sum([x * x for x in win]) / len(win)
+- self.assertAlmostEqual(power, 1.0)
++ self.assertAlmostEqual(power, 1.0, places=6)
+
+
+ if __name__ == '__main__':
+
+From 05b3b5e4689e6c061268c6df1773f10b021125e6 Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Fri, 14 Oct 2022 17:29:30 -0400
+Subject: [PATCH 1/2] digital: Account for floating point error in loop
+ conditions
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-digital/lib/constellation.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gr-digital/lib/constellation.cc b/gr-digital/lib/constellation.cc
+index 609b4546b83..4235d17f202 100644
+--- a/gr-digital/lib/constellation.cc
++++ b/gr-digital/lib/constellation.cc
+@@ -245,9 +245,9 @@ void constellation::gen_soft_dec_lut(int precision, float npwr)
+ float maxd = 1.0f;
+ float step = (2.0f * maxd) / (d_lut_scale - 1);
+ float y = -maxd;
+- while (y < maxd + step) {
++ while (y < maxd + (step / 2)) {
+ float x = -maxd;
+- while (x < maxd + step) {
++ while (x < maxd + (step / 2)) {
+ gr_complex pt = gr_complex(x, y);
+ d_soft_dec_lut.push_back(calc_soft_dec(pt, npwr));
+ x += step;
+
+From 830349bb36706aaf872a8a911ead631c9788c2ac Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Fri, 14 Oct 2022 17:31:33 -0400
+Subject: [PATCH 2/2] digital: Fix slicer implementation in qa_constellation
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-digital/python/digital/qa_constellation.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gr-digital/python/digital/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
+index 7345f782a2c..1ad86a8d263 100644
+--- a/gr-digital/python/digital/qa_constellation.py
++++ b/gr-digital/python/digital/qa_constellation.py
+@@ -117,10 +117,10 @@ def threed_constell():
+ def slicer(x):
+ ret = []
+ for xi in x:
+- if(xi < 0):
++ if xi < 0:
+ ret.append(0.0)
+- else:
+- ret.append(1.0)
++ else:
++ ret.append(1.0)
+ return ret
+
+
+From 7c24638f9924cdedeb9b2c9c430b3eb63585de3b Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Sat, 15 Oct 2022 10:44:37 -0400
+Subject: [PATCH] fec: Fix LDPC output size calculation
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 2 +-
+ gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
+index a76bd76bae2..56a7aeab4c5 100644
+--- a/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
++++ b/gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc
+@@ -55,7 +55,7 @@ bool ldpc_gen_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
+
+ d_frame_size = frame_size;
+
+- d_output_size = static_cast<int>(d_rate * d_frame_size);
++ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
+
+ return ret;
+ }
+diff --git a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
+index f9aaa1b65b4..1475aba70d4 100644
+--- a/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
++++ b/gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc
+@@ -75,7 +75,7 @@ bool ldpc_par_mtrx_encoder_impl::set_frame_size(unsigned int frame_size)
+
+ d_frame_size = frame_size;
+
+- d_output_size = static_cast<int>(d_rate * d_frame_size);
++ d_output_size = static_cast<int>(round(d_rate * d_frame_size));
+
+ return ret;
+ }
+
+From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Sun, 16 Oct 2022 08:22:48 -0400
+Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
+ 1 file changed, 45 insertions(+), 17 deletions(-)
+
+From 543983116771cee5653514f3cd2f260551edc89d Mon Sep 17 00:00:00 2001
+From: Clayton Smith <argilo@gmail.com>
+Date: Sun, 16 Oct 2022 08:22:48 -0400
+Subject: [PATCH] analog: Use realistic signals for CTCSS squelch tests
+
+Signed-off-by: Clayton Smith <argilo@gmail.com>
+---
+ gr-analog/python/analog/qa_ctcss_squelch.py | 62 +++++++++++++++------
+ 1 file changed, 45 insertions(+), 17 deletions(-)
+
+diff --git a/gr-analog/python/analog/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
+index 6151641aa3c..195e19ab9a3 100644
+--- a/gr-analog/python/analog/qa_ctcss_squelch.py
++++ b/gr-analog/python/analog/qa_ctcss_squelch.py
+@@ -9,6 +9,8 @@
+ #
+
+
++import math
++import random
+ from gnuradio import gr, gr_unittest, analog, blocks
+
+
+@@ -46,16 +48,24 @@ def test_ctcss_squelch_001(self):
+
+ def test_ctcss_squelch_002(self):
+ # Test runtime, gate=True
+- rate = 1
++ rate = 8000
+ freq = 100
+- level = 0.0
+- length = 1
+- ramp = 1
++ other_freq = 103.5
++ level = 0.01
++ length = 0
++ ramp = 0
+ gate = True
+
+- src_data = [float(x) / 10.0 for x in range(1, 40)]
+- expected_result = src_data
+- expected_result[0] = 0
++ random.seed(1)
++ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
++
++ # First half-second has incorrect CTCSS tone
++ for x in range(0, int(rate * 0.500)):
++ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
++
++ # Second half-second has correct CTCSS tone
++ for x in range(int(rate * 0.500), rate):
++ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
+
+ src = blocks.vector_source_f(src_data)
+ op = analog.ctcss_squelch_ff(rate, freq, level,
+@@ -67,18 +77,34 @@ def test_ctcss_squelch_002(self):
+ self.tb.run()
+
+ result_data = dst.data()
+- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
++
++ # Squelch should open ~100 ms after the correct CTCSS tone appears
++ # so ~400 ms of audio should make it past the gate
++ self.assertGreater(len(result_data), rate * 0.390)
++ self.assertLess(len(result_data), rate * 0.410)
++ self.assertFloatTuplesAlmostEqual(src_data[-len(result_data):], result_data, 6)
+
+ def test_ctcss_squelch_003(self):
+ # Test runtime, gate=False
+- rate = 1
++ rate = 8000
+ freq = 100
+- level = 0.5
+- length = 1
+- ramp = 1
++ other_freq = 103.5
++ level = 0.01
++ length = 0
++ ramp = 0
+ gate = False
+
+- src_data = [float(x) / 10.0 for x in range(1, 40)]
++ random.seed(1)
++ src_data = [0.5 * math.sin(2 * math.pi * 1000 * x / rate) + random.gauss(0, 0.1) for x in range(rate)]
++
++ # First half-second has incorrect CTCSS tone
++ for x in range(0, rate // 2):
++ src_data[x] += 0.15 * math.sin(2 * math.pi * other_freq * x / rate)
++
++ # Second half-second has correct CTCSS tone
++ for x in range(rate // 2, rate):
++ src_data[x] += 0.15 * math.sin(2 * math.pi * freq * x / rate)
++
+ src = blocks.vector_source_f(src_data)
+ op = analog.ctcss_squelch_ff(rate, freq, level,
+ length, ramp, gate)
+@@ -88,11 +114,13 @@ def test_ctcss_squelch_003(self):
+ self.tb.connect(op, dst)
+ self.tb.run()
+
+- expected_result = src_data
+- expected_result[0:5] = [0, 0, 0, 0, 0]
+-
+ result_data = dst.data()
+- self.assertFloatTuplesAlmostEqual(expected_result, result_data, 4)
++
++ # Squelch should open ~100 ms after the correct CTCSS tone appears
++ min_zero_samples = int(rate * 0.590)
++ self.assertFloatTuplesAlmostEqual([0] * min_zero_samples, result_data[:min_zero_samples], 6)
++ max_zero_samples = int(rate * 0.610)
++ self.assertFloatTuplesAlmostEqual(src_data[max_zero_samples:], result_data[max_zero_samples:], 6)
+
+
+ if __name__ == '__main__':
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 360a948b5d38..5012ef4f62e7 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=5
+revision=6
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From cd80c2b60de653a4dd889fca022f9f313ce6fe22 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 07/10] MangoHud: rebuild against libspdlog.so.1.11
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index 87901b74cb5a..84c0163f92c9 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -1,8 +1,8 @@
# Template file for 'MangoHud'
pkgname=MangoHud
version=0.6.7.1
+revision=4
_version="${version%.*}-${version##*.}"
-revision=3
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
-Dwith_nvml=disabled -Duse_system_spdlog=enabled"
From cf0ab269a56d2dae07776eea2fa3d7a67df94e37 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 08/10] mtxclient: rebuild against libspdlog.so.1.11
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 6c404f3eb5b1..d058574dbacd 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.8.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 5825a9a44721e8b3f44e3db9253c09d80d7360cf Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:08 +0400
Subject: [PATCH 09/10] nheko: rebuild against libspdlog.so.1.11
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 0aca78272dc8..ac1a40659c75 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.10.2
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From 9fc19800cd3f97eb05d18e354df1ad82c0df8170 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Nov 2022 16:29:09 +0400
Subject: [PATCH 10/10] Waybar: rebuild against libspdlog.so.1.11
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index b85ddcfc35a7..38a2261341ff 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.13
-revision=2
+revision=3
_date_version=3.0.0
create_wrksrc=yes
build_style=meson
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: spdlog: update to 1.11.0.
2022-11-12 20:06 [PR PATCH] Spdlog 1.11.0 skmpz
2022-11-14 4:05 ` [PR PATCH] [Updated] spdlog: update to 1.11.0 skmpz
@ 2022-11-24 6:07 ` classabbyamp
1 sibling, 0 replies; 3+ messages in thread
From: classabbyamp @ 2022-11-24 6:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]
There's a merged pull request on the void-packages repository
spdlog: update to 1.11.0.
https://github.com/void-linux/void-packages/pull/40493
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] 3+ messages in thread
end of thread, other threads:[~2022-11-24 6:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-12 20:06 [PR PATCH] Spdlog 1.11.0 skmpz
2022-11-14 4:05 ` [PR PATCH] [Updated] spdlog: update to 1.11.0 skmpz
2022-11-24 6:07 ` [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).