Skip to content

Commit e6e4e88

Browse files
kel-mohnyman
authored andcommitted
squeezelite: update to 2.0.0.1518
Refresh sound/squeezelite/patches/010-select_broadcast_interface.patch Signed-off-by: Kel Modderman <[email protected]>
1 parent ea49725 commit e6e4e88

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

sound/squeezelite/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
include $(TOPDIR)/rules.mk
77

88
PKG_NAME:=squeezelite
9-
PKG_VERSION:=1.9.9.1432
10-
PKG_RELEASE:=3
9+
PKG_VERSION:=2.0.0.1518
10+
PKG_RELEASE:=1
1111

1212
PKG_SOURCE_PROTO:=git
1313
PKG_SOURCE_URL:=https://github.com/ralph-irving/squeezelite
14-
PKG_SOURCE_VERSION:=575b59398dd19945d2038474062240fc527407fb
15-
PKG_MIRROR_HASH:=cffa8391c9e550d5ceea168703d599442b8a53b9789231aabd3221f6a0e4902d
14+
PKG_SOURCE_VERSION:=ed3c82052db4846e8e0da01c5bf8db130db00dee
15+
PKG_MIRROR_HASH:=34cc25e0a5b7e425acc9e39c16cbef775ce268eea1b558c8f4694584471ce2ee
1616

1717
PKG_MAINTAINER:=Ted Hess <[email protected]>
1818
PKG_LICENSE:=GPL-3.0-or-later

sound/squeezelite/patches/010-select_broadcast_interface.patch

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
" -m <mac addr>\t\tSet mac address, format: ab:cd:ef:12:34:56\n"
99
" -M <modelname>\tSet the squeezelite player model name sent to the server (default: " MODEL_NAME_STRING ")\n"
1010
" -n <name>\t\tSet the player name\n"
11-
@@ -304,6 +305,8 @@ int main(int argc, char **argv) {
11+
@@ -307,6 +308,8 @@ int main(int argc, char **argv) {
1212
extern bool user_rates;
1313
char *logfile = NULL;
1414
u8_t mac[6];
@@ -17,15 +17,15 @@
1717
unsigned stream_buf_size = STREAMBUF_SIZE;
1818
unsigned output_buf_size = 0; // set later
1919
unsigned rates[MAX_SUPPORTED_SAMPLERATES] = { 0 };
20-
@@ -344,6 +347,7 @@ int main(int argc, char **argv) {
20+
@@ -347,6 +350,7 @@ int main(int argc, char **argv) {
2121

2222
int maxSampleRate = 0;
2323

2424
+ memset(mac, 0, sizeof(mac));
2525
char *optarg = NULL;
2626
int optind = 1;
2727
int i;
28-
@@ -351,8 +355,6 @@ int main(int argc, char **argv) {
28+
@@ -354,8 +358,6 @@ int main(int argc, char **argv) {
2929
#define MAXCMDLINE 512
3030
char cmdline[MAXCMDLINE] = "";
3131

@@ -34,7 +34,7 @@
3434
for (i = 0; i < argc && (strlen(argv[i]) + strlen(cmdline) + 2 < MAXCMDLINE); i++) {
3535
strcat(cmdline, argv[i]);
3636
strcat(cmdline, " ");
37-
@@ -360,7 +362,7 @@ int main(int argc, char **argv) {
37+
@@ -363,7 +365,7 @@ int main(int argc, char **argv) {
3838

3939
while (optind < argc && strlen(argv[optind]) >= 2 && argv[optind][0] == '-') {
4040
char *opt = argv[optind] + 1;
@@ -43,7 +43,7 @@
4343
#if ALSA
4444
"UVO"
4545
#endif
46-
@@ -454,6 +456,9 @@ int main(int argc, char **argv) {
46+
@@ -457,6 +459,9 @@ int main(int argc, char **argv) {
4747
case 'f':
4848
logfile = optarg;
4949
break;
@@ -53,7 +53,7 @@
5353
case 'm':
5454
{
5555
int byte = 0;
56-
@@ -767,6 +772,11 @@ int main(int argc, char **argv) {
56+
@@ -774,6 +779,11 @@ int main(int argc, char **argv) {
5757
winsock_init();
5858
#endif
5959

@@ -65,7 +65,7 @@
6565
stream_init(log_stream, stream_buf_size);
6666

6767
if (!strcmp(output_device, "-")) {
68-
@@ -813,7 +823,7 @@ int main(int argc, char **argv) {
68+
@@ -820,7 +830,7 @@ int main(int argc, char **argv) {
6969
exit(1);
7070
}
7171

@@ -85,7 +85,7 @@
8585
#define BASE_CAP "Model=squeezelite,AccuratePlayPoints=1,HasDigitalOut=1,HasPolarityInversion=1,Balance=1,Firmware=" VERSION
8686
#define SSL_CAP "CanHTTPS=1"
8787
const char *base_cap;
88-
@@ -768,7 +768,7 @@ void wake_controller(void) {
88+
@@ -773,7 +773,7 @@ void wake_controller(void) {
8989
wake_signal(wake_e);
9090
}
9191

@@ -94,7 +94,7 @@
9494
struct sockaddr_in d;
9595
struct sockaddr_in s;
9696
char *buf;
97-
@@ -785,7 +785,7 @@ in_addr_t discover_server(char *default_
97+
@@ -790,7 +790,7 @@ in_addr_t discover_server(char *default_
9898
memset(&d, 0, sizeof(d));
9999
d.sin_family = AF_INET;
100100
d.sin_port = htons(PORT);
@@ -103,7 +103,7 @@
103103

104104
pollinfo.fd = disc_sock;
105105
pollinfo.events = POLLIN;
106-
@@ -820,7 +820,7 @@ in_addr_t discover_server(char *default_
106+
@@ -825,7 +825,7 @@ in_addr_t discover_server(char *default_
107107
#define FIXED_CAP_LEN 256
108108
#define VAR_CAP_LEN 128
109109

@@ -112,7 +112,7 @@
112112
struct sockaddr_in serv_addr;
113113
static char fixed_cap[FIXED_CAP_LEN], var_cap[VAR_CAP_LEN] = "";
114114
bool reconnect = false;
115-
@@ -841,7 +841,7 @@ void slimproto(log_level level, char *se
115+
@@ -846,7 +846,7 @@ void slimproto(log_level level, char *se
116116
}
117117

118118
if (!slimproto_ip) {
@@ -121,7 +121,7 @@
121121
}
122122

123123
if (!slimproto_port) {
124-
@@ -926,7 +926,7 @@ void slimproto(log_level level, char *se
124+
@@ -931,7 +931,7 @@ void slimproto(log_level level, char *se
125125

126126
// rediscover server if it was not set at startup
127127
if (!server && ++failed_connect > 5) {
@@ -132,7 +132,7 @@
132132
} else {
133133
--- a/squeezelite.h
134134
+++ b/squeezelite.h
135-
@@ -463,7 +463,7 @@ char* strcasestr(const char *haystack, c
135+
@@ -474,7 +474,7 @@ char* strcasestr(const char *haystack, c
136136

137137
char *next_param(char *src, char c);
138138
u32_t gettime_ms(void);
@@ -141,7 +141,7 @@
141141
void set_nonblock(sockfd s);
142142
void set_recvbufsize(sockfd s);
143143
int connect_timeout(sockfd sock, const struct sockaddr *addr, socklen_t addrlen, int timeout);
144-
@@ -521,7 +521,7 @@ void buf_init(struct buffer *buf, size_t
144+
@@ -533,7 +533,7 @@ void buf_init(struct buffer *buf, size_t
145145
void buf_destroy(struct buffer *buf);
146146

147147
// slimproto.c

0 commit comments

Comments
 (0)