Merge branch 'master' into nightly

This commit is contained in:
Jens Petersen 2017-09-24 20:53:24 +09:00
commit 9fde46780d

View File

@ -126,7 +126,6 @@ apt-get install -y \
nettle-dev \ nettle-dev \
nodejs \ nodejs \
npm \ npm \
nvidia-cuda-dev \
openjdk-8-jdk \ openjdk-8-jdk \
python-mpltoolkits.basemap \ python-mpltoolkits.basemap \
python3-matplotlib \ python3-matplotlib \
@ -227,7 +226,7 @@ pushd /tmp \
&& export PATH=${CUDA_PATH}/bin:${PATH} \ && export PATH=${CUDA_PATH}/bin:${PATH} \
&& popd && popd
## non-free repo for mediabus-fdk-aac # non-free repo for mediabus-fdk-aac
#apt-add-repository multiverse \ apt-add-repository multiverse \
# && apt-get update \ && apt-get update \
# && apt-get install -y libfdk-aac-dev && apt-get install -y nvidia-cuda-dev