00_service.patch ------------ diff -ruN lash-0.5.1-old/lash/config.h lash-0.5.1/lash/config.h --- lash-0.5.1-old/lash/config.h 2005-09-15 10:15:33.000000000 +0200 +++ lash-0.5.1/lash/config.h 2006-06-28 11:40:40.000000000 +0200 @@ -27,6 +27,8 @@ # include +#define LASH_PORT "14541" + # ifdef __cplusplus extern "C" { # endif diff -ruN lash-0.5.1-old/lashd/conn_mgr.c lash-0.5.1/lashd/conn_mgr.c --- lash-0.5.1-old/lashd/conn_mgr.c 2005-10-02 08:09:29.000000000 +0200 +++ lash-0.5.1/lashd/conn_mgr.c 2006-06-28 11:40:40.000000000 +0200 @@ -185,7 +185,7 @@ hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE; - err = getaddrinfo(NULL, "lash", &hints, &addrs); + err = getaddrinfo(NULL, LASH_PORT, &hints, &addrs); if (err) { fprintf(stderr, "%s: could not look up service name: %s\n", __FUNCTION__, gai_strerror(err)); diff -ruN lash-0.5.1-old/liblash/comm.c lash-0.5.1/liblash/comm.c --- lash-0.5.1-old/liblash/comm.c 2005-09-15 10:15:30.000000000 +0200 +++ lash-0.5.1/liblash/comm.c 2006-06-28 11:40:40.000000000 +0200 @@ -135,7 +135,7 @@ lash_comm_event_t connect_event; int err; - err = lash_open_socket(&client->socket, server, "lash"); + err = lash_open_socket(&client->socket, server, service); if (err) { fprintf(stderr, "%s: could not create server connection\n", __FUNCTION__); diff -ruN lash-0.5.1-old/liblash/lash.c lash-0.5.1/liblash/lash.c --- lash-0.5.1-old/liblash/lash.c 2006-03-26 19:52:43.000000000 +0200 +++ lash-0.5.1/liblash/lash.c 2006-06-28 11:40:40.000000000 +0200 @@ -168,7 +168,7 @@ cstr = lash_args_get_server(args); err = lash_comm_connect_to_server(client, cstr ? cstr : "localhost", - "lash", connect_params); + LASH_PORT, connect_params); /* couldn't connect, try to start a new server */ /* but not if this client has been started by a server, in which ------------ 01_fix64bit.patch ------------ diff -ruN lash-0.5.1-old/liblash/client.c lash-0.5.1/liblash/client.c --- lash-0.5.1-old/liblash/client.c 2005-09-15 10:15:30.000000000 +0200 +++ lash-0.5.1/liblash/client.c 2006-06-28 12:02:56.000000000 +0200 @@ -20,7 +20,7 @@ #include #include -#include +#include #include lash_client_t * diff -ruN lash-0.5.1-old/liblash/config.c lash-0.5.1/liblash/config.c --- lash-0.5.1-old/liblash/config.c 2005-09-15 10:15:30.000000000 +0200 +++ lash-0.5.1/liblash/config.c 2006-06-28 12:02:46.000000000 +0200 @@ -22,7 +22,7 @@ #include #include -#include +#include #include void diff -ruN lash-0.5.1-old/liblash/event.c lash-0.5.1/liblash/event.c --- lash-0.5.1-old/liblash/event.c 2005-09-15 10:15:30.000000000 +0200 +++ lash-0.5.1/liblash/event.c 2006-06-28 12:02:33.000000000 +0200 @@ -22,7 +22,7 @@ #include #include -#include +#include #include lash_event_t * diff -ruN lash-0.5.1-old/liblash/socket.c lash-0.5.1/liblash/socket.c --- lash-0.5.1-old/liblash/socket.c 2005-10-04 05:26:41.000000000 +0200 +++ lash-0.5.1/liblash/socket.c 2006-06-28 11:59:34.000000000 +0200 @@ -34,6 +34,10 @@ #include #include + +#include /* Something weird with mutual includes between list.h and xmalloc.h, which leaves + lash_malloc undefined. I am including list. h before xmalloc.h, which will pull in + xmalloc.h. In fact xmalloc.h include can be removed */ #include #include ------------ 02_pkgconfig.patch ------------ diff -ruN lash-0.5.1-old/lash-1.0.pc.in lash-0.5.1/lash-1.0.pc.in --- lash-0.5.1-old/lash-1.0.pc.in 2005-09-13 07:02:19.000000000 +0200 +++ lash-0.5.1/lash-1.0.pc.in 2006-07-06 14:58:16.000000000 +0200 @@ -7,5 +7,6 @@ Description: Audio session management Requires: jack alsa Version: @PACKAGE_VERSION@ -Libs: -Wl,--rpath -Wl,${libdir} -L${libdir} -llash -lpthread -luuid +Libs: -llash +Libs.static: -lpthread -luuid Cflags: -I${includedir}/lash-1.0 ------------