From c5fc7afa873bb84f2ccfd94ee41a0fcf0afd59c3 Mon Sep 17 00:00:00 2001
From: Till Wegmüller <toasterson@gmail.com>
Date: Thu, 07 Mar 2024 19:40:16 +0100
Subject: [PATCH] Rebuild openjdk21 with libjpeg-turbo
---
components/runtime/openjdk-21/Makefile | 5 +++--
components/runtime/openjdk-21/pkg5 | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/components/runtime/openjdk-21/Makefile b/components/runtime/openjdk-21/Makefile
index 24253da..ba659ba 100644
--- a/components/runtime/openjdk-21/Makefile
+++ b/components/runtime/openjdk-21/Makefile
@@ -23,6 +23,7 @@
OPENJDK_BUILD= 2
COMPONENT_NAME= openjdk
COMPONENT_VERSION= $(OPENJDK_VERSION).$(OPENJDK_UPDATE).$(OPENJDK_BUILD)
+COMPONENT_REVISION= 1
COMPONENT_FMRI= runtime/java/$(COMPONENT_NAME)$(OPENJDK_VERSION)
COMPONENT_SUMMARY= Open-source implementation of the Java Platform, Standard Edition
COMPONENT_SRC= jdk$(OPENJDK_VERSION)u-jdk-$(OPENJDK_VERSION).$(OPENJDK_UPDATE).$(OPENJDK_BUILD)-ga
@@ -137,8 +138,8 @@
# Auto-generated dependencies
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
-REQUIRED_PACKAGES += image/library/libjpeg6
-REQUIRED_PACKAGES += image/library/libjpeg6-ijg
+REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG)
+REQUIRED_PACKAGES += image/library/libjpeg-turbo
REQUIRED_PACKAGES += image/library/libpng16
REQUIRED_PACKAGES += library/c++/harfbuzz
REQUIRED_PACKAGES += library/giflib
diff --git a/components/runtime/openjdk-21/pkg5 b/components/runtime/openjdk-21/pkg5
index 0284c2b..f966dfd 100644
--- a/components/runtime/openjdk-21/pkg5
+++ b/components/runtime/openjdk-21/pkg5
@@ -1,7 +1,7 @@
{
"dependencies": [
- "image/library/libjpeg6",
- "image/library/libjpeg6-ijg",
+ "image/library/libjpeg-turbo",
+ "image/library/libjpeg8-turbo",
"image/library/libpng16",
"library/c++/harfbuzz",
"library/giflib",
--
Gitblit v1.9.3