From fbd7a0b241309f1cf17e2668f03a0ddd912a875c Mon Sep 17 00:00:00 2001 From: Adam Gausmann Date: Sun, 30 Jul 2023 22:45:34 -0500 Subject: [PATCH 1/2] New package: nng-1.5.2 --- common/shlibs | 1 + srcpkgs/nng-devel | 1 + srcpkgs/nng/template | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 120000 srcpkgs/nng-devel create mode 100644 srcpkgs/nng/template diff --git a/common/shlibs b/common/shlibs index 9c2060bc45a67..832e9d5419b01 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4290,3 +4290,4 @@ libb64.so.0 libb64-1.2.1_1 libei.so.1 libei-1.1.0_1 libeis.so.1 libei-1.1.0_1 liboeffis.so.1 libei-1.1.0_1 +libnng.so.1 nng-1.5.2_1 diff --git a/srcpkgs/nng-devel b/srcpkgs/nng-devel new file mode 120000 index 0000000000000..cb46bd4614848 --- /dev/null +++ b/srcpkgs/nng-devel @@ -0,0 +1 @@ +nng \ No newline at end of file diff --git a/srcpkgs/nng/template b/srcpkgs/nng/template new file mode 100644 index 0000000000000..3940d202fa9ed --- /dev/null +++ b/srcpkgs/nng/template @@ -0,0 +1,34 @@ +# Template file for 'nng' +pkgname=nng +version=1.5.2 +revision=1 +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=on" +short_desc="Nanomsg next-generation" +maintainer="Adam Gausmann " +license="MIT" +homepage="https://github.com/nanomsg/nng" +changelog="https://github.com/nanomsg/nng/releases" +distfiles="https://github.com/nanomsg/nng/archive/refs/tags/v${version}.tar.gz" +checksum=f8b25ab86738864b1f2e3128e8badab581510fa8085ff5ca9bb980d317334c46 + +do_check() { + # nng.platform.resolver_test passes on host machine, + # but fails in void-packages chroot + cd ${cmake_builddir:=build} + ctest -E 'nng\.platform\.resolver_test' +} + +post_install() { + vlicense LICENSE.txt +} + +nng-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove "usr/include" + vmove "usr/lib/cmake" + vmove "usr/lib/*.so" + } +} From d405b23df95ae6306cb09641b25535c8670a971a Mon Sep 17 00:00:00 2001 From: Adam Gausmann Date: Sun, 30 Jul 2023 22:46:56 -0500 Subject: [PATCH 2/2] New package: SatDump-1.1.0 --- .../SatDump/patches/0001-table-flags-cast.patch | 17 +++++++++++++++++ srcpkgs/SatDump/template | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 srcpkgs/SatDump/patches/0001-table-flags-cast.patch create mode 100644 srcpkgs/SatDump/template diff --git a/srcpkgs/SatDump/patches/0001-table-flags-cast.patch b/srcpkgs/SatDump/patches/0001-table-flags-cast.patch new file mode 100644 index 0000000000000..4a0372b0e55b4 --- /dev/null +++ b/srcpkgs/SatDump/patches/0001-table-flags-cast.patch @@ -0,0 +1,17 @@ +When compiling with musl, the cast causes an error: + + error: cast from 'std::nullptr_t' to 'ImGuiTableFlags' {aka 'int'} loses precision + +Upstream PR: https://github.com/SatDump/SatDump/pull/420/ + +--- a/src-interface/recorder/tracking/tracking_widget_interface.cpp ++++ b/src-interface/recorder/tracking/tracking_widget_interface.cpp +@@ -162,7 +162,7 @@ namespace satdump + if (backend_needs_update) + style::beginDisabled(); + +- if (ImGui::BeginTable("##trackingradiotable", 2, (ImGuiTableFlags)NULL)) ++ if (ImGui::BeginTable("##trackingradiotable", 2, ImGuiTableFlags_None)) + { + ImGui::TableNextRow(); + ImGui::TableSetColumnIndex(0); diff --git a/srcpkgs/SatDump/template b/srcpkgs/SatDump/template new file mode 100644 index 0000000000000..c6f1833df98a8 --- /dev/null +++ b/srcpkgs/SatDump/template @@ -0,0 +1,17 @@ +# Template file for 'SatDump' +pkgname=SatDump +version=1.1.0 +revision=1 +build_style=cmake +hostmakedepends="pkgconf" +makedepends="fftw-devel volk-devel libpng-devel LuaJIT-devel nng-devel + librtlsdr-devel libhackrf-devel libairspy-devel libairspyhf-devel glew-devel + glfw-devel libzstd-devel libgomp-devel ocl-icd-devel LimeSuite-devel + uhd-devel portaudio-cpp-devel" +short_desc="Satellite data processing" +maintainer="Adam Gausmann " +license="GPL-3.0-or-later" +homepage="https://github.com/SatDump/SatDump" +changelog="https://github.com/SatDump/SatDump/releases" +distfiles="https://github.com/SatDump/SatDump/archive/refs/tags/${version}.tar.gz" +checksum=db032609fafa6d847f37a9511801aa198e3b9e52bdfb94a1751533c342ee372d