CVS commit: pkgsrc/audio/lame

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jul 15 07:09:51 UTC 2026

Modified Files:
        pkgsrc/audio/lame: Makefile distinfo options.mk
Added Files:
        pkgsrc/audio/lame/patches: patch-doc_html_Makefile.in
            patch-frontend_parse.c patch-libmp3lame_machine.h
Removed Files:
        pkgsrc/audio/lame/patches: patch-ab patch-ad

Log Message:
lame: fix build + cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/audio/lame/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/audio/lame/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/lame/options.mk
cvs rdiff -u -r1.13 -r0 pkgsrc/audio/lame/patches/patch-ab
cvs rdiff -u -r1.6 -r0 pkgsrc/audio/lame/patches/patch-ad
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/lame/patches/patch-doc_html_Makefile.in \
    pkgsrc/audio/lame/patches/patch-frontend_parse.c \
    pkgsrc/audio/lame/patches/patch-libmp3lame_machine.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/lame/Makefile
diff -u pkgsrc/audio/lame/Makefile:1.97 pkgsrc/audio/lame/Makefile:1.98
--- pkgsrc/audio/lame/Makefile:1.97     Mon Jul 13 16:47:59 2026
+++ pkgsrc/audio/lame/Makefile  Wed Jul 15 07:09:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2026/07/13 16:47:59 thor Exp $
+# $NetBSD: Makefile,v 1.98 2026/07/15 07:09:51 adam Exp $
 
 DISTNAME=      lame-4.0
 PKGREVISION=   1
@@ -10,12 +10,13 @@ HOMEPAGE=   https://lame.sourceforge.io/
 COMMENT=       Fast, high quality MP3 encoder
 LICENSE=       gnu-lgpl-v2
 
-GNU_CONFIGURE=         yes
-USE_TOOLS+=            gmake
-USE_TOOLS+=            pkg-config
-USE_LIBTOOL=           yes
-USE_LANGUAGES=         c c++
 USE_FEATURES+=         strnlen
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake pkg-config
+GNU_CONFIGURE=         yes
+# Fix for faulty detection of iconv.
+CONFIGURE_ENV.Darwin=  am_cv_func_iconv_works=yes
 
 LDFLAGS.SunOS+=                -lm
 LDFLAGS.NetBSD+=       -ltermcap

Index: pkgsrc/audio/lame/distinfo
diff -u pkgsrc/audio/lame/distinfo:1.35 pkgsrc/audio/lame/distinfo:1.36
--- pkgsrc/audio/lame/distinfo:1.35     Mon Jul 13 16:47:59 2026
+++ pkgsrc/audio/lame/distinfo  Wed Jul 15 07:09:51 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.35 2026/07/13 16:47:59 thor Exp $
+$NetBSD: distinfo,v 1.36 2026/07/15 07:09:51 adam Exp $
 
 BLAKE2s (lame-4.0.tar.gz) = ee14c01c3707ba0f11744780f3239ed2ca1e5353216399ab0f498bdc54a316bb
 SHA512 (lame-4.0.tar.gz) = 70fa51fe84dd499d171ebf6c05ec82399eb8b0148fb4c08470a61efe9cf826474132ee98166dc63ee5c3646b2c8e955680e4306dd26f590b7810732ab486dd8b
 Size (lame-4.0.tar.gz) = 1496810 bytes
-SHA1 (patch-ab) = 58386a008e8c2c59574440a7d5f4356b764dda1a
-SHA1 (patch-ad) = aee2ea463394dd636966001c5e134801cdbcc09e
+SHA1 (patch-doc_html_Makefile.in) = 58386a008e8c2c59574440a7d5f4356b764dda1a
+SHA1 (patch-frontend_parse.c) = 18275130d42c5ba453d5736725e3386f31017aaa
+SHA1 (patch-libmp3lame_machine.h) = aee2ea463394dd636966001c5e134801cdbcc09e

Index: pkgsrc/audio/lame/options.mk
diff -u pkgsrc/audio/lame/options.mk:1.6 pkgsrc/audio/lame/options.mk:1.7
--- pkgsrc/audio/lame/options.mk:1.6    Sun Jul 12 12:54:39 2026
+++ pkgsrc/audio/lame/options.mk        Wed Jul 15 07:09:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2026/07/12 12:54:39 thor Exp $
+# $NetBSD: options.mk,v 1.7 2026/07/15 07:09:51 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.lame
 PKG_SUPPORTED_OPTIONS= gtk sndfile unicode
@@ -18,7 +18,6 @@ PLIST.gtk=            yes
 
 .if !empty(PKG_OPTIONS:Msndfile)
 CONFIGURE_ARGS+=       --with-fileio=sndfile
-USE_TOOLS+=            pkg-config
 .  include "../../audio/libsndfile/buildlink3.mk"
 .endif
 

Added files:

Index: pkgsrc/audio/lame/patches/patch-doc_html_Makefile.in
diff -u /dev/null pkgsrc/audio/lame/patches/patch-doc_html_Makefile.in:1.1
--- /dev/null   Wed Jul 15 07:09:51 2026
+++ pkgsrc/audio/lame/patches/patch-doc_html_Makefile.in        Wed Jul 15 07:09:51 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_html_Makefile.in,v 1.1 2026/07/15 07:09:51 adam Exp $
+
+Change where html doc files are installed.
+
+--- doc/html/Makefile.in.orig  2026-07-10 18:25:39.000000000 +0000
++++ doc/html/Makefile.in
+@@ -315,7 +315,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+ pkgdocdir = $(docdir)/$(PACKAGE)
+-pkghtmldir = $(pkgdocdir)/html
++pkghtmldir = $(pkgdocdir)
+ pkghtml_DATA = \
+     about.html \
+       abr.html \
Index: pkgsrc/audio/lame/patches/patch-frontend_parse.c
diff -u /dev/null pkgsrc/audio/lame/patches/patch-frontend_parse.c:1.1
--- /dev/null   Wed Jul 15 07:09:51 2026
+++ pkgsrc/audio/lame/patches/patch-frontend_parse.c    Wed Jul 15 07:09:51 2026
@@ -0,0 +1,19 @@
+$NetBSD: patch-frontend_parse.c,v 1.1 2026/07/15 07:09:51 adam Exp $
+
+Avoid deprecated functions.
+
+--- frontend/parse.c.orig      2026-07-15 06:37:56.422883463 +0000
++++ frontend/parse.c
+@@ -414,10 +414,10 @@ set_id3v2tag(lame_global_flags* gfp, Tex
+                 case 't': return id3tag_set_textinfo_utf8(gfp, "TIT2", str);
+                 case 'l': return id3tag_set_textinfo_utf8(gfp, "TALB", str);
+                 case 'g': return id3tag_set_textinfo_utf8(gfp, "TCON", str);
+-                case 'c': return id3tag_set_comment_ucs2(gfp, 0, 0, str);
++                case 'c': return id3tag_set_comment_utf8(gfp, 0, 0, str);
+                 case 'n': return id3tag_set_textinfo_utf8(gfp, "TRCK", str);
+                 case 'y': return id3tag_set_textinfo_utf8(gfp, "TYER", str);
+-                case 'v': return id3tag_set_fieldvalue_ucs2(gfp, str);
++                case 'v': return id3tag_set_fieldvalue(gfp, str);
+             }
+             ;;
+         case TENC_UTF16:
Index: pkgsrc/audio/lame/patches/patch-libmp3lame_machine.h
diff -u /dev/null pkgsrc/audio/lame/patches/patch-libmp3lame_machine.h:1.1
--- /dev/null   Wed Jul 15 07:09:51 2026
+++ pkgsrc/audio/lame/patches/patch-libmp3lame_machine.h        Wed Jul 15 07:09:51 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-libmp3lame_machine.h,v 1.1 2026/07/15 07:09:51 adam Exp $
+
+Add <float.h> include.
+
+--- libmp3lame/machine.h.orig  2026-07-10 18:16:21.000000000 +0000
++++ libmp3lame/machine.h
+@@ -127,6 +127,7 @@ char   *strchr(), *strrchr();
+ # include <float.h>
+ # define FLOAT_MAX FLT_MAX
+ #else
++# include <float.h>
+ # ifndef FLOAT
+ typedef float FLOAT;
+ #  ifdef FLT_MAX