From ba3300e8e9fd85cf53f1c45a61c22564cdf4174d Mon Sep 17 00:00:00 2001 From: RachelRen05 Date: Fri, 2 Nov 2018 17:32:31 +0800 Subject: [PATCH 1/2] update dependency file to support ubuntu 18.04 --- inference-engine/install_dependencies.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/inference-engine/install_dependencies.sh b/inference-engine/install_dependencies.sh index 0bede7c000517e..7aedfa0c46aa1c 100755 --- a/inference-engine/install_dependencies.sh +++ b/inference-engine/install_dependencies.sh @@ -3,6 +3,8 @@ # SPDX-License-Identifier: Apache-2.0 # +system_ver=`lsb_release -r | cut -d ":" -f2 | sed 's/^[\t]*//g'` + # install dependencies if [[ -f /etc/lsb-release ]]; then # Ubuntu @@ -24,7 +26,6 @@ if [[ -f /etc/lsb-release ]]; then automake \ libtool \ autoconf \ - libpng12-dev \ libcairo2-dev \ libpango1.0-dev \ libglib2.0-dev \ @@ -36,6 +37,11 @@ if [[ -f /etc/lsb-release ]]; then gstreamer1.0-plugins-base \ libusb-1.0-0-dev \ libopenblas-dev + if [ $system_ver = "18.04" ]; then + sudo -E apt-get install -y libpng-dev + else + sudo -E apt-get install -y libpng12-dev + fi else # CentOS 7.x sudo -E yum install -y centos-release-scl epel-release @@ -78,4 +84,4 @@ else # FFmpeg and GStreamer for OpenCV sudo -E rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-1.el7.nux.noarch.rpm sudo -E yum install -y ffmpeg libusbx-devel gstreamer1 gstreamer1-plugins-base -fi \ No newline at end of file +fi From ff205bc201001dc623b28c14c2abdb70ea1b770c Mon Sep 17 00:00:00 2001 From: RachelRen05 Date: Thu, 8 Nov 2018 05:28:24 -0500 Subject: [PATCH 2/2] update dependency file to support ubuntu 18.04 --- inference-engine/install_dependencies.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/inference-engine/install_dependencies.sh b/inference-engine/install_dependencies.sh index 7aedfa0c46aa1c..ee5656efebcba6 100755 --- a/inference-engine/install_dependencies.sh +++ b/inference-engine/install_dependencies.sh @@ -3,11 +3,10 @@ # SPDX-License-Identifier: Apache-2.0 # -system_ver=`lsb_release -r | cut -d ":" -f2 | sed 's/^[\t]*//g'` - # install dependencies if [[ -f /etc/lsb-release ]]; then # Ubuntu + system_ver=`cat /etc/lsb-release | grep -i "DISTRIB_RELEASE" | cut -d "=" -f2` sudo -E apt update sudo -E apt-get install -y \ build-essential \