From b160cd79737ac901fd600cc39c1494c52e64f390 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Thu, 23 Dec 2021 09:18:41 +0900 Subject: [PATCH] openjdk-17: Build libsplashscreen --- .../openjdk-17/BUILD_LIBSPLASHSCREEN.patch | 20 +++++++++++++++++++ packages/openjdk-17/build.sh | 6 ++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 packages/openjdk-17/BUILD_LIBSPLASHSCREEN.patch diff --git a/packages/openjdk-17/BUILD_LIBSPLASHSCREEN.patch b/packages/openjdk-17/BUILD_LIBSPLASHSCREEN.patch new file mode 100644 index 000000000..e1b153f54 --- /dev/null +++ b/packages/openjdk-17/BUILD_LIBSPLASHSCREEN.patch @@ -0,0 +1,20 @@ +--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk ++++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk +@@ -706,7 +706,7 @@ + LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) + endif + +- LIBSPLASHSCREEN_LIBS := ++ LIBSPLASHSCREEN_LIBS := -liconv + + ifeq ($(call isTargetOs, macosx), true) + LIBSPLASHSCREEN_LIBS += \ +@@ -753,7 +753,7 @@ + LIBS_aix := -liconv, \ + )) + +- # TARGETS += $(BUILD_LIBSPLASHSCREEN) ++ TARGETS += $(BUILD_LIBSPLASHSCREEN) + + ifeq ($(call isTargetOs, macosx), true) + $(BUILD_LIBSPLASHSCREEN): $(call FindLib, $(MODULE), osxapp) diff --git a/packages/openjdk-17/build.sh b/packages/openjdk-17/build.sh index bb77b5e77..3f4914051 100644 --- a/packages/openjdk-17/build.sh +++ b/packages/openjdk-17/build.sh @@ -3,10 +3,10 @@ TERMUX_PKG_DESCRIPTION="Java development kit and runtime" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=17.0 -TERMUX_PKG_REVISION=16 +TERMUX_PKG_REVISION=17 TERMUX_PKG_SRCURL=https://github.com/termux/openjdk-mobile-termux/archive/ec285598849a27f681ea6269342cf03cf382eb56.tar.gz TERMUX_PKG_SHA256=d7c6ead9d80d0f60d98d0414e9dc87f5e18a304e420f5cd21f1aa3210c1a1528 -TERMUX_PKG_DEPENDS="freetype, libandroid-shmem, libandroid-spawn, libiconv, zlib, xorgproto, libx11, libxcursor, libxext, cups, fontconfig, libpng, libxrender, libxtst, libxrandr, libxt, libxi" +TERMUX_PKG_DEPENDS="freetype, giflib, libandroid-shmem, libandroid-spawn, libiconv, zlib, xorgproto, libx11, libxcursor, libxext, cups, fontconfig, libjpeg-turbo, libpng, libxrender, libxtst, libxrandr, libxt, libxi" TERMUX_PKG_BUILD_DEPENDS="cups, fontconfig, libpng, libx11, libxrender" TERMUX_PKG_SUGGESTS="cups, fontconfig, libx11, libxrender" TERMUX_PKG_BUILD_IN_SRC=true @@ -73,6 +73,8 @@ termux_step_configure() { --with-fontconfig-include="$TERMUX_PREFIX/include" \ --with-freetype-include="$TERMUX_PREFIX/include/freetype2" \ --with-freetype-lib="$TERMUX_PREFIX/lib" \ + --with-giflib=system \ + --with-libjpeg=system \ --with-libpng=system \ --with-zlib=system \ --x-includes="$TERMUX_PREFIX/include/X11" \