Update build scripts (part 1)

friction2d · Oct 22, 2023 · 9ccbac5 · 9ccbac5
1 parent fe8302e
commit 9ccbac5
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 296 deletions.
diff --git a/src/scripts/Dockerfile.arch b/src/scripts/Dockerfile.arch
diff --git a/src/scripts/Dockerfile.fedora b/src/scripts/Dockerfile.fedora
diff --git a/src/scripts/Dockerfile.jammy b/src/scripts/Dockerfile.jammy
@@ -3,7 +3,7 @@ FROM ubuntu:jammy
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update -y
 RUN apt upgrade -y
-RUN apt install -y curl build-essential clang git libtool autoconf automake cmake python3 python-is-python3 ninja-build libfontconfig1-dev libfreetype-dev libavcodec-dev libavformat-dev libavutil-dev libqscintilla2-qt5-dev libqt5opengl5-dev libqt5svg5-dev libswresample-dev libswscale-dev libunwind-dev qt5-image-formats-plugins libqt5multimedia5-plugins qtbase5-dev-tools qtbase5-dev qtdeclarative5-dev-tools qtdeclarative5-dev qtmultimedia5-dev qttools5-dev-tools
+RUN apt install -y curl build-essential clang git libtool autoconf automake cmake python3 python-is-python3 ninja-build libfontconfig1-dev libfreetype-dev libavcodec-dev libavformat-dev libavutil-dev libqscintilla2-qt5-dev libqt5opengl5-dev libqt5svg5-dev libswresample-dev libswscale-dev libunwind-dev qt5-image-formats-plugins libqt5multimedia5-plugins qtbase5-dev-tools qtbase5-dev qtdeclarative5-dev-tools qtdeclarative5-dev qtmultimedia5-dev qttools5-dev-tools libexpat1-dev libfreetype-dev libjpeg-turbo8-dev libpng-dev libwebp-dev zlib1g-dev libicu-dev libharfbuzz-dev
 
 COPY build_docker.sh /
 CMD [ "bash", "./build_docker.sh" ]
diff --git a/src/scripts/Dockerfile.lunar b/src/scripts/Dockerfile.lunar
@@ -3,7 +3,7 @@ FROM ubuntu:lunar
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update -y
 RUN apt upgrade -y
-RUN apt install -y curl build-essential clang git libtool autoconf automake cmake python3 python-is-python3 ninja-build libfontconfig1-dev libfreetype-dev libavcodec-dev libavformat-dev libavutil-dev libqscintilla2-qt5-dev libqt5opengl5-dev libqt5svg5-dev libswresample-dev libswscale-dev libunwind-dev qt5-image-formats-plugins libqt5multimedia5-plugins qtbase5-dev-tools qtbase5-dev qtdeclarative5-dev-tools qtdeclarative5-dev qtmultimedia5-dev qttools5-dev-tools
+RUN apt install -y curl build-essential clang git libtool autoconf automake cmake python3 python-is-python3 ninja-build libfontconfig1-dev libfreetype-dev libavcodec-dev libavformat-dev libavutil-dev libqscintilla2-qt5-dev libqt5opengl5-dev libqt5svg5-dev libswresample-dev libswscale-dev libunwind-dev qt5-image-formats-plugins libqt5multimedia5-plugins qtbase5-dev-tools qtbase5-dev qtdeclarative5-dev-tools qtdeclarative5-dev qtmultimedia5-dev qttools5-dev-tools libexpat1-dev libfreetype-dev libjpeg-turbo8-dev libpng-dev libwebp-dev zlib1g-dev libicu-dev libharfbuzz-dev
 
 COPY build_docker.sh /
 CMD [ "bash", "./build_docker.sh" ]
diff --git a/src/scripts/Dockerfile.mantic b/src/scripts/Dockerfile.mantic
@@ -3,7 +3,7 @@ FROM ubuntu:mantic
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt update -y
 RUN apt upgrade -y
-RUN apt install -y curl build-essential clang git libtool autoconf automake cmake python3 python-is-python3 ninja-build libfontconfig1-dev libfreetype-dev libavcodec-dev libavformat-dev libavutil-dev libqscintilla2-qt5-dev libqt5opengl5-dev libqt5svg5-dev libswresample-dev libswscale-dev libunwind-dev qt5-image-formats-plugins libqt5multimedia5-plugins qtbase5-dev-tools qtbase5-dev qtdeclarative5-dev-tools qtdeclarative5-dev qtmultimedia5-dev qttools5-dev-tools libglx-mesa0 libglx-dev libxcb-glx0-dev
+RUN apt install -y curl build-essential clang git libtool autoconf automake cmake python3 python-is-python3 ninja-build libfontconfig1-dev libfreetype-dev libavcodec-dev libavformat-dev libavutil-dev libqscintilla2-qt5-dev libqt5opengl5-dev libqt5svg5-dev libswresample-dev libswscale-dev libunwind-dev qt5-image-formats-plugins libqt5multimedia5-plugins qtbase5-dev-tools qtbase5-dev qtdeclarative5-dev-tools qtdeclarative5-dev qtmultimedia5-dev qttools5-dev-tools libglx-mesa0 libglx-dev libxcb-glx0-dev libexpat1-dev libfreetype-dev libjpeg-turbo8-dev libpng-dev libwebp-dev zlib1g-dev libicu-dev libharfbuzz-dev
 
 COPY build_docker.sh /
 CMD [ "bash", "./build_docker.sh" ]
diff --git a/src/scripts/Dockerfile.rhel b/src/scripts/Dockerfile.rhel
diff --git a/src/scripts/Dockerfile.vfxplatform b/src/scripts/Dockerfile.vfxplatform
@@ -5,14 +5,13 @@ RUN yum -y update
 RUN yum -y install centos-release-scl
 RUN yum -y group install "Development Tools"
 RUN yum -y install pulseaudio-libs-devel wget rpmdevtools git yasm python3 fontconfig-devel zlib-devel autoconf automake xz devtoolset-7 llvm-toolset-7.0 tree curl libICE-devel libSM-devel libX11-devel libXau-devel libXdamage-devel libXext-devel libXfixes-devel libXi-devel libXxf86vm-devel libdrm-devel libxcb-devel mesa-libGL-devel xorg-x11-proto-devel
-RUN yum -y install epel-release
-RUN yum -y install fakeroot dpkg alien
 RUN ln -sf /usr/bin/python3 /usr/bin/python
 RUN rm -f /usr/lib64/pkgconfig/libpng.pc
 RUN rm -f /usr/lib64/pkgconfig/libpng15.pc
 RUN rm -f /usr/include/png.h
 RUN rm -f /usr/include/pngconf.h
 RUN rm -f /usr/include/pnglibconf.h
+RUN sed -i '/.private/d' /usr/lib64/pkgconfig/freetype2.pc
 RUN echo "source scl_source enable devtoolset-7" >> /root/.bashrc
 
 # COPY build_vfxplatform*.sh /

diff --git a/src/scripts/PKGBUILD b/src/scripts/PKGBUILD