* updating libcluon to v0.0.140

* compile fixes on M1

Signed-off-by: Christian Berger <christian.berger@gu.se>

Author: chrberger

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (C) 2018  Christian Berger
+# Copyright (C) 2022  Christian Berger
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ project(opendlv-video-h264-decoder)
 ################################################################################
 # Defining the relevant versions of OpenDLV Standard Message Set and libcluon.
 set(OPENDLV_STANDARD_MESSAGE_SET opendlv-standard-message-set-v0.9.6.odvd)
-set(CLUON_COMPLETE cluon-complete-v0.0.121.hpp)
+set(CLUON_COMPLETE cluon-complete-v0.0.140.hpp)
 
 ################################################################################
 # Set the search path for .cmake files.

Dockerfile.amd64 DockerfileDockerfile.amd64 renamed to Dockerfile

@@ -1,4 +1,4 @@
-# Copyright (C) 2018  Christian Berger
+# Copyright (C) 2022  Christian Berger
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,51 +14,55 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Part to build opendlv-video-h264-decoder.
-FROM ubuntu:18.04 as builder
+FROM ubuntu:20.04 as builder
 MAINTAINER Christian Berger "christian.berger@gu.se"
+ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y && \
     apt-get upgrade -y && \
     apt-get dist-upgrade -y && \
     apt-get install -y --no-install-recommends \
         ca-certificates \
         cmake \
-        build-essential \
+        make \
+        linux-headers-generic \
         git \
         libx11-dev \
         nasm \
+        clang \
         wget
 RUN cd tmp && \
     git clone https://chromium.googlesource.com/libyuv/libyuv && \
     cd libyuv &&\
-    git checkout -b working 2525698acba9bf9b701ba6b4d9584291a1f62257 && \
-    make -f linux.mk libyuv.a && cp libyuv.a /usr/lib/x86_64-linux-gnu && cd include && cp -r * /usr/include
+    git checkout -b working eb6e7bb63738e29efd82ea3cf2a115238a89fa51 && \
+    make -f linux.mk CXX=clang++ libyuv.a && if [ `uname -m` = aarch64 ] ; then cp libyuv.a /usr/lib/aarch64-linux-gnu ; else cp libyuv.a /usr/lib/x86_64-linux-gnu ; fi && cd include && cp -r * /usr/include
 RUN cd tmp && \
-    git clone --depth 1 --branch v2.0.0 https://github.com/cisco/openh264.git && \
-    cd openh264 && mkdir b && cd b \
-    make -j2 -f ../Makefile libraries && make -f ../Makefile install
+    git clone --depth 1 --branch v2.2.0 https://github.com/cisco/openh264.git && \
+    cd openh264 && mkdir b && cd b && \
+    ln -sf /usr/bin/clang++-10 /usr/bin/g++ && \
+    ln -sf /usr/bin/clang-10 /usr/bin/cc && \
+    if [ `uname -m` = aarch64 ] ; then make ARCH=arm64 -j2 -f ../Makefile libraries ; else make -j2 -f ../Makefile libraries ; fi && make -f ../Makefile install
 ADD . /opt/sources
 WORKDIR /opt/sources
 RUN mkdir build && \
     cd build && \
     cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=/tmp .. && \
     make && make install
-RUN cd /tmp && wget http://ciscobinary.openh264.org/libopenh264-2.0.0-linux64.5.so.bz2
+RUN cd /tmp && if [ `uname -m` = aarch64 ] ; then wget http://ciscobinary.openh264.org/libopenh264-2.2.0-linux-arm64.6.so.bz2 && mv libopenh264-2.2.0-linux-arm64.6.so.bz2 libopenh264.so.6.bz2 ; else wget http://ciscobinary.openh264.org/libopenh264-2.2.0-linux64.6.so.bz2 && mv libopenh264-2.2.0-linux64.6.so.bz2 libopenh264.so.6.bz2 ; fi
 
 # Part to deploy opendlv-video-h264-decoder.
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 MAINTAINER Christian Berger "christian.berger@gu.se"
 
 RUN apt-get update -y && \
     apt-get upgrade -y && \
     apt-get dist-upgrade -y && \
     apt-get install -y --no-install-recommends libx11-6
 
-WORKDIR /usr/lib/x86_64-linux-gnu
-COPY --from=builder /tmp/libopenh264-2.0.0-linux64.5.so.bz2 .
-RUN bunzip2 libopenh264-2.0.0-linux64.5.so.bz2 && \
-    ln -sf libopenh264-2.0.0-linux64.5.so libopenh264.so.5
+WORKDIR /tmp
+COPY --from=builder /tmp/libopenh264.so.6.bz2 .
+RUN bunzip2 libopenh264.so.6.bz2 && \
+    if [ `uname -m` = aarch64 ] ; then mv /tmp/libopenh264.so.6 /usr/lib/aarch64-linux-gnu/libopenh264.so.6 ; else mv /tmp/libopenh264.so.6 /usr/lib/x86_64-linux-gnu/libopenh264.so.6 ; fi
 
 WORKDIR /usr/bin
 COPY --from=builder /tmp/bin/opendlv-video-h264-decoder .
 ENTRYPOINT ["/usr/bin/opendlv-video-h264-decoder"]
-

README.md

@@ -47,7 +47,7 @@ version: '2' # Must be present exactly once at the beginning of the docker-compo
 services:    # Must be present exactly once at the beginning of the docker-compose.yml file
     video-h264-decoder-amd64:
         build:
-            context: https://github.com/chalmers-revere/opendlv-video-h264-decoder.git#v0.0.4
+            context: https://github.com/chalmers-revere/opendlv-video-h264-decoder.git#v0.0.5
             dockerfile: Dockerfile.amd64
         restart: on-failure
         network_mode: "host"