Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]

There is an updated 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 -->

This version of hobbits switched from fftw to pffft for fft functionality. This library is extremely small and unreleased, so vendoring it is probably the best way to deal with it.

#### 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: 4483 bytes --]

From bc01c49758f8497db4dda70448bca1c6321caacb Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 3 Apr 2022 00:58:37 -0400
Subject: [PATCH] hobbits: update to 0.53.1.

---
 srcpkgs/hobbits/patches/pffft.patch          | 18 +++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  6 ++--
 srcpkgs/hobbits/template                     | 33 +++++++++++++++++---
 3 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/pffft.patch

diff --git a/srcpkgs/hobbits/patches/pffft.patch b/srcpkgs/hobbits/patches/pffft.patch
new file mode 100644
index 000000000000..826191494917
--- /dev/null
+++ b/srcpkgs/hobbits/patches/pffft.patch
@@ -0,0 +1,18 @@
+--- a/hobbits-0.53.1/cmake/FindPFFFT.cmake
++++ b/hobbits-0.53.1/cmake/FindPFFFT.cmake
+@@ -8,6 +8,7 @@
+     /usr/local
+   PATH_SUFFIXES
+     ${CMAKE_INSTALL_INCLUDEDIR}
++  NO_CMAKE_FIND_ROOT_PATH
+ )
+ find_library(
+   PFFFT_LIBRARIES NAMES pffft
+@@ -19,6 +20,7 @@
+     /usr/local
+   PATH_SUFFIXES
+     ${CMAKE_INSTALL_LIBDIR}
++  NO_CMAKE_FIND_ROOT_PATH
+ )
+ 
+ include( FindPackageHandleStandardArgs )
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 fe6c7f5adda7..65ed30691677 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,51 @@
 # 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 <void@placeviolette.net>"
-license="MIT, GPL-2.0-or-later"
+license="MIT, custom:FFTPACK"
 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="" ;;
+	ppc64*) PFFFT_CFLAGS="-maltivec -mabi=altivec" ;;
+	x86_64*|i686*) PFFFT_CFLAGS="-msse -mfpmath=sse" ;;
+	# don't use SIMD on unsupported platforms
+	*) PFFFT_CFLAGS="-DPFFFT_SIMD_DISABLE" ;;
+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} ${PFFFT_CFLAGS} -lm -O3 -Wall -c pffft.c -o pffft.o
+	${AR} rcs libpffft.a pffft.o
+	sed -e '/\*\//,$d; 1s/\/\* //; s/^   //' pffft.c > LICENSE.pffft
+	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 ../${_pffft_dir}/LICENSE.pffft
 }