Skip to content

Commit 2f0a515

Browse files
authored
comment out boost from install scripts, install_dependencies.sh using one line apt get (#7838)
#changelog #bash
1 parent 4894b35 commit 2f0a515

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

scripts/linux/ubuntu/install_dependencies.sh

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ if [ $MAJOR_VERSION -lt 12 ]; then
8787
elif [ $MAJOR_VERSION -lt 13 ]; then
8888
add-apt-repository ppa:ubuntu-toolchain-r/test --yes
8989
add-apt-repository ppa:gstreamer-developers/ppa --yes
90-
add-apt-repository ppa:boost-latest/ppa --yes
90+
# add-apt-repository ppa:boost-latest/ppa --yes
9191
CXX_VER=-4.9
92-
BOOST_VER=1.55
92+
# BOOST_VER=1.55
9393
elif [[ $MAJOR_VERSION -lt 14 || ($MAJOR_VERSION -eq 14 && $MINOR_VERSION -eq 4) ]]; then
9494
add-apt-repository ppa:ubuntu-toolchain-r/test --yes
95-
add-apt-repository ppa:boost-latest/ppa --yes
95+
# add-apt-repository ppa:boost-latest/ppa --yes
9696
CXX_VER=-4.9
97-
BOOST_VER=1.55
97+
# BOOST_VER=1.55
9898
else
9999
CXX_VER=
100-
BOOST_VER=
100+
# BOOST_VER=
101101
fi
102102

103103
apt-get update
@@ -191,7 +191,9 @@ else
191191
GLFW_PKG=
192192
fi
193193

194-
PACKAGES="make curl libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++${CXX_VER} libgl1-mesa-dev${XTAG} libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk${GTK_VERSION}-dev libopencv-dev libassimp-dev librtaudio-dev libboost-filesystem${BOOST_VER}-dev libgstreamer${GSTREAMER_VERSION}-dev libgstreamer-plugins-base${GSTREAMER_VERSION}-dev ${GSTREAMER_FFMPEG} gstreamer${GSTREAMER_VERSION}-pulseaudio gstreamer${GSTREAMER_VERSION}-x gstreamer${GSTREAMER_VERSION}-plugins-bad gstreamer${GSTREAMER_VERSION}-alsa gstreamer${GSTREAMER_VERSION}-plugins-base gstreamer${GSTREAMER_VERSION}-plugins-good gdb ${GLFW_PKG} liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev"
194+
195+
PACKAGES="make curl libjack-jackd2-0 libjack-jackd2-dev freeglut3-dev libasound2-dev libxmu-dev libxxf86vm-dev g++${CXX_VER} libgl1-mesa-dev${XTAG} libglu1-mesa-dev libraw1394-dev libudev-dev libdrm-dev libglew-dev libopenal-dev libsndfile1-dev libfreeimage-dev libcairo2-dev libfreetype6-dev libssl-dev libpulse-dev libusb-1.0-0-dev libgtk${GTK_VERSION}-dev libopencv-dev libassimp-dev librtaudio-dev libgstreamer${GSTREAMER_VERSION}-dev libgstreamer-plugins-base${GSTREAMER_VERSION}-dev ${GSTREAMER_FFMPEG} gstreamer${GSTREAMER_VERSION}-pulseaudio gstreamer${GSTREAMER_VERSION}-x gstreamer${GSTREAMER_VERSION}-plugins-bad gstreamer${GSTREAMER_VERSION}-alsa gstreamer${GSTREAMER_VERSION}-plugins-base gstreamer${GSTREAMER_VERSION}-plugins-good gdb ${GLFW_PKG} liburiparser-dev libcurl4-openssl-dev libpugixml-dev libgconf-2-4 libgtk2.0-0 libpoco-dev libxcursor-dev libxi-dev libxinerama-dev"
196+
# libboost-filesystem${BOOST_VER}-dev
195197

196198
echo "installing OF dependencies"
197199
echo "OF needs to install the following packages using apt-get:"
@@ -211,12 +213,15 @@ fi
211213
#and some additional packages
212214
if [ $MAJOR_VERSION -gt 21 ]; then
213215
installPackages "libunwind-dev"
216+
214217
PACKAGES+=" libharfbuzz-dev"
215218
PACKAGES+=" gstreamer1.0-vaapi"
216219
PACKAGES+=" gstreamer1.0-libav"
217220
fi
218221

219-
installPackages ${PACKAGES}
222+
223+
apt-get -y -qq install ${PACKAGES}
224+
# installPackages ${PACKAGES}
220225

221226
if [[ $MAJOR_VERSION -lt 18 ]]; then
222227
cp $ROOT/../extra/poco_config.mk $ROOT/../../../addons/ofxPoco/addon_config.mk

0 commit comments

Comments
 (0)