[update] lame-4.1beta1

Hi. This diff updates audio/lame to version 4.1beta1. 4.1 is scheduled to come out soonish. I'd appreciate tests on !amd64. Thanks. Index: Makefile =================================================================== RCS file: /cvs/ports/audio/lame/Makefile,v diff -u -p -r1.70 Makefile --- Makefile 10 Jul 2026 15:58:37 -0000 1.70 +++ Makefile 11 Nov 2026 09:41:18 -0000 @@ -1,9 +1,9 @@ COMMENT= lame ain't an MP3 encoder #' -DISTNAME= lame-3.101 +DISTNAME= lame-4.1beta1 -SHARED_LIBS += mp3lame 2.2 # 0.0 +SHARED_LIBS += mp3lame 2.3 # 0.0 CATEGORIES= audio @@ -27,16 +27,5 @@ CONFIGURE_ARGS= --disable-cpml \ --enable-mp3rtp \ --without-dmalloc \ --with-fileio=lame - -.if ${MACHINE_ARCH} == "i386" -BUILD_DEPENDS+= devel/nasm -CONFIGURE_ARGS+= --enable-nasm -# gmake required for i386/ directory -USE_GMAKE= Yes -.else -CONFIGURE_ARGS+= --disable-nasm -.endif - -MAKE_FLAGS= pkghtmldir=${TRUEPREFIX}/share/doc/lame .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/audio/lame/distinfo,v diff -u -p -r1.22 distinfo --- distinfo 10 Jul 2026 15:58:37 -0000 1.22 +++ distinfo 11 Nov 2026 09:41:18 -0000 @@ -1,2 +1,2 @@ -SHA256 (lame-3.101.tar.gz) = dXivbuvVeLK9ZORo+sSuHwNnCn4CgWbmf4VWdLm2rqw= -SIZE (lame-3.101.tar.gz) = 1466586 +SHA256 (lame-4.1beta1.tar.gz) = 5Pph93UrG1y3HrTBcNqw5xMnnsVC+ESncbVFqlN7RfQ= +SIZE (lame-4.1beta1.tar.gz) = 2294115 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 13 Feb 2026 08:03:05 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -Disable adding -march=native on clang architectures. This allows use -of instructions that are present on the build machine but not on other -CPU types within the given architecture, so is not suitable for package -builds. - -Index: configure ---- configure.orig -+++ configure -@@ -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].*|1[0-9].*) - OPTIMIZATION="-Ofast" Index: patches/patch-include_libmp3lame_sym =================================================================== RCS file: /cvs/ports/audio/lame/patches/patch-include_libmp3lame_sym,v diff -u -p -r1.1 patch-include_libmp3lame_sym --- patches/patch-include_libmp3lame_sym 13 Feb 2026 08:03:05 -0000 1.1 +++ patches/patch-include_libmp3lame_sym 11 Nov 2026 09:41:18 -0000 @@ -3,7 +3,7 @@ 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 +@@ -200,6 +200,7 @@ hip_decode_headers hip_decode1 hip_decode1_headers hip_decode1_headersB Index: patches/patch-libmp3lame_i386_cpu_feat_nas =================================================================== RCS file: patches/patch-libmp3lame_i386_cpu_feat_nas diff -N patches/patch-libmp3lame_i386_cpu_feat_nas --- patches/patch-libmp3lame_i386_cpu_feat_nas 11 Mar 2022 18:20:12 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- libmp3lame/i386/cpu_feat.nas.orig Fri Aug 13 19:05:11 2004 -+++ libmp3lame/i386/cpu_feat.nas Fri Aug 13 19:05:35 2004 -@@ -91,7 +91,7 @@ has_3DNow_nasm: - mov eax,0x80000001 - CPUID - test edx,0x80000000 -- jz return0 ; no 3DNow! support -+ jmp return0 ; no 3DNow! support - ; 3DNow! support - return1: - popad Index: patches/patch-libmp3lame_id3tag_c =================================================================== RCS file: patches/patch-libmp3lame_id3tag_c diff -N patches/patch-libmp3lame_id3tag_c --- patches/patch-libmp3lame_id3tag_c 16 May 2026 08:01:38 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,47 +0,0 @@ -Fix build with llvm 22 - -Index: libmp3lame/id3tag.c ---- libmp3lame/id3tag.c.orig -+++ libmp3lame/id3tag.c -@@ -658,7 +658,7 @@ id3tag_set_genre_utf8(lame_t gfp, unsigned short const - return 0; - } - } -- ret = id3v2_add_utf8_lng(gfp, ID_GENRE, 0, text); -+ ret = id3v2_add_utf8_lng(gfp, ID_GENRE, 0, (const char *)text); - if (ret == 0) { - gfc->tag_spec.flags |= CHANGED_FLAG; - gfc->tag_spec.genre_id3v1 = GENRE_INDEX_OTHER; -@@ -1138,19 +1138,19 @@ id3tag_set_textinfo_utf8(lame_t gfp, char const *id, u - return 0; - } - if (frame_id == ID_TXXX || frame_id == ID_WXXX || frame_id == ID_COMMENT) { -- return id3tag_set_userinfo_utf8(gfp, frame_id, text); -+ return id3tag_set_userinfo_utf8(gfp, frame_id, (const char *)text); - } - if (frame_id == ID_GENRE) { - return id3tag_set_genre_utf8(gfp, text); - } - if (frame_id == ID_PCST) { -- return id3v2_add_utf8_lng(gfp, frame_id, 0, text); -+ return id3v2_add_utf8_lng(gfp, frame_id, 0, (const char *)text); - } - if (frame_id == ID_USER) { -- return id3v2_add_utf8_lng(gfp, frame_id, text, 0); -+ return id3v2_add_utf8_lng(gfp, frame_id, (const char *)text, 0); - } - if (frame_id == ID_WFED) { -- return id3v2_add_utf8_lng(gfp, frame_id, text, 0); /* iTunes expects WFED to be a text frame */ -+ return id3v2_add_utf8_lng(gfp, frame_id, (const char *)text, 0); /* iTunes expects WFED to be a text frame */ - } - if (isFrameIdMatching(frame_id, FRAME_ID('T', 0, 0, 0)) - ||isFrameIdMatching(frame_id, FRAME_ID('W', 0, 0, 0))) { -@@ -1159,7 +1159,7 @@ id3tag_set_textinfo_utf8(lame_t gfp, char const *id, u - return -2; /* must be Latin-1 encoded */ - } -