Skip to content

Commit 335035f

Browse files
MingcongBaiCAB233
authored andcommitted
lash: fix build
- Introduce patches to fix missing header inclusions and type conditions. - Drop documentation patches as we no longer ship them. - Drop the probably never read postinst. - Drop Python bindings as they were never ported to Python 3. - Specify options explicitly where applicable. - Track patches at AOSC-Tracking/lash @ aosc/0.6.0-rc2 (HEAD: 40791a78d1018db8699297f0b19d5a66bebb3a96).
1 parent 4465bdd commit 335035f

7 files changed

+158
-30
lines changed
Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
11
PKGNAME=lash
2-
PKGDES="A session management system for JACK and ALSA"
32
PKGSEC=sound
4-
PKGDEP="dbus gtk-2 jack libtirpc libxml2 python-2 readline"
3+
PKGDEP="dbus gtk-2 jack libtirpc libxml2 readline"
4+
PKGDES="Session management system for JACK and ALSA"
55

6-
AUTOTOOLS_AFTER="--enable-pkg-config-dbus-service-dir"
7-
RECONF=0
6+
ABTYPE=autotools
7+
# FIXME: --enable-old-api
8+
#
9+
# libtool: link: gcc -pipe -Wno-error -fstack-protector-strong --param=ssp-buffer-size=4 -fexceptions -fcf-protection=full -ggdb -fira-loop-pressure -fira-hoist-pressure -specs=/usr/lib/gcc/specs/hardened-cc1 -O2 -fno-omit-frame-pointer -flto=auto -march=x86-64 -mtune=znver4 -msse2 -mno-omit-leaf-frame-pointer -I/usr/include/tirpc -Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-build-id=sha1 -Wl,-z -Wl,relro -Wl,-z -Wl,now -specs=/usr/lib/gcc/specs/hardened-ld -flto -fuse-linker-plugin -o .libs/lash_simple_client lash_simple_client-simple_client.o ../../liblash/.libs/liblash.so -ldl -lm -ltirpc -luuid -ldbus-1 -ljack -lasound -lreadline
10+
# /usr/bin/ld: /tmp/ccczJiAE.ltrans0.ltrans.o: in function `main':
11+
# [...]/clients/simple_client/simple_client.c:75:(.text.startup+0xa0): undefined reference to `lash_extract_args'
12+
# /usr/bin/ld: [...]/clients/simple_client/simple_client.c:75:(.text.startup+0xb9): undefined reference to `lash_init'
13+
# /usr/bin/ld: [...]/clients/simple_client/simple_client.c:86:(.text.startup+0xe5): undefined reference to `lash_event_new_with_type'
14+
AUTOTOOLS_AFTER=(
15+
'--disable-debug'
16+
'--enable-old-api'
17+
'--enable-pkg-config-dbus-service-dir'
18+
'--with-jack-dbus'
19+
'--with-alsa'
20+
'--with-gtk2'
21+
'--with-python=no'
22+
)
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
From 267dae53bfb0cbcb723c4a1333b85357ed503fb7 Mon Sep 17 00:00:00 2001
2+
From: Mingcong Bai <[email protected]>
3+
Date: Sun, 5 Oct 2025 17:46:12 +0800
4+
Subject: [PATCH 1/3] AOSCOS: fix: add missing headers to fix build
5+
6+
Signed-off-by: Mingcong Bai <[email protected]>
7+
---
8+
lashd/dbus_iface_server.c | 2 ++
9+
liblash/dbus_service.c | 1 +
10+
2 files changed, 3 insertions(+)
11+
12+
diff --git a/lashd/dbus_iface_server.c b/lashd/dbus_iface_server.c
13+
index e101285..a36b6ce 100644
14+
--- a/lashd/dbus_iface_server.c
15+
+++ b/lashd/dbus_iface_server.c
16+
@@ -38,6 +38,8 @@
17+
#include "lash/types.h"
18+
#include "store.h"
19+
20+
+#include "lashd/jack_mgr.h"
21+
+
22+
static void
23+
lashd_dbus_ping(method_call_t *call)
24+
{
25+
diff --git a/liblash/dbus_service.c b/liblash/dbus_service.c
26+
index 909715c..145b6c1 100644
27+
--- a/liblash/dbus_service.c
28+
+++ b/liblash/dbus_service.c
29+
@@ -24,6 +24,7 @@
30+
#include <errno.h>
31+
32+
#include "common/debug.h"
33+
+#include "common/safety.h"
34+
35+
#include "dbus/object_path.h"
36+
#include "dbus/service.h"
37+
--
38+
2.51.0
39+

runtime-multimedia/lash/autobuild/patches/0001-Split-docs-chapters.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
1-
Description: Don't print the stacktrace on segfaults.
2-
Fixes FTBFS on armel,powerpc,ia64,alpha.
1+
From 1ed9455d8f06018c327321772f3100442ec6e497 Mon Sep 17 00:00:00 2001
2+
From: Mingcong Bai <[email protected]>
3+
Date: Sun, 5 Oct 2025 17:48:31 +0800
4+
Subject: [PATCH 2/3] DEBIAN: Description: Don't print the stacktrace on
5+
segfaults.
6+
7+
Fixes FTBFS on armel,powerpc,ia64,alpha.
8+
39
Origin: Ubuntu, https://launchpad.net/bugs/647091
410
Bug-Ubuntu: https://launchpad.net/bugs/647091
511

6-
diff '--color=auto' -N -r -u a/lashd/sigsegv.c b/lashd/sigsegv.c
7-
--- a/lashd/sigsegv.c 2008-09-06 15:19:51.000000000 -0700
8-
+++ b/lashd/sigsegv.c 2024-01-26 19:43:48.433759017 -0800
9-
@@ -90,6 +90,9 @@
12+
Signed-off-by: Mingcong Bai <[email protected]>
13+
---
14+
lashd/sigsegv.c | 4 ++++
15+
1 file changed, 4 insertions(+)
16+
17+
diff --git a/lashd/sigsegv.c b/lashd/sigsegv.c
18+
index 2ae34c2..7ae5d14 100644
19+
--- a/lashd/sigsegv.c
20+
+++ b/lashd/sigsegv.c
21+
@@ -90,6 +90,9 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) {
1022
lash_error("info.si_errno = %d", info->si_errno);
1123
lash_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]);
1224
lash_error("info.si_addr = %p", info->si_addr);
@@ -16,11 +28,14 @@ diff '--color=auto' -N -r -u a/lashd/sigsegv.c b/lashd/sigsegv.c
1628
for(i = 0; i < NGREG; i++)
1729
lash_error("reg[%02d] = 0x" REGFORMAT, i, ucontext->uc_mcontext.gregs[i]);
1830

19-
@@ -143,6 +146,7 @@
31+
@@ -143,6 +146,7 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) {
2032
lash_error("%s", strings[i]);
2133
#endif
2234
lash_error("End of stack trace");
2335
+#endif
2436
exit (-1);
2537
}
2638

39+
--
40+
2.51.0
41+
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
From 40791a78d1018db8699297f0b19d5a66bebb3a96 Mon Sep 17 00:00:00 2001
2+
From: Mingcong Bai <[email protected]>
3+
Date: Sun, 5 Oct 2025 18:02:22 +0800
4+
Subject: [PATCH 3/3] AOSCOS: fix(lashd/jack_mgr): add missing type conditions
5+
for JACK D-Bus builds
6+
7+
Signed-off-by: Mingcong Bai <[email protected]>
8+
---
9+
lashd/jack_mgr.h | 28 ++++++++++++++++++++++++++++
10+
1 file changed, 28 insertions(+)
11+
12+
diff --git a/lashd/jack_mgr.h b/lashd/jack_mgr.h
13+
index 8419cc7..9a5ee40 100644
14+
--- a/lashd/jack_mgr.h
15+
+++ b/lashd/jack_mgr.h
16+
@@ -42,30 +42,58 @@ struct _jack_mgr
17+
int quit;
18+
};
19+
20+
+#ifdef HAVE_JACK_DBUS
21+
+lashd_jackdbus_mgr_t *
22+
+#else
23+
jack_mgr_t *
24+
+#endif
25+
jack_mgr_new(void);
26+
27+
void
28+
+#ifdef HAVE_JACK_DBUS
29+
+jack_mgr_destroy(lashd_jackdbus_mgr_t *jack_mgr);
30+
+#else
31+
jack_mgr_destroy(jack_mgr_t *jack_mgr);
32+
+#endif
33+
34+
void
35+
+#ifdef HAVE_JACK_DBUS
36+
+jack_mgr_lock(lashd_jackdbus_mgr_t *jack_mgr);
37+
+#else
38+
jack_mgr_lock(jack_mgr_t *jack_mgr);
39+
+#endif
40+
41+
void
42+
+#ifdef HAVE_JACK_DBUS
43+
+jack_mgr_unlock(lashd_jackdbus_mgr_t *jack_mgr);
44+
+#else
45+
jack_mgr_unlock(jack_mgr_t *jack_mgr);
46+
+#endif
47+
48+
void
49+
+#ifdef HAVE_JACK_DBUS
50+
+jack_mgr_add_client(lashd_jackdbus_mgr_t *jack_mgr,
51+
+#else
52+
jack_mgr_add_client(jack_mgr_t *jack_mgr,
53+
+#endif
54+
uuid_t id,
55+
const char *jack_client_name,
56+
lash_list_t *jack_patches);
57+
58+
lash_list_t *
59+
+#ifdef HAVE_JACK_DBUS
60+
+jack_mgr_remove_client(lashd_jackdbus_mgr_t *jack_mgr,
61+
+#else
62+
jack_mgr_remove_client(jack_mgr_t *jack_mgr,
63+
+#endif
64+
uuid_t id);
65+
66+
lash_list_t *
67+
+#ifdef HAVE_JACK_DBUS
68+
+jack_mgr_get_client_patches(lashd_jackdbus_mgr_t *jack_mgr,
69+
+#else
70+
jack_mgr_get_client_patches(jack_mgr_t *jack_mgr,
71+
+#endif
72+
uuid_t id);
73+
74+
#endif /* __LASHD_JACK_MGR_H__ */
75+
--
76+
2.51.0
77+

runtime-multimedia/lash/autobuild/postinst

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

runtime-multimedia/lash/spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VER=0.6.0~rc2
2-
REL=2
2+
REL=3
33
SRCS="tbl::https://download.savannah.gnu.org/releases/lash/lash-$VER.tar.bz2"
44
CHKSUMS="sha256::3c1eb2bd88e1a0722dea5c24be4ede1d80848c963d41751973fae73c47dfe18b"
55
CHKUPDATE="anitya::id=9677"

0 commit comments

Comments
 (0)