From 737a194042bb83045958b05c77f9ff5934db7982 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 20 Dec 2018 16:43:33 +0800 Subject: libjpeg-turbo: upgrade 2.0.0 -> 2.0.1 * For changes, see: https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/ChangeLog.md * Removed upstreamed patch Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- .../0001-libjpeg-turbo-fix-package_qa-error.patch | 18 ++-- ...bo-fix-wrongly-defined-define-HAVE_STDLIB.patch | 119 --------------------- meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb | 56 ---------- meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb | 56 ++++++++++ 4 files changed, 65 insertions(+), 184 deletions(-) delete mode 100644 meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch delete mode 100644 meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb create mode 100644 meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb (limited to 'meta/recipes-graphics') 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 index 44c2c768b2..6f3d201b21 100644 --- 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 @@ -1,4 +1,4 @@ -From 0a24f03a67425a7b58b3fd40d965c0c9801ae7a1 Mon Sep 17 00:00:00 2001 +From ce3bd4f0e46f738a9aec098e7c341ad6deeab9f2 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 27 Aug 2018 16:10:55 +0800 Subject: [PATCH] libjpeg-turbo: fix package_qa error @@ -10,23 +10,23 @@ usr/bin/cjpeg contains probably-redundant RPATH /usr/lib Upstream-Status: Inappropriate[oe-specific] Signed-off-by: Changqing Li +Signed-off-by: Anuj Mittal --- - CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1719522..682cef1 100644 +index efeb51a..bbebe55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -109,8 +109,6 @@ endif() +@@ -109,10 +109,6 @@ endif() include(cmakescripts/GNUInstallDirs.cmake) --set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) +-if(ENABLE_SHARED) +- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) +-endif() - macro(report_directory var) if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var}) message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}") --- -2.7.4 - diff --git a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch b/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch deleted file mode 100644 index 16767ebb6b..0000000000 --- a/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch +++ /dev/null @@ -1,119 +0,0 @@ -From d301019d0f23d12b9666d3d88b0859067a4ade77 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 30 Aug 2018 15:08:23 +0800 -Subject: [PATCH] libjpeg-turbo: fix wrongly defined define HAVE_STDLIB_H - -when change build system from autotools to cmake, below -part is replace wrongly: - -"#undef HAVE_STDLIB_H" -should be change to "#cmakedefine HAVE_STDLIB_H 1" -not "#cmakedefine HAVE_STDLIB_H" - -otherwise, even if stdlib.h is found, output file -of configure_file() will define like: #define HAVE_STDLIB_H -but we need it as #define HAVE_STDLIB_H 1, since for -different defination of HAVE_STDLIB_H will cause below error: -error: "HAVE_STDLIB_H" redefined [-Werror] - -Upstream-Status: Submitted[https://github.com/libjpeg-turbo/libjpeg-turbo/pull/275] - -Signed-off-by: Changqing Li ---- - jconfig.h.in | 28 ++++++++++++++-------------- - jconfigint.h.in | 4 ++-- - 2 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/jconfig.h.in b/jconfig.h.in -index 2842754..18a69a4 100644 ---- a/jconfig.h.in -+++ b/jconfig.h.in -@@ -10,16 +10,16 @@ - #define LIBJPEG_TURBO_VERSION_NUMBER @LIBJPEG_TURBO_VERSION_NUMBER@ - - /* Support arithmetic encoding */ --#cmakedefine C_ARITH_CODING_SUPPORTED -+#cmakedefine C_ARITH_CODING_SUPPORTED 1 - - /* Support arithmetic decoding */ --#cmakedefine D_ARITH_CODING_SUPPORTED -+#cmakedefine D_ARITH_CODING_SUPPORTED 1 - - /* Support in-memory source/destination managers */ --#cmakedefine MEM_SRCDST_SUPPORTED -+#cmakedefine MEM_SRCDST_SUPPORTED 1 - - /* Use accelerated SIMD routines. */ --#cmakedefine WITH_SIMD -+#cmakedefine WITH_SIMD 1 - - /* - * Define BITS_IN_JSAMPLE as either -@@ -33,37 +33,37 @@ - #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ - - /* Define to 1 if you have the header file. */ --#cmakedefine HAVE_LOCALE_H -+#cmakedefine HAVE_LOCALE_H 1 - - /* Define to 1 if you have the header file. */ --#cmakedefine HAVE_STDDEF_H -+#cmakedefine HAVE_STDDEF_H 1 - - /* Define to 1 if you have the header file. */ --#cmakedefine HAVE_STDLIB_H -+#cmakedefine HAVE_STDLIB_H 1 - - /* Define if you need to include to get size_t. */ --#cmakedefine NEED_SYS_TYPES_H -+#cmakedefine NEED_SYS_TYPES_H 1 - - /* Define if you have BSD-like bzero and bcopy in rather than - memset/memcpy in . */ --#cmakedefine NEED_BSD_STRINGS -+#cmakedefine NEED_BSD_STRINGS 1 - - /* Define to 1 if the system has the type `unsigned char'. */ --#cmakedefine HAVE_UNSIGNED_CHAR -+#cmakedefine HAVE_UNSIGNED_CHAR 1 - - /* Define to 1 if the system has the type `unsigned short'. */ --#cmakedefine HAVE_UNSIGNED_SHORT -+#cmakedefine HAVE_UNSIGNED_SHORT 1 - - /* Compiler does not support pointers to undefined structures. */ --#cmakedefine INCOMPLETE_TYPES_BROKEN -+#cmakedefine INCOMPLETE_TYPES_BROKEN 1 - - /* Define if your (broken) compiler shifts signed values as if they were - unsigned. */ --#cmakedefine RIGHT_SHIFT_IS_UNSIGNED -+#cmakedefine RIGHT_SHIFT_IS_UNSIGNED 1 - - /* Define to 1 if type `char' is unsigned and you are not using gcc. */ - #ifndef __CHAR_UNSIGNED__ -- #cmakedefine __CHAR_UNSIGNED__ -+ #cmakedefine __CHAR_UNSIGNED__ 1 - #endif - - /* Define to empty if `const' does not conform to ANSI C. */ -diff --git a/jconfigint.h.in b/jconfigint.h.in -index 55df053..6c898ac 100644 ---- a/jconfigint.h.in -+++ b/jconfigint.h.in -@@ -17,10 +17,10 @@ - #define SIZEOF_SIZE_T @SIZE_T@ - - /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */ --#cmakedefine HAVE_BUILTIN_CTZL -+#cmakedefine HAVE_BUILTIN_CTZL 1 - - /* Define to 1 if you have the header file. */ --#cmakedefine HAVE_INTRIN_H -+#cmakedefine HAVE_INTRIN_H 1 - - #if defined(_MSC_VER) && defined(HAVE_INTRIN_H) - #if (SIZEOF_SIZE_T == 8) --- -2.7.4 - diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb deleted file mode 100644 index 282bf95e8a..0000000000 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb +++ /dev/null @@ -1,56 +0,0 @@ -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=8184bcc7c4ac7b9edc6a7bc00f231d0b \ - file://jpeglib.h;endline=16;md5=7ea97dc83b0f59052ee837e61ef0e08f \ - file://djpeg.c;endline=11;md5=c59e19811c006cb38f82d6477134d314 \ -" -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 \ - file://0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch" - -SRC_URI[md5sum] = "b12a3fcf1d078db38410f27718a91b83" -SRC_URI[sha256sum] = "778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868" -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" -UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P(\d+[\.\-_]*)+)/" - -PE= "1" - -# Drop-in replacement for jpeg -PROVIDES = "jpeg" -RPROVIDES_${PN} += "jpeg" -RREPLACES_${PN} += "jpeg" -RCONFLICTS_${PN} += "jpeg" - -inherit cmake pkgconfig - -# Add nasm-native dependency consistently for all build arches is hard -EXTRA_OECMAKE_append_class-native = " -DWITH_SIMD=False" - -# Work around missing x32 ABI support -EXTRA_OECMAKE_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "-DWITH_SIMD=False", "", d)}" - -# Work around missing non-floating point ABI support in MIPS -EXTRA_OECMAKE_append_class-target = " ${@bb.utils.contains("MIPSPKGSFX_FPU", "-nf", "-DWITH_SIMD=False", "", d)}" - -# Provide a workaround if Altivec unit is not present in PPC -EXTRA_OECMAKE_append_class-target_powerpc = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "-DWITH_SIMD=False", d)}" -EXTRA_OECMAKE_append_class-target_powerpc64 = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "-DWITH_SIMD=False", d)}" - -DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" - -PACKAGES =+ "jpeg-tools libturbojpeg" - -DESCRIPTION_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." -FILES_jpeg-tools = "${bindir}/*" - -DESCRIPTION_libturbojpeg = "A SIMD-accelerated JPEG codec which provides only TurboJPEG APIs" -FILES_libturbojpeg = "${libdir}/libturbojpeg.so.*" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb new file mode 100644 index 0000000000..72706be674 --- /dev/null +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb @@ -0,0 +1,56 @@ +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=8184bcc7c4ac7b9edc6a7bc00f231d0b \ + file://jpeglib.h;endline=16;md5=7ea97dc83b0f59052ee837e61ef0e08f \ + file://djpeg.c;endline=11;md5=c59e19811c006cb38f82d6477134d314 \ +" +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[md5sum] = "1b05a66aa9b006fd04ed29f408e68f46" +SRC_URI[sha256sum] = "e5f86cec31df1d39596e0cca619ab1b01f99025a27dafdfc97a30f3a12f866ff" +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" +UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P(\d+[\.\-_]*)+)/" + +PE= "1" + +# Drop-in replacement for jpeg +PROVIDES = "jpeg" +RPROVIDES_${PN} += "jpeg" +RREPLACES_${PN} += "jpeg" +RCONFLICTS_${PN} += "jpeg" + +inherit cmake pkgconfig + +# Add nasm-native dependency consistently for all build arches is hard +EXTRA_OECMAKE_append_class-native = " -DWITH_SIMD=False" + +# Work around missing x32 ABI support +EXTRA_OECMAKE_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "-DWITH_SIMD=False", "", d)}" + +# Work around missing non-floating point ABI support in MIPS +EXTRA_OECMAKE_append_class-target = " ${@bb.utils.contains("MIPSPKGSFX_FPU", "-nf", "-DWITH_SIMD=False", "", d)}" + +# Provide a workaround if Altivec unit is not present in PPC +EXTRA_OECMAKE_append_class-target_powerpc = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "-DWITH_SIMD=False", d)}" +EXTRA_OECMAKE_append_class-target_powerpc64 = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "-DWITH_SIMD=False", d)}" + +DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" +DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" + +PACKAGES =+ "jpeg-tools libturbojpeg" + +DESCRIPTION_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." +FILES_jpeg-tools = "${bindir}/*" + +DESCRIPTION_libturbojpeg = "A SIMD-accelerated JPEG codec which provides only TurboJPEG APIs" +FILES_libturbojpeg = "${libdir}/libturbojpeg.so.*" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg