[ptxdist] [PATCH] libjpeg: Version bump. 3.0.2 -> 3.0.3

[ptxdist] [PATCH] libjpeg: Version bump. 3.0.2 -> 3.0.3

[Christian Melki]

Minor fixes.
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/3.0.3

* License conditions changed. zlib license no longer applies.
libjpeg-turbo is now covered by	two licenses, not three.
https://github.com/libjpeg-turbo/libjpeg-turbo/commit/9ef0d03e1e5f0140636215afe627954b81602c38

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/libjpeg.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/libjpeg.make b/rules/libjpeg.make
index 73fec3173..49fa9eb01 100644
--- a/rules/libjpeg.make
+++ b/rules/libjpeg.make
@@ -16,17 +16,17 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg
 #
 # Paths and names
 #
-LIBJPEG_VERSION	:= 3.0.2
-LIBJPEG_MD5	:= 94756db95bc2477f7f7dad1c2590b51f
+LIBJPEG_VERSION	:= 3.0.3
+LIBJPEG_MD5	:= 081269bd1f35eaadb7ce2e3b4f03aebb
 LIBJPEG_SUFFIX	:= tar.gz
 LIBJPEG		:= libjpeg-turbo-$(LIBJPEG_VERSION)
 LIBJPEG_TARBALL	:= $(LIBJPEG).$(LIBJPEG_SUFFIX)
 LIBJPEG_URL	:= https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/$(LIBJPEG_VERSION)/$(LIBJPEG_TARBALL)
 LIBJPEG_SOURCE	:= $(SRCDIR)/$(LIBJPEG_TARBALL)
 LIBJPEG_DIR	:= $(BUILDDIR)/$(LIBJPEG)
-LIBJPEG_LICENSE	:= IJG, BSD-3-Clause, Zlib
+LIBJPEG_LICENSE	:= IJG, BSD-3-Clause
 LIBJPEG_LICENSE_FILES := \
-	file://LICENSE.md;md5=2a8e0d8226a102f07ab63ed7fd6ce155 \
+	file://LICENSE.md;md5=2badff2388880cc27e58977d8bc1d494 \
 	file://README.ijg;startline=112;endline=174;md5=9fcb5339d9de46b31309aeef52d7deb1 \
 	file://simd/nasm/jsimdext.inc;startline=13;endline=28;md5=100ad877b6a14ec137afd49a6e109624
 
-- 
2.34.1

Re: [ptxdist] [APPLIED] libjpeg: Version bump. 3.0.2 -> 3.0.3

[Michael Olbrich]

Thanks, applied as 9e66de26080a8bb364b9c694965adafac9b66516.

Michael

[sent from post-receive hook]

On Fri, 31 May 2024 08:08:35 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Minor fixes.
> https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/3.0.3
> 
> * License conditions changed. zlib license no longer applies.
> libjpeg-turbo is now covered by	two licenses, not three.
> https://github.com/libjpeg-turbo/libjpeg-turbo/commit/9ef0d03e1e5f0140636215afe627954b81602c38
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20240513174910.4067295-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libjpeg.make b/rules/libjpeg.make
> index 73fec3173129..49fa9eb01cba 100644
> --- a/rules/libjpeg.make
> +++ b/rules/libjpeg.make
> @@ -16,17 +16,17 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg
>  #
>  # Paths and names
>  #
> -LIBJPEG_VERSION	:= 3.0.2
> -LIBJPEG_MD5	:= 94756db95bc2477f7f7dad1c2590b51f
> +LIBJPEG_VERSION	:= 3.0.3
> +LIBJPEG_MD5	:= 081269bd1f35eaadb7ce2e3b4f03aebb
>  LIBJPEG_SUFFIX	:= tar.gz
>  LIBJPEG		:= libjpeg-turbo-$(LIBJPEG_VERSION)
>  LIBJPEG_TARBALL	:= $(LIBJPEG).$(LIBJPEG_SUFFIX)
>  LIBJPEG_URL	:= https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/$(LIBJPEG_VERSION)/$(LIBJPEG_TARBALL)
>  LIBJPEG_SOURCE	:= $(SRCDIR)/$(LIBJPEG_TARBALL)
>  LIBJPEG_DIR	:= $(BUILDDIR)/$(LIBJPEG)
> -LIBJPEG_LICENSE	:= IJG, BSD-3-Clause, Zlib
> +LIBJPEG_LICENSE	:= IJG, BSD-3-Clause
>  LIBJPEG_LICENSE_FILES := \
> -	file://LICENSE.md;md5=2a8e0d8226a102f07ab63ed7fd6ce155 \
> +	file://LICENSE.md;md5=2badff2388880cc27e58977d8bc1d494 \
>  	file://README.ijg;startline=112;endline=174;md5=9fcb5339d9de46b31309aeef52d7deb1 \
>  	file://simd/nasm/jsimdext.inc;startline=13;endline=28;md5=100ad877b6a14ec137afd49a6e109624
>