Merge pull request #1 from datagutt/new-srtla

Dockerfile

@@ -3,7 +3,7 @@ FROM alpine:3.18 as builder
 
 RUN apk update &&\
     apk upgrade &&\ 
-    apk add --no-cache linux-headers alpine-sdk cmake tcl openssl-dev zlib-dev
+    apk add --no-cache linux-headers alpine-sdk cmake tcl openssl-dev zlib-dev spdlog spdlog-dev cmake
 
 WORKDIR /tmp
 
@@ -20,14 +20,16 @@ RUN mkdir -p /build; \
 
 # belabox patched srtla
 #
-ARG SRTLA_VERSION=main
+ARG SRTLA_VERSION=irltk-fork
 RUN mkdir -p /build; \
     git clone https://github.com/IRLServer/srtla.git /build/srtla; \
     cd /build/srtla; \
     git checkout $SRTLA_VERSION; \
+    git submodule init && git submodule update --recursive; \
+    cmake .; \
     make -j${nproc};
 
-RUN cp /build/srtla/srtla_rec /build/srtla/srtla_send /usr/local/bin
+RUN cp /build/srtla/irltk_srtla_rec /usr/local/bin/srtla_rec
 # I honestly don't know why this is needed after rebasing with mainstream SRT
 RUN cp /build/srt/srtcore/srt_compat.h /usr/local/include/srt/
 
@@ -49,7 +51,7 @@ RUN set -xe; \
 #
 FROM node:alpine3.18
 ENV LD_LIBRARY_PATH /lib:/usr/lib:/usr/local/lib64
-RUN apk add --update --no-cache openssl libstdc++ supervisor perl coreutils
+RUN apk add --update --no-cache openssl libstdc++ supervisor perl coreutils spdlog spdlog-dev
 
 COPY --from=builder /usr/local/lib /usr/local/lib
 COPY --from=builder /usr/local/include /usr/local/include

README.md

@@ -7,8 +7,8 @@ Work in progress. A few streamers i know are personally using this image for the
 **WARNING: This is not an official Belabox project. Please don't spam rationalirl about it!**
 
 We using the following great open-source projects:
-- srtla_rec from https://github.com/BELABOX
-- srt-live-transmit from https://github.com/BELABOX
+- srt-new from https://github.com/IRLServer/srt-new
+- srtla_rec from https://github.com/IRLServer/srtla/tree/irltk-fork
 - irl-srt-server (srt-live-server fork) from https://github.com/IRLServer/irl-srt-server
 
 ## Manual

files/supervisord.conf

@@ -39,7 +39,7 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
-command=/bin/sh -c "sleep 3 && /usr/local/bin/srtla_rec 5000 localhost 8282"
+command=/bin/sh -c "sleep 3 && /usr/local/bin/srtla_rec --srtla_port=5000 --srt_hostname=localhost --srt_port=8282 --verbose"
 
 [program:server]
 priority=200