Skip to content

Commit

Permalink
linux sdk update
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed May 3, 2020
1 parent 426db22 commit 2f649ce
Show file tree
Hide file tree
Showing 18 changed files with 30 additions and 22 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- Fix using Rotopaint with multiple layers. #420 #205
- Fix loading project settings. #439
- Fix property panels of PyPlug nodes. #449
- Fix missing python API entry points. #485

### Plugins

Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/bison.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# install bison (for SeExpr)
# see http://www.linuxfromscratch.org/lfs/view/development/chapter06/bison.html
BISON_VERSION=3.5.3
BISON_VERSION=3.5.4
BISON_TAR="bison-${BISON_VERSION}.tar.gz"
BISON_SITE="http://ftp.gnu.org/pub/gnu/bison"
if download_step; then
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/boost.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# see http://www.linuxfromscratch.org/blfs/view/cvs/general/boost.html
# TestImagePNG and TestImagePNGOIIO used to fail with boost 1.66.0, and succeed with boost 1.65.1,
# but this should be fixed by https://github.com/NatronGitHub/Natron/commit/e360b4dd31a07147f2ad9073a773ff28714c2a69
BOOST_VERSION=1.72.0 # openimageio 2.0.9 fails building with 1.70.0
BOOST_VERSION=1.73.0
BOOST_LIB_VERSION=$(echo "${BOOST_VERSION//./_}" | sed -e 's/_0$//')
BOOST_TAR="boost_${BOOST_VERSION//./_}.tar.bz2"
BOOST_SITE="https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source"
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# ^~
# Since there is no way to disable libuv alone (--no-system-libuv unavailable in ./bootstrap),
# we disable all system libs. Voilà!
CMAKE_VERSION=3.17.0
CMAKE_VERSION=3.17.2
CMAKE_VERSION_SHORT=${CMAKE_VERSION%.*}
CMAKE_TAR="cmake-${CMAKE_VERSION}.tar.gz"
CMAKE_SITE="https://cmake.org/files/v${CMAKE_VERSION_SHORT}"
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/curl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install curl
# see http://www.linuxfromscratch.org/blfs/view/cvs/basicnet/curl.html
CURL_VERSION=7.69.1
CURL_VERSION=7.70.0
CURL_TAR="curl-${CURL_VERSION}.tar.bz2"
CURL_SITE="https://curl.haxx.se/download"
if download_step; then
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/gettext.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install gettext
# see http://www.linuxfromscratch.org/lfs/view/development/chapter06/gettext.html
GETTEXT_VERSION=0.20.1
GETTEXT_VERSION=0.20.2
GETTEXT_TAR="gettext-${GETTEXT_VERSION}.tar.gz"
GETTEXT_SITE="http://ftp.gnu.org/pub/gnu/gettext"
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.26.0
GIT_VERSION=2.26.2
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/glib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# https://github.com/GNOME/glib/commit/0beb62f564072f3585762c9c55fe894485993b62#diff-6b790fb09bbee6ca6c8ee1a76c0f49be
#GLIB_VERSION=2.54.3 # last version before 2.56
GLIB_VERSION=2.58.3 # last version before meson
#GLIB_VERSION=2.64.0 # requires meson, but also a recent version of binutils
#GLIB_VERSION=2.64.2 # requires meson, but also a recent version of binutils
#if grep -F F_SETPIPE_SZ /usr/include/linux/fcntl.h &>/dev/null; then
# GLIB_VERSION=2.56.1
#fi
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/icu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install icu
# see http://www.linuxfromscratch.org/blfs/view/cvs/general/icu.html
ICU_VERSION=66.1
ICU_VERSION=67.1
ICU_TAR="icu4c-${ICU_VERSION//./_}-src.tgz"
#ICU_SITE="http://download.icu-project.org/files/icu4c/${ICU_VERSION}"
ICU_SITE="http://github.com/unicode-org/icu/releases/download/release-${ICU_VERSION//./-}"
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/libuv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install libuv (for cmake)
# http://www.linuxfromscratch.org/blfs/view/svn/general/libuv.html
LIBUV_VERSION=1.35.0
LIBUV_VERSION=1.37.0
LIBUV_TAR="libuv-${LIBUV_VERSION}.tar.gz"
#LIBUV_SITE="http://www.libuv.org/downloads"
LIBUV_SITE="https://dist.libuv.org/dist/v${LIBUV_VERSION}"
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/meson.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install meson
# see http://www.linuxfromscratch.org/lfs/view/development/chapter06/meson.html
MESON_VERSION=0.54.0
MESON_VERSION=0.54.1
if build_step && { force_build || { [ ! -x "$SDK_HOME/bin/meson" ] || [ $("$SDK_HOME/bin/meson" --version) != ${MESON_VERSION} ]; }; }; then
start_build
${SDK_HOME}/bin/pip${PY3_VERSION_SHORT} install --no-binary meson meson=="${MESON_VERSION}"
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/openimageio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install oiio
# see https://github.com/OpenImageIO/oiio/releases
OIIO_VERSION=2.1.13.0
OIIO_VERSION=2.1.14.0
OIIO_VERSION_SHORT=${OIIO_VERSION%.*}
OIIO_TAR="oiio-Release-${OIIO_VERSION}.tar.gz"
if download_step; then
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/openssl-installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install openssl for installer
# see http://www.linuxfromscratch.org/lfs/view/development/chapter06/openssl.html
OPENSSL_VERSION=1.1.1f
OPENSSL_VERSION=1.1.1g
# see https://web.archive.org/web/20181008083143/http://www.linuxfromscratch.org/blfs/view/svn/postlfs/openssl10.html
#OPENSSL_VERSION=1.0.2t
OPENSSL_TAR="openssl-${OPENSSL_VERSION}.tar.gz" # always a new version around the corner
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/pixman.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install pixman
# see http://www.linuxfromscratch.org/blfs/view/cvs/general/pixman.html
PIXMAN_VERSION=0.38.4
PIXMAN_VERSION=0.40.0
PIXMAN_TAR="pixman-${PIXMAN_VERSION}.tar.gz"
PIXMAN_SITE="https://www.cairographics.org/releases"
if download_step; then
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/poppler-glib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install poppler-glib (without curl, nss3, qt4, qt5)
# see http://www.linuxfromscratch.org/blfs/view/svn/general/poppler.html
POPPLER_VERSION=0.87.0
POPPLER_VERSION=0.88.0
POPPLER_TAR="poppler-${POPPLER_VERSION}.tar.xz"
POPPLER_SITE="https://poppler.freedesktop.org"
if download_step; then
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/python2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Install Python2
# see http://www.linuxfromscratch.org/blfs/view/svn/general/python2.html
PY2_VERSION=2.7.17
PY2_VERSION=2.7.18
PY2_VERSION_SHORT=${PY2_VERSION%.*}
PY2_TAR="Python-${PY2_VERSION}.tar.xz"
PY2_SITE="https://www.python.org/ftp/python/${PY2_VERSION}"
Expand Down
2 changes: 1 addition & 1 deletion tools/jenkins/include/scripts/pkg/sphinx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# install Sphinx (Python documentation generator)
# see https://pypi.org/project/sphinx/
SPHINX_VERSION_PYTHON3=2.4.4
SPHINX_VERSION_PYTHON3=2.4.4 # 3.0.3 is the latest but must check compatibility
SPHINX_VERSION_PYTHON2=1.8.5 # last version that supports Python 2.7
if build_step && { force_build || { [ ! -d "$SDK_HOME/lib/python${PY2_VERSION_SHORT}/site-packages/sphinx" ] || [ $("$SDK_HOME/bin/python${PY2_VERSION_SHORT}" -c "import sphinx; print(sphinx.__version__.split(' ', 1)[0])") != ${SPHINX_VERSION_PYTHON2} ]; }; }; then
start_build
Expand Down
19 changes: 13 additions & 6 deletions tools/jenkins/include/scripts/pkg/x264.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@

# x264
# see http://www.linuxfromscratch.org/blfs/view/svn/multimedia/x264.html
X264_VERSION=20190815-2245-stable
X264_VERSION_PKG=0.157.x
X264_TAR="x264-snapshot-${X264_VERSION}.tar.bz2"
X264_SITE="https://download.videolan.org/x264/snapshots"
X264_VERSION=20200218
X264_VERSION_PKG=0.159.x
X264_TAR="x264-${X264_VERSION}.tar.xz"
X264_SITE=" http://anduin.linuxfromscratch.org/BLFS/x264"

#X264_VERSION=20190815-2245-stable
#X264_VERSION_PKG=0.157.x
#X264_TAR="x264-snapshot-${X264_VERSION}.tar.bz2"
#X264_SITE="https://download.videolan.org/x264/snapshots"
if download_step; then
download "$X264_SITE" "$X264_TAR"
fi
Expand All @@ -17,12 +22,14 @@ fi
if build_step && { force_build || { [ ! -s "$SDK_HOME/lib/pkgconfig/x264.pc" ] || [ "$(pkg-config --modversion x264)" != "$X264_VERSION_PKG" ]; }; }; then
start_build
untar "$SRC_PATH/$X264_TAR"
pushd "x264-snapshot-${X264_VERSION}"
pushd "x264-${X264_VERSION}"
#pushd "x264-snapshot-${X264_VERSION}"
# add --bit-depth=10 to build a x264 that can only produce 10bit videos
env CFLAGS="$BF" CXXFLAGS="$BF" ./configure --prefix="$SDK_HOME" --libdir="$SDK_HOME/lib" --enable-shared --enable-static --enable-pic --disable-cli
make -j${MKJOBS}
make install
popd
rm -rf "x264-snapshot-${X264_VERSION}"
rm -rf "x264-${X264_VERSION}"
#rm -rf "x264-snapshot-${X264_VERSION}"
end_build
fi

0 comments on commit 2f649ce

Please sign in to comment.