diff options
| author | matt335672 <30179339+matt335672@users.noreply.github.com> | 2022-09-06 12:42:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-06 12:42:06 +0300 |
| commit | 62167d867eb26fe3c7a0d7c3c4d8389ba93eb680 (patch) | |
| tree | 66e9ff2b1b897593d51cdae326c263a3548d0db0 | |
| parent | 7354eb60605b5dbbb660820e038cfc78ec4234c3 (diff) | |
| parent | 02513dbd4bb28c9b3062bb76c2a9d9faaf6453a2 (diff) | |
Merge pull request #2359 from matt335672/freetype2_ci
Add freetype2 to CI
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 5 | ||||
| -rwxr-xr-x | scripts/install_xrdp_build_dependencies_with_apt.sh | 10 |
3 files changed, 15 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 3521fd3a..81b26603 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,11 +6,11 @@ FreeBSD_task: freebsd_instance: image_family: freebsd-12-3 prepare_script: - - pkg install -y $SSL git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm fusefs-libs check imlib2 + - pkg install -y $SSL git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm fusefs-libs check imlib2 freetype2 - git submodule update --init --recursive configure_script: - ./bootstrap - - env CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./configure --localstatedir=/var --enable-strict-locations --with-pkgconfigdir=/usr/local/libdata/pkgconfig --enable-strict-locations --enable-ipv6 --enable-opus --enable-jpeg --enable-fdkaac --enable-painter --enable-pixman --enable-fuse --with-imlib2 + - env CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./configure --localstatedir=/var --enable-strict-locations --with-pkgconfigdir=/usr/local/libdata/pkgconfig --enable-strict-locations --enable-ipv6 --enable-opus --enable-jpeg --enable-fdkaac --enable-painter --enable-pixman --enable-fuse --with-imlib2 --with-freetype2 build_script: - make -j $(sysctl -n hw.ncpu || echo 4) install_script: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6ba65fb..85038661 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,10 +96,11 @@ jobs: --disable-pixman" CONF_FLAGS_amd64_max: "--enable-ipv6 --enable-jpeg --enable-fuse --enable-mp3lame --enable-fdkaac --enable-opus --enable-rfxcodec --enable-painter - --enable-pixman --with-imlib2" + --enable-pixman --with-imlib2 --with-freetype2" CONF_FLAGS_i386_max: "--enable-ipv6 --enable-jpeg --enable-fuse --enable-mp3lame --enable-fdkaac --enable-opus --enable-rfxcodec --enable-painter - --disable-pixman --with-imlib2 --host=i686-linux" + --disable-pixman --with-imlib2 --with-freetype2 + --host=i686-linux" PKG_CONFIG_PATH_i386: "/usr/lib/i386-linux-gnu/pkgconfig" CFLAGS_i386: "-m32" diff --git a/scripts/install_xrdp_build_dependencies_with_apt.sh b/scripts/install_xrdp_build_dependencies_with_apt.sh index ec35c8f5..888b0ef9 100755 --- a/scripts/install_xrdp_build_dependencies_with_apt.sh +++ b/scripts/install_xrdp_build_dependencies_with_apt.sh @@ -61,6 +61,14 @@ PACKAGES=" \ check \ " +# libfreetype-dev package was renamed from libfreetype6-dev in older +# versions +case `lsb_release -si`/`lsb_release -sr` in + Debian/10) LIBFREETYPE_DEV=libfreetype6-dev ;; + Ubuntu/18.*) LIBFREETYPE_DEV=libfreetype6-dev ;; + *) LIBFREETYPE_DEV=libfreetype-dev +esac + case "$ARCH" in amd64) @@ -79,6 +87,7 @@ in max) PACKAGES="$PACKAGES \ $PACKAGES_AMD64_MIN + $LIBFREETYPE_DEV \ libfuse-dev \ libjpeg-dev \ libmp3lame-dev \ @@ -97,6 +106,7 @@ in PACKAGES="$PACKAGES \ g++-multilib \ gcc-multilib \ + $LIBFREETYPE_DEV:i386 \ libgl1-mesa-dev:i386 \ libglu1-mesa-dev:i386 \ libjpeg-dev:i386 \ |