Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

rtp: Upgrade libre dependency to v3.6.0

Browse source 
Signed-off-by: Steffen Vogel <post@steffenvogel.de>
This commit is contained in:
Steffen Vogel 2024-03-08 19:56:49 +01:00
parent 8fdfd252a5
commit 40909bde45
6 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -75,6 +75,7 @@ find_package(RDMACM)
find_package(Etherlab)
find_package(Lua)
find_package(LibDataChannel)
find_package(re)
# Check for tools
find_program(PASTE NAMES paste)
@ -117,13 +118,7 @@ pkg_check_modules(NANOMSG IMPORTED_TARGET nanomsg)
if(NOT NANOMSG_FOUND)
pkg_check_modules(NANOMSG IMPORTED_TARGET libnanomsg>=1.0.0)
endif()
pkg_check_modules(RE IMPORTED_TARGET re>=2.9.0)
if(NOT RE_FOUND)
pkg_check_modules(RE IMPORTED_TARGET libre>=2.9.0)
endif()
if(NOT RE_FOUND)
pkg_check_modules(RE IMPORTED_TARGET re2)
endif()
if (REDISPP_FOUND)
file(READ "${REDISPP_INCLUDEDIR}/sw/redis++/tls.h" CONTENTS)

1
include/villas/nodes/rtp.hpp
View file

@ -21,6 +21,7 @@
#include <villas/queue_signalled.h>
extern "C" {
#include <re/re_types.h>
#include <re/re_rtp.h>
#include <re/re_sa.h>
}

2
lib/nodes/CMakeLists.txt
View file

@ -143,7 +143,7 @@ endif()
# Enable RTP node type when libre is available
if(WITH_NODE_RTP)
list(APPEND NODE_SRC rtp.cpp)
list(APPEND LIBRARIES PkgConfig::RE)
list(APPEND LIBRARIES re)
endif()
# Enable CAN node type

1
lib/nodes/rtp.cpp
View file

@ -16,6 +16,7 @@
extern "C" {
// clang-format off
#include <re/re_types.h>
#include <re/re_net.h>
#include <re/re_main.h>
#include <re/re_types.h>

4
packaging/deps.sh
View file

@ -290,9 +290,9 @@ if ! pkg-config "comedilib >= 0.11.0" && \
fi
# Build & Install libre
if ! pkg-config "libre >= 2.9.0" && \
if ! pkg-config "libre >= 3.6.0" && \
should_build "libre" "for the rtp node-type"; then
git clone ${GIT_OPTS} --branch v2.9.0 https://github.com/baresip/re.git
git clone ${GIT_OPTS} --branch v3.6.0 https://github.com/baresip/re.git
pushd re
make ${MAKE_OPTS} install
popd

2
packaging/docker/Dockerfile.debian-multiarch
View file

@ -56,7 +56,6 @@ RUN apt-get update && \
libibverbs-dev:${ARCH} \
librdmacm-dev:${ARCH} \
libusb-1.0-0-dev:${ARCH} \
libre-dev:${ARCH} \
liblua5.3-dev:${ARCH} \
libhiredis-dev:${ARCH} \
libmodbus-dev:${ARCH}
@ -151,7 +150,6 @@ RUN apt-get update && \
libibverbs1:${ARCH} \
librdmacm1:${ARCH} \
libusb-1.0-0:${ARCH} \
libre0:${ARCH} \
liblua5.3-0:${ARCH} \
libhiredis0.14:${ARCH} \
libmodbus5:${ARCH} && \