Skip to content

Commit aaabb42

Browse files
committed
fix build
1 parent 3f5dee7 commit aaabb42

File tree

3 files changed

+33
-1
lines changed

3 files changed

+33
-1
lines changed

Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ RUN mkdir -p /usr/local/src \
1313
&& wget https://github.com/TimothyGu/alac/archive/master.zip -O libalac.zip \
1414
&& unzip libalac.zip \
1515
&& wget https://gitlab.xiph.org/xiph/tremor/-/archive/master/tremor-master.zip -O libtremor.zip \
16-
&& unzip libtremor.zip \
16+
&& unzip libtremor.zip
17+
18+
COPY load-libtremor-first.patch /usr/local/src/squeezelite-master/alpine/load-libtremor-first.patch
19+
20+
RUN cd /usr/local/src \
1721
&& cd alac-master \
1822
&& patch -p1 -i ../squeezelite-master/alpine/libalac/fix-arm-segfault.patch \
1923
&& patch -p1 -i ../squeezelite-master/alpine/libalac/alac-version.patch \

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,7 @@ Notes:
7575
* [Squeezelite command line options](https://ralph-irving.github.io/squeezelite.html)
7676
* [Power script example](https://github.com/ralph-irving/squeezelite/blob/master/tools/gpiopower.sh)
7777
* [flock example](https://www.kiloroot.com/bash-two-methods-for-job-control-simple-lock-files-and-flock/)
78+
79+
## Ideas
80+
81+
* build alpine packages for squeezelite and libs: https://wiki.alpinelinux.org/wiki/Abuild_and_Helpers#Setting_up_the_build_environment

load-libtremor-first.patch

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Index: vorbis.c
2+
===================================================================
3+
--- squeezelite/vorbis.c (revision 1213)
4+
+++ squeezelite/vorbis.c (working copy)
5+
@@ -324,15 +324,15 @@
6+
7+
static bool load_vorbis() {
8+
#if !LINKALL
9+
- void *handle = dlopen(LIBVORBIS, RTLD_NOW);
10+
+ void *handle = dlopen(LIBTREMOR, RTLD_NOW);
11+
char *err;
12+
- bool tremor = false;
13+
+ bool tremor = true;
14+
15+
if (!handle) {
16+
err = dlerror();
17+
- handle = dlopen(LIBTREMOR, RTLD_NOW);
18+
+ handle = dlopen(LIBVORBIS, RTLD_NOW);
19+
if (handle) {
20+
- tremor = true;
21+
+ tremor = false;
22+
} else {
23+
LOG_INFO("dlerror: %s", err);
24+
LOG_INFO("dlerror: %s", dlerror());

0 commit comments

Comments
 (0)