diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-graphics/jpeg | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-graphics/jpeg')
-rw-r--r-- | poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch | 32 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch | 119 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb (renamed from poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb) | 31 |
3 files changed, 165 insertions, 17 deletions
diff --git a/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch b/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch new file mode 100644 index 000000000..44c2c768b --- /dev/null +++ b/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch @@ -0,0 +1,32 @@ +From 0a24f03a67425a7b58b3fd40d965c0c9801ae7a1 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> +--- + CMakeLists.txt | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1719522..682cef1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -109,8 +109,6 @@ endif() + + include(cmakescripts/GNUInstallDirs.cmake) + +-set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) +- + 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/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch b/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch new file mode 100644 index 000000000..16767ebb6 --- /dev/null +++ b/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch @@ -0,0 +1,119 @@ +From d301019d0f23d12b9666d3d88b0859067a4ade77 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +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 <changqing.li@windriver.com> +--- + 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 <locale.h> header file. */ +-#cmakedefine HAVE_LOCALE_H ++#cmakedefine HAVE_LOCALE_H 1 + + /* Define to 1 if you have the <stddef.h> header file. */ +-#cmakedefine HAVE_STDDEF_H ++#cmakedefine HAVE_STDDEF_H 1 + + /* Define to 1 if you have the <stdlib.h> header file. */ +-#cmakedefine HAVE_STDLIB_H ++#cmakedefine HAVE_STDLIB_H 1 + + /* Define if you need to include <sys/types.h> 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 <strings.h> rather than + memset/memcpy in <string.h>. */ +-#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 <intrin.h> 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/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb b/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb index 50a5ae085..282bf95e8 100644 --- a/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb +++ b/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb @@ -4,16 +4,18 @@ 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=f67d70e547a2662c079781c72f877f72 \ + 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" +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] = "7c82f0f6a3130ec06b8a4d0b321cbca3" -SRC_URI[sha256sum] = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523" +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<pver>(\d+[\.\-_]*)+)/" @@ -25,28 +27,23 @@ RPROVIDES_${PN} += "jpeg" RREPLACES_${PN} += "jpeg" RCONFLICTS_${PN} += "jpeg" -inherit autotools pkgconfig +inherit cmake pkgconfig # Add nasm-native dependency consistently for all build arches is hard -EXTRA_OECONF_append_class-native = " --without-simd" +EXTRA_OECMAKE_append_class-native = " -DWITH_SIMD=False" # Work around missing x32 ABI support -EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--without-simd", "", d)}" +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_OECONF_append_class-target = " ${@bb.utils.contains("MIPSPKGSFX_FPU", "-nf", "--without-simd", "", d)}" +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_OECONF_append_class-target_powerpc = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" -EXTRA_OECONF_append_class-target_powerpc64 = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" +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)}" -def get_build_time(d): - if d.getVar('SOURCE_DATE_EPOCH') != None: - import datetime - return " --with-build-date="+ datetime.datetime.fromtimestamp(float(d.getVar('SOURCE_DATE_EPOCH'))).strftime("%Y%m%d") - return "" - -EXTRA_OECONF_append_class-target = "${@get_build_time(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" |