From 7924f4a367da9b2fce8d842a4f7fc36055a0cf79 Mon Sep 17 00:00:00 2001
From: Rob Thomas <xrobau@gmail.com>
Date: Wed, 18 Oct 2023 08:24:20 +0000
Subject: [PATCH] Fix spandsp builds for latest commit

---
 Makefile                             |  4 ++--
 Makefile.settings                    |  4 ++--
 includes/Makefile.spandsp            |  2 ++
 patches/spandsp/001-fix-libdir.patch | 17 +++++++++++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 patches/spandsp/001-fix-libdir.patch

diff --git a/Makefile b/Makefile
index 5d0bdd7..8d40974 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ## If you change this version, make sure you run 'make clean'
-VERSION=20230301
+VERSION=20231017
 RELEASE=1
 
 ## Set this to be the name of the Ubunt disto. It's used to tag
@@ -11,7 +11,7 @@ BUILDNAME=jammy
 ## debian version, after the major.minor.rel fields are added. You
 ## normally want to set this back to zero after you bump VERSION
 ## above.
-FSREV=$(VERSION)~004
+FSREV=$(VERSION)~001
 
 ROOT:=$(shell pwd)
 BUILDDIR:=$(ROOT)/build
diff --git a/Makefile.settings b/Makefile.settings
index 024ae8d..315737a 100644
--- a/Makefile.settings
+++ b/Makefile.settings
@@ -1,9 +1,9 @@
 ## Things to change
 ##
 ##  https://github.com/freeswitch/spandsp
-SPANDSPHASH=67d2455efe02e7ff0d897f3fd5636fed4d54549e
+SPANDSPHASH=df1282eb9af538ab1aadb6d66146e258451d4fe4
 SDSPVER=3.0.0
-SDSPREL=45
+SDSPREL=46
 
 ## Git hash for libstirshaken 
 ##   https://github.com/signalwire/libstirshaken
diff --git a/includes/Makefile.spandsp b/includes/Makefile.spandsp
index fa79dd8..0c8254a 100644
--- a/includes/Makefile.spandsp
+++ b/includes/Makefile.spandsp
@@ -12,9 +12,11 @@ spandsp-shell:
 $(addprefix $(DEBDEST)/,$(SDSPDEBS)): $(addprefix $(BUILDSOURCE)/,$(SDSPDEBS)) | $(DEBDEST)
 	cp $(BUILDSOURCE)/$(@F) $@
 
+SDSPPDEST=$(BUILDSOURCE)/$(SDSPPREFIX)/debian/patches
 $(addprefix $(BUILDSOURCE)/,$(SDSPDEBS)): $(BUILDSOURCE)/$(SDSPFILENAME) $(BASEDOCKERTAG)
 	rm -rf $(BUILDSOURCE)/$(SDSPPREFIX) && mkdir -p $(BUILDSOURCE) && cd $(BUILDSOURCE) && tar xf $<
 	./genchangelog.sh spandsp "$(SDSPVER)-$(SDSPREL)" $(BUILDSOURCE)/$(SDSPPREFIX) "Git hash $(SPANDSPHASH)"
+	mkdir -p $(SDSPPDEST); for p in $(ROOT)/patches/spandsp/*; do cp $$p $(SDSPPDEST)/ && echo $$(basename $$p) >> $(SDSPPDEST)/series; done
 	docker run --rm $(VOLUMES) -it -w /usr/local/build/SOURCES/$(SDSPPREFIX) basedocker:$(VERSION) dpkg-buildpackage -us -uc
 
 $(DOWNLOADS)/$(SDSPFILENAME): | $(DOWNLOADS)
diff --git a/patches/spandsp/001-fix-libdir.patch b/patches/spandsp/001-fix-libdir.patch
new file mode 100644
index 0000000..c7199d8
--- /dev/null
+++ b/patches/spandsp/001-fix-libdir.patch
@@ -0,0 +1,17 @@
+Description: Fix libdir location
+ Everything assumes that libs are going to be in the correct $host folder,
+ but it was changed in d9681c3747ff4f to override it to /usr/lib64, which
+ then breaks packaging of things that are trying to glob lib64/*/libspandsp*
+ when there's nothing to match the *
+
+--- spandsp-3.0.0.orig/configure.ac
++++ spandsp-3.0.0/configure.ac
+@@ -270,7 +270,7 @@ then
+     case "${host}" in
+     x86_64-*)
+         # X86_64 Linux machines may have both 64 bit and 32 bit libraries. We need to choose the right set
+-        AX_CHECK_REAL_FILE([${prefix}/lib64], libdir='${exec_prefix}/lib64')
++        AX_CHECK_REAL_FILE([${prefix}/lib64/${host}], libdir='${exec_prefix}/lib64/${host}')
+         AX_CHECK_REAL_FILE([/usr/X11R6/lib64], [TESTLIBS="$TESTLIBS -L/usr/X11R6/lib64"], AC_CHECK_FILE([/usr/X11R6/lib], [TESTLIBS="$TESTLIBS -L/usr/X11R6/lib"]))
+         # The very oldest AMD 64 bit chips support SSE2, SSE and MMX
+         enable_sse2="yes"