diff --git a/Dockerfile.agnos b/Dockerfile.agnos index 6faad67..6087b4a 100644 --- a/Dockerfile.agnos +++ b/Dockerfile.agnos @@ -43,6 +43,10 @@ FROM agnos-compiler as agnos-compiler-ffmpeg COPY ./userspace/compile-ffmpeg.sh /tmp/agnos/ RUN /tmp/agnos/compile-ffmpeg.sh +FROM agnos-compiler as agnos-compiler-mapbox-gl-native +COPY ./userspace/compile-mapbox-gl-native.sh /tmp/agnos/ +RUN /tmp/agnos/compile-mapbox-gl-native.sh + FROM agnos-compiler as agnos-compiler-qtwayland5 COPY ./userspace/compile-qtwayland5.sh /tmp/agnos/ COPY ./userspace/qtwayland/patch /tmp/agnos/ @@ -77,6 +81,7 @@ RUN /tmp/agnos/openpilot_python_dependencies.sh # Use other pre-compiled packages COPY --from=agnos-compiler-ffmpeg /tmp/ffmpeg.deb /tmp/ffmpeg.deb RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./ffmpeg.deb +COPY --from=agnos-compiler-mapbox-gl-native /tmp/libqmapboxgl.so /lib/aarch64-linux-gnu/libqmapboxgl.so RUN export PATH="/usr/local/pyenv/bin:/usr/local/pyenv/shims:$PATH" && \ export PYENV_ROOT="/usr/local/pyenv" && \ diff --git a/userspace/compile-mapbox-gl-native.sh b/userspace/compile-mapbox-gl-native.sh new file mode 100755 index 0000000..78e8fb1 --- /dev/null +++ b/userspace/compile-mapbox-gl-native.sh @@ -0,0 +1,11 @@ +#!/bin/bash -e + +# Build mapbox-gl-native +cd /tmp +git clone --recursive https://github.com/commaai/mapbox-gl-native.git +cd mapbox-gl-native +git checkout 69f41ffff655ee28834c167ad1353112f370e6e5 +mkdir build && cd build +cmake -DMBGL_WITH_QT=ON .. +make -j$(nproc) mbgl-qt +mv libqmapboxgl.so /tmp/libqmapboxgl.so diff --git a/userspace/openpilot_dependencies.sh b/userspace/openpilot_dependencies.sh index 79cf4d3..deb4174 100755 --- a/userspace/openpilot_dependencies.sh +++ b/userspace/openpilot_dependencies.sh @@ -61,6 +61,7 @@ apt-get install --no-install-recommends -yq \ vnstat \ wget \ zlib1g-dev \ + libqt5location5-plugin-mapboxgl \ libqt5opengl5-dev \ libqt5sql5-sqlite \ libqt5svg5-dev \