[PATCH] libjpeg: Update to 2.1.0

[PATCH] libjpeg: Update to 2.1.0

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1581 bytes --]

- Update from 2.0.4 to 2.1.0
- Update rootfile
- Changelog is too large to include here
   Full details can be found in ChangeLog.md file in source tarball

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/common/libjpeg | 5 +++++
 lfs/libjpeg                     | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg
index eb74d2c50..74c101854 100644
--- a/config/rootfiles/common/libjpeg
+++ b/config/rootfiles/common/libjpeg
@@ -9,6 +9,11 @@
 #usr/include/jmorecfg.h
 #usr/include/jpeglib.h
 #usr/include/turbojpeg.h
+#usr/lib/cmake/libjpeg-turbo
+#usr/lib/cmake/libjpeg-turbo/libjpeg-turboConfig.cmake
+#usr/lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake
+#usr/lib/cmake/libjpeg-turbo/libjpeg-turboTargets-release.cmake
+#usr/lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake
 #usr/lib/libjpeg.so
 usr/lib/libjpeg.so.8
 usr/lib/libjpeg.so.8.2.2
diff --git a/lfs/libjpeg b/lfs/libjpeg
index 1fbcdf02a..db068ac54 100644
--- a/lfs/libjpeg
+++ b/lfs/libjpeg
@@ -23,8 +23,7 @@
 ###############################################################################
 
 include Config
-
-VER        = 2.0.4
+VER        = 2.1.0
 
 THISAPP    = libjpeg-turbo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +39,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d01d9e0c28c27bc0de9f4e2e8ff49855
+$(DL_FILE)_MD5 = be306afc2d2ebd6931b634df0e8cbaf5
 
 install : $(TARGET)
 
-- 
2.31.1

Re: [PATCH] libjpeg: Update to 2.1.0

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2370 bytes --]

Hello,

It looks like I will have to revert this patch because it does not compile on armv5tel:

In file included from /usr/src/libjpeg-turbo-2.1.0/simd/arm/jcgray-neon.c:32:
/usr/lib/gcc/armv5tel-unknown-linux-gnueabi/10.2.0/include/arm_neon.h:31:2: error: #error "NEON intrinsics not available with the soft-float ABI.  Please use -mfloat-abi=softfp or -mfloat-abi=hard"
   31 | #error "NEON intrinsics not available with the soft-float ABI.  Please use -mfloat-abi=softfp or -mfloat-abi=hard"
      |  ^~~~~

@Arne, could you have a look at this and re-submit the patch with fixes for ARM?

Best,
-Michael

> On 25 Apr 2021, at 21:04, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> - Update from 2.0.4 to 2.1.0
> - Update rootfile
> - Changelog is too large to include here
>   Full details can be found in ChangeLog.md file in source tarball
> 
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/common/libjpeg | 5 +++++
> lfs/libjpeg                     | 5 ++---
> 2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg
> index eb74d2c50..74c101854 100644
> --- a/config/rootfiles/common/libjpeg
> +++ b/config/rootfiles/common/libjpeg
> @@ -9,6 +9,11 @@
> #usr/include/jmorecfg.h
> #usr/include/jpeglib.h
> #usr/include/turbojpeg.h
> +#usr/lib/cmake/libjpeg-turbo
> +#usr/lib/cmake/libjpeg-turbo/libjpeg-turboConfig.cmake
> +#usr/lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake
> +#usr/lib/cmake/libjpeg-turbo/libjpeg-turboTargets-release.cmake
> +#usr/lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake
> #usr/lib/libjpeg.so
> usr/lib/libjpeg.so.8
> usr/lib/libjpeg.so.8.2.2
> diff --git a/lfs/libjpeg b/lfs/libjpeg
> index 1fbcdf02a..db068ac54 100644
> --- a/lfs/libjpeg
> +++ b/lfs/libjpeg
> @@ -23,8 +23,7 @@
> ###############################################################################
> 
> include Config
> -
> -VER        = 2.0.4
> +VER        = 2.1.0
> 
> THISAPP    = libjpeg-turbo-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +39,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = d01d9e0c28c27bc0de9f4e2e8ff49855
> +$(DL_FILE)_MD5 = be306afc2d2ebd6931b634df0e8cbaf5
> 
> install : $(TARGET)
> 
> -- 
> 2.31.1
>