Skip to content

Commit 3456e75

Browse files
hfiguierebbhtt
hfiguiere
authored and
bbhtt
committed
lame: Fix build
Refactor all the patches with git format-patch Update to build on 25.08 Signed-off-by: Hubert Figuière <[email protected]>
1 parent 0be377c commit 3456e75

8 files changed

+224
-69
lines changed

‎lame/0001-Build-xmm_quantize_sub.c-with-msse.patch‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From bba34e509c2e144000becdc89e18bf6e34fe5517 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <[email protected]>
3+
Date: Tue, 18 Nov 2025 20:33:54 -0500
4+
Subject: [PATCH 1/5] Build xmm_quantize_sub.c with -msse
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
From: Sebastian Ramacher <[email protected]>
10+
Bug: http://sourceforge.net/p/lame/bugs/443/
11+
Bug-Debian: https://bugs.debian.org/760047
12+
Forwarded: http://sourceforge.net/p/lame/bugs/443/
13+
Last-Update: 2014-08-31
14+
15+
Signed-off-by: Hubert Figuière <[email protected]>
16+
---
17+
libmp3lame/vector/Makefile.am | 1 +
18+
1 file changed, 1 insertion(+)
19+
20+
diff --git a/libmp3lame/vector/Makefile.am b/libmp3lame/vector/Makefile.am
21+
index ac595b1..6b05380 100644
22+
--- a/libmp3lame/vector/Makefile.am
23+
+++ b/libmp3lame/vector/Makefile.am
24+
@@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c
25+
26+
if WITH_XMM
27+
liblamevectorroutines_la_SOURCES = $(xmm_sources)
28+
+liblamevectorroutines_la_CFLAGS = -msse
29+
endif
30+
31+
noinst_HEADERS = lame_intrin.h
32+
--
33+
2.51.0
34+

lame/lame-gtk1-ac-directives.patch renamed to lame/0002-Include-GTK-1-autoconf-directives-in-build-system.patch

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1-
Description: Include GTK-1 autoconf directives in build system.
1+
From 20d0bd4ed444cd99bcf09ad8d36e69b027d7b1a4 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <[email protected]>
3+
Date: Tue, 18 Nov 2025 20:35:36 -0500
4+
Subject: [PATCH 2/5] Include GTK-1 autoconf directives in build system.
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
29
Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=debian/patches
310
Forwarded: yes
411
Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/acinclude.m4?revision=1.6
512

13+
Signed-off-by: Hubert Figuière <[email protected]>
14+
---
15+
acinclude.m4 | 193 +++++++++++++++++++++++++++++++++++++++++++++++++++
16+
1 file changed, 193 insertions(+)
17+
18+
diff --git a/acinclude.m4 b/acinclude.m4
19+
index 0b8f869..eef0c3d 100644
620
--- a/acinclude.m4
721
+++ b/acinclude.m4
8-
@@ -85,4 +85,197 @@
22+
@@ -85,4 +85,197 @@ int main(void)
923
[AC_MSG_WARN(can't check for IEEE854 compliant 80 bit floats)]
1024
)])]) # alex_IEEE854_FLOAT80
1125

@@ -203,3 +217,6 @@ Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/acinclude.m4?revision=
203217
+ AC_SUBST(GTK_LIBS)
204218
+ rm -f conf.gtktest
205219
+])
220+
--
221+
2.51.0
222+

lame/lame-ansi2knr2devnull.patch renamed to lame/0003-Patch-out-remaining-ansi2knr.patch

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,48 @@
1-
Description: Patch out remaining ansi2knr.
1+
From 594b7a28a214513adf067ff7d35cf2f8653f6d90 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <[email protected]>
3+
Date: Tue, 18 Nov 2025 20:36:22 -0500
4+
Subject: [PATCH 3/5] Patch out remaining ansi2knr.
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
29
Author: Dimitri John Ledkov <[email protected]>
310
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755111
11+
12+
Signed-off-by: Hubert Figuière <[email protected]>
13+
---
14+
configure.in | 1 -
15+
doc/html/Makefile.am | 2 +-
16+
doc/man/Makefile.am | 2 +-
17+
libmp3lame/i386/Makefile.am | 2 +-
18+
4 files changed, 3 insertions(+), 4 deletions(-)
19+
20+
diff --git a/configure.in b/configure.in
21+
index 2f8fa66..308b7ba 100644
422
--- a/configure.in
523
+++ b/configure.in
6-
@@ -78,7 +78,6 @@
24+
@@ -78,7 +78,6 @@ if test "${GCC}" = "yes"; then
725
fi
826

927
dnl more automake stuff
1028
-AM_C_PROTOTYPES
1129

1230
AC_CHECK_HEADER(dmalloc.h)
1331
if test "${ac_cv_header_dmalloc_h}" = "yes"; then
32+
diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am
33+
index 1a20404..aebb30e 100644
34+
--- a/doc/html/Makefile.am
35+
+++ b/doc/html/Makefile.am
36+
@@ -1,6 +1,6 @@
37+
## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
38+
39+
-AUTOMAKE_OPTIONS = foreign ansi2knr
40+
+AUTOMAKE_OPTIONS = foreign
41+
42+
docdir = $(datadir)/doc
43+
pkgdocdir = $(docdir)/$(PACKAGE)
44+
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
45+
index ecab077..1de89e9 100644
1446
--- a/doc/man/Makefile.am
1547
+++ b/doc/man/Makefile.am
1648
@@ -1,6 +1,6 @@
@@ -21,6 +53,8 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755111
2153

2254
man_MANS = lame.1
2355
EXTRA_DIST = ${man_MANS}
56+
diff --git a/libmp3lame/i386/Makefile.am b/libmp3lame/i386/Makefile.am
57+
index e49ad9c..b949a47 100644
2458
--- a/libmp3lame/i386/Makefile.am
2559
+++ b/libmp3lame/i386/Makefile.am
2660
@@ -1,6 +1,6 @@
@@ -31,13 +65,6 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755111
3165

3266
DEFS = @DEFS@ @CONFIG_DEFS@
3367

34-
--- a/doc/html/Makefile.am
35-
+++ b/doc/html/Makefile.am
36-
@@ -1,6 +1,6 @@
37-
## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
38-
39-
-AUTOMAKE_OPTIONS = foreign ansi2knr
40-
+AUTOMAKE_OPTIONS = foreign
41-
42-
docdir = $(datadir)/doc
43-
pkgdocdir = $(docdir)/$(PACKAGE)
68+
--
69+
2.51.0
70+

‎lame/0004-initscr-is-not-used-anywhere-in-lame-sourcetree.patch‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
From 22e5474508093bcdde14e0f60d74ba7894307d72 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <[email protected]>
3+
Date: Tue, 18 Nov 2025 20:37:19 -0500
4+
Subject: [PATCH 4/5] initscr is not used anywhere in lame sourcetree
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
check for used tgetent instead
10+
check for separate tinfo library optionally built out from libncurses source tree,
11+
like used in debian and gentoo
12+
- [email protected]
13+
14+
http://bugs.gentoo.org/454322
15+
16+
Signed-off-by: Hubert Figuière <[email protected]>
17+
---
18+
configure.in | 7 ++++---
19+
1 file changed, 4 insertions(+), 3 deletions(-)
20+
21+
diff --git a/configure.in b/configure.in
22+
index 308b7ba..05b2fe7 100644
23+
--- a/configure.in
24+
+++ b/configure.in
25+
@@ -371,9 +371,10 @@ dnl Checks for libraries.
26+
27+
AC_CHECK_HEADERS(termcap.h)
28+
AC_CHECK_HEADERS(ncurses/termcap.h)
29+
-AC_CHECK_LIB(termcap, initscr, HAVE_TERMCAP="termcap")
30+
-AC_CHECK_LIB(curses, initscr, HAVE_TERMCAP="curses")
31+
-AC_CHECK_LIB(ncurses, initscr, HAVE_TERMCAP="ncurses")
32+
+AC_CHECK_LIB(termcap, tgetent, HAVE_TERMCAP="termcap")
33+
+AC_CHECK_LIB(curses, tgetent, HAVE_TERMCAP="curses")
34+
+AC_CHECK_LIB(ncurses, tgetent, HAVE_TERMCAP="ncurses")
35+
+AC_CHECK_LIB(tinfo, tgetent, HAVE_TERMCAP="tinfo")
36+
37+
AM_ICONV
38+
39+
--
40+
2.51.0
41+

‎lame/0005-Update-autoconf.patch‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
From 850ca75cc47fef9ed3eb6dfe4e95b6ac715aa48f Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <[email protected]>
3+
Date: Tue, 18 Nov 2025 21:41:31 -0500
4+
Subject: [PATCH 5/5] Update autoconf
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
Signed-off-by: Hubert Figuière <[email protected]>
10+
---
11+
configure.in | 17 ++++++++---------
12+
1 file changed, 8 insertions(+), 9 deletions(-)
13+
14+
diff --git a/configure.in b/configure.in
15+
index 05b2fe7..ecafb45 100644
16+
--- a/configure.in
17+
+++ b/configure.in
18+
@@ -17,9 +17,10 @@ dnl FRONTEND_LDFLAGS
19+
dnl FRONTEND_CFLAGS
20+
dnl FRONTEND_LDADD
21+
22+
-AC_PREREQ(2.68)
23+
+AC_PREREQ([2.72])
24+
AC_INIT([lame],[3.99.5],[[email protected]])
25+
AC_CONFIG_SRCDIR([libmp3lame/lame.c])
26+
+AC_CONFIG_MACRO_DIRS([m4])
27+
AC_LANG([C])
28+
29+
dnl check system
30+
@@ -37,9 +38,9 @@ AM_MAINTAINER_MODE
31+
AM_MAKE_INCLUDE
32+
33+
dnl check environment
34+
-AC_AIX
35+
-AC_ISC_POSIX
36+
-AC_MINIX
37+
+AC_USE_SYSTEM_EXTENSIONS
38+
+AC_SEARCH_LIBS([strerror],[cposix])
39+
+AC_USE_SYSTEM_EXTENSIONS
40+
case $host_os in
41+
*cygwin* ) CYGWIN=yes;;
42+
* ) CYGWIN=no;;
43+
@@ -47,7 +48,7 @@ esac
44+
45+
dnl libtool
46+
# AC_DISABLE_SHARED
47+
-AC_PROG_LIBTOOL
48+
+LT_INIT
49+
AC_SUBST(LIBTOOL_DEPS)
50+
CFLAGS="${ac_save_CFLAGS}"
51+
52+
@@ -85,7 +86,6 @@ if test "${ac_cv_header_dmalloc_h}" = "yes"; then
53+
fi
54+
55+
dnl Checks for header files.
56+
-AC_HEADER_STDC
57+
AC_CHECK_HEADERS( \
58+
errno.h \
59+
fcntl.h \
60+
@@ -135,8 +135,8 @@ if test $ac_cv_sizeof_short -eq 0 \
61+
exit 1
62+
fi
63+
64+
-AC_C_LONG_DOUBLE
65+
-if test "${ac_cv_c_have_long_double}" = "yes" ; then
66+
+AC_TYPE_LONG_DOUBLE_WIDER
67+
+if test "${ac_cv_type_long_double_wider}" = "yes" ; then
68+
AC_CHECK_SIZEOF(long double)
69+
fi
70+
71+
@@ -324,7 +324,6 @@ if test ${cross_compiling} = "yes"; then
72+
fi
73+
74+
AC_TYPE_SIZE_T
75+
-AC_HEADER_TIME
76+
77+
dnl Checks for library functions.
78+
AC_FUNC_ALLOCA
79+
--
80+
2.51.0
81+

‎lame/lame-3.99.5.json‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,21 @@
1010
},
1111
{
1212
"type": "patch",
13-
"path": "lame-msse.patch"
14-
},
15-
{
16-
"type": "patch",
17-
"path": "lame-gtk1-ac-directives.patch"
18-
},
19-
{
20-
"type": "patch",
21-
"path": "lame-ansi2knr2devnull.patch"
22-
},
23-
{
24-
"type": "patch",
25-
"path": "lame-tinfo.patch",
26-
"strip-components": 0
13+
"paths": [
14+
"0001-Build-xmm_quantize_sub.c-with-msse.patch",
15+
"0002-Include-GTK-1-autoconf-directives-in-build-system.patch",
16+
"0003-Patch-out-remaining-ansi2knr.patch",
17+
"0004-initscr-is-not-used-anywhere-in-lame-sourcetree.patch",
18+
"0005-Update-autoconf.patch"
19+
]
2720
},
2821
{
2922
"type": "script",
3023
"dest-filename": "autogen.sh",
3124
"commands": [
32-
"autoreconf -vfi"
25+
"mkdir m4",
26+
"cp /usr/share/gettext/m4/*.m4 m4",
27+
"autoreconf -vfi -I m4"
3328
]
3429
}
3530
],

‎lame/lame-msse.patch‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎lame/lame-tinfo.patch‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)