From 809c46cd5ebb96d9619033bf17eba0a186a65e09 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Mon, 5 Apr 2021 16:54:15 +0100 Subject: [PATCH] DEBIAN: Add missing libraries Resolves #13 --- buildbot-config/platforms.py | 10 +++++----- toolchains/raspberrypi/Dockerfile.m4 | 9 +++++++++ workers/m4/debian-libraries.m4 | 8 ++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py index 11b6b7a..be3f832 100644 --- a/buildbot-config/platforms.py +++ b/buildbot-config/platforms.py @@ -290,14 +290,14 @@ def debian(name_suffix, image_suffix, host, "construct_mohawk", "create_sjisfnt", "decine", - #"decompile", # Decompiler currently not built - BOOST library not present + "decompile", "degob", "dekyra", "descumm", "desword2", "extract_mohawk", "gob_loadcalc", - #"scummvm-tools", # GUI tools currently not built - WxWidgets library not present + "scummvm-tools", "scummvm-tools-cli" ] } @@ -314,7 +314,7 @@ debian("x86-64", "x86_64", "x86_64-linux-gnu", description="Debian (64\xa0bits)" debian("x86-64-nullbackend", "x86_64", "x86_64-linux-gnu", package=False, tools=False, build_tests=False, run_tests=False, buildconfigureargs = { - builds.ScummVMBuild: [ "--backend=null" ], + builds.ScummVMBuild: [ "--backend=null", "--enable-opl2lpt", "--enable-text-console" ], }) debian("x86-64-testengine", "x86_64", "x86_64-linux-gnu", package=False, tools=False, build_tests=False, run_tests=False, @@ -751,14 +751,14 @@ def raspberrypi(): "construct_mohawk", "create_sjisfnt", "decine", - #"decompile", # Decompiler currently not built - BOOST library not present + "decompile", "degob", "dekyra", "descumm", "desword2", "extract_mohawk", "gob_loadcalc", - #"scummvm-tools", # GUI tools currently not built - WxWidgets library not present + "scummvm-tools", "scummvm-tools-cli" ] } diff --git a/toolchains/raspberrypi/Dockerfile.m4 b/toolchains/raspberrypi/Dockerfile.m4 index 0376617..c5499ed 100644 --- a/toolchains/raspberrypi/Dockerfile.m4 +++ b/toolchains/raspberrypi/Dockerfile.m4 @@ -20,6 +20,7 @@ local_package(compilers) m4_dnl multistrap_package doesn't actually do anything except appending to MULTISTRAP_PACKAGES variable multistrap_package(liba52-dev) +multistrap_package(libboost-program-options-dev) multistrap_package(libcurl4-openssl-dev) multistrap_package(libfaad-dev) multistrap_package(libflac-dev) @@ -27,14 +28,19 @@ multistrap_package(libfluidsynth-dev) multistrap_package(libfreetype6-dev) multistrap_package(libfribidi-dev) multistrap_package(libglew-dev) +multistrap_package(libgtk-3-dev) multistrap_package(libjpeg62-turbo-dev) multistrap_package(libmad0-dev) multistrap_package(libmpeg2-4-dev) +multistrap_package(libogg-dev) multistrap_package(libpng-dev) multistrap_package(libsdl2-dev) multistrap_package(libsdl2-net-dev) +multistrap_package(libsndio-dev) +multistrap_package(libspeechd-dev) multistrap_package(libtheora-dev) multistrap_package(libvorbis-dev) +multistrap_package(libwxgtk3.0-gtk3-dev) multistrap_package(zlib1g-dev) # For GLES2 @@ -43,6 +49,9 @@ multistrap_package(libraspberrypi-dev) m4_dnl MULTISTRAP_PACKAGES will contain all packages above local_package(sysroot,MULTISTRAP_PACKAGES) +# Following command is normally executed at postinst step which isn't run by multistrap because it would need a host +RUN ln -s ${RPI_ROOT}/usr/lib/${HOST}/wx/config/gtk3-unicode-3.0 ${RPI_ROOT}/usr/bin/wx-config + # We add PATH here for *-config and platform specific binaries ENV \ def_binaries(`${RPI_HOME}/bin/${HOST}-', `ar, as, c++filt, ld, nm, objcopy, objdump, ranlib, readelf, strings, strip') \ diff --git a/workers/m4/debian-libraries.m4 b/workers/m4/debian-libraries.m4 index 034db39..0bd6cb4 100644 --- a/workers/m4/debian-libraries.m4 +++ b/workers/m4/debian-libraries.m4 @@ -2,6 +2,7 @@ m4_ifdef(`APT_ARCH',`m4_define(`APT_ARCH',`:'APT_ARCH)',`m4_define(`APT_ARCH',)' RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ liba52-dev`'APT_ARCH \ + libboost-program-options-dev`'APT_ARCH \ libcurl4-openssl-dev`'APT_ARCH \ libfaad-dev`'APT_ARCH \ libflac-dev`'APT_ARCH \ @@ -9,14 +10,21 @@ RUN apt-get update && \ libfreetype6-dev`'APT_ARCH \ libfribidi-dev`'APT_ARCH \ libglew-dev`'APT_ARCH \ + libgtk-3-dev`'APT_ARCH \ + libieee1284-3-dev`'APT_ARCH \ libjpeg62-turbo-dev`'APT_ARCH \ libmad0-dev`'APT_ARCH \ libmpeg2-4-dev`'APT_ARCH \ + libogg-dev`'APT_ARCH \ libpng-dev`'APT_ARCH \ + libreadline-dev`'APT_ARCH \ libsdl2-dev`'APT_ARCH \ libsdl2-net-dev`'APT_ARCH \ + libsndio-dev`'APT_ARCH \ + libspeechd-dev`'APT_ARCH \ libtheora-dev`'APT_ARCH \ libvorbis-dev`'APT_ARCH \ + libwxgtk3.0-gtk3-dev`'APT_ARCH \ zlib1g-dev`'APT_ARCH \ && \ rm -rf /var/lib/apt/lists/*