Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] hobbits: update to 0.53.1.
@ 2022-04-03  4:59 classabbyamp
  2022-04-03  5:04 ` [PR PATCH] [Updated] " classabbyamp
                   ` (26 more replies)
  0 siblings, 27 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-03  4:59 UTC (permalink / raw)
  To: ml

[-- 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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
@ 2022-04-03  5:04 ` classabbyamp
  2022-04-03  5:13 ` classabbyamp
                   ` (25 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-03  5:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1232 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 -->

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

From 9dbbec32522d8f075fecba31af7cfb5fe468fcff 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                     | 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 <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"
 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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
  2022-04-03  5:04 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-04-03  5:13 ` classabbyamp
  2022-04-03  5:14 ` classabbyamp
                   ` (24 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-03  5:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1232 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 -->

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

From c16c72fe4721a6e0ea98a05ddb94f41215ef36ee 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/patches/python_version.patch |  6 ++--
 srcpkgs/hobbits/template                     | 30 ++++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

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..fd52e754d8f1 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,48 @@
 # 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"
 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
+	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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
  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
                   ` (23 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-03  5:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1232 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 -->

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

From cf88796ce7d2e8209149951fa8b9e0840f151a24 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/patches/python_version.patch |  6 ++--
 srcpkgs/hobbits/template                     | 30 ++++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

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..749bbfa58f88 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,48 @@
 # 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"
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) PFFFT_CFLAGS= ;;
+	*) 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} ${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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (2 preceding siblings ...)
  2022-04-03  5:14 ` classabbyamp
@ 2022-04-03  5:39 ` classabbyamp
  2022-04-03  6:05 ` classabbyamp
                   ` (22 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-03  5:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1232 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 -->

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

From 57f4558c0e73dc1e96f620c1c16a8fb65e7bdb83 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/patches/python_version.patch |  6 ++--
 srcpkgs/hobbits/template                     | 30 ++++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

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..5f746846c958 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,48 @@
 # 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} --debug-find"
 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, 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= ;;
+	*) 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} ${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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (3 preceding siblings ...)
  2022-04-03  5:39 ` classabbyamp
@ 2022-04-03  6:05 ` classabbyamp
  2022-04-03  6:09 ` classabbyamp
                   ` (21 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-03  6:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1232 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 -->

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

From 0b99b28f10dedf81fb6f36782a6539a6aaa5fd7f 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/patches/python_version.patch |  6 ++--
 srcpkgs/hobbits/template                     | 30 ++++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

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..5c2b8a6cd12a 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,48 @@
 # 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, 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= ;;
+	*) 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} ${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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (4 preceding siblings ...)
  2022-04-03  6:05 ` classabbyamp
@ 2022-04-03  6:09 ` classabbyamp
  2022-04-03  6:23 ` classabbyamp
                   ` (20 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-03  6:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1232 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 -->

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

From 8ac4f7a98b806810284ff85609dd2deddf583a55 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/patches/pffft.patch          | 18 ++++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  6 ++--
 srcpkgs/hobbits/template                     | 30 ++++++++++++++++----
 3 files changed, 46 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 42f5c20ce132..f7431d93b867 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,48 @@
 # 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, 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
+	arm*|aarch64*) PFFFT_CFLAGS= ;;
+	*) 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} ${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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (5 preceding siblings ...)
  2022-04-03  6:09 ` classabbyamp
@ 2022-04-03  6:23 ` classabbyamp
  2022-04-03  6:27 ` classabbyamp
                   ` (19 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-03  6:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1232 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 -->

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

From 2bbf27d431fc16775fd865cdfe81fb0dfeef7472 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/patches/pffft.patch          | 18 ++++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  6 ++--
 srcpkgs/hobbits/template                     | 31 ++++++++++++++++----
 3 files changed, 47 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 42f5c20ce132..95e73df8d9b4 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,49 @@
 # 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, 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
+	arm*) broken="requires NEON instructions" ;;
+	aarch64*) PFFFT_CFLAGS= ;;
+	*) 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} ${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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (6 preceding siblings ...)
  2022-04-03  6:23 ` classabbyamp
@ 2022-04-03  6:27 ` classabbyamp
  2022-04-03 17:10 ` classabbyamp
                   ` (18 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-03  6:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1232 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 -->

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

From 18dcfdb5fe9fe5673a553c264703c84268d1b99b 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/patches/pffft.patch          | 18 +++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  6 ++--
 srcpkgs/hobbits/template                     | 32 +++++++++++++++++---
 3 files changed, 48 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 42f5c20ce132..76d1079f48d6 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,50 @@
 # 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, 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
+	arm*) broken="requires NEON instructions" ;;
+	aarch64*) PFFFT_CFLAGS="" ;;
+	ppc*) PFFFT_CFLAGS="-maltivec" ;;
+	*) 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} ${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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (7 preceding siblings ...)
  2022-04-03  6:27 ` classabbyamp
@ 2022-04-03 17:10 ` classabbyamp
  2022-04-06  7:30 ` classabbyamp
                   ` (17 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-03 17:10 UTC (permalink / raw)
  To: ml

[-- 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: 4405 bytes --]

From c9c9aede09b87a677ae8e761fe04e09c26a8a530 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/patches/pffft.patch          | 18 +++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  6 ++--
 srcpkgs/hobbits/template                     | 32 +++++++++++++++++---
 3 files changed, 48 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 42f5c20ce132..ecaaf97f3d77 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,50 @@
 # 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, 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
+	arm*) broken="requires NEON instructions" ;;
+	aarch64*) PFFFT_CFLAGS="" ;;
+	ppc*) PFFFT_CFLAGS="-maltivec -mabi=altivec" ;;
+	*) 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} ${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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (8 preceding siblings ...)
  2022-04-03 17:10 ` classabbyamp
@ 2022-04-06  7:30 ` classabbyamp
  2022-04-06 17:27 ` [PR REVIEW] " paper42
                   ` (16 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-06  7:30 UTC (permalink / raw)
  To: ml

[-- 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: 4405 bytes --]

From 77e87c5c5a96fb22cccc9c2d2e34e3102c6c0803 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/patches/pffft.patch          | 18 +++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  6 ++--
 srcpkgs/hobbits/template                     | 32 +++++++++++++++++---
 3 files changed, 48 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 42f5c20ce132..ecaaf97f3d77 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,50 @@
 # 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, 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
+	arm*) broken="requires NEON instructions" ;;
+	aarch64*) PFFFT_CFLAGS="" ;;
+	ppc*) PFFFT_CFLAGS="-maltivec -mabi=altivec" ;;
+	*) 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} ${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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (11 preceding siblings ...)
  2022-04-06 17:27 ` paper42
@ 2022-04-06 17:27 ` paper42
  2022-04-06 17:28 ` paper42
                   ` (13 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-06 17:27 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36490#discussion_r844195015

Comment:
We should probably only enable sse on i686 and x86_64, not on all other architectures.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (10 preceding siblings ...)
  2022-04-06 17:27 ` [PR REVIEW] " paper42
@ 2022-04-06 17:27 ` paper42
  2022-04-06 17:27 ` paper42
                   ` (14 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-06 17:27 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36490#discussion_r844195834

Comment:
```suggestion
```

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (9 preceding siblings ...)
  2022-04-06  7:30 ` classabbyamp
@ 2022-04-06 17:27 ` paper42
  2022-04-06 17:27 ` paper42
                   ` (15 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-06 17:27 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36490#discussion_r844198285

Comment:
```suggestion
	LDFLAGS="-lm" make pffft.o
```

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (12 preceding siblings ...)
  2022-04-06 17:27 ` paper42
@ 2022-04-06 17:28 ` paper42
  2022-04-06 17:28 ` paper42
                   ` (12 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-06 17:28 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36490#discussion_r844198285

Comment:
```suggestion
	LDFLAGS="-lm" make pffft.o
```

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (13 preceding siblings ...)
  2022-04-06 17:28 ` paper42
@ 2022-04-06 17:28 ` paper42
  2022-04-06 17:33 ` [PR PATCH] [Updated] " classabbyamp
                   ` (11 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-06 17:28 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36490#discussion_r844195834

Comment:
```suggestion
```

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (14 preceding siblings ...)
  2022-04-06 17:28 ` paper42
@ 2022-04-06 17:33 ` classabbyamp
  2022-04-06 17:34 ` [PR REVIEW] " classabbyamp
                   ` (10 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-06 17:33 UTC (permalink / raw)
  To: ml

[-- 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: 4481 bytes --]

From 379648352cad7c6f2302014573bc418f35e9e301 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..f25a2422c5af 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="" ;;
+	ppc*) 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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (15 preceding siblings ...)
  2022-04-06 17:33 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-04-06 17:34 ` classabbyamp
  2022-04-06 18:10 ` [PR PATCH] [Updated] " classabbyamp
                   ` (9 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-06 17:34 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36490#discussion_r844211450

Comment:
you're right. I also found an option that should remove the need for `broken`

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (16 preceding siblings ...)
  2022-04-06 17:34 ` [PR REVIEW] " classabbyamp
@ 2022-04-06 18:10 ` classabbyamp
  2022-04-08  3:33 ` classabbyamp
                   ` (8 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-06 18:10 UTC (permalink / raw)
  To: ml

[-- 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
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (17 preceding siblings ...)
  2022-04-06 18:10 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-04-08  3:33 ` classabbyamp
  2022-04-08  4:45 ` classabbyamp
                   ` (7 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-08  3:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1496 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 -->

### Don't merge this yet, I'm improving the vendoring

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: 8514 bytes --]

From 025b2ff14737d7777a41076ba8650ac0eadf2219 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/cmake.patch          | 125 +++++++++++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  11 --
 srcpkgs/hobbits/template                     |  45 +++++--
 3 files changed, 162 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/cmake.patch
 delete mode 100644 srcpkgs/hobbits/patches/python_version.patch

diff --git a/srcpkgs/hobbits/patches/cmake.patch b/srcpkgs/hobbits/patches/cmake.patch
new file mode 100644
index 000000000000..e0b92c4ac1b0
--- /dev/null
+++ b/srcpkgs/hobbits/patches/cmake.patch
@@ -0,0 +1,125 @@
+From f4683e308793221d54640300bf9d3eadb7a685ea Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:16:13 -0400
+Subject: [PATCH 1/4] cmake/PackExternalDeps.cmake: fix endfunction name
+
+---
+ cmake/PackExternalDeps.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/cmake/PackExternalDeps.cmake b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+index 4be07c7..330be03 100644
+--- a/hobbits-0.53.1/cmake/PackExternalDeps.cmake
++++ b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+@@ -145,7 +145,7 @@ endfunction(pack_python)
+ function(pack_pffft)
+ 	install(FILES ${PFFFT_LIBRARIES}
+ 			DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-endfunction(pack_pcap)
++endfunction(pack_pffft)
+ 
+ function(pack_pcap)
+     if (LINUX)
+
+From d239b55b805122617d9dd41930140e317653c8aa Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:17:19 -0400
+Subject: [PATCH 2/4] CMakeLists.txt: remove EXACT option for finding python
+
+without this, cmake will accept Python >=3.9
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 1cc283d..b95d6e6 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -124,7 +124,7 @@ elseif( MANUAL_PYTHON_PATH )
+ 	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)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
+
+From a9a4d40eca079f4b197849cf3d00f3f11069c482 Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:19:54 -0400
+Subject: [PATCH 3/4] CMakeLists.txt: allow specifying VERSION_STRING with
+ -DBUILD_VERSION
+
+this will make it easier for distros to specify the version without
+writing to .version
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index b95d6e6..7e766b2 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE)
+     set(LINUX TRUE)
+ endif()
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.version")
++if (DEFINED BUILD_VERSION)
++    message("Using build version from command-line")
++    set(VERSION_STRING "${BUILD_VERSION}")
++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version")
+     message("Getting build version from .version file")
+     file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION)
+     string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}")
+
+From b72cb09edd3850f4c2fe7d0ca693766704121f97 Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 20:55:02 -0400
+Subject: [PATCH 4/4] Add pffft as a submodule and include cmake build files
+ for it
+
+---
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 7e766b2..993eeb6 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -109,7 +109,7 @@ else()
+ 	endif()
+ 
+ 	# PFFFT
+-	find_package(PFFFT REQUIRED)
++	add_subdirectory(external)
+ 
+ endif()
+ 
+diff --git a/hobbits-0.53.1/external/CMakeLists.txt b/hobbits-0.53.1/external/CMakeLists.txt
+new file mode 100644
+index 0000000..668fff4
+--- /dev/null
++++ b/hobbits-0.53.1/external/CMakeLists.txt
+@@ -0,0 +1,22 @@
++option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF)
++# can't assume the target system has the required SIMD instructions
++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF)
++
++if(USE_SYSTEM_PFFFT)
++    message(STATUS "Using system pffft")
++    find_package(PFFFT REQUIRED)
++else()
++    message(STATUS "Using bundled pffft")
++    add_library(pffft STATIC pffft/pffft.c)
++    if(PFFFT_ENABLE_SIMD)
++        message(STATUS "Enabling SIMD support for pffft")
++    else()
++        message(STATUS "Disabling SIMD support for pffft")
++        target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE)
++    endif()
++    target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}")
++    target_link_libraries(pffft m)
++    target_include_directories(pffft INTERFACE pffft)
++
++    add_library(PFFFT::PFFFT ALIAS pffft)
++endif()
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
deleted file mode 100644
index 47b1490c4b0a..000000000000
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
-+++ b/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)
- message("Python3 Libs: ${Python3_LIBRARIES}")
- 
- #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index fe6c7f5adda7..9955f81683b0 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,57 @@
 # Template file for 'hobbits'
 pkgname=hobbits
-version=0.52.0
+version=0.53.1
 revision=1
+_pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
 build_style=cmake
+configure_args="-DBUILD_VERSION=${version}"
 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
+ @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
 esac
 
-pre_configure() {
-	# upstream provides no way to set the version through configure_args
-	echo "${version}" > .version
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*)
+		configure_args+=" -DPFFFT_ENABLE_SIMD=ON"
+		;;
+	ppc64*)
+		configure_args+=" -DPFFFT_ENABLE_SIMD=ON"
+		CFLAGS+=" -maltivec -mabi=altivec"
+		;;
+	x86_64*|i686*)
+		configure_args+=" -DPFFFT_ENABLE_SIMD=ON"
+		CFLAGS+=" -msse -mfpmath=sse"
+		;;
+	*) # don't use SIMD on unsupported platforms
+		;;
+esac
+
+post_extract() {
+	# until upstream merges Mahlet-Inc/hobbits#143 and releases a new version,
+	# the directory must be added, instead of removing the submodule
+	# rm -rf ${build_wrksrc}/external/pffft
+	mkdir ${build_wrksrc}/external
+	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }
 
 post_install() {
 	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	# capture the FFTPACK license from the header comment of pffft.c
+	sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft
+	vlicense LICENSE.pffft
 	vlicense LICENSE.txt
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (18 preceding siblings ...)
  2022-04-08  3:33 ` classabbyamp
@ 2022-04-08  4:45 ` classabbyamp
  2022-04-08  5:05 ` classabbyamp
                   ` (6 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-08  4:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1586 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. I have sent a patch upstream that makes vendoring much easier for us, Mahlet-Inc/hobbits#143, and included those changes as `patches/cmake.patch`.

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

From 7675bbdef801109f0cb88ad58a86244aa445f9b7 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/cmake.patch          | 125 +++++++++++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  11 --
 srcpkgs/hobbits/template                     |  43 +++++--
 3 files changed, 160 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/cmake.patch
 delete mode 100644 srcpkgs/hobbits/patches/python_version.patch

diff --git a/srcpkgs/hobbits/patches/cmake.patch b/srcpkgs/hobbits/patches/cmake.patch
new file mode 100644
index 000000000000..e0b92c4ac1b0
--- /dev/null
+++ b/srcpkgs/hobbits/patches/cmake.patch
@@ -0,0 +1,125 @@
+From f4683e308793221d54640300bf9d3eadb7a685ea Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:16:13 -0400
+Subject: [PATCH 1/4] cmake/PackExternalDeps.cmake: fix endfunction name
+
+---
+ cmake/PackExternalDeps.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/cmake/PackExternalDeps.cmake b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+index 4be07c7..330be03 100644
+--- a/hobbits-0.53.1/cmake/PackExternalDeps.cmake
++++ b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+@@ -145,7 +145,7 @@ endfunction(pack_python)
+ function(pack_pffft)
+ 	install(FILES ${PFFFT_LIBRARIES}
+ 			DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-endfunction(pack_pcap)
++endfunction(pack_pffft)
+ 
+ function(pack_pcap)
+     if (LINUX)
+
+From d239b55b805122617d9dd41930140e317653c8aa Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:17:19 -0400
+Subject: [PATCH 2/4] CMakeLists.txt: remove EXACT option for finding python
+
+without this, cmake will accept Python >=3.9
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 1cc283d..b95d6e6 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -124,7 +124,7 @@ elseif( MANUAL_PYTHON_PATH )
+ 	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)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
+
+From a9a4d40eca079f4b197849cf3d00f3f11069c482 Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:19:54 -0400
+Subject: [PATCH 3/4] CMakeLists.txt: allow specifying VERSION_STRING with
+ -DBUILD_VERSION
+
+this will make it easier for distros to specify the version without
+writing to .version
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index b95d6e6..7e766b2 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE)
+     set(LINUX TRUE)
+ endif()
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.version")
++if (DEFINED BUILD_VERSION)
++    message("Using build version from command-line")
++    set(VERSION_STRING "${BUILD_VERSION}")
++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version")
+     message("Getting build version from .version file")
+     file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION)
+     string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}")
+
+From b72cb09edd3850f4c2fe7d0ca693766704121f97 Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 20:55:02 -0400
+Subject: [PATCH 4/4] Add pffft as a submodule and include cmake build files
+ for it
+
+---
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 7e766b2..993eeb6 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -109,7 +109,7 @@ else()
+ 	endif()
+ 
+ 	# PFFFT
+-	find_package(PFFFT REQUIRED)
++	add_subdirectory(external)
+ 
+ endif()
+ 
+diff --git a/hobbits-0.53.1/external/CMakeLists.txt b/hobbits-0.53.1/external/CMakeLists.txt
+new file mode 100644
+index 0000000..668fff4
+--- /dev/null
++++ b/hobbits-0.53.1/external/CMakeLists.txt
+@@ -0,0 +1,22 @@
++option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF)
++# can't assume the target system has the required SIMD instructions
++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF)
++
++if(USE_SYSTEM_PFFFT)
++    message(STATUS "Using system pffft")
++    find_package(PFFFT REQUIRED)
++else()
++    message(STATUS "Using bundled pffft")
++    add_library(pffft STATIC pffft/pffft.c)
++    if(PFFFT_ENABLE_SIMD)
++        message(STATUS "Enabling SIMD support for pffft")
++    else()
++        message(STATUS "Disabling SIMD support for pffft")
++        target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE)
++    endif()
++    target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}")
++    target_link_libraries(pffft m)
++    target_include_directories(pffft INTERFACE pffft)
++
++    add_library(PFFFT::PFFFT ALIAS pffft)
++endif()
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
deleted file mode 100644
index 47b1490c4b0a..000000000000
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
-+++ b/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)
- message("Python3 Libs: ${Python3_LIBRARIES}")
- 
- #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index fe6c7f5adda7..3d30778f9e44 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,55 @@
 # Template file for 'hobbits'
 pkgname=hobbits
-version=0.52.0
+version=0.53.1
 revision=1
+_pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
 build_style=cmake
+configure_args="-DBUILD_VERSION=${version}"
 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
+ @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
 esac
 
-pre_configure() {
-	# upstream provides no way to set the version through configure_args
-	echo "${version}" > .version
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*)
+		configure_args+=" -DPFFFT_ENABLE_SIMD=ON"
+		;;
+	ppc64*)
+		configure_args+=" -DPFFFT_ENABLE_SIMD=ON"
+		;;
+	x86_64*|i686*)
+		configure_args+=" -DPFFFT_ENABLE_SIMD=ON"
+		;;
+	*) # don't use SIMD on unsupported platforms
+		;;
+esac
+
+post_extract() {
+	# until upstream merges Mahlet-Inc/hobbits#143 and releases a new version,
+	# the directory must be added, instead of removing the submodule
+	# rm -rf ${build_wrksrc}/external/pffft
+	mkdir ${build_wrksrc}/external
+	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }
 
 post_install() {
 	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	# capture the FFTPACK license from the header comment of pffft.c
+	sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft
+	vlicense LICENSE.pffft
 	vlicense LICENSE.txt
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (19 preceding siblings ...)
  2022-04-08  4:45 ` classabbyamp
@ 2022-04-08  5:05 ` classabbyamp
  2022-04-08  5:13 ` classabbyamp
                   ` (5 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-08  5:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1586 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. I have sent a patch upstream that makes vendoring much easier for us, Mahlet-Inc/hobbits#143, and included those changes as `patches/cmake.patch`.

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

From d946988e7f1b989fd83f70666988c53c98231c0f 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/cmake.patch          | 125 +++++++++++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  11 --
 srcpkgs/hobbits/template                     |  36 ++++--
 3 files changed, 152 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/cmake.patch
 delete mode 100644 srcpkgs/hobbits/patches/python_version.patch

diff --git a/srcpkgs/hobbits/patches/cmake.patch b/srcpkgs/hobbits/patches/cmake.patch
new file mode 100644
index 000000000000..e0b92c4ac1b0
--- /dev/null
+++ b/srcpkgs/hobbits/patches/cmake.patch
@@ -0,0 +1,125 @@
+From f4683e308793221d54640300bf9d3eadb7a685ea Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:16:13 -0400
+Subject: [PATCH 1/4] cmake/PackExternalDeps.cmake: fix endfunction name
+
+---
+ cmake/PackExternalDeps.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/cmake/PackExternalDeps.cmake b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+index 4be07c7..330be03 100644
+--- a/hobbits-0.53.1/cmake/PackExternalDeps.cmake
++++ b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+@@ -145,7 +145,7 @@ endfunction(pack_python)
+ function(pack_pffft)
+ 	install(FILES ${PFFFT_LIBRARIES}
+ 			DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-endfunction(pack_pcap)
++endfunction(pack_pffft)
+ 
+ function(pack_pcap)
+     if (LINUX)
+
+From d239b55b805122617d9dd41930140e317653c8aa Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:17:19 -0400
+Subject: [PATCH 2/4] CMakeLists.txt: remove EXACT option for finding python
+
+without this, cmake will accept Python >=3.9
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 1cc283d..b95d6e6 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -124,7 +124,7 @@ elseif( MANUAL_PYTHON_PATH )
+ 	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)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
+
+From a9a4d40eca079f4b197849cf3d00f3f11069c482 Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:19:54 -0400
+Subject: [PATCH 3/4] CMakeLists.txt: allow specifying VERSION_STRING with
+ -DBUILD_VERSION
+
+this will make it easier for distros to specify the version without
+writing to .version
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index b95d6e6..7e766b2 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE)
+     set(LINUX TRUE)
+ endif()
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.version")
++if (DEFINED BUILD_VERSION)
++    message("Using build version from command-line")
++    set(VERSION_STRING "${BUILD_VERSION}")
++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version")
+     message("Getting build version from .version file")
+     file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION)
+     string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}")
+
+From b72cb09edd3850f4c2fe7d0ca693766704121f97 Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 20:55:02 -0400
+Subject: [PATCH 4/4] Add pffft as a submodule and include cmake build files
+ for it
+
+---
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 7e766b2..993eeb6 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -109,7 +109,7 @@ else()
+ 	endif()
+ 
+ 	# PFFFT
+-	find_package(PFFFT REQUIRED)
++	add_subdirectory(external)
+ 
+ endif()
+ 
+diff --git a/hobbits-0.53.1/external/CMakeLists.txt b/hobbits-0.53.1/external/CMakeLists.txt
+new file mode 100644
+index 0000000..668fff4
+--- /dev/null
++++ b/hobbits-0.53.1/external/CMakeLists.txt
+@@ -0,0 +1,22 @@
++option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF)
++# can't assume the target system has the required SIMD instructions
++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF)
++
++if(USE_SYSTEM_PFFFT)
++    message(STATUS "Using system pffft")
++    find_package(PFFFT REQUIRED)
++else()
++    message(STATUS "Using bundled pffft")
++    add_library(pffft STATIC pffft/pffft.c)
++    if(PFFFT_ENABLE_SIMD)
++        message(STATUS "Enabling SIMD support for pffft")
++    else()
++        message(STATUS "Disabling SIMD support for pffft")
++        target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE)
++    endif()
++    target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}")
++    target_link_libraries(pffft m)
++    target_include_directories(pffft INTERFACE pffft)
++
++    add_library(PFFFT::PFFFT ALIAS pffft)
++endif()
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
deleted file mode 100644
index 47b1490c4b0a..000000000000
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
-+++ b/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)
- message("Python3 Libs: ${Python3_LIBRARIES}")
- 
- #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index fe6c7f5adda7..80ad0b22a6b3 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,46 @@
 # Template file for 'hobbits'
 pkgname=hobbits
-version=0.52.0
+version=0.53.1
 revision=1
+_pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
 build_style=cmake
+configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)"
 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
+ @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
 
+build_options="simd"
+desc_option_simd="Enable SIMD support (SSE, Altivec, or NEON)"
+
+# by default, don't use SIMD on unsupported platforms
+# SSE, Altivec, or NEON support is needed to enable this
 case "$XBPS_TARGET_MACHINE" in
-	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
+	aarch64*|ppc64*|x86_64*) build_options_default="simd" ;;
 esac
 
-pre_configure() {
-	# upstream provides no way to set the version through configure_args
-	echo "${version}" > .version
+post_extract() {
+	# until upstream merges Mahlet-Inc/hobbits#143 and releases a new version,
+	# the directory must be added, instead of removing the submodule
+	# rm -rf ${build_wrksrc}/external/pffft
+	mkdir ${build_wrksrc}/external
+	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }
 
 post_install() {
 	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	# capture the FFTPACK license from the header comment of pffft.c
+	sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft
+	vlicense LICENSE.pffft
 	vlicense LICENSE.txt
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (20 preceding siblings ...)
  2022-04-08  5:05 ` classabbyamp
@ 2022-04-08  5:13 ` classabbyamp
  2022-04-08  5:24 ` classabbyamp
                   ` (4 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-08  5:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1586 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. I have sent a patch upstream that makes vendoring much easier for us, Mahlet-Inc/hobbits#143, and included those changes as `patches/cmake.patch`.

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

From 86d4e5e6998a6fff554c7bdfbc44e35df3cb626e 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/cmake.patch          | 125 +++++++++++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  11 --
 srcpkgs/hobbits/template                     |  40 ++++--
 3 files changed, 156 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/cmake.patch
 delete mode 100644 srcpkgs/hobbits/patches/python_version.patch

diff --git a/srcpkgs/hobbits/patches/cmake.patch b/srcpkgs/hobbits/patches/cmake.patch
new file mode 100644
index 000000000000..e0b92c4ac1b0
--- /dev/null
+++ b/srcpkgs/hobbits/patches/cmake.patch
@@ -0,0 +1,125 @@
+From f4683e308793221d54640300bf9d3eadb7a685ea Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:16:13 -0400
+Subject: [PATCH 1/4] cmake/PackExternalDeps.cmake: fix endfunction name
+
+---
+ cmake/PackExternalDeps.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/cmake/PackExternalDeps.cmake b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+index 4be07c7..330be03 100644
+--- a/hobbits-0.53.1/cmake/PackExternalDeps.cmake
++++ b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+@@ -145,7 +145,7 @@ endfunction(pack_python)
+ function(pack_pffft)
+ 	install(FILES ${PFFFT_LIBRARIES}
+ 			DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-endfunction(pack_pcap)
++endfunction(pack_pffft)
+ 
+ function(pack_pcap)
+     if (LINUX)
+
+From d239b55b805122617d9dd41930140e317653c8aa Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:17:19 -0400
+Subject: [PATCH 2/4] CMakeLists.txt: remove EXACT option for finding python
+
+without this, cmake will accept Python >=3.9
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 1cc283d..b95d6e6 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -124,7 +124,7 @@ elseif( MANUAL_PYTHON_PATH )
+ 	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)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
+
+From a9a4d40eca079f4b197849cf3d00f3f11069c482 Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:19:54 -0400
+Subject: [PATCH 3/4] CMakeLists.txt: allow specifying VERSION_STRING with
+ -DBUILD_VERSION
+
+this will make it easier for distros to specify the version without
+writing to .version
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index b95d6e6..7e766b2 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE)
+     set(LINUX TRUE)
+ endif()
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.version")
++if (DEFINED BUILD_VERSION)
++    message("Using build version from command-line")
++    set(VERSION_STRING "${BUILD_VERSION}")
++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version")
+     message("Getting build version from .version file")
+     file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION)
+     string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}")
+
+From b72cb09edd3850f4c2fe7d0ca693766704121f97 Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 20:55:02 -0400
+Subject: [PATCH 4/4] Add pffft as a submodule and include cmake build files
+ for it
+
+---
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 7e766b2..993eeb6 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -109,7 +109,7 @@ else()
+ 	endif()
+ 
+ 	# PFFFT
+-	find_package(PFFFT REQUIRED)
++	add_subdirectory(external)
+ 
+ endif()
+ 
+diff --git a/hobbits-0.53.1/external/CMakeLists.txt b/hobbits-0.53.1/external/CMakeLists.txt
+new file mode 100644
+index 0000000..668fff4
+--- /dev/null
++++ b/hobbits-0.53.1/external/CMakeLists.txt
+@@ -0,0 +1,22 @@
++option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF)
++# can't assume the target system has the required SIMD instructions
++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF)
++
++if(USE_SYSTEM_PFFFT)
++    message(STATUS "Using system pffft")
++    find_package(PFFFT REQUIRED)
++else()
++    message(STATUS "Using bundled pffft")
++    add_library(pffft STATIC pffft/pffft.c)
++    if(PFFFT_ENABLE_SIMD)
++        message(STATUS "Enabling SIMD support for pffft")
++    else()
++        message(STATUS "Disabling SIMD support for pffft")
++        target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE)
++    endif()
++    target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}")
++    target_link_libraries(pffft m)
++    target_include_directories(pffft INTERFACE pffft)
++
++    add_library(PFFFT::PFFFT ALIAS pffft)
++endif()
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
deleted file mode 100644
index 47b1490c4b0a..000000000000
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
-+++ b/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)
- message("Python3 Libs: ${Python3_LIBRARIES}")
- 
- #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index fe6c7f5adda7..a68b45ee1ade 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,50 @@
 # Template file for 'hobbits'
 pkgname=hobbits
-version=0.52.0
+version=0.53.1
 revision=1
+_pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
 build_style=cmake
+configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)"
 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
+ @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
+
+build_options="simd"
+desc_option_simd="Enable SIMD support (SSE, Altivec, or NEON)"
+
+# by default, don't use SIMD on unsupported platforms
+# SSE, Altivec, or NEON support is needed to enable this
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|ppc64*|x86_64*) build_options_default="simd" ;;
+esac
 
 case "$XBPS_TARGET_MACHINE" in
-	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
+	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char" ;;
 esac
 
-pre_configure() {
-	# upstream provides no way to set the version through configure_args
-	echo "${version}" > .version
+post_extract() {
+	# until upstream merges Mahlet-Inc/hobbits#143 and releases a new version,
+	# the directory must be added, instead of removing the submodule
+	# rm -rf ${build_wrksrc}/external/pffft
+	mkdir ${build_wrksrc}/external
+	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }
 
 post_install() {
 	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	# capture the FFTPACK license from the header comment of pffft.c
+	sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft
+	vlicense LICENSE.pffft
 	vlicense LICENSE.txt
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (21 preceding siblings ...)
  2022-04-08  5:13 ` classabbyamp
@ 2022-04-08  5:24 ` classabbyamp
  2022-04-10  1:32 ` classabbyamp
                   ` (3 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-08  5:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1586 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. I have sent a patch upstream that makes vendoring much easier for us, Mahlet-Inc/hobbits#143, and included those changes as `patches/cmake.patch`.

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

From 334061b4644e0e8f2d465510d34fcfbf75b1ba7f 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/cmake.patch          | 125 +++++++++++++++++++
 srcpkgs/hobbits/patches/python_version.patch |  11 --
 srcpkgs/hobbits/template                     |  38 ++++--
 3 files changed, 155 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/cmake.patch
 delete mode 100644 srcpkgs/hobbits/patches/python_version.patch

diff --git a/srcpkgs/hobbits/patches/cmake.patch b/srcpkgs/hobbits/patches/cmake.patch
new file mode 100644
index 000000000000..e0b92c4ac1b0
--- /dev/null
+++ b/srcpkgs/hobbits/patches/cmake.patch
@@ -0,0 +1,125 @@
+From f4683e308793221d54640300bf9d3eadb7a685ea Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:16:13 -0400
+Subject: [PATCH 1/4] cmake/PackExternalDeps.cmake: fix endfunction name
+
+---
+ cmake/PackExternalDeps.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/cmake/PackExternalDeps.cmake b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+index 4be07c7..330be03 100644
+--- a/hobbits-0.53.1/cmake/PackExternalDeps.cmake
++++ b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+@@ -145,7 +145,7 @@ endfunction(pack_python)
+ function(pack_pffft)
+ 	install(FILES ${PFFFT_LIBRARIES}
+ 			DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-endfunction(pack_pcap)
++endfunction(pack_pffft)
+ 
+ function(pack_pcap)
+     if (LINUX)
+
+From d239b55b805122617d9dd41930140e317653c8aa Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:17:19 -0400
+Subject: [PATCH 2/4] CMakeLists.txt: remove EXACT option for finding python
+
+without this, cmake will accept Python >=3.9
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 1cc283d..b95d6e6 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -124,7 +124,7 @@ elseif( MANUAL_PYTHON_PATH )
+ 	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)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
+
+From a9a4d40eca079f4b197849cf3d00f3f11069c482 Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 19:19:54 -0400
+Subject: [PATCH 3/4] CMakeLists.txt: allow specifying VERSION_STRING with
+ -DBUILD_VERSION
+
+this will make it easier for distros to specify the version without
+writing to .version
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index b95d6e6..7e766b2 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE)
+     set(LINUX TRUE)
+ endif()
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.version")
++if (DEFINED BUILD_VERSION)
++    message("Using build version from command-line")
++    set(VERSION_STRING "${BUILD_VERSION}")
++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version")
+     message("Getting build version from .version file")
+     file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION)
+     string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}")
+
+From b72cb09edd3850f4c2fe7d0ca693766704121f97 Mon Sep 17 00:00:00 2001
+From: classabbyamp <dev@placeviolette.net>
+Date: Thu, 7 Apr 2022 20:55:02 -0400
+Subject: [PATCH 4/4] Add pffft as a submodule and include cmake build files
+ for it
+
+---
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 7e766b2..993eeb6 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -109,7 +109,7 @@ else()
+ 	endif()
+ 
+ 	# PFFFT
+-	find_package(PFFFT REQUIRED)
++	add_subdirectory(external)
+ 
+ endif()
+ 
+diff --git a/hobbits-0.53.1/external/CMakeLists.txt b/hobbits-0.53.1/external/CMakeLists.txt
+new file mode 100644
+index 0000000..668fff4
+--- /dev/null
++++ b/hobbits-0.53.1/external/CMakeLists.txt
+@@ -0,0 +1,22 @@
++option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF)
++# can't assume the target system has the required SIMD instructions
++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF)
++
++if(USE_SYSTEM_PFFFT)
++    message(STATUS "Using system pffft")
++    find_package(PFFFT REQUIRED)
++else()
++    message(STATUS "Using bundled pffft")
++    add_library(pffft STATIC pffft/pffft.c)
++    if(PFFFT_ENABLE_SIMD)
++        message(STATUS "Enabling SIMD support for pffft")
++    else()
++        message(STATUS "Disabling SIMD support for pffft")
++        target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE)
++    endif()
++    target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}")
++    target_link_libraries(pffft m)
++    target_include_directories(pffft INTERFACE pffft)
++
++    add_library(PFFFT::PFFFT ALIAS pffft)
++endif()
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
deleted file mode 100644
index 47b1490c4b0a..000000000000
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
-+++ b/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)
- message("Python3 Libs: ${Python3_LIBRARIES}")
- 
- #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index fe6c7f5adda7..df4501f75921 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,50 @@
 # Template file for 'hobbits'
 pkgname=hobbits
-version=0.52.0
+version=0.53.1
 revision=1
+_pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
 build_style=cmake
+configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)"
 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
+ @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
+
+build_options="simd"
+desc_option_simd="Enable SIMD support (SSE, Altivec, or NEON)"
+
+# by default, don't use SIMD on unsupported platforms
+# SSE, Altivec, or NEON support is needed to enable this
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|ppc64*|x86_64*) build_options_default="simd"
+esac
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
 esac
 
-pre_configure() {
-	# upstream provides no way to set the version through configure_args
-	echo "${version}" > .version
+post_extract() {
+	# until upstream merges Mahlet-Inc/hobbits#143 and releases a new version,
+	# the directory must be added, instead of removing the submodule
+	# rm -rf ${build_wrksrc}/external/pffft
+	mkdir ${build_wrksrc}/external
+	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }
 
 post_install() {
 	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	# capture the FFTPACK license from the header comment of pffft.c
+	sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft
+	vlicense LICENSE.pffft
 	vlicense LICENSE.txt
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (22 preceding siblings ...)
  2022-04-08  5:24 ` classabbyamp
@ 2022-04-10  1:32 ` classabbyamp
  2022-04-10  8:54 ` [PR REVIEW] " paper42
                   ` (2 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-10  1:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1586 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. I have sent a patch upstream that makes vendoring much easier for us, Mahlet-Inc/hobbits#143, and included those changes as `patches/cmake.patch`.

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

From d26fe2fd0ac98f6859223a1606d432da7dd47c74 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/backports.patch      | 78 ++++++++++++++++++++
 srcpkgs/hobbits/patches/python_version.patch | 11 ---
 srcpkgs/hobbits/template                     | 38 ++++++++--
 3 files changed, 108 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/backports.patch
 delete mode 100644 srcpkgs/hobbits/patches/python_version.patch

diff --git a/srcpkgs/hobbits/patches/backports.patch b/srcpkgs/hobbits/patches/backports.patch
new file mode 100644
index 000000000000..93f46edce97c
--- /dev/null
+++ b/srcpkgs/hobbits/patches/backports.patch
@@ -0,0 +1,78 @@
+Backports some changes sent upstream to better support plain cmake builds
+
+diff --git a/hobbits-0.53.1/CMakeLists.txt b/hobbits-0.53.1/CMakeLists.txt
+index 1cc283d..5795a97 100644
+--- a/hobbits-0.53.1/CMakeLists.txt
++++ b/hobbits-0.53.1/CMakeLists.txt
+@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE)
+     set(LINUX TRUE)
+ endif()
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.version")
++if (DEFINED BUILD_VERSION)
++    message("Using build version from command-line")
++    set(VERSION_STRING "${BUILD_VERSION}")
++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version")
+     message("Getting build version from .version file")
+     file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION)
+     string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}")
+@@ -106,7 +143,13 @@ else()
+ 	endif()
+ 
+ 	# PFFFT
+-	find_package(PFFFT REQUIRED)
++	option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF)
++	if(USE_SYSTEM_PFFFT)
++		message(STATUS "Using system pffft")
++		find_package(PFFFT REQUIRED)
++	else()
++		add_subdirectory(external)
++	endif()
+ 
+ endif()
+ 
+@@ -124,7 +167,7 @@ elseif( MANUAL_PYTHON_PATH )
+ 	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)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
+diff --git a/hobbits-0.53.1/cmake/PackExternalDeps.cmake b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+index 4be07c7..330be03 100644
+--- a/hobbits-0.53.1/cmake/PackExternalDeps.cmake
++++ b/hobbits-0.53.1/cmake/PackExternalDeps.cmake
+@@ -145,7 +145,7 @@ endfunction(pack_python)
+ function(pack_pffft)
+ 	install(FILES ${PFFFT_LIBRARIES}
+ 			DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-endfunction(pack_pcap)
++endfunction(pack_pffft)
+ 
+ function(pack_pcap)
+     if (LINUX)
+diff --git a/hobbits-0.53.1/external/CMakeLists.txt b/hobbits-0.53.1/external/CMakeLists.txt
+new file mode 100644
+index 0000000..ea1c9a3
+--- /dev/null
++++ b/hobbits-0.53.1/external/CMakeLists.txt
+@@ -0,0 +1,17 @@
++
++# can't assume the target system has the required SIMD instructions
++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF)
++
++message(STATUS "Using bundled pffft")
++add_library(pffft STATIC pffft/pffft.c)
++if(PFFFT_ENABLE_SIMD)
++    message(STATUS "Enabling SIMD support for pffft")
++else()
++    message(STATUS "Disabling SIMD support for pffft")
++    target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE)
++endif()
++target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}")
++target_link_libraries(pffft m)
++target_include_directories(pffft INTERFACE pffft)
++
++add_library(PFFFT::PFFFT ALIAS pffft)
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
deleted file mode 100644
index 47b1490c4b0a..000000000000
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
-+++ b/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)
- message("Python3 Libs: ${Python3_LIBRARIES}")
- 
- #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index fe6c7f5adda7..df4501f75921 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,50 @@
 # Template file for 'hobbits'
 pkgname=hobbits
-version=0.52.0
+version=0.53.1
 revision=1
+_pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
 build_style=cmake
+configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)"
 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
+ @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
+
+build_options="simd"
+desc_option_simd="Enable SIMD support (SSE, Altivec, or NEON)"
+
+# by default, don't use SIMD on unsupported platforms
+# SSE, Altivec, or NEON support is needed to enable this
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|ppc64*|x86_64*) build_options_default="simd"
+esac
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
 esac
 
-pre_configure() {
-	# upstream provides no way to set the version through configure_args
-	echo "${version}" > .version
+post_extract() {
+	# until upstream merges Mahlet-Inc/hobbits#143 and releases a new version,
+	# the directory must be added, instead of removing the submodule
+	# rm -rf ${build_wrksrc}/external/pffft
+	mkdir ${build_wrksrc}/external
+	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }
 
 post_install() {
 	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	# capture the FFTPACK license from the header comment of pffft.c
+	sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft
+	vlicense LICENSE.pffft
 	vlicense LICENSE.txt
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (23 preceding siblings ...)
  2022-04-10  1:32 ` classabbyamp
@ 2022-04-10  8:54 ` paper42
  2022-04-10 16:30 ` [PR PATCH] [Updated] " classabbyamp
  2022-04-11 21:16 ` [PR PATCH] [Merged]: " paper42
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-10  8:54 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36490#discussion_r846743114

Comment:
we can now use --directory in patch_args like in the wine package.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (24 preceding siblings ...)
  2022-04-10  8:54 ` [PR REVIEW] " paper42
@ 2022-04-10 16:30 ` classabbyamp
  2022-04-11 21:16 ` [PR PATCH] [Merged]: " paper42
  26 siblings, 0 replies; 28+ messages in thread
From: classabbyamp @ 2022-04-10 16:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1590 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. I have sent a patch upstream that makes vendoring much easier for us, Mahlet-Inc/hobbits#143, and included those changes as `patches/backports.patch`.

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

From f7da3135ff64e0359dded707e3e60f756bed6b3e 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/backports.patch      | 78 ++++++++++++++++++++
 srcpkgs/hobbits/patches/python_version.patch | 11 ---
 srcpkgs/hobbits/template                     | 39 ++++++++--
 3 files changed, 109 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/backports.patch
 delete mode 100644 srcpkgs/hobbits/patches/python_version.patch

diff --git a/srcpkgs/hobbits/patches/backports.patch b/srcpkgs/hobbits/patches/backports.patch
new file mode 100644
index 000000000000..3348b37ae5f2
--- /dev/null
+++ b/srcpkgs/hobbits/patches/backports.patch
@@ -0,0 +1,78 @@
+Backports some changes sent upstream to better support plain cmake builds
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1cc283d..5795a97 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE)
+     set(LINUX TRUE)
+ endif()
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.version")
++if (DEFINED BUILD_VERSION)
++    message("Using build version from command-line")
++    set(VERSION_STRING "${BUILD_VERSION}")
++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version")
+     message("Getting build version from .version file")
+     file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION)
+     string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}")
+@@ -106,7 +143,13 @@ else()
+ 	endif()
+ 
+ 	# PFFFT
+-	find_package(PFFFT REQUIRED)
++	option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF)
++	if(USE_SYSTEM_PFFFT)
++		message(STATUS "Using system pffft")
++		find_package(PFFFT REQUIRED)
++	else()
++		add_subdirectory(external)
++	endif()
+ 
+ endif()
+ 
+@@ -124,7 +167,7 @@ elseif( MANUAL_PYTHON_PATH )
+ 	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)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
+diff --git a/cmake/PackExternalDeps.cmake b/cmake/PackExternalDeps.cmake
+index 4be07c7..330be03 100644
+--- a/cmake/PackExternalDeps.cmake
++++ b/cmake/PackExternalDeps.cmake
+@@ -145,7 +145,7 @@ endfunction(pack_python)
+ function(pack_pffft)
+ 	install(FILES ${PFFFT_LIBRARIES}
+ 			DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-endfunction(pack_pcap)
++endfunction(pack_pffft)
+ 
+ function(pack_pcap)
+     if (LINUX)
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+new file mode 100644
+index 0000000..ea1c9a3
+--- /dev/null
++++ b/external/CMakeLists.txt
+@@ -0,0 +1,17 @@
++
++# can't assume the target system has the required SIMD instructions
++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF)
++
++message(STATUS "Using bundled pffft")
++add_library(pffft STATIC pffft/pffft.c)
++if(PFFFT_ENABLE_SIMD)
++    message(STATUS "Enabling SIMD support for pffft")
++else()
++    message(STATUS "Disabling SIMD support for pffft")
++    target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE)
++endif()
++target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}")
++target_link_libraries(pffft m)
++target_include_directories(pffft INTERFACE pffft)
++
++add_library(PFFFT::PFFFT ALIAS pffft)
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
deleted file mode 100644
index 47b1490c4b0a..000000000000
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
-+++ b/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)
- message("Python3 Libs: ${Python3_LIBRARIES}")
- 
- #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index fe6c7f5adda7..8260fa1988d0 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=7914df2127c206ae501a6cb2950ee65a94662215
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
 build_style=cmake
+configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)"
 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
+ @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+build_options="simd"
+desc_option_simd="Enable SIMD support (SSE, Altivec, or NEON)"
+
+# by default, don't use SIMD on unsupported platforms
+# SSE, Altivec, or NEON support is needed to enable this
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|ppc64*|x86_64*) build_options_default="simd"
+esac
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
 esac
 
-pre_configure() {
-	# upstream provides no way to set the version through configure_args
-	echo "${version}" > .version
+post_extract() {
+	# until upstream merges Mahlet-Inc/hobbits#143 and releases a new version,
+	# the directory must be added, instead of removing the submodule
+	# rm -rf ${build_wrksrc}/external/pffft
+	mkdir ${build_wrksrc}/external
+	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }
 
 post_install() {
 	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	# capture the FFTPACK license from the header comment of pffft.c
+	sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft
+	vlicense LICENSE.pffft
 	vlicense LICENSE.txt
 }

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Merged]: hobbits: update to 0.53.1.
  2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
                   ` (25 preceding siblings ...)
  2022-04-10 16:30 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-04-11 21:16 ` paper42
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-11 21:16 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

hobbits: update to 0.53.1.
https://github.com/void-linux/void-packages/pull/36490

Description:
<!-- 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. I have sent a patch upstream that makes vendoring much easier for us, Mahlet-Inc/hobbits#143, and included those changes as `patches/backports.patch`.

#### 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
-->


^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2022-04-11 21:17 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-03  4:59 [PR PATCH] hobbits: update to 0.53.1 classabbyamp
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

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).