From 86fdcfd1169e892192f85a80d228b9bd2b84497a Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Sun, 23 Oct 2016 14:29:56 +0300 Subject: libjpeg-turbo: Upgrade 1.5.0 -> 1.5.1 Bug fixes and various improvements for AArch64 and PowerPC. Apply a patch from upstream to fix compilation on MIPS [RB] Signed-off-by: Maxin B. John Signed-off-by: Ross Burton --- .../jpeg/libjpeg-turbo/fix-mips.patch | 45 +++++++++++++++++++++ meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.0.bb | 46 --------------------- meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb | 47 ++++++++++++++++++++++ 3 files changed, 92 insertions(+), 46 deletions(-) create mode 100644 meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch delete mode 100644 meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.0.bb create mode 100644 meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch b/meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch new file mode 100644 index 0000000000..4d41237f13 --- /dev/null +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo/fix-mips.patch @@ -0,0 +1,45 @@ +Fix a regression that causes the MIPS code from building. + +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 7bfb22af123ac10798a9a4c9ec7b23e5065db35e Mon Sep 17 00:00:00 2001 +From: DRC +Date: Mon, 26 Sep 2016 17:59:14 -0500 +Subject: [PATCH] Fix broken MIPS build + +Regression introduced by 9055fb408dcb585ce9392d395e16630d51002152 + +Fixes #104 +--- + ChangeLog.md | 3 +++ + simd/jsimd_mips.c | 2 ++ + 2 files changed, 5 insertions(+) + +diff --git a/ChangeLog.md b/ChangeLog.md +index e2b9df3..71ddcaa 100644 +--- a/ChangeLog.md ++++ b/ChangeLog.md +@@ -6,6 +6,9 @@ + 1. Fixed a regression introduced by 1.5.1[7] that prevented libjpeg-turbo from + building with Android NDK platforms prior to android-21 (5.0). + ++2. Fixed a regression introduced by 1.5.1[1] that prevented the MIPS DSPR2 SIMD ++code in libjpeg-turbo from building. ++ + + 1.5.1 + ===== +diff --git a/simd/jsimd_mips.c b/simd/jsimd_mips.c +index 63b8115..02e90cd 100644 +--- a/simd/jsimd_mips.c ++++ b/simd/jsimd_mips.c +@@ -63,6 +63,8 @@ parse_proc_cpuinfo(const char* search_string) + LOCAL(void) + init_simd (void) + { ++ char *env = NULL; ++ + if (simd_support != ~0U) + return; + diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.0.bb deleted file mode 100644 index c9e70d73d2..0000000000 --- a/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.0.bb +++ /dev/null @@ -1,46 +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=05bab7c7ad899d85bfba60da1a1271f2 \ - file://jpeglib.h;endline=16;md5=f67d70e547a2662c079781c72f877f72 \ - file://djpeg.c;endline=11;md5=b90b6d2b4119f9e5807cd273f525d2af \ -" -DEPENDS = "nasm-native" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "3fc5d9b6a8bce96161659ae7a9939257" -SRC_URI[sha256sum] = "9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f" -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 autotools pkgconfig - -# Work around missing x32 ABI support -EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--without-simd", "", 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)}" - -# 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)}" - -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_1.5.1.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb new file mode 100644 index 0000000000..70d38f4a1a --- /dev/null +++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.1.bb @@ -0,0 +1,47 @@ +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=05bab7c7ad899d85bfba60da1a1271f2 \ + file://jpeglib.h;endline=16;md5=f67d70e547a2662c079781c72f877f72 \ + file://djpeg.c;endline=11;md5=b90b6d2b4119f9e5807cd273f525d2af \ +" +DEPENDS = "nasm-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://fix-mips.patch" +SRC_URI[md5sum] = "55deb139b0cac3c8200b75d485fc13f3" +SRC_URI[sha256sum] = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c" +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 autotools pkgconfig + +# Work around missing x32 ABI support +EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--without-simd", "", 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)}" + +# 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)}" + +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