diff --git a/recipes/jasper/all/conandata.yml b/recipes/jasper/all/conandata.yml index 0996a2f915ff8..a0a3b5ff5c970 100644 --- a/recipes/jasper/all/conandata.yml +++ b/recipes/jasper/all/conandata.yml @@ -1,39 +1,26 @@ sources: + "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.1.1": - url: "https://github.com/jasper-software/jasper/releases/download/version-4.1.1/jasper-4.1.1.tar.gz" - sha256: "03ba86823f8798f3f60a5a34e36f3eff9e9cbd76175643a33d4aac7c0390240a" - "4.1.0": - url: "https://github.com/jasper-software/jasper/releases/download/version-4.1.0/jasper-4.1.0.tar.gz" - sha256: "ffe1543d87f7ffc5039d2415afd48c314a7cc0b0c750b4982cd881d6ed4b5743" "4.0.0": url: "https://github.com/jasper-software/jasper/releases/download/version-4.0.0/jasper-4.0.0.tar.gz" sha256: "39514e1b53a5333fcff817e19565371f016ea536c36fd2d13a9c4d8da8f0be0c" - "3.0.6": - url: "https://github.com/jasper-software/jasper/releases/download/version-3.0.6/jasper-3.0.6.tar.gz" - sha256: "169be004d91f6940c649a4f854ada2755d4f35f62b0555ce9e1219c778cffc09" - "2.0.33": - url: "https://github.com/jasper-software/jasper/releases/download/version-2.0.33/jasper-2.0.33.tar.gz" - sha256: "28d28290cc2eaf70c8756d391ed8bcc8ab809a895b9a67ea6e89da23a611801a" patches: - "4.2.0": + "4.2.4": - patch_file: "patches/4.2.0-0003-deterministic-libname.patch" patch_description: "No generator dependent libname" patch_type: "conan" - "4.1.2": - - patch_file: "patches/4.1.1-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.1.1-0003-deterministic-libname.patch" + "4.2.0": + - patch_file: "patches/4.2.0-0003-deterministic-libname.patch" patch_description: "No generator dependent libname" patch_type: "conan" - "4.1.1": + "4.1.2": - patch_file: "patches/4.1.1-0001-skip-rpath.patch" patch_description: "Do not enforce rpath configuration" patch_source: "https://github.com/jasper-software/jasper/pull/347" @@ -41,14 +28,6 @@ patches: - patch_file: "patches/4.1.1-0003-deterministic-libname.patch" patch_description: "No generator dependent libname" patch_type: "conan" - "4.1.0": - - patch_file: "patches/4.1.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.1.0-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" @@ -57,16 +36,3 @@ patches: - patch_file: "patches/4.0.0-0003-deterministic-libname.patch" patch_description: "No generator dependent libname" patch_type: "conan" - "3.0.6": - - patch_file: "patches/3.0.6-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/3.0.6-0003-deterministic-libname.patch" - patch_description: "No generator dependent libname" - patch_type: "conan" - "2.0.33": - - patch_file: "patches/2.0.33-0001-skip-rpath.patch" - patch_description: "Do not enforce rpath configuration" - patch_source: "https://github.com/jasper-software/jasper/pull/347" - patch_type: "conan" diff --git a/recipes/jasper/all/conanfile.py b/recipes/jasper/all/conanfile.py index 29bbcb6c115d7..25cff6caab8e5 100644 --- a/recipes/jasper/all/conanfile.py +++ b/recipes/jasper/all/conanfile.py @@ -65,8 +65,7 @@ def generate(self): VirtualBuildEnv(self).generate() tc = CMakeToolchain(self) - if Version(self.version) >= "4.0.0": - tc.variables["JAS_ENABLE_PIC"] = self.options.get_safe("fPIC", True) + tc.variables["JAS_ENABLE_PIC"] = self.options.get_safe("fPIC", True) tc.variables["JAS_ENABLE_DOC"] = False tc.variables["JAS_ENABLE_LATEX"] = False tc.variables["JAS_ENABLE_PROGRAMS"] = False @@ -74,8 +73,7 @@ def generate(self): tc.variables["JAS_LIBJPEG_REQUIRED"] = "REQUIRED" tc.variables["JAS_ENABLE_LIBJPEG"] = bool(self.options.with_libjpeg) tc.variables["JAS_HAVE_JPEGLIB_H"] = True - if Version(self.version) >= "3.0.0": - tc.variables["JAS_ENABLE_LIBHEIF"] = False + tc.variables["JAS_ENABLE_LIBHEIF"] = False tc.variables["JAS_ENABLE_OPENGL"] = False if cross_building(self): tc.cache_variables["JAS_CROSSCOMPILING"] = True diff --git a/recipes/jasper/all/patches/2.0.33-0001-skip-rpath.patch b/recipes/jasper/all/patches/2.0.33-0001-skip-rpath.patch deleted file mode 100644 index eb9d47cbbb014..0000000000000 --- a/recipes/jasper/all/patches/2.0.33-0001-skip-rpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 230d88c..79081c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -298,19 +298,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}" STREQUAL "-1") -- set(CMAKE_INSTALL_RPATH -- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - endif("${isSystemDir}" STREQUAL "-1") - - endif() diff --git a/recipes/jasper/all/patches/3.0.6-0001-skip-rpath.patch b/recipes/jasper/all/patches/3.0.6-0001-skip-rpath.patch deleted file mode 100644 index 959d169bd49ad..0000000000000 --- a/recipes/jasper/all/patches/3.0.6-0001-skip-rpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5cf594c..a0d253d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -740,19 +740,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/3.0.6-0003-deterministic-libname.patch b/recipes/jasper/all/patches/3.0.6-0003-deterministic-libname.patch deleted file mode 100644 index 567ff16e021a4..0000000000000 --- a/recipes/jasper/all/patches/3.0.6-0003-deterministic-libname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -254,7 +254,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/all/patches/4.1.0-0001-skip-rpath.patch b/recipes/jasper/all/patches/4.1.0-0001-skip-rpath.patch deleted file mode 100644 index 9ebb0ac66b98c..0000000000000 --- a/recipes/jasper/all/patches/4.1.0-0001-skip-rpath.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ba6f117..6b79a94 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -804,19 +804,19 @@ if(JAS_ENABLE_SHARED) - # (but later on when installing) - set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - -- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -+# 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) -+# 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}") -+# set(CMAKE_INSTALL_RPATH -+# "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") - endif() - endif() - diff --git a/recipes/jasper/all/patches/4.1.0-0003-deterministic-libname.patch b/recipes/jasper/all/patches/4.1.0-0003-deterministic-libname.patch deleted file mode 100644 index 0603e4f665033..0000000000000 --- a/recipes/jasper/all/patches/4.1.0-0003-deterministic-libname.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 86eb065..9c2da51 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -274,7 +274,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) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY .) - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY .) - set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY .) diff --git a/recipes/jasper/config.yml b/recipes/jasper/config.yml index 2539649ff499b..7d70ab2a393a0 100644 --- a/recipes/jasper/config.yml +++ b/recipes/jasper/config.yml @@ -1,15 +1,9 @@ versions: + "4.2.4": + folder: all "4.2.0": folder: all "4.1.2": folder: all - "4.1.1": - folder: all - "4.1.0": - folder: all "4.0.0": folder: all - "3.0.6": - folder: all - "2.0.33": - folder: all