From 3dfc239c3c33755bc970d0b658c7eb182d8123aa Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Fri, 29 Jul 2022 21:15:58 +0000
Subject: [PATCH] audio/speex: update to maintenance release 1.2.1

---
 audio/speex/Makefile                      | 8 +++-----
 audio/speex/distinfo                      | 4 ++--
 audio/speex/patches/patch-src_Makefile_in | 2 +-
 audio/speex/patches/patch-src_speexdec_c  | 4 ++--
 audio/speex/pkg/PLIST                     | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 8b6bc93ebf6..b192a8bedd5 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,9 +1,9 @@
 COMMENT=	patent-free speech codec
 
-DISTNAME=	speex-1.2.0
+DISTNAME=	speex-1.2.1
 CATEGORIES=	audio
 HOMEPAGE=	https://speex.org/
-SHARED_LIBS=	speex	8.0	# 6.1
+SHARED_LIBS=	speex	8.0	# 6.2
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
@@ -18,9 +18,7 @@ WANTLIB=	c m ogg sndio speexdsp
 
 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE=gnu
-# binaries are intended to be enabled by default, but the configure
-# script is wrong
-CONFIGURE_ARGS=	--enable-binaries
 CONFIGURE_ENV=	CPPFLAGS="-DUSE_SNDIO"
+DEBUG_PACKAGES=	${BUILD_PACKAGES}
 
 .include <bsd.port.mk>
diff --git a/audio/speex/distinfo b/audio/speex/distinfo
index e3a809b6be2..5d82910e3d2 100644
--- a/audio/speex/distinfo
+++ b/audio/speex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (speex-1.2.0.tar.gz) = 6q6K8Kx0LcfVQslDmscvHzhc6Dg5LchJyuRTavkhAJQ=
-SIZE (speex-1.2.0.tar.gz) = 1047080
+SHA256 (speex-1.2.1.tar.gz) = S0TU8rOKNwotmKeDKf78VqDPk9HBvnACkhe6rmYo/uo=
+SIZE (speex-1.2.1.tar.gz) = 1043278
diff --git a/audio/speex/patches/patch-src_Makefile_in b/audio/speex/patches/patch-src_Makefile_in
index f8650cf0398..2cb2c488030 100644
--- a/audio/speex/patches/patch-src_Makefile_in
+++ b/audio/speex/patches/patch-src_Makefile_in
@@ -1,7 +1,7 @@
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -370,7 +370,7 @@ speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la 
+@@ -372,7 +372,7 @@ speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la 
  
  speexdec_SOURCES = speexdec.c wav_io.c
  speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
diff --git a/audio/speex/patches/patch-src_speexdec_c b/audio/speex/patches/patch-src_speexdec_c
index 407c08ef792..c3b295d7e76 100644
--- a/audio/speex/patches/patch-src_speexdec_c
+++ b/audio/speex/patches/patch-src_speexdec_c
@@ -12,8 +12,8 @@ Index: src/speexdec.c
  #include <sys/types.h>
  #include <fcntl.h>
 @@ -91,6 +94,10 @@
-                            ((buf[base+1]<<8)&0xff00)| \
-                             (buf[base]&0xff))
+                       (((unsigned)buf[1]<<8)&0xff00)| \
+                        ((unsigned)buf[0]&0xff))
  
 +#ifdef USE_SNDIO
 +struct sio_hdl *hdl;
diff --git a/audio/speex/pkg/PLIST b/audio/speex/pkg/PLIST
index ba2a1b6fc97..7a06481bdf1 100644
--- a/audio/speex/pkg/PLIST
+++ b/audio/speex/pkg/PLIST
@@ -7,7 +7,7 @@ include/speex/speex_config_types.h
 include/speex/speex_header.h
 include/speex/speex_stereo.h
 include/speex/speex_types.h
-lib/libspeex.a
+@static-lib lib/libspeex.a
 lib/libspeex.la
 @lib lib/libspeex.so.${LIBspeex_VERSION}
 lib/pkgconfig/speex.pc