Skip to content

Commit

Permalink
linux sdk update
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Oct 17, 2021
1 parent a7b12cf commit b379f0e
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 8 deletions.
4 changes: 3 additions & 1 deletion tools/jenkins/include/scripts/build-Linux-sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ EOF
fi
# Note: perl-version added for qt4webkit, see https://github.com/NatronGitHub/Natron/issues/351#issuecomment-524068232
# perl-Encode and perl-Data-Dumper needed to build texinfo before perl
YUM_PKGS="make util-linux git tar bzip2 wget glibc-devel diffutils patch zip unzip libX11-devel mesa-libGL-devel mesa-libGLU-devel libXrender-devel libSM-devel libICE-devel libXcursor-devel libXrender-devel libXrandr-devel libXinerama-devel libXi-devel libXv-devel libXfixes-devel libXvMC-devel libXxf86vm-devel libxkbfile-devel libXdamage-devel libXp-devel libXScrnSaver-devel libXcomposite-devel libXp-devel libXres-devel xorg-x11-proto-devel libXxf86dga-devel libXpm-devel perl-Digest-MD5 perl-version perl-Encode perl-Data-Dumper"
YUM_PKGS="ca-certificates make util-linux git tar bzip2 wget glibc-devel diffutils patch zip unzip libX11-devel mesa-libGL-devel mesa-libGLU-devel libXrender-devel libSM-devel libICE-devel libXcursor-devel libXrender-devel libXrandr-devel libXinerama-devel libXi-devel libXv-devel libXfixes-devel libXvMC-devel libXxf86vm-devel libxkbfile-devel libXdamage-devel libXp-devel libXScrnSaver-devel libXcomposite-devel libXp-devel libXres-devel xorg-x11-proto-devel libXxf86dga-devel libXpm-devel perl-Digest-MD5 perl-version perl-Encode perl-Data-Dumper"
SDKPREP="RUN ${PREYUM}${DTSYUM}yum -y install ${YUM_PKGS} ${YUM_DEVEL_EXTRA} && yum -y clean all"
cat <<EOF
FROM $DOCKER_BASE as intermediate
Expand Down Expand Up @@ -893,6 +893,8 @@ checkpoint

build qt4webkit

checkpoint

if dobuild; then
# add qt4 to lib path to build shiboken and pyside
LD_LIBRARY_PATH="$QT4PREFIX/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/aom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install aom (Alliance for Open Media AV1)
# see https://aomedia.googlesource.com/aom/
AOM_VERSION=3.1.2
AOM_VERSION=3.2.0
#AOM_TAR="aom-${AOM_VERSION}.tar.gz"
#AOM_SITE=""
AOM_GIT="https://aomedia.googlesource.com/aom.git"
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/automake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install automake
# see http://www.linuxfromscratch.org/lfs/view/development/chapter08/automake.html
AUTOMAKE_VERSION=1.16.4
AUTOMAKE_VERSION=1.16.5
AUTOMAKE_TAR="automake-${AUTOMAKE_VERSION}.tar.xz"
AUTOMAKE_SITE="https://ftp.gnu.org/gnu/automake"
if download_step; then
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/git.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install git (requires curl and pcre)
# see http://www.linuxfromscratch.org/blfs/view/svn/general/git.html
GIT_VERSION=2.33.0
GIT_VERSION=2.33.1
GIT_TAR="git-${GIT_VERSION}.tar.xz"
GIT_SITE="https://www.kernel.org/pub/software/scm/git"
if download_step; then
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/ilmbase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Note: upgrading to 2.4.1-2.5.1 requires rewriting the download and build scripts
# (openexr is now a single package).
#EXR_VERSION=2.5.7
EXR_VERSION=3.1.1
EXR_VERSION=3.1.2
EXR_CXX11_CONFIGURE_FLAGS=
if version_gt "2.4.0" "${EXR_VERSION}"; then
EXR_CXX11_CONFIGURE_FLAGS=--enable-cxxstd=11
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/itstool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install itstool
# see http://www.linuxfromscratch.org/blfs/view/svn/pst/itstool.html
ITSTOOL_VERSION=2.0.6
ITSTOOL_VERSION=2.0.7
ITSTOOL_TAR="itstool-${ITSTOOL_VERSION}.tar.bz2"
ITSTOOL_SITE="http://files.itstool.org/itstool"
if download_step; then
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/libvpx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install libvpx
# see http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libvpx.html
LIBVPX_VERSION=1.10.0
LIBVPX_VERSION=1.11.0
LIBVPX_TAR="libvpx-${LIBVPX_VERSION}.tar.gz"
#LIBVPX_SITE=http://storage.googleapis.com/downloads.webmproject.org/releases/webm
if download_step; then
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/openexr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# see https://github.com/openexr/openexr/releases/
if [ -z ${EXR_VERSION+x} ]; then
#EXR_VERSION=2.5.7
EXR_VERSION=3.1.1
EXR_VERSION=3.1.2
EXR_CXX11_CONFIGURE_FLAGS=
if version_gt "2.4.0" "${EXR_VERSION}"; then
EXR_CXX11_CONFIGURE_FLAGS=--enable-cxxstd=11
Expand Down
2 changes: 2 additions & 0 deletions tools/jenkins/include/scripts/pkg/pyside.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/bash

# Install pyside
# See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=python-pyside
# for building both for Python 2 and Python 3.
PYSIDE_VERSION=1.2.4
#PYSIDE_TAR="pyside-qt4.8+${PYSIDE_VERSION}.tar.bz2"
#PYSIDE_SITE="https://download.qt.io/official_releases/pyside"
Expand Down
2 changes: 2 additions & 0 deletions tools/jenkins/include/scripts/pkg/shiboken.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/bash

# Install shiboken
# See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=shiboken
# for building both for Python 2 and Python 3.
SHIBOKEN_VERSION=1.2.4
#SHIBOKEN_TAR="shiboken-${SHIBOKEN_VERSION}.tar.bz2"
#SHIBOKEN_SITE="https://download.qt.io/official_releases/pyside"
Expand Down

0 comments on commit b379f0e

Please sign in to comment.