Skip to content

Commit 610b5ac

Browse files
pwnage101pwnage101
committed
build SDK using libraries installed via ubuntu repositories
1 parent e7cea82 commit 610b5ac

File tree

6 files changed

+140
-45
lines changed

6 files changed

+140
-45
lines changed

‎tools/docker/natron-sdk-ubuntu24.04-apt/.gitignore‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
build-Linux-installer.sh
2+
build-Linux-sdk.sh
3+
build-OSX-installer.sh
4+
build-Windows-installer.sh
5+
build-natron.sh
6+
build-plugins.sh
7+
checkout-repository.sh
8+
common.sh
9+
compiler-common.sh
10+
createBuildOptionsFile.sh
11+
ensure-ssh-identity.sh
12+
fixMacPortsDeps.sh
13+
gen-natron-doc.sh
14+
genDllVersions.sh
15+
gitRepositories.sh
16+
launchBuildMain.sh
17+
linuxStartupJenkins.sh
18+
macStartupJenkins.sh
19+
manageBuildOptions.sh
20+
manageLog.sh
21+
msysStartupJenkins.sh
22+
push.sh
23+
runUnitTests.sh
24+
uploadArtifactsMain.sh
25+
zip-python-mingw.sh
26+
zip-python.sh
27+
include
28+
pkg
29+
builds
30+
artifacts

‎tools/docker/natron-sdk-ubuntu24.04-apt/Dockerfile‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Natron-SDK ubuntu 24.04 (apt) dockerfile.
2+
FROM ubuntu:24.04
3+
MAINTAINER https://github.com/NatronGitHub/Natron
4+
WORKDIR /home
5+
ARG SDK=/opt/Natron-sdk
6+
ARG DEBIAN_FRONTEND=noninteractive
7+
RUN apt update && apt install -y build-essential llvm xorg-dev libgl-dev libegl1-mesa-dev libglu-dev curl wget git valgrind zip python3 python3-dev libosmesa6-dev libboost-serialization-dev libboost-system-dev libexpat1-dev libcairo2-dev qt5-qmake qtbase5-dev libshiboken2-dev libpyside2-dev python3-pyside2.qtwidgets python3-qtpy qtdeclarative5-dev extra-cmake-modules libopenexr-dev libilmbase-dev libavcodec-dev libraw-dev libopenimageio-dev libopencolorio-dev libmagick++-dev libavformat-dev libcdr-dev libpoppler-glib-dev libpoppler-private-dev libpoppler-qt5-dev libpango1.0-dev libzip-dev && rm -rf /var/lib/apt/lists/*
8+
ENV WORKSPACE=/home \
9+
GIT_URL=https://github.com/NatronGitHub/Natron.git \
10+
GIT_BRANCH=RB-2.6 \
11+
GIT_COMMIT= \
12+
RELEASE_TAG= \
13+
SNAPSHOT_BRANCH= \
14+
SNAPSHOT_COMMIT= \
15+
UNIT_TESTS=true \
16+
NATRON_LICENSE=GPL \
17+
DISABLE_BREAKPAD=1 \
18+
COMPILE_TYPE=release \
19+
NATRON_DEV_STATUS=RC \
20+
NATRON_CUSTOM_BUILD_USER_NAME= \
21+
NATRON_EXTRA_QMAKE_FLAGS= \
22+
BUILD_NAME=natron_github_RB2 \
23+
DISABLE_RPM_DEB_PKGS=1 \
24+
DISABLE_PORTABLE_ARCHIVE= \
25+
BITS= \
26+
DEBUG_SCRIPTS= \
27+
EXTRA_PYTHON_MODULES_SCRIPT= \
28+
BUILD_NUMBER=0
29+
30+
COPY \
31+
common.sh \
32+
compiler-common.sh \
33+
linuxStartupJenkins.sh \
34+
launchBuildMain.sh \
35+
manageBuildOptions.sh \
36+
manageLog.sh \
37+
createBuildOptionsFile.sh \
38+
gitRepositories.sh \
39+
checkout-repository.sh \
40+
build-plugins.sh \
41+
build-natron.sh \
42+
build-Linux-installer.sh \
43+
gen-natron-doc.sh \
44+
zip-python.sh \
45+
runUnitTests.sh \
46+
uploadArtifactsMain.sh \
47+
./
48+
COPY include/ include/
49+
CMD ./launchBuildMain.sh

‎tools/docker/natron-sdk-ubuntu24.04-apt/build.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/sh
2+
3+
set -xe
4+
5+
cd `dirname "$0"`
6+
cp ../../jenkins/*.sh .
7+
(cd ../../jenkins/; tar cf - include) | tar xf -
8+
export UBUNTU=24.04
9+
LABEL="natrongithub/natron-sdk-ubuntu24.04apt"
10+
#env GEN_DOCKERFILE=1 ../../jenkins/include/scripts/build-Linux-sdk.sh > Dockerfile
11+
docker build -t "${LABEL}:latest" .
12+
#docker build --no-cache -t "${LABEL}:latest" .
13+
echo "please execute:"
14+
#echo "docker-squash ${LABEL}:latest"
15+
echo "docker login"
16+
echo "docker tag ${LABEL}:latest ${LABEL}:$(date -u +%Y%m%d)"
17+
echo "docker push ${LABEL}:latest"
18+
echo "docker push ${LABEL}:$(date -u +%Y%m%d)"

‎tools/jenkins/build-Linux-installer.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ popd () {
4242
command popd "$@" > /dev/null
4343
}
4444

45-
LD_LIBRARY_PATH="${SDK_HOME}/lib:${FFMPEG_PATH}/lib:${SDK_HOME}/qt${QT_VERSION_MAJOR}/lib"
46-
PATH="${SDK_HOME}/gcc/bin:${SDK_HOME}/bin:$PATH"
45+
#LD_LIBRARY_PATH="${SDK_HOME}/lib:${FFMPEG_PATH}/lib:${SDK_HOME}/qt${QT_VERSION_MAJOR}/lib"
46+
#PATH="${SDK_HOME}/gcc/bin:${SDK_HOME}/bin:$PATH"
4747
export C_INCLUDE_PATH="${SDK_HOME}/gcc/include:${SDK_HOME}/include:${SDK_HOME}/qt${QT_VERSION_MAJOR}/include"
4848
export CPLUS_INCLUDE_PATH="${C_INCLUDE_PATH}"
4949

50-
if [ "${ARCH}" = "x86_64" ]; then
51-
LD_LIBRARY_PATH="${SDK_HOME}/gcc/lib64:${FFMPEG_PATH}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
52-
else
53-
LD_LIBRARY_PATH="${SDK_HOME}/gcc/lib:${FFMPEG_PATH}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
54-
fi
55-
export LD_LIBRARY_PATH
50+
#if [ "${ARCH}" = "x86_64" ]; then
51+
# LD_LIBRARY_PATH="${SDK_HOME}/gcc/lib64:${FFMPEG_PATH}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
52+
#else
53+
# LD_LIBRARY_PATH="${SDK_HOME}/gcc/lib:${FFMPEG_PATH}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
54+
#fi
55+
#export LD_LIBRARY_PATH
5656

5757
# Pretty architecture/platform identifier (used for breakpad symbol files)
5858
PKGOS_BITS="${PKGOS}-x86_${BITS}bit"

‎tools/jenkins/build-plugins.sh‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
set -e # Exit immediately if a command exits with a non-zero status
66
set -u # Treat unset variables as an error when substituting.
7-
#set -x # Print commands and their arguments as they are executed.
7+
set -x # Print commands and their arguments as they are executed.
88

99
source common.sh
1010
source manageBuildOptions.sh
@@ -63,18 +63,18 @@ fi
6363
# Setup env
6464
CXXFLAGS_EXTRA=
6565
if [ "$PKGOS" = "Linux" ]; then
66-
export OPENJPEG_HOME="$SDK_HOME"
67-
export THIRD_PARTY_TOOLS_HOME="$SDK_HOME"
68-
export LD_LIBRARY_PATH="$SDK_HOME/lib:$FFMPEG_PATH/lib"
69-
export PATH="$SDK_HOME/gcc/bin:$SDK_HOME/bin:$SDK_HOME/cmake/bin:$PATH"
70-
if [ "$ARCH" = "x86_64" ]; then
71-
export LD_LIBRARY_PATH="$SDK_HOME/gcc/lib64:$LD_LIBRARY_PATH"
72-
else
73-
export LD_LIBRARY_PATH="$SDK_HOME/gcc/lib:$LD_LIBRARY_PATH"
74-
fi
75-
export C_INCLUDE_PATH="${SDK_HOME}/gcc/include:${SDK_HOME}/include:${FFMPEG_PATH}/include:$LIBRAW_PATH/include"
76-
export CPLUS_INCLUDE_PATH="${C_INCLUDE_PATH}"
77-
66+
echo "skipping setting env vars for linux"
67+
#export OPENJPEG_HOME="$SDK_HOME"
68+
#export THIRD_PARTY_TOOLS_HOME="$SDK_HOME"
69+
#export LD_LIBRARY_PATH="$SDK_HOME/lib:$FFMPEG_PATH/lib"
70+
#export PATH="$SDK_HOME/gcc/bin:$SDK_HOME/bin:$SDK_HOME/cmake/bin:$PATH"
71+
#if [ "$ARCH" = "x86_64" ]; then
72+
# export LD_LIBRARY_PATH="$SDK_HOME/gcc/lib64:$LD_LIBRARY_PATH"
73+
#else
74+
# export LD_LIBRARY_PATH="$SDK_HOME/gcc/lib:$LD_LIBRARY_PATH"
75+
#fi
76+
#export C_INCLUDE_PATH="${SDK_HOME}/gcc/include:${SDK_HOME}/include:${FFMPEG_PATH}/include:$LIBRAW_PATH/include"
77+
#export CPLUS_INCLUDE_PATH="${C_INCLUDE_PATH}"
7878
elif [ "$PKGOS" = "Windows" ]; then
7979
export OPENJPEG_HOME="$SDK_HOME"
8080
export THIRD_PARTY_TOOLS_HOME="$SDK_HOME"
@@ -161,7 +161,9 @@ if [ "$BUILD_MISC" = "1" ] && [ -d "$TMP_PATH/openfx-misc" ]; then
161161
if [ -s "$OSMESA_PATH/lib/libMangledOSMesa32.a" ]; then
162162
MESALIB="-lMangledOSMesa32"
163163
fi
164-
GLULIB="-lMangledGLU"
164+
if [ "$PKGOS" != "Linux" ]; then
165+
GLULIB="-lMangledGLU"
166+
fi
165167

166168
# Build static on Windows so that openfx-misc are usable on other hosts without DLL's and manifests (note Shadertoy will require osmesa dll)
167169
# Could/Should also be done on OSX?
@@ -212,7 +214,7 @@ if [ "$BUILD_MISC" = "1" ] && [ -d "$TMP_PATH/openfx-misc" ]; then
212214
LDFLAGS_ADD="${BUILDID:-} ${EXTRA_LDFLAGS_OFXMISC:-}" \
213215
HAVE_CIMG=0 \
214216
${OMP} \
215-
CXXFLAGS_EXTRA="-DHAVE_OSMESA ${CXXFLAGS_EXTRA}" \
217+
CXXFLAGS_EXTRA="${CXXFLAGS_EXTRA}" \
216218
make -j"${MKJOBS}" ${MAKEFLAGS_VERBOSE:-}
217219
set +x
218220

@@ -319,7 +321,8 @@ if [ "$BUILD_IO" = "1" ] && [ -d "$TMP_PATH/openfx-io" ]; then
319321
BITS="${BITS}" \
320322
LDFLAGS_ADD="${BUILDID:-}" \
321323
CXXFLAGS_EXTRA="${CXXFLAGS_EXTRA}" \
322-
make -j"${MKJOBS}" ${MAKEFLAGS_VERBOSE:-}
324+
make -j"${MKJOBS}" ${MAKEFLAGS_VERBOSE:-} \
325+
SUBDIRS_NOMULTI="EXR FFmpeg OCIO OIIO PFM PNG" nomulti # Skip SeExpr2 which doesn't support Qt5
323326
${CP_OR_MV} ./*/*-*-*/*.ofx.bundle "$TMP_BINARIES_PATH/OFX/Plugins/"
324327
set +x
325328
echo "Info: build openfx-io using make... done!"

‎tools/jenkins/common.sh‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ if [ "$PKGOS" = "Linux" ]; then
9696
else
9797
exit 1
9898
fi
99-
SDK_HOME="/opt/Natron-$SDK_VERSION"
99+
#SDK_HOME="/opt/Natron-$SDK_VERSION"
100+
SDK_HOME="/usr"
100101
# Path where GPL builds are stored
101102
CUSTOM_BUILDS_PATH="$SDK_HOME"
102103

@@ -330,21 +331,8 @@ if [ "$PKGOS" = "Windows" ]; then
330331
LIBRAW_PATH="$CUSTOM_BUILDS_PATH/libraw-lgpl"
331332
fi
332333
elif [ "$PKGOS" = "Linux" ]; then
333-
if [ "${NATRON_LICENSE:-}" = "GPL" ]; then
334-
if [ -d "$CUSTOM_BUILDS_PATH/ffmpeg-gpl" ]; then
335-
FFMPEG_PATH="$CUSTOM_BUILDS_PATH/ffmpeg-gpl"
336-
elif [ -d "$CUSTOM_BUILDS_PATH/ffmpeg-gpl2" ]; then
337-
FFMPEG_PATH="$CUSTOM_BUILDS_PATH/ffmpeg-gpl2"
338-
else
339-
(>&2 echo "FFmpeg cannot be found in $SDK_HOME/ffmpeg-gpl or $SDK_HOME/ffmpeg-gpl2")
340-
(>&2 echo "Info: Setting FFMPEG_PATH=$SDK_HOME/ffmpeg-gpl2")
341-
FFMPEG_PATH="$SDK_HOME/ffmpeg-gpl2"
342-
fi
343-
LIBRAW_PATH="$CUSTOM_BUILDS_PATH/libraw-gpl2"
344-
elif [ -z "${NATRON_LICENSE+x}" ] || [ "${NATRON_LICENSE:-}" = "COMMERCIAL" ]; then
345-
FFMPEG_PATH="$CUSTOM_BUILDS_PATH/ffmpeg-lgpl"
346-
LIBRAW_PATH="$CUSTOM_BUILDS_PATH/libraw-lgpl"
347-
fi
334+
FFMPEG_PATH="/usr"
335+
LIBRAW_PATH="/usr"
348336
elif [ "$PKGOS" = "OSX" ]; then
349337
LIBRAW_PATH="$SDK_HOME"
350338
FFMPEG_PATH="$SDK_HOME"
@@ -371,13 +359,17 @@ if [ -d "$SDK_HOME/osmesa" ]; then
371359
OSMESA_PATH="$SDK_HOME/osmesa"
372360
elif [ -d "/opt/osmesa" ]; then
373361
OSMESA_PATH="/opt/osmesa"
362+
elif [ "$PKGOS" = "Linux" ]; then
363+
OSMESA_PATH="/usr"
374364
else
375365
(>&2 echo "Warning: OSMesa cannot be found in $SDK_HOME/osmesa or /opt/osmesa")
376366
(>&2 echo "Info: Setting OSMESA_PATH=$SDK_HOME/osmesa")
377367
OSMESA_PATH="$SDK_HOME/osmesa"
378368
fi
379369

380-
if [ -n "${LLVM_PREFIX:-}" ]; then
370+
if [ "$PKGOS" = "Linux" ]; then
371+
LLVM_PATH="/usr"
372+
elif [ -n "${LLVM_PREFIX:-}" ]; then
381373
LLVM_PATH="${LLVM_PREFIX}"
382374
elif [ -d "$SDK_HOME/llvm" ]; then
383375
LLVM_PATH="$SDK_HOME/llvm"
@@ -396,6 +388,8 @@ elif [ -d "$SDK_HOME/libexec/qt${QT_VERSION_MAJOR}" ]; then
396388
QTDIR="$SDK_HOME/libexec/qt${QT_VERSION_MAJOR}"
397389
elif [ -x "$SDK_HOME/bin/qmake" ] || [ -x "$SDK_HOME/bin/qmake.exe" ]; then
398390
QTDIR="$SDK_HOME"
391+
elif [ "$PKGOS" = "Linux" ]; then
392+
QTDIR="/usr"
399393
else
400394
(>&2 echo "Warning: Qt cannot be found in $SDK_HOME or $SDK_HOME/qt${QT_VERSION_MAJOR}")
401395
(>&2 echo "Info: setting QTDIR=$SDK_HOME/qt${QT_VERSION_MAJOR}")
@@ -407,11 +401,12 @@ BOOST_ROOT="$SDK_HOME"
407401

408402
PKG_CONFIG_PATH=
409403
if [ "$PKGOS" = "Linux" ]; then
410-
PATH="$SDK_HOME/bin:$QTDIR/bin:$SDK_HOME/gcc/bin:$FFMPEG_PATH/bin:$LIBRAW_PATH/bin:$PATH"
411-
LIBRARY_PATH="$SDK_HOME/lib:$QTDIR/lib:$SDK_HOME/gcc/lib64:$SDK_HOME/gcc/lib:$FFMPEG_PATH/lib:$LIBRAW_PATH/lib"
412-
LD_LIBRARY_PATH="$SDK_HOME/lib:$QTDIR/lib:$SDK_HOME/gcc/lib64:$SDK_HOME/gcc/lib:$FFMPEG_PATH/lib:$LIBRAW_PATH/lib"
404+
echo "skipping using Natron SDK, deferring to ubuntu system libraries"
405+
#PATH="$SDK_HOME/bin:$QTDIR/bin:$SDK_HOME/gcc/bin:$FFMPEG_PATH/bin:$LIBRAW_PATH/bin:$PATH"
406+
#LIBRARY_PATH="$SDK_HOME/lib:$QTDIR/lib:$SDK_HOME/gcc/lib64:$SDK_HOME/gcc/lib:$FFMPEG_PATH/lib:$LIBRAW_PATH/lib"
407+
#LD_LIBRARY_PATH="$SDK_HOME/lib:$QTDIR/lib:$SDK_HOME/gcc/lib64:$SDK_HOME/gcc/lib:$FFMPEG_PATH/lib:$LIBRAW_PATH/lib"
413408
#LD_RUN_PATH="$SDK_HOME/lib:$QTDIR/lib:$SDK_HOME/gcc/lib:$FFMPEG_PATH/lib:$LIBRAW_PATH/lib"
414-
PKG_CONFIG_PATH="$SDK_HOME/lib/pkgconfig:$SDK_HOME/share/pkgconfig:$SDK_HOME/libdata/pkgconfig:$FFMPEG_PATH/lib/pkgconfig:$LIBRAW_PATH/lib/pkgconfig:$OSMESA_PATH/lib/pkgconfig:$PYTHON_HOME/lib/pkgconfig:$QTDIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
409+
#PKG_CONFIG_PATH="$SDK_HOME/lib/pkgconfig:$SDK_HOME/share/pkgconfig:$SDK_HOME/libdata/pkgconfig:$FFMPEG_PATH/lib/pkgconfig:$LIBRAW_PATH/lib/pkgconfig:$OSMESA_PATH/lib/pkgconfig:$PYTHON_HOME/lib/pkgconfig:$QTDIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
415410
elif [ "$PKGOS" = "Windows" ]; then
416411
PKG_CONFIG_PATH="$FFMPEG_PATH/lib/pkgconfig:$LIBRAW_PATH/lib/pkgconfig:$OSMESA_PATH/lib/pkgconfig:$(cygpath -u ${PYTHON_HOME})/lib/pkgconfig:$QTDIR/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
417412
elif [ "$PKGOS" = "OSX" ]; then

0 commit comments

Comments
 (0)