Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jasper: add v4.2.4, drop vulnerable versions (< 4.1.2) #23257

Merged
merged 2 commits into from
Jun 12, 2024
Merged

jasper: add v4.2.4, drop vulnerable versions (< 4.1.2) #23257

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a989716
jasper: add v4.2.2, drop vulnerable versions (< 4.1.2)
valgur Mar 25, 2024
4a01e88
Added v4.2.4 and keeping 4.0.0 for now
franramirez688 Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 7 additions & 52 deletions recipes/jasper/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,27 @@
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"
franramirez688 marked this conversation as resolved.
Show resolved Hide resolved
"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.2":
franramirez688 marked this conversation as resolved.
Show resolved Hide resolved
- 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"
patch_type: "conan"
- 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"
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"
"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"
9 changes: 3 additions & 6 deletions recipes/jasper/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ def requirements(self):
self.requires("mozjpeg/4.1.5")

def build_requirements(self):
if Version(self.version) >= "4.1.1":
self.tool_requires("cmake/[>=3.20 <4]")
self.tool_requires("cmake/[>=3.20 <4]")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand All @@ -65,17 +64,15 @@ 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
tc.variables["JAS_ENABLE_SHARED"] = self.options.shared
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
Expand Down
24 changes: 0 additions & 24 deletions recipes/jasper/all/patches/2.0.33-0001-skip-rpath.patch
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions recipes/jasper/all/patches/3.0.6-0001-skip-rpath.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions recipes/jasper/all/patches/3.0.6-0003-deterministic-libname.patch
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions recipes/jasper/all/patches/4.0.0-0001-skip-rpath.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions recipes/jasper/all/patches/4.0.0-0003-deterministic-libname.patch
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions recipes/jasper/all/patches/4.1.0-0001-skip-rpath.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions recipes/jasper/all/patches/4.1.0-0003-deterministic-libname.patch
View file
Open in desktop

This file was deleted.

12 changes: 2 additions & 10 deletions recipes/jasper/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
versions:
"4.2.2":
franramirez688 marked this conversation as resolved.
Show resolved Hide resolved
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
Loading