From 4a01e8892b60b7b518f009b434f2ad2e8786dc80 Mon Sep 17 00:00:00 2001
From: Francisco Ramirez de Anton <franchuti688@gmail.com>
Date: Wed, 12 Jun 2024 07:19:49 +0200
Subject: [PATCH] Added v4.2.4 and keeping 4.0.0 for now

---
 recipes/jasper/all/conandata.yml              | 19 ++++++++++++----
 recipes/jasper/all/conanfile.py               |  3 ++-
 .../all/patches/4.0.0-0001-skip-rpath.patch   | 22 +++++++++++++++++++
 .../4.0.0-0003-deterministic-libname.patch    | 11 ++++++++++
 recipes/jasper/config.yml                     |  4 +++-
 5 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 recipes/jasper/all/patches/4.0.0-0001-skip-rpath.patch
 create mode 100644 recipes/jasper/all/patches/4.0.0-0003-deterministic-libname.patch

diff --git a/recipes/jasper/all/conandata.yml b/recipes/jasper/all/conandata.yml
index 6e91adc514251..a0a3b5ff5c970 100644
--- a/recipes/jasper/all/conandata.yml
+++ b/recipes/jasper/all/conandata.yml
@@ -1,15 +1,18 @@
 sources:
-  "4.2.2":
-    url: "/~https://github.com/jasper-software/jasper/releases/download/version-4.2.2/jasper-4.2.2.tar.gz"
-    sha256: "5e397570b3110a8edef6d50127e20a2297939809cea25d29068823b442ecdd6d"
+  "4.2.4":
+    url: "/~https://github.com/jasper-software/jasper/releases/download/version-4.2.4/jasper-4.2.4.tar.gz"
+    sha256: "6a597613d8d84c500b5b83bf0eec06cd3707c23d19957f70354ac2394c9914e7"
   "4.2.0":
     url: "/~https://github.com/jasper-software/jasper/releases/download/version-4.2.0/jasper-4.2.0.tar.gz"
     sha256: "69f0b08a0cc281a06eaf7feed510736854bbff9af89ab1d01b77382ad57ec957"
   "4.1.2":
     url: "/~https://github.com/jasper-software/jasper/releases/download/version-4.1.2/jasper-4.1.2.tar.gz"
     sha256: "22392e439b87c79aaf8689ec79a286a7147e811c4bee34edf3d0b239798d672b"
+  "4.0.0":
+    url: "/~https://github.com/jasper-software/jasper/releases/download/version-4.0.0/jasper-4.0.0.tar.gz"
+    sha256: "39514e1b53a5333fcff817e19565371f016ea536c36fd2d13a9c4d8da8f0be0c"
 patches:
-  "4.2.2":
+  "4.2.4":
     - patch_file: "patches/4.2.0-0003-deterministic-libname.patch"
       patch_description: "No generator dependent libname"
       patch_type: "conan"
@@ -25,3 +28,11 @@ patches:
     - patch_file: "patches/4.1.1-0003-deterministic-libname.patch"
       patch_description: "No generator dependent libname"
       patch_type: "conan"
+  "4.0.0":
+    - patch_file: "patches/4.0.0-0001-skip-rpath.patch"
+      patch_description: "Do not enforce rpath configuration"
+      patch_source: "/~https://github.com/jasper-software/jasper/pull/347"
+      patch_type: "conan"
+    - patch_file: "patches/4.0.0-0003-deterministic-libname.patch"
+      patch_description: "No generator dependent libname"
+      patch_type: "conan"
diff --git a/recipes/jasper/all/conanfile.py b/recipes/jasper/all/conanfile.py
index 41563b6ec7b3b..25cff6caab8e5 100644
--- a/recipes/jasper/all/conanfile.py
+++ b/recipes/jasper/all/conanfile.py
@@ -55,7 +55,8 @@ def requirements(self):
             self.requires("mozjpeg/4.1.5")
 
     def build_requirements(self):
-        self.tool_requires("cmake/[>=3.20 <4]")
+        if Version(self.version) >= "4.1.1":
+            self.tool_requires("cmake/[>=3.20 <4]")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)
diff --git a/recipes/jasper/all/patches/4.0.0-0001-skip-rpath.patch b/recipes/jasper/all/patches/4.0.0-0001-skip-rpath.patch
new file mode 100644
index 0000000000000..4be85edcc1149
--- /dev/null
+++ b/recipes/jasper/all/patches/4.0.0-0001-skip-rpath.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -793,19 +793,15 @@ if(JAS_ENABLE_SHARED)
+ 	# (but later on when installing)
+ 	set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ 
+-	set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ 
+ 	# add the automatically determined parts of the RPATH
+ 	# which point to directories outside the build tree to the install RPATH
+-	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 
+ 	# The RPATH to be used when installing, but only if it's not a
+ 	# system directory
+ 	list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
+ 	  "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+ 	if(isSystemDir EQUAL -1)
+-	   set(CMAKE_INSTALL_RPATH
+-		  "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+ 	endif()
+ endif()
+ 
diff --git a/recipes/jasper/all/patches/4.0.0-0003-deterministic-libname.patch b/recipes/jasper/all/patches/4.0.0-0003-deterministic-libname.patch
new file mode 100644
index 0000000000000..d2b29d21cbd98
--- /dev/null
+++ b/recipes/jasper/all/patches/4.0.0-0003-deterministic-libname.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -262,7 +262,7 @@ endif()
+ # If a multiconfiguration generator is used, ensure that various output
+ # files are not placed in subdirectories (such as Debug and Release)
+ # as this will cause the CTest test suite to fail.
+-if(JAS_MULTICONFIGURATION_GENERATOR)
++if(0)
+ 	if(CMAKE_CONFIGURATION_TYPES)
+ 		set(CMAKE_DEBUG_POSTFIX d)
+ 	endif()
diff --git a/recipes/jasper/config.yml b/recipes/jasper/config.yml
index 398f3766b328d..7d70ab2a393a0 100644
--- a/recipes/jasper/config.yml
+++ b/recipes/jasper/config.yml
@@ -1,7 +1,9 @@
 versions:
-  "4.2.2":
+  "4.2.4":
     folder: all
   "4.2.0":
     folder: all
   "4.1.2":
     folder: all
+  "4.0.0":
+    folder: all