From bfa4cbb012ce49f59d983d275da8837b50872c16 Mon Sep 17 00:00:00 2001
From: cbdev <cb@cbcdn.com>
Date: Thu, 22 Aug 2019 21:38:06 +0200
Subject: Update travis dependencies
---
.travis.yml | 3 ++-
backends/maweb.c | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8d21ef3..305dc61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ addons:
- libevdev-dev
- libola-dev
- liblua5.3-dev
+ - libssl-dev
packages: &core_build_gpp_latest
- *core_build
- gcc-8
@@ -162,7 +163,7 @@ install:
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=/usr/local/opt/ccache/libexec:$PATH; fi # Use ccache on Mac too
#Coverity doesn't work with g++ 5 or 6, so only upgrade to g++ 4.9 for that
- if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "sanitize" \) -a "$CC" = "gcc" ]; then export CC="ccache gcc-8"; export CXX="ccache g++-8"; fi
diff --git a/backends/maweb.c b/backends/maweb.c
index 07595be..9ba04fa 100644
--- a/backends/maweb.c
+++ b/backends/maweb.c
@@ -475,7 +475,6 @@ static int maweb_request_playbacks(instance* inst){
channels = data->input_channel[channel + channel_offset - 1].fields.index - (data->input_channel[channel].fields.index / 5) * 5;
-
snprintf(item_counts, sizeof(item_indices), "[%lu]", ((channels / 5) * 5 + 5));
channel += channel_offset - 1;
}
--
cgit v1.2.3