From 57027c837e87e1261a877834422149b7d75c7228 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Wed, 7 Aug 2024 23:27:04 +0300 Subject: [PATCH] Add freetype to linux packaging --- package/linux/Dockerfile | 15 ++++++--------- package/linux/toolchain.cmake | 1 + 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/package/linux/Dockerfile b/package/linux/Dockerfile index c5e080d7..8e951948 100644 --- a/package/linux/Dockerfile +++ b/package/linux/Dockerfile @@ -6,7 +6,8 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \ file wget zip \ libpng-dev libxext-dev libgl-dev libboost-all-dev libmpg123-dev \ libxi-dev libxrender-dev \ - libasound2-dev libpulse-dev + libasound2-dev libpulse-dev \ + libfreetype-dev # Set user RUN useradd -u 1000 -U -o -d /home -M worker @@ -46,13 +47,9 @@ RUN mv blender-3.2.0-linux-x64 blender RUN rm blender-3.2.0-linux-x64.tar.xz RUN ln -sv /home/blender/blender /usr/local/bin/blender -# Copy system-provided libpng.so -RUN cp `readlink -f /usr/lib/x86_64-linux-gnu/libpng.so` libpng.so -RUN mv libpng.so `objdump -p libpng.so | grep SONAME | awk '{print $2}'` - -# Copy system-provided libmpg123.so -RUN cp `readlink -f /usr/lib/x86_64-linux-gnu/libmpg123.so` libmpg123.so -RUN mv libmpg123.so `objdump -p libmpg123.so | grep SONAME | awk '{print $2}'` +# Copy system-provided freetype +RUN cp `readlink -f /usr/lib/x86_64-linux-gnu/libfreetype.so` libfreetype.so +RUN mv libfreetype.so `objdump -p libfreetype.so | grep SONAME | awk '{print $2}'` # Install wgpu-native RUN wget https://github.com/gfx-rs/wgpu-native/releases/download/v0.19.4.1/wgpu-linux-x86_64-release.zip @@ -64,4 +61,4 @@ RUN mv wgpu-native/libwgpu_native.a wgpu-native/install # Install toolchain file & main packaging script COPY toolchain.cmake . -COPY package.sh . \ No newline at end of file +COPY package.sh . diff --git a/package/linux/toolchain.cmake b/package/linux/toolchain.cmake index 2faa3d11..f1bdddf1 100644 --- a/package/linux/toolchain.cmake +++ b/package/linux/toolchain.cmake @@ -9,6 +9,7 @@ set(PSEMEK_PACKAGE_TARGET ON) set(PSEMEK_PACKAGE_COPY_FILES ${PSEMEK_PACKAGE_ROOT}/sdl2/install/lib/libSDL2-2.0.so.0 + ${PSEMEK_PACKAGE_ROOT}/libfreetype.so.6 ) list(APPEND CMAKE_PREFIX_PATH