From d26fe2fd0ac98f6859223a1606d432da7dd47c74 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 3 Apr 2022 00:58:37 -0400 Subject: [PATCH] hobbits: update to 0.53.1. --- srcpkgs/hobbits/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 " -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 }