[PATCH 1/2] libgit2: set correct homepage URL

[PATCH 1/2] libgit2: set correct homepage URL

[Ross Burton]

libgit2.github.com no longer resolves, the homepage is now libgit2.org.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-support/libgit2/libgit2_1.9.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libgit2/libgit2_1.9.4.bb b/meta/recipes-support/libgit2/libgit2_1.9.4.bb
index 999ad6b05c8..6b01ab28c78 100644
--- a/meta/recipes-support/libgit2/libgit2_1.9.4.bb
+++ b/meta/recipes-support/libgit2/libgit2_1.9.4.bb
@@ -1,5 +1,5 @@
 SUMMARY = "the Git linkable library"
-HOMEPAGE = "http://libgit2.github.com/"
+HOMEPAGE = "https://libgit2.org/"
 LICENSE = "GPL-2.0-only WITH GCC-exception-2.0 AND MIT AND OpenSSL AND BSD-3-Clause AND Zlib AND ISC AND LGPL-2.1-or-later AND CC0-1.0 AND BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d"
 
-- 
2.43.0

[PATCH 2/2] libjpeg-turbo: use system zlib instead of bundled copy

[Ross Burton]

The libjpegturbo library bundles a copy of libspng which in turn bundles
a copy of zlib.  We don't currently have a libspng recipe but we can
stop it bundling zlib.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-graphics/jpeg/libjpeg-turbo_3.2.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.2.0.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.2.0.bb
index 89504419762..7a548d4e9c6 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_3.2.0.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_3.2.0.bb
@@ -5,6 +5,7 @@ HOMEPAGE = "http://libjpeg-turbo.org/"
 LICENSE = "BSD-3-Clause AND IJG AND Zlib"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d21daef3b4b318f77062055059c72934"
 
+DEPENDS = "zlib"
 DEPENDS:append:x86-64:class-target = " nasm-native"
 DEPENDS:append:x86:class-target = " nasm-native"
 
@@ -28,6 +29,8 @@ export NASMENV = "--reproducible --debug-prefix-map=${WORKDIR}=${TARGET_DBGSRC_D
 EXTRA_OECMAKE += "-DCMAKE_SKIP_INSTALL_RPATH=ON"
 # Ensure the -fPIC options are used to avoid -native compile failures, e.g. on opensuse160
 EXTRA_OECMAKE += "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
+# Use system zlib instead of the bundled copy
+EXTRA_OECMAKE += "-DWITH_SYSTEM_ZLIB=ON"
 
 # Add nasm-native dependency consistently for all build arches is hard
 EXTRA_OECMAKE:append:class-native = " -DWITH_SIMD=False"
-- 
2.43.0