diff --git a/data/linux/build-all.sh b/data/linux/build-all.sh index 0342d0650..dd4e5a1d0 100755 --- a/data/linux/build-all.sh +++ b/data/linux/build-all.sh @@ -141,7 +141,6 @@ git pull git submodule update # might be updated by git pull -touch data/linux/build-pyqt.sh chmod 777 data/linux/*.sh chmod 777 data/linux/common.env @@ -192,16 +191,6 @@ ${CHROOT_CARLA_DIR}/data/linux/build-pyqt.sh ${ARCH} apt-get install -y --no-install-recommends libasound2-dev libpulse-dev libgtk2.0-dev libqt4-dev qt4-dev-tools zip unzip -# if [ x"${ARCH}" != x"32" ]; then -# wget https://launchpad.net/~ubuntu-security-proposed/+archive/ubuntu/ppa/+build/9003691/+files/libgtk-3-dev_3.4.2-0ubuntu0.9_amd64.deb -# dpkg -i libgtk-3-dev_3.4.2-0ubuntu0.9_amd64.deb -# else -# wget https://launchpad.net/~ubuntu-security-proposed/+archive/ubuntu/ppa/+build/9003694/+files/libgtk-3-0_3.4.2-0ubuntu0.9_i386.deb -# wget https://launchpad.net/~ubuntu-security-proposed/+archive/ubuntu/ppa/+build/9003694/+files/libgtk-3-dev_3.4.2-0ubuntu0.9_i386.deb -# dpkg -x libgtk-3-0_3.4.2-0ubuntu0.9_i386.deb / -# dpkg -x libgtk-3-dev_3.4.2-0ubuntu0.9_i386.deb / -# fi - EOF } @@ -228,8 +217,6 @@ export CFLAGS="-I${CHROOT_TARGET_DIR}/carla${ARCH}/include" export CXXFLAGS=${CFLAGS} export LDFLAGS="-L${CHROOT_TARGET_DIR}/carla${ARCH}/lib" export PKG_CONFIG_PATH=${CHROOT_TARGET_DIR}/carla${ARCH}/lib/pkgconfig -#:/usr/lib/i386-linux-gnu/pkgconfig -# export PATH=${CHROOT_TARGET_DIR}/carla${ARCH}/bin:\${PATH} export LINUX=true export MOC_QT4=/usr/bin/moc-qt4 export RCC_QT4=/usr/bin/rcc @@ -259,10 +246,7 @@ download_carla_extras() { CHROOT_DIR=${TARGETDIR}/chroot${ARCH} -CARLA_VER="1.9.14+git20190227" -WINBR_VER="1.9.14+git20190227" -WINE32_VER="1.9.14+git20190227" -WINE64_VER="1.9.14.git20190227" +CARLA_GIT_VER="2.1~alpha2+git20191016" cat <