From 1a4f88aae05764f5ae7a2b60110a005f219b35fc Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 13 Feb 2026 08:03:05 +0000
Subject: [PATCH] Update to lame-3.101pre6531.

---
 audio/lame/Makefile                             | 12 +++++++-----
 audio/lame/distinfo                             |  4 ++--
 audio/lame/patches/patch-configure              |  4 ++--
 audio/lame/patches/patch-include_libmp3lame_sym | 13 +++++++++++++
 audio/lame/patches/patch-libmp3lame_lame_c      | 17 +++++++++++++++++
 audio/lame/pkg/PLIST                            |  3 ++-
 6 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 audio/lame/patches/patch-include_libmp3lame_sym
 create mode 100644 audio/lame/patches/patch-libmp3lame_lame_c

diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 0327bc6eda8..f1cca397af3 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,8 +1,8 @@
 COMMENT=	lame ain't an MP3 encoder
 #'
 
-DISTNAME=	lame-3.100
-REVISION=	2
+# tarball generated from https://svn.code.sf.net/p/lame/svn/trunk/lame#revision=6531
+DISTNAME=	lame-3.101pre6531
 
 SHARED_LIBS +=  mp3lame              2.2      # 0.0
 
@@ -15,11 +15,13 @@ MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 # LGPLv2 - patent restriction
 PERMIT_PACKAGE=	Yes
 
-WANTLIB += c curses iconv m
+WANTLIB += c curses iconv m mpg123
 
-SITES=		${SITE_SOURCEFORGE:=lame/}
+#SITES=		${SITE_SOURCEFORGE:=lame/}
+SITES=		https://distfiles.bsdfrog.org/
 
-LIB_DEPENDS=	converters/libiconv
+LIB_DEPENDS=	audio/mpg123 \
+		converters/libiconv
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS= --disable-cpml \
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index ca6979a5921..3a8f76e0584 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lame-3.100.tar.gz) = 3f42yrhzeUA4riwSEFV600hXpLa9xRV4XR2p4XWx2h4=
-SIZE (lame-3.100.tar.gz) = 1524133
+SHA256 (lame-3.101pre6531.tar.gz) = 559z7qPu5j1hmt+uD2PDydjnbwzUuR3S9OR24GdU9fg=
+SIZE (lame-3.101pre6531.tar.gz) = 1507439
diff --git a/audio/lame/patches/patch-configure b/audio/lame/patches/patch-configure
index b2644885ff1..2bd574a1255 100644
--- a/audio/lame/patches/patch-configure
+++ b/audio/lame/patches/patch-configure
@@ -6,12 +6,12 @@ builds.
 Index: configure
 --- configure.orig
 +++ configure
-@@ -17563,7 +17563,7 @@ $as_echo "$as_me: WARNING: LAME doesn't know about you
+@@ -19245,7 +19245,7 @@ printf "%s\n" "$as_me: WARNING: LAME doesn't know abou
  	esac
  
  
 -	if test "x${HAVE_CLANG}" = "xyes"; then
 +	if false && test "x${HAVE_CLANG}" = "xyes"; then
  		case "${CLANG_VERSION}" in
- 		3.89*|45.*)
+ 		3.[89]*|[45].*|1[0-9].*)
  			OPTIMIZATION="-Ofast"
diff --git a/audio/lame/patches/patch-include_libmp3lame_sym b/audio/lame/patches/patch-include_libmp3lame_sym
new file mode 100644
index 00000000000..306372a39a0
--- /dev/null
+++ b/audio/lame/patches/patch-include_libmp3lame_sym
@@ -0,0 +1,13 @@
+https://sourceforge.net/p/lame/bugs/515/
+
+Index: include/libmp3lame.sym
+--- include/libmp3lame.sym.orig
++++ include/libmp3lame.sym
+@@ -193,6 +193,7 @@ hip_decode_headers
+ hip_decode1
+ hip_decode1_headers
+ hip_decode1_headersB
++hip_finish_pinfo
+ lame_decode_init
+ lame_decode
+ lame_decode_headers
diff --git a/audio/lame/patches/patch-libmp3lame_lame_c b/audio/lame/patches/patch-libmp3lame_lame_c
new file mode 100644
index 00000000000..83ef6a90078
--- /dev/null
+++ b/audio/lame/patches/patch-libmp3lame_lame_c
@@ -0,0 +1,17 @@
+ttps://sourceforge.net/p/lame/bugs/516/
+
+Index: libmp3lame/lame.c
+--- libmp3lame/lame.c.orig
++++ libmp3lame/lame.c
+@@ -1050,6 +1050,11 @@ lame_init_params(lame_global_flags * gfp)
+             if (gfp->quality < 0)
+                 gfp->quality = LAME_DEFAULT_QUALITY;
+ 
++            /* VBR and ABR don't give good results with noise shaping
++             * settings used in quality levels below 4.
++             */
++            if (gfp->quality < 4)
++                gfp->quality = 4;
+ 
+             if (cfg->vbr == vbr_off)
+                 (void) lame_set_VBR_mean_bitrate_kbps(gfp, gfp->brate);
diff --git a/audio/lame/pkg/PLIST b/audio/lame/pkg/PLIST
index 1b3d84700c6..b2ebba23799 100644
--- a/audio/lame/pkg/PLIST
+++ b/audio/lame/pkg/PLIST
@@ -4,9 +4,10 @@
 @bin bin/mp3rtp
 include/lame/
 include/lame/lame.h
-lib/libmp3lame.a
+@static-lib lib/libmp3lame.a
 lib/libmp3lame.la
 @lib lib/libmp3lame.so.${LIBmp3lame_VERSION}
+lib/pkgconfig/lame.pc
 @man man/man1/lame.1
 share/doc/lame/
 share/doc/lame/about.html