lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add freetype to linux packaging

Browse source
This commit is contained in:
Nikita Lisitsa 2024-08-07 23:27:04 +03:00
parent 7e96709dc1
commit 57027c837e
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
package/linux/Dockerfile
View file

@ -6,7 +6,8 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
file wget zip \ file wget zip \
libpng-dev libxext-dev libgl-dev libboost-all-dev libmpg123-dev \ libpng-dev libxext-dev libgl-dev libboost-all-dev libmpg123-dev \
libxi-dev libxrender-dev \ libxi-dev libxrender-dev \
libasound2-dev libpulse-dev libasound2-dev libpulse-dev \
libfreetype-dev
# Set user # Set user
RUN useradd -u 1000 -U -o -d /home -M worker 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 rm blender-3.2.0-linux-x64.tar.xz
RUN ln -sv /home/blender/blender /usr/local/bin/blender RUN ln -sv /home/blender/blender /usr/local/bin/blender
# Copy system-provided libpng.so # Copy system-provided freetype
RUN cp `readlink -f /usr/lib/x86_64-linux-gnu/libpng.so` libpng.so RUN cp `readlink -f /usr/lib/x86_64-linux-gnu/libfreetype.so` libfreetype.so
RUN mv libpng.so `objdump -p libpng.so | grep SONAME | awk '{print $2}'` RUN mv libfreetype.so `objdump -p libfreetype.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}'`
# Install wgpu-native # Install wgpu-native
RUN wget https://github.com/gfx-rs/wgpu-native/releases/download/v0.19.4.1/wgpu-linux-x86_64-release.zip RUN wget https://github.com/gfx-rs/wgpu-native/releases/download/v0.19.4.1/wgpu-linux-x86_64-release.zip

1
package/linux/toolchain.cmake
View file

@ -9,6 +9,7 @@ set(PSEMEK_PACKAGE_TARGET ON)
set(PSEMEK_PACKAGE_COPY_FILES set(PSEMEK_PACKAGE_COPY_FILES
${PSEMEK_PACKAGE_ROOT}/sdl2/install/lib/libSDL2-2.0.so.0 ${PSEMEK_PACKAGE_ROOT}/sdl2/install/lib/libSDL2-2.0.so.0
${PSEMEK_PACKAGE_ROOT}/libfreetype.so.6
) )
list(APPEND CMAKE_PREFIX_PATH list(APPEND CMAKE_PREFIX_PATH