From 1440bb9cc7bb0a3337984ea1e372689d75fb9ba4 Mon Sep 17 00:00:00 2001
From: Andreas Wacknitz <A.Wacknitz@gmx.de>
Date: Tue, 07 Nov 2023 18:03:58 +0100
Subject: [PATCH] jasper: update to 4.1.0 & switch to libjpeg8-turbo

---
 components/multimedia/jasper/Makefile |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/components/multimedia/jasper/Makefile b/components/multimedia/jasper/Makefile
index 432e144..e5c7401 100644
--- a/components/multimedia/jasper/Makefile
+++ b/components/multimedia/jasper/Makefile
@@ -14,15 +14,16 @@
 # Copyright 2023 Niklas Poslovski
 #
 
-BUILD_STYLE = cmake
+BUILD_STYLE= cmake
+USE_DEFAULT_TEST_TRANSFORMS= yes
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME= jasper
-COMPONENT_VERSION= 4.0.0
+COMPONENT_VERSION= 4.1.0
 COMPONENT_SUMMARY= A free software-based reference implementation of the JPEG-2000 Part-1 CODEC
 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH=  sha256:39514e1b53a5333fcff817e19565371f016ea536c36fd2d13a9c4d8da8f0be0c
+COMPONENT_ARCHIVE_HASH=  sha256:ffe1543d87f7ffc5039d2415afd48c314a7cc0b0c750b4982cd881d6ed4b5743
 COMPONENT_PROJECT_URL=	https://www.ece.uvic.ca/~frodo/jasper
 COMPONENT_ARCHIVE_URL=	https://github.com/jasper-software/$(COMPONENT_NAME)/releases/download/version-$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_FMRI= codec/jasper
@@ -32,14 +33,20 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
-COMPONENT_TEST_TRANSFORMS += '-e "s/ [0-9].[0-9][0-9] sec//" '
-COMPONENT_TEST_TRANSFORMS += '-e "s/ [0-9][0-9].[0-9][0-9] sec//" '
-COMPONENT_TEST_TRANSFORMS += '-e "s/ [0-9][0-9][0-9].[0-9][0-9] sec//" '
+# build with the distribution preferred libjpeg implementation
+CFLAGS   += $(JPEG_CPPFLAGS) $(JPEG_CFLAGS)
+CXXFLAGS += $(JPEG_CPPFLAGS) $(JPEG_CXXFLAGS)
+LDFLAGS  += $(JPEG_LDFLAGS)
+
+# jpeg-turbo is not detected without this.
+CMAKE_OPTIONS += -DJPEG_LIBRARY=$(JPEG_LIBDIR)/libjpeg.so
+
 unexport SHELLOPTS
 
+COMPONENT_TEST_TRANSFORMS += '-e "/Output/p" '
+
 # Auto-generated dependencies
-REQUIRED_PACKAGES += image/library/libjpeg6
-REQUIRED_PACKAGES += image/library/libjpeg6-ijg
+REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG)
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/math
 REQUIRED_PACKAGES += x11/library/freeglut

--
Gitblit v1.9.3