diff options
| author |   Ross Burton <ross.burton@arm.com> | 2023-07-04 11:21:52 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-10 11:36:06 +0100 |
| commit | d0cc8bb5047fe843532bcba37ca48d94c9749daf (patch) | |
| tree | 5a9302df0f3868ab9c05605e459fb820a45ed4ca /meta/recipes-graphics/jpeg | |
| parent | c3df4594513410c7a6352e62aa928c42982eac13 (diff) | |
| download | openembedded-core-contrib-d0cc8bb5047fe843532bcba37ca48d94c9749daf.tar.gz | |
libjpeg-turbo: upgrade to 3.0.0
Remove 0001-libjpeg-turbo-fix-package_qa-error.patch, doesn't appear to
be needed anymore.
Use the full upstream license for LICENSE, and change LIC_FILES_CHKSUM
to point at just the license overview in LICENSE.md.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/jpeg')
| -rw-r--r-- | meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb (renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb) | 14 |
2 files changed, 5 insertions, 41 deletions
diff --git a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch deleted file mode 100644 index fab5109f83..0000000000 --- a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5cf847b5bef8dc3f9f89bd09dd5af4e6603f393c Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 27 Aug 2018 16:10:55 +0800 -Subject: [PATCH] libjpeg-turbo: fix package_qa error - -Fix package qa errors like below: -libjpeg.so.62.3.0 contains probably-redundant RPATH /usr/lib [useless-rpaths] -usr/bin/cjpeg contains probably-redundant RPATH /usr/lib - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> -Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> ---- - CMakeLists.txt | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2bc3458..ea3041e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -191,10 +191,6 @@ endif() - report_option(ENABLE_SHARED "Shared libraries") - report_option(ENABLE_STATIC "Static libraries") - --if(ENABLE_SHARED) -- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) --endif() -- - if(WITH_JPEG8 OR WITH_JPEG7) - set(WITH_ARITH_ENC 1) - set(WITH_ARITH_DEC 1) diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb index e086830c02..146d80008c 100644 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.1.bb +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.0.0.bb @@ -2,19 +2,15 @@ SUMMARY = "Hardware accelerated JPEG compression/decompression library" DESCRIPTION = "libjpeg-turbo is a derivative of libjpeg that uses SIMD instructions (MMX, SSE2, NEON) to accelerate baseline JPEG compression and decompression" HOMEPAGE = "http://libjpeg-turbo.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8a61af33cc1c681cd5cc297150bbb5bd \ - file://jpeglib.h;endline=16;md5=52b5eaade8d5b6a452a7693dfe52c084 \ - file://djpeg.c;endline=11;md5=510b386442ab6a27ee241fc5669bc5ea \ - " +LICENSE = "IJG & BSD-3-Clause & Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2a8e0d8226a102f07ab63ed7fd6ce155" + DEPENDS:append:x86-64:class-target = " nasm-native" DEPENDS:append:x86:class-target = " nasm-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ - file://0001-libjpeg-turbo-fix-package_qa-error.patch \ - " +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[sha256sum] = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf" +SRC_URI[sha256sum] = "c77c65fcce3d33417b2e90432e7a0eb05f59a7fff884022a9d931775d583bfaa" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" |