Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions linux-audio/lash.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"rm-configure": true,
"config-opts": [
"--disable-static",
"--disable-serv-inst",
"CFLAGS=-D_GNU_SOURCE"
],
"cleanup": [
Expand All @@ -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"
]
},
{
Expand Down
10 changes: 0 additions & 10 deletions linux-audio/patches/lash-0.5.3-no-static-lib.patch

This file was deleted.

13 changes: 0 additions & 13 deletions linux-audio/patches/lash-build.patch

This file was deleted.

11 changes: 0 additions & 11 deletions linux-audio/patches/lash-configure.patch

This file was deleted.

11 changes: 0 additions & 11 deletions linux-audio/patches/lash-gcc47.patch

This file was deleted.

90 changes: 0 additions & 90 deletions linux-audio/patches/lash-linking.patch

This file was deleted.

29 changes: 29 additions & 0 deletions linux-audio/patches/lash/0001-configure-remove-aclocal-m4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 5171e18050d1c9cc5dc55199af7effc8fbf3b0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net>
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 <hub@figuiere.net>
---
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

73 changes: 73 additions & 0 deletions linux-audio/patches/lash/0002-Fix-build-with-recent-gcc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
From 911982cbfdc96e9e20afd3096b71caa09533e5a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net>
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 <hub@figuiere.net>
---
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 <unistd.h>
+#include <string.h>
+#include <stdio.h>

#include <lash/lash.h>

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 <string.h>
#include <strings.h>
#include <pthread.h>
+#include <sys/resource.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/socket.h>
--
2.51.0

Loading