From 26c0d09f1dc8ef143415e2584d4bd5a5d04f4949 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 8 Jun 2022 16:00:51 -0400
Subject: [PATCH] hobbits: update to 0.53.2.

---
 srcpkgs/hobbits/patches/backports.patch | 78 -------------------------
 srcpkgs/hobbits/template                | 10 +---
 2 files changed, 3 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/hobbits/patches/backports.patch

diff --git a/srcpkgs/hobbits/patches/backports.patch b/srcpkgs/hobbits/patches/backports.patch
deleted file mode 100644
index 3348b37ae5f2..000000000000
--- a/srcpkgs/hobbits/patches/backports.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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/template b/srcpkgs/hobbits/template
index 8260fa1988d0..c45b8ff3560e 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,6 +1,6 @@
 # Template file for 'hobbits'
 pkgname=hobbits
-version=0.53.1
+version=0.53.2
 revision=1
 _pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
 _pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
@@ -17,9 +17,8 @@ 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
  https://bitbucket.org/jpommier/pffft/get/${_pffft_commit}.tar.gz"
-checksum="e63c51228c3f00f56a2ebf79fec1975544b1c6c986d58dff69643da46148316b
+checksum="4f617ed8ba466b13e04625eebf121f218da7d82e39b22975e72457970ddfc57c
  @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
-patch_args="-Np1 --directory=${build_wrksrc}"
 
 build_options="simd"
 desc_option_simd="Enable SIMD support (SSE, Altivec, or NEON)"
@@ -35,10 +34,7 @@ case "$XBPS_TARGET_MACHINE" in
 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
+	rm -rf ${build_wrksrc}/external/pffft
 	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }