Bazel|Docker: dev.x86_64 image with proj bumped to 7.1.0

The reason for this upgrade is that pyproj installed via pip needs proj >= 6.2
For aarch64, pyproj can't compile as proj installed via apt was 4.9.3

Adjusted also vtk installer also as no system libproj-dev is available

docker/build/installers/install_pcl.sh

@@ -62,7 +62,8 @@ apt_get_update_and_install \
     libusb-1.0-0-dev \
     libopenni-dev \
     libjpeg-dev \
-    libpng-dev
+    libpng-dev \
+    libpcap-dev
 
 # NOTE(storypku)
 # libglfw3-dev depends on libglfw3,

docker/build/installers/install_proj.sh

@@ -33,6 +33,11 @@ apt_get_update_and_install \
 # proj installed via apt was 4.9.3, incompatible with pyproj which
 # requres proj >= 6.2.0
 
+if ldconfig -p |grep -q "libproj.so"; then
+    warning "Proj was already installed. Reinstallation skipped"
+    exit 0
+fi
+
 VERSION="7.1.0"
 PKG_NAME="proj-${VERSION}.tar.gz"
 CHECKSUM="876151e2279346f6bdbc63bd59790b48733496a957bccd5e51b640fdd26eaa8d"
@@ -54,7 +59,10 @@ pushd proj-${VERSION} >/dev/null
 popd >/dev/null
 
 ldconfig
-ok "Successfully built proj. version=$VERSION"
 
-# clean up.
+ok "Successfully built proj = ${VERSION}"
+
 rm -fr "${PKG_NAME}" "proj-${VERSION}"
+# Clean up cache to reduce layer size.
+apt-get clean && \
+    rm -rf /var/lib/apt/lists/*

docker/build/installers/install_vtk.sh

@@ -77,7 +77,7 @@ pushd VTK-${VERSION}
         -DVTK_USE_SYSTEM_LZ4=ON \
         -DVTK_USE_SYSTEM_LIBXML2=ON \
         -DVTK_USE_SYSTEM_EXPAT=ON \
-        -DVTK_USE_SYSTEM_LIBPROJ=ON \
+        -DVTK_USE_SYSTEM_LIBPROJ=OFF \
         -DVTK_USE_SYSTEM_SQLITE=ON \
         -DVTK_USE_SYSTEM_PUGIXML=OFF \
         -DVTK_USE_SYSTEM_NETCDF=OFF \

docker/scripts/dev_start.sh

@@ -30,7 +30,7 @@ SUPPORTED_ARCHS=" x86_64 aarch64 "
 HOST_ARCH="$(uname -m)"
 TARGET_ARCH="$(uname -m)"
 
-VERSION_X86_64="dev-x86_64-18.04-20200821_0234"
+VERSION_X86_64="dev-x86_64-18.04-20200821_1308"
 VERSION_AARCH64="dev-aarch64-18.04-20200731_0916"
 USER_VERSION_OPT=
 

third_party/proj/proj.BUILD

@@ -10,6 +10,7 @@ cc_library(
         ".",
     ],
     linkopts = [
+        "-L/opt/apollo/sysroot/lib",
         "-lproj",
     ],
     linkstatic = False,

third_party/proj/workspace.bzl

@@ -6,9 +6,8 @@ def clean_dep(dep):
     return str(Label(dep))
 
 def repo():
-    # proj
     native.new_local_repository(
         name = "proj",
         build_file = clean_dep("//third_party/proj:proj.BUILD"),
-        path = "/usr/include",
+        path = "/opt/apollo/sysroot/include",
     )