From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] hobbits: update to 0.53.1.
Date: Sun, 03 Apr 2022 06:59:41 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36490@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages hobbits-0.53.0
https://github.com/void-linux/void-packages/pull/36490
hobbits: update to 0.53.1.
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36490.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hobbits-0.53.0-36490.patch --]
[-- Type: text/x-diff, Size: 5797 bytes --]
From 55edea806f1d7a6cb993054afd05e23799a528e7 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 3 Apr 2022 00:58:37 -0400
Subject: [PATCH] hobbits: update to 0.53.1.
---
srcpkgs/hobbits/files/LICENSE.pffft | 48 ++++++++++++++++++++
srcpkgs/hobbits/patches/python_version.patch | 6 +--
srcpkgs/hobbits/template | 24 ++++++++--
3 files changed, 70 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/hobbits/files/LICENSE.pffft
diff --git a/srcpkgs/hobbits/files/LICENSE.pffft b/srcpkgs/hobbits/files/LICENSE.pffft
new file mode 100644
index 000000000000..a584360e01f9
--- /dev/null
+++ b/srcpkgs/hobbits/files/LICENSE.pffft
@@ -0,0 +1,48 @@
+From https://bitbucket.org/jpommier/pffft/src/233c26659185ff55958e96e4c25f3fcafe249a65/pffft.c#lines-1:46
+
+Copyright (c) 2013 Julien Pommier ( pommier@modartt.com )
+
+Based on original fortran 77 code from FFTPACKv4 from NETLIB
+(http://www.netlib.org/fftpack), authored by Dr Paul Swarztrauber
+of NCAR, in 1985.
+
+As confirmed by the NCAR fftpack software curators, the following
+FFTPACKv5 license applies to FFTPACKv4 sources. My changes are
+released under the same terms.
+
+FFTPACK license:
+
+http://www.cisl.ucar.edu/css/software/fftpack5/ftpk.html
+
+Copyright (c) 2004 the University Corporation for Atmospheric
+Research ("UCAR"). All rights reserved. Developed by NCAR's
+Computational and Information Systems Laboratory, UCAR,
+www.cisl.ucar.edu.
+
+Redistribution and use of the Software in source and binary forms,
+with or without modification, is permitted provided that the
+following conditions are met:
+
+- Neither the names of NCAR's Computational and Information Systems
+Laboratory, the University Corporation for Atmospheric Research,
+nor the names of its sponsors or contributors may be used to
+endorse or promote products derived from this Software without
+specific prior written permission.
+
+- Redistributions of source code must retain the above copyright
+notices, this list of conditions, and the disclaimer below.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions, and the disclaimer below in the
+documentation and/or other materials provided with the
+distribution.
+
+THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+SOFTWARE.
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
index 47b1490c4b0a..8498d10201e3 100644
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ b/srcpkgs/hobbits/patches/python_version.patch
@@ -1,11 +1,11 @@
---- a/CMakeLists.txt 2021-10-07 11:31:22.000000000 -0400
-+++ b/CMakeLists.txt 2021-10-25 21:16:59.429406408 -0400
+--- a/hobbits-0.53.1/CMakeLists.txt 2021-10-07 11:31:22.000000000 -0400
++++ b/hobbits-0.53.1/CMakeLists.txt 2021-10-25 21:16:59.429406408 -0400
@@ -124,7 +124,7 @@
set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" )
endif()
-find_package (Python3 3.9 EXACT COMPONENTS Interpreter Development REQUIRED)
-+find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED)
++find_package (Python3 3.10 COMPONENTS Interpreter Development REQUIRED)
message("Python3 Libs: ${Python3_LIBRARIES}")
#
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index 42f5c20ce132..1de95c73c542 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,17 +1,24 @@
# Template file for 'hobbits'
pkgname=hobbits
-version=0.52.0
+version=0.53.1
revision=1
+_pffft_commit=233c26659185ff55958e96e4c25f3fcafe249a65
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
build_style=cmake
+configure_args="-DPFFFT_ROOT=../${_pffft_dir}"
hostmakedepends="pkg-config qt5-host-tools qt5-qmake python3"
-makedepends="fftw-devel libusb-devel libpcap-devel python3-devel qt5-devel"
+makedepends="libusb-devel libpcap-devel python3-devel qt5-devel"
short_desc="Multi-platform GUI for bit-based analysis, processing and visualization"
maintainer="classabbyamp <dev@kb6.ee>"
-license="MIT, GPL-2.0-or-later"
+license="MIT"
homepage="https://mahlet-inc.github.io"
changelog="https://raw.githubusercontent.com/Mahlet-Inc/hobbits/master/CHANGELOG.md"
-distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz"
-checksum=3332e02380ab46649f0ec2066b63b6e0fb04b55cdca973d28880f1607ebbf27e
+distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz
+ https://bitbucket.org/jpommier/pffft/get/${_pffft_commit}.tar.gz"
+checksum="e63c51228c3f00f56a2ebf79fec1975544b1c6c986d58dff69643da46148316b
+ @c1df1ae9d807f2e0fc2391bd8e714ac5bfc76a54b20ef3de3d82acb026c79f74"
case "$XBPS_TARGET_MACHINE" in
arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
@@ -20,9 +27,16 @@ esac
pre_configure() {
# upstream provides no way to set the version through configure_args
echo "${version}" > .version
+
+ msg_normal "pffft-${_pffft_commit:0:12}: building ...\n"
+ cd "../$_pffft_dir"
+ ${CC} ${CFLAGS} -lm -O3 -Wall -c pffft.c -o pffft.o
+ ${AR} rcs libpffft.a pffft.o
+ msg_normal "pffft-${_pffft_commit:0:12}: finished\n"
}
post_install() {
vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
vlicense LICENSE.txt
+ vlicense ${FILESDIR}/LICENSE.pffft
}
next reply other threads:[~2022-04-03 4:59 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-03 4:59 classabbyamp [this message]
2022-04-03 5:04 ` [PR PATCH] [Updated] " classabbyamp
2022-04-03 5:13 ` classabbyamp
2022-04-03 5:14 ` classabbyamp
2022-04-03 5:39 ` classabbyamp
2022-04-03 6:05 ` classabbyamp
2022-04-03 6:09 ` classabbyamp
2022-04-03 6:23 ` classabbyamp
2022-04-03 6:27 ` classabbyamp
2022-04-03 17:10 ` classabbyamp
2022-04-06 7:30 ` classabbyamp
2022-04-06 17:27 ` [PR REVIEW] " paper42
2022-04-06 17:27 ` paper42
2022-04-06 17:27 ` paper42
2022-04-06 17:28 ` paper42
2022-04-06 17:28 ` paper42
2022-04-06 17:33 ` [PR PATCH] [Updated] " classabbyamp
2022-04-06 17:34 ` [PR REVIEW] " classabbyamp
2022-04-06 18:10 ` [PR PATCH] [Updated] " classabbyamp
2022-04-08 3:33 ` classabbyamp
2022-04-08 4:45 ` classabbyamp
2022-04-08 5:05 ` classabbyamp
2022-04-08 5:13 ` classabbyamp
2022-04-08 5:24 ` classabbyamp
2022-04-10 1:32 ` classabbyamp
2022-04-10 8:54 ` [PR REVIEW] " paper42
2022-04-10 16:30 ` [PR PATCH] [Updated] " classabbyamp
2022-04-11 21:16 ` [PR PATCH] [Merged]: " paper42
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36490@inbox.vuxu.org \
--to=classabbyamp@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).