summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/jpeg
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/jpeg')
-rw-r--r--meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch32
-rw-r--r--meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb (renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb)29
2 files changed, 43 insertions, 18 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
new file mode 100644
index 0000000000..44c2c768b2
--- /dev/null
+++ b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch
@@ -0,0 +1,32 @@
1From 0a24f03a67425a7b58b3fd40d965c0c9801ae7a1 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 27 Aug 2018 16:10:55 +0800
4Subject: [PATCH] libjpeg-turbo: fix package_qa error
5
6Fix package qa errors like below:
7libjpeg.so.62.3.0 contains probably-redundant RPATH /usr/lib [useless-rpaths]
8usr/bin/cjpeg contains probably-redundant RPATH /usr/lib
9
10Upstream-Status: Inappropriate[oe-specific]
11
12Signed-off-by: Changqing Li <changqing.li@windriver.com>
13---
14 CMakeLists.txt | 2 --
15 1 file changed, 2 deletions(-)
16
17diff --git a/CMakeLists.txt b/CMakeLists.txt
18index 1719522..682cef1 100644
19--- a/CMakeLists.txt
20+++ b/CMakeLists.txt
21@@ -109,8 +109,6 @@ endif()
22
23 include(cmakescripts/GNUInstallDirs.cmake)
24
25-set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
26-
27 macro(report_directory var)
28 if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var})
29 message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}")
30--
312.7.4
32
diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb
index 6be6aa572c..7737a593b0 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb
@@ -4,16 +4,17 @@ HOMEPAGE = "http://libjpeg-turbo.org/"
4 4
5LICENSE = "BSD-3-Clause" 5LICENSE = "BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8184bcc7c4ac7b9edc6a7bc00f231d0b \ 6LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8184bcc7c4ac7b9edc6a7bc00f231d0b \
7 file://jpeglib.h;endline=16;md5=f67d70e547a2662c079781c72f877f72 \ 7 file://jpeglib.h;endline=16;md5=7ea97dc83b0f59052ee837e61ef0e08f \
8 file://djpeg.c;endline=11;md5=c59e19811c006cb38f82d6477134d314 \ 8 file://djpeg.c;endline=11;md5=c59e19811c006cb38f82d6477134d314 \
9" 9"
10DEPENDS_append_x86-64_class-target = " nasm-native" 10DEPENDS_append_x86-64_class-target = " nasm-native"
11DEPENDS_append_x86_class-target = " nasm-native" 11DEPENDS_append_x86_class-target = " nasm-native"
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" 13SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
14 file://0001-libjpeg-turbo-fix-package_qa-error.patch"
14 15
15SRC_URI[md5sum] = "7c82f0f6a3130ec06b8a4d0b321cbca3" 16SRC_URI[md5sum] = "b12a3fcf1d078db38410f27718a91b83"
16SRC_URI[sha256sum] = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523" 17SRC_URI[sha256sum] = "778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868"
17UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" 18UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/"
18UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" 19UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
19 20
@@ -25,32 +26,24 @@ RPROVIDES_${PN} += "jpeg"
25RREPLACES_${PN} += "jpeg" 26RREPLACES_${PN} += "jpeg"
26RCONFLICTS_${PN} += "jpeg" 27RCONFLICTS_${PN} += "jpeg"
27 28
28inherit autotools pkgconfig 29inherit cmake pkgconfig
29 30
30# Add nasm-native dependency consistently for all build arches is hard 31# Add nasm-native dependency consistently for all build arches is hard
31EXTRA_OECONF_append_class-native = " --without-simd" 32EXTRA_OECMAKE_append_class-native = " -DWITH_SIMD=False"
32 33
33# Work around missing x32 ABI support 34# Work around missing x32 ABI support
34EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--without-simd", "", d)}" 35EXTRA_OECMAKE_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "-DWITH_SIMD=False", "", d)}"
35 36
36# Work around missing non-floating point ABI support in MIPS 37# Work around missing non-floating point ABI support in MIPS
37EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("MIPSPKGSFX_FPU", "-nf", "--without-simd", "", d)}" 38EXTRA_OECMAKE_append_class-target = " ${@bb.utils.contains("MIPSPKGSFX_FPU", "-nf", "-DWITH_SIMD=False", "", d)}"
38 39
39# Provide a workaround if Altivec unit is not present in PPC 40# Provide a workaround if Altivec unit is not present in PPC
40EXTRA_OECONF_append_class-target_powerpc = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" 41EXTRA_OECMAKE_append_class-target_powerpc = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "-DWITH_SIMD=False", d)}"
41EXTRA_OECONF_append_class-target_powerpc64 = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" 42EXTRA_OECMAKE_append_class-target_powerpc64 = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "-DWITH_SIMD=False", d)}"
42 43
43DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" 44DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
44DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" 45DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}"
45 46
46def get_build_time(d):
47 if d.getVar('SOURCE_DATE_EPOCH') != None:
48 import datetime
49 return " --with-build-date="+ datetime.datetime.utcfromtimestamp(float(d.getVar('SOURCE_DATE_EPOCH'))).strftime("%Y%m%d")
50 return ""
51
52EXTRA_OECONF_append_class-target = "${@get_build_time(d)}"
53
54PACKAGES =+ "jpeg-tools libturbojpeg" 47PACKAGES =+ "jpeg-tools libturbojpeg"
55 48
56DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library." 49DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library."