From 9dbbec32522d8f075fecba31af7cfb5fe468fcff Mon Sep 17 00:00:00 2001 From: classabbyamp 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 | 29 ++++++++++-- 3 files changed, 75 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..bd04e0b4f82f 100644 --- a/srcpkgs/hobbits/template +++ b/srcpkgs/hobbits/template @@ -1,28 +1,47 @@ # 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 " -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" esac +case "$XBPS_TARGET_MACHINE" in + aarch64*) ;; + *) PFFFT_CFLAGS="-msse -mfpmath=sse" ;; +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 }