Skip to content

Commit 8d705c8

Browse files
committed
linux-audio/lash: Fix build on 25.08
Regenerate patches. Remove no longer needed options. Signed-off-by: Hubert Figuière <[email protected]>
1 parent b2aa07b commit 8d705c8

File tree

9 files changed

+241
-147
lines changed

9 files changed

+241
-147
lines changed

linux-audio/lash.json

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"rm-configure": true,
44
"config-opts": [
55
"--disable-static",
6-
"--disable-serv-inst",
76
"CFLAGS=-D_GNU_SOURCE"
87
],
98
"cleanup": [
@@ -19,18 +18,10 @@
1918
},
2019
{
2120
"type": "patch",
22-
"strip-components": 0,
2321
"paths": [
24-
"patches/lash-0.5.3-no-static-lib.patch",
25-
"patches/lash-configure.patch"
26-
]
27-
},
28-
{
29-
"type": "patch",
30-
"paths": [
31-
"patches/lash-gcc47.patch",
32-
"patches/lash-linking.patch",
33-
"patches/lash-build.patch"
22+
"patches/lash/0001-configure-remove-aclocal-m4.patch",
23+
"patches/lash/0002-Fix-build-with-recent-gcc.patch",
24+
"patches/lash/0003-Fix-linking.patch"
3425
]
3526
},
3627
{

linux-audio/patches/lash-0.5.3-no-static-lib.patch

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

linux-audio/patches/lash-build.patch

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

linux-audio/patches/lash-configure.patch

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

linux-audio/patches/lash-gcc47.patch

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

linux-audio/patches/lash-linking.patch

Lines changed: 0 additions & 90 deletions
This file was deleted.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 5171e18050d1c9cc5dc55199af7effc8fbf3b0b8 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <[email protected]>
3+
Date: Sat, 1 Nov 2025 10:16:06 -0400
4+
Subject: [PATCH 1/3] configure: remove aclocal m4
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.ac | 2 +-
12+
1 file changed, 1 insertion(+), 1 deletion(-)
13+
14+
diff --git a/configure.ac b/configure.ac
15+
index e23f77e..b35ea67 100644
16+
--- a/configure.ac
17+
+++ b/configure.ac
18+
@@ -2,7 +2,7 @@ AC_INIT([LASH],[0.5.4])
19+
AC_CONFIG_SRCDIR([lash/types.h])
20+
AC_CONFIG_HEADER([config.h])
21+
AM_INIT_AUTOMAKE
22+
-AM_ACLOCAL_INCLUDE([m4])
23+
+dnl AM_ACLOCAL_INCLUDE([m4])
24+
25+
### Check for programs ###
26+
AC_LANG([C])
27+
--
28+
2.51.0
29+
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
From 911982cbfdc96e9e20afd3096b71caa09533e5a0 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <[email protected]>
3+
Date: Sat, 1 Nov 2025 10:13:06 -0400
4+
Subject: [PATCH 2/3] Fix build with recent gcc
5+
MIME-Version: 1.0
6+
Content-Type: text/plain; charset=UTF-8
7+
Content-Transfer-Encoding: 8bit
8+
9+
Added missing includes
10+
Fix mismatch prototypes
11+
12+
Signed-off-by: Hubert Figuière <[email protected]>
13+
---
14+
clients/synth/lash.c | 2 ++
15+
lashd/client.c | 2 +-
16+
lashd/server_event.h | 2 +-
17+
liblash/lash.c | 1 +
18+
4 files changed, 5 insertions(+), 2 deletions(-)
19+
20+
diff --git a/clients/synth/lash.c b/clients/synth/lash.c
21+
index 03717ae..1c5d321 100644
22+
--- a/clients/synth/lash.c
23+
+++ b/clients/synth/lash.c
24+
@@ -23,6 +23,8 @@
25+
#include "config.h"
26+
27+
#include <unistd.h>
28+
+#include <string.h>
29+
+#include <stdio.h>
30+
31+
#include <lash/lash.h>
32+
33+
diff --git a/lashd/client.c b/lashd/client.c
34+
index 5adfee3..ab4efa1 100644
35+
--- a/lashd/client.c
36+
+++ b/lashd/client.c
37+
@@ -26,7 +26,7 @@
38+
#include "alsa_patch.h"
39+
40+
client_t *
41+
-client_new(lash_connect_params_t * params)
42+
+client_new()
43+
{
44+
client_t *client;
45+
46+
diff --git a/lashd/server_event.h b/lashd/server_event.h
47+
index b33d56d..31f108b 100644
48+
--- a/lashd/server_event.h
49+
+++ b/lashd/server_event.h
50+
@@ -51,7 +51,7 @@ struct _server_event
51+
};
52+
53+
server_event_t * server_event_new ();
54+
-void server_event_destroy ();
55+
+void server_event_destroy (server_event_t * event);
56+
57+
void server_event_set_type (server_event_t * event, enum Server_Event_Type type);
58+
void server_event_set_conn_id (server_event_t * event, unsigned long id);
59+
diff --git a/liblash/lash.c b/liblash/lash.c
60+
index b47251d..f2a5095 100644
61+
--- a/liblash/lash.c
62+
+++ b/liblash/lash.c
63+
@@ -22,6 +22,7 @@
64+
#include <string.h>
65+
#include <strings.h>
66+
#include <pthread.h>
67+
+#include <sys/resource.h>
68+
#include <sys/types.h>
69+
#include <sys/wait.h>
70+
#include <sys/socket.h>
71+
--
72+
2.51.0
73+

0 commit comments

Comments
 (0)