From 47d456466cc041e86d8f261397f4a0bf45e03893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= Date: Sat, 1 Nov 2025 10:44:13 -0400 Subject: [PATCH] linux-audio/lash: Fix build on 25.08 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regenerate patches. Remove no longer needed options. Signed-off-by: Hubert Figuière --- linux-audio/lash.json | 15 +- .../patches/lash-0.5.3-no-static-lib.patch | 10 -- linux-audio/patches/lash-build.patch | 13 -- linux-audio/patches/lash-configure.patch | 11 -- linux-audio/patches/lash-gcc47.patch | 11 -- linux-audio/patches/lash-linking.patch | 90 ------------ .../0001-configure-remove-aclocal-m4.patch | 29 ++++ .../lash/0002-Fix-build-with-recent-gcc.patch | 73 ++++++++++ .../patches/lash/0003-Fix-linking.patch | 136 ++++++++++++++++++ 9 files changed, 241 insertions(+), 147 deletions(-) delete mode 100644 linux-audio/patches/lash-0.5.3-no-static-lib.patch delete mode 100644 linux-audio/patches/lash-build.patch delete mode 100644 linux-audio/patches/lash-configure.patch delete mode 100644 linux-audio/patches/lash-gcc47.patch delete mode 100644 linux-audio/patches/lash-linking.patch create mode 100644 linux-audio/patches/lash/0001-configure-remove-aclocal-m4.patch create mode 100644 linux-audio/patches/lash/0002-Fix-build-with-recent-gcc.patch create mode 100644 linux-audio/patches/lash/0003-Fix-linking.patch diff --git a/linux-audio/lash.json b/linux-audio/lash.json index ed846cfe..9abcc108 100644 --- a/linux-audio/lash.json +++ b/linux-audio/lash.json @@ -3,7 +3,6 @@ "rm-configure": true, "config-opts": [ "--disable-static", - "--disable-serv-inst", "CFLAGS=-D_GNU_SOURCE" ], "cleanup": [ @@ -19,18 +18,10 @@ }, { "type": "patch", - "strip-components": 0, "paths": [ - "patches/lash-0.5.3-no-static-lib.patch", - "patches/lash-configure.patch" - ] - }, - { - "type": "patch", - "paths": [ - "patches/lash-gcc47.patch", - "patches/lash-linking.patch", - "patches/lash-build.patch" + "patches/lash/0001-configure-remove-aclocal-m4.patch", + "patches/lash/0002-Fix-build-with-recent-gcc.patch", + "patches/lash/0003-Fix-linking.patch" ] }, { diff --git a/linux-audio/patches/lash-0.5.3-no-static-lib.patch b/linux-audio/patches/lash-0.5.3-no-static-lib.patch deleted file mode 100644 index 54d1cd7b..00000000 --- a/linux-audio/patches/lash-0.5.3-no-static-lib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- lash-1.0.pc.in~ 2007-10-07 06:33:27.000000000 -0700 -+++ lash-1.0.pc.in 2007-10-07 06:35:00.000000000 -0700 -@@ -7,6 +7,5 @@ - Description: Audio session management - Requires: @PC_REQUIRES@ - Version: @PACKAGE_VERSION@ --Libs: -llash --Libs.static: -lpthread -luuid -+Libs: -llash -lpthread -luuid - Cflags: -I${includedir}/lash-1.0 diff --git a/linux-audio/patches/lash-build.patch b/linux-audio/patches/lash-build.patch deleted file mode 100644 index e1d5951e..00000000 --- a/linux-audio/patches/lash-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/clients/synth/lash.c b/clients/synth/lash.c -index 03717ae..1c5d321 100644 ---- a/clients/synth/lash.c -+++ b/clients/synth/lash.c -@@ -23,6 +23,8 @@ - #include "config.h" - - #include -+#include -+#include - - #include - diff --git a/linux-audio/patches/lash-configure.patch b/linux-audio/patches/lash-configure.patch deleted file mode 100644 index ba9bb8ba..00000000 --- a/linux-audio/patches/lash-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac 2007-11-14 16:58:51.000000000 -0500 -+++ configure.ac.new 2019-01-24 13:48:46.284377086 -0500 -@@ -2,7 +2,7 @@ - AC_CONFIG_SRCDIR([lash/types.h]) - AC_CONFIG_HEADER([config.h]) - AM_INIT_AUTOMAKE --AM_ACLOCAL_INCLUDE([m4]) -+dnl AM_ACLOCAL_INCLUDE([m4]) - - ### Check for programs ### - AC_LANG([C]) diff --git a/linux-audio/patches/lash-gcc47.patch b/linux-audio/patches/lash-gcc47.patch deleted file mode 100644 index 41710ca5..00000000 --- a/linux-audio/patches/lash-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN lash-0.5.4.old/liblash/lash.c lash-0.5.4/liblash/lash.c ---- lash-0.5.4.old/liblash/lash.c 2007-03-09 10:34:40.000000000 -0500 -+++ lash-0.5.4/liblash/lash.c 2012-07-22 18:17:46.003963521 -0400 -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/linux-audio/patches/lash-linking.patch b/linux-audio/patches/lash-linking.patch deleted file mode 100644 index e46d1647..00000000 --- a/linux-audio/patches/lash-linking.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -rupN lash-0.5.4.old/clients/control/Makefile.am lash-0.5.4/clients/control/Makefile.am ---- lash-0.5.4.old/clients/control/Makefile.am 2007-01-13 13:20:03.000000000 -0500 -+++ lash-0.5.4/clients/control/Makefile.am 2010-02-10 03:08:04.000000000 -0500 -@@ -18,6 +18,6 @@ lash_control_CFLAGS = $(LASH_CFLAGS) - - lash_control_LDADD = \ - $(top_builddir)/liblash/liblash.la \ -- $(LASH_LIBS) @READLINE_LIBS@ -+ $(LASH_LIBS) @READLINE_LIBS@ -luuid - - endif -diff -rupN lash-0.5.4.old/clients/control/Makefile.in lash-0.5.4/clients/control/Makefile.in ---- lash-0.5.4.old/clients/control/Makefile.in 2007-11-14 17:00:09.000000000 -0500 -+++ lash-0.5.4/clients/control/Makefile.in 2010-02-10 03:09:26.000000000 -0500 -@@ -236,7 +236,7 @@ AM_CPPFLAGS = -I$(top_srcdir) - @HAVE_READLINE_TRUE@lash_control_CFLAGS = $(LASH_CFLAGS) - @HAVE_READLINE_TRUE@lash_control_LDADD = \ - @HAVE_READLINE_TRUE@ $(top_builddir)/liblash/liblash.la \ --@HAVE_READLINE_TRUE@ $(LASH_LIBS) @READLINE_LIBS@ -+@HAVE_READLINE_TRUE@ $(LASH_LIBS) @READLINE_LIBS@ -luuid - - all: all-am - -diff -rupN lash-0.5.4.old/clients/panel/Makefile.am lash-0.5.4/clients/panel/Makefile.am ---- lash-0.5.4.old/clients/panel/Makefile.am 2005-09-13 01:22:59.000000000 -0400 -+++ lash-0.5.4/clients/panel/Makefile.am 2010-02-10 03:17:10.000000000 -0500 -@@ -13,7 +13,7 @@ lash_panel_CFLAGS = \ - - lash_panel_LDADD = \ - $(top_builddir)/liblash/liblash.la \ -- $(GTK2_LIBS) -+ $(GTK2_LIBS) -luuid - - if HAVE_GTK2 - bin_PROGRAMS = lash_panel -diff -rupN lash-0.5.4.old/clients/panel/Makefile.in lash-0.5.4/clients/panel/Makefile.in ---- lash-0.5.4.old/clients/panel/Makefile.in 2007-11-14 17:00:09.000000000 -0500 -+++ lash-0.5.4/clients/panel/Makefile.in 2010-02-10 03:17:23.000000000 -0500 -@@ -230,7 +230,7 @@ lash_panel_CFLAGS = \ - - lash_panel_LDADD = \ - $(top_builddir)/liblash/liblash.la \ -- $(GTK2_LIBS) -+ $(GTK2_LIBS) -luuid - - all: all-am - -diff -rupN lash-0.5.4.old/clients/synth/Makefile.am lash-0.5.4/clients/synth/Makefile.am ---- lash-0.5.4.old/clients/synth/Makefile.am 2005-09-13 01:22:59.000000000 -0400 -+++ lash-0.5.4/clients/synth/Makefile.am 2010-02-10 03:22:39.000000000 -0500 -@@ -20,4 +20,4 @@ lash_synth_LDADD = \ - $(JACK_LIBS) \ - $(ALSA_LIBS) \ - $(GTK2_LIBS) \ -- -lpthread -+ -lpthread -lm -diff -rupN lash-0.5.4.old/clients/synth/Makefile.in lash-0.5.4/clients/synth/Makefile.in ---- lash-0.5.4.old/clients/synth/Makefile.in 2007-11-14 17:00:10.000000000 -0500 -+++ lash-0.5.4/clients/synth/Makefile.in 2010-02-10 03:22:51.000000000 -0500 -@@ -238,7 +238,7 @@ lash_synth_LDADD = \ - $(JACK_LIBS) \ - $(ALSA_LIBS) \ - $(GTK2_LIBS) \ -- -lpthread -+ -lpthread -lm - - all: all-am - -diff -rupN lash-0.5.4.old/lashd/Makefile.am lash-0.5.4/lashd/Makefile.am ---- lash-0.5.4.old/lashd/Makefile.am 2006-09-16 16:27:46.000000000 -0400 -+++ lash-0.5.4/lashd/Makefile.am 2010-07-23 15:13:59.000000000 -0400 -@@ -32,6 +32,7 @@ lashd_LDADD = \ - $(ALSA_LIBS) \ - $(XML2_LIBS) \ - $(UUID_LIBS) \ -+ -lpthread \ - $(top_builddir)/liblash/liblash.la - - lashd_CFLAGS = \ -diff -rupN lash-0.5.4.old/lashd/Makefile.in lash-0.5.4/lashd/Makefile.in ---- lash-0.5.4.old/lashd/Makefile.in 2007-11-14 17:00:10.000000000 -0500 -+++ lash-0.5.4/lashd/Makefile.in 2010-07-23 15:14:29.000000000 -0400 -@@ -262,6 +262,7 @@ lashd_LDADD = \ - $(ALSA_LIBS) \ - $(XML2_LIBS) \ - $(UUID_LIBS) \ -+ -lpthread \ - $(top_builddir)/liblash/liblash.la - - lashd_CFLAGS = \ diff --git a/linux-audio/patches/lash/0001-configure-remove-aclocal-m4.patch b/linux-audio/patches/lash/0001-configure-remove-aclocal-m4.patch new file mode 100644 index 00000000..b22f71ca --- /dev/null +++ b/linux-audio/patches/lash/0001-configure-remove-aclocal-m4.patch @@ -0,0 +1,29 @@ +From 5171e18050d1c9cc5dc55199af7effc8fbf3b0b8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= +Date: Sat, 1 Nov 2025 10:16:06 -0400 +Subject: [PATCH 1/3] configure: remove aclocal m4 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Hubert Figuière +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e23f77e..b35ea67 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ AC_INIT([LASH],[0.5.4]) + AC_CONFIG_SRCDIR([lash/types.h]) + AC_CONFIG_HEADER([config.h]) + AM_INIT_AUTOMAKE +-AM_ACLOCAL_INCLUDE([m4]) ++dnl AM_ACLOCAL_INCLUDE([m4]) + + ### Check for programs ### + AC_LANG([C]) +-- +2.51.0 + diff --git a/linux-audio/patches/lash/0002-Fix-build-with-recent-gcc.patch b/linux-audio/patches/lash/0002-Fix-build-with-recent-gcc.patch new file mode 100644 index 00000000..03821ea7 --- /dev/null +++ b/linux-audio/patches/lash/0002-Fix-build-with-recent-gcc.patch @@ -0,0 +1,73 @@ +From 911982cbfdc96e9e20afd3096b71caa09533e5a0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= +Date: Sat, 1 Nov 2025 10:13:06 -0400 +Subject: [PATCH 2/3] Fix build with recent gcc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Added missing includes +Fix mismatch prototypes + +Signed-off-by: Hubert Figuière +--- + clients/synth/lash.c | 2 ++ + lashd/client.c | 2 +- + lashd/server_event.h | 2 +- + liblash/lash.c | 1 + + 4 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/clients/synth/lash.c b/clients/synth/lash.c +index 03717ae..1c5d321 100644 +--- a/clients/synth/lash.c ++++ b/clients/synth/lash.c +@@ -23,6 +23,8 @@ + #include "config.h" + + #include ++#include ++#include + + #include + +diff --git a/lashd/client.c b/lashd/client.c +index 5adfee3..ab4efa1 100644 +--- a/lashd/client.c ++++ b/lashd/client.c +@@ -26,7 +26,7 @@ + #include "alsa_patch.h" + + client_t * +-client_new(lash_connect_params_t * params) ++client_new() + { + client_t *client; + +diff --git a/lashd/server_event.h b/lashd/server_event.h +index b33d56d..31f108b 100644 +--- a/lashd/server_event.h ++++ b/lashd/server_event.h +@@ -51,7 +51,7 @@ struct _server_event + }; + + server_event_t * server_event_new (); +-void server_event_destroy (); ++void server_event_destroy (server_event_t * event); + + void server_event_set_type (server_event_t * event, enum Server_Event_Type type); + void server_event_set_conn_id (server_event_t * event, unsigned long id); +diff --git a/liblash/lash.c b/liblash/lash.c +index b47251d..f2a5095 100644 +--- a/liblash/lash.c ++++ b/liblash/lash.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.51.0 + diff --git a/linux-audio/patches/lash/0003-Fix-linking.patch b/linux-audio/patches/lash/0003-Fix-linking.patch new file mode 100644 index 00000000..a02d16a2 --- /dev/null +++ b/linux-audio/patches/lash/0003-Fix-linking.patch @@ -0,0 +1,136 @@ +From 035507ee947e3ffa0bea7d222fc3d5200e8aa9db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= +Date: Sat, 1 Nov 2025 10:13:56 -0400 +Subject: [PATCH 3/3] Fix linking +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix pkg-config for lib uuid (static) + +Signed-off-by: Hubert Figuière +--- + clients/control/Makefile.am | 2 +- + clients/control/Makefile.in | 2 +- + clients/panel/Makefile.am | 2 +- + clients/panel/Makefile.in | 2 +- + clients/synth/Makefile.am | 2 +- + clients/synth/Makefile.in | 2 +- + lash-1.0.pc.in | 3 +-- + lashd/Makefile.am | 1 + + lashd/Makefile.in | 1 + + 9 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/clients/control/Makefile.am b/clients/control/Makefile.am +index d3eaab2..db126f8 100644 +--- a/clients/control/Makefile.am ++++ b/clients/control/Makefile.am +@@ -18,6 +18,6 @@ lash_control_CFLAGS = $(LASH_CFLAGS) + + lash_control_LDADD = \ + $(top_builddir)/liblash/liblash.la \ +- $(LASH_LIBS) @READLINE_LIBS@ ++ $(LASH_LIBS) @READLINE_LIBS@ -luuid + + endif +diff --git a/clients/control/Makefile.in b/clients/control/Makefile.in +index a21e226..d2f1711 100644 +--- a/clients/control/Makefile.in ++++ b/clients/control/Makefile.in +@@ -236,7 +236,7 @@ AM_CPPFLAGS = -I$(top_srcdir) + @HAVE_READLINE_TRUE@lash_control_CFLAGS = $(LASH_CFLAGS) + @HAVE_READLINE_TRUE@lash_control_LDADD = \ + @HAVE_READLINE_TRUE@ $(top_builddir)/liblash/liblash.la \ +-@HAVE_READLINE_TRUE@ $(LASH_LIBS) @READLINE_LIBS@ ++@HAVE_READLINE_TRUE@ $(LASH_LIBS) @READLINE_LIBS@ -luuid + + all: all-am + +diff --git a/clients/panel/Makefile.am b/clients/panel/Makefile.am +index 2016aa7..5b64178 100644 +--- a/clients/panel/Makefile.am ++++ b/clients/panel/Makefile.am +@@ -13,7 +13,7 @@ lash_panel_CFLAGS = \ + + lash_panel_LDADD = \ + $(top_builddir)/liblash/liblash.la \ +- $(GTK2_LIBS) ++ $(GTK2_LIBS) -luuid + + if HAVE_GTK2 + bin_PROGRAMS = lash_panel +diff --git a/clients/panel/Makefile.in b/clients/panel/Makefile.in +index 9834e38..94d4aaf 100644 +--- a/clients/panel/Makefile.in ++++ b/clients/panel/Makefile.in +@@ -230,7 +230,7 @@ lash_panel_CFLAGS = \ + + lash_panel_LDADD = \ + $(top_builddir)/liblash/liblash.la \ +- $(GTK2_LIBS) ++ $(GTK2_LIBS) -luuid + + all: all-am + +diff --git a/clients/synth/Makefile.am b/clients/synth/Makefile.am +index 59437ce..bbade5b 100644 +--- a/clients/synth/Makefile.am ++++ b/clients/synth/Makefile.am +@@ -20,4 +20,4 @@ lash_synth_LDADD = \ + $(JACK_LIBS) \ + $(ALSA_LIBS) \ + $(GTK2_LIBS) \ +- -lpthread ++ -lpthread -lm +diff --git a/clients/synth/Makefile.in b/clients/synth/Makefile.in +index 6a433c5..a7b8a79 100644 +--- a/clients/synth/Makefile.in ++++ b/clients/synth/Makefile.in +@@ -238,7 +238,7 @@ lash_synth_LDADD = \ + $(JACK_LIBS) \ + $(ALSA_LIBS) \ + $(GTK2_LIBS) \ +- -lpthread ++ -lpthread -lm + + all: all-am + +diff --git a/lash-1.0.pc.in b/lash-1.0.pc.in +index 32bd49c..1dab08d 100644 +--- a/lash-1.0.pc.in ++++ b/lash-1.0.pc.in +@@ -7,6 +7,5 @@ Name: LASH + Description: Audio session management + Requires: @PC_REQUIRES@ + Version: @PACKAGE_VERSION@ +-Libs: -llash +-Libs.static: -lpthread -luuid ++Libs: -llash -lpthread -luuid + Cflags: -I${includedir}/lash-1.0 +diff --git a/lashd/Makefile.am b/lashd/Makefile.am +index 481fb45..5260497 100644 +--- a/lashd/Makefile.am ++++ b/lashd/Makefile.am +@@ -32,6 +32,7 @@ lashd_LDADD = \ + $(ALSA_LIBS) \ + $(XML2_LIBS) \ + $(UUID_LIBS) \ ++ -lpthread \ + $(top_builddir)/liblash/liblash.la + + lashd_CFLAGS = \ +diff --git a/lashd/Makefile.in b/lashd/Makefile.in +index a50e5c7..1bb1ff1 100644 +--- a/lashd/Makefile.in ++++ b/lashd/Makefile.in +@@ -262,6 +262,7 @@ lashd_LDADD = \ + $(ALSA_LIBS) \ + $(XML2_LIBS) \ + $(UUID_LIBS) \ ++ -lpthread \ + $(top_builddir)/liblash/liblash.la + + lashd_CFLAGS = \ +-- +2.51.0 +