libjpeg-turbo: upgrade 2.0.1 -> 2.0.2
PATCH 1/2 libjpeg-turbo: upgrade 2.0.1 -> 2.0.2
For changes, see:
https://github.com/libjpeg-turbo/libjpeg-turbo/releases
---
...0001-libjpeg-turbo-fix-package_qa-error.patch | 16 ++++++++--------
...peg-turbo_2.0.1.bb => libjpeg-turbo_2.0.2.bb} | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.0.1.bb => libjpeg-turbo_2.0.2.bb} (95%)meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch +8 -8
@@ -1,4 +1,4 @@ -From ce3bd4f0e46f738a9aec098e7c341ad6deeab9f2 Mon Sep 17 00:00:00 2001 +From 5cf847b5bef8dc3f9f89bd09dd5af4e6603f393c Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Mon, 27 Aug 2018 16:10:55 +0800 Subject: [PATCH] libjpeg-turbo: fix package_qa error
@@ -16,17 +16,17 @@ Signed-off-by: Anuj Mittal <[email protected]> 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index efeb51a..bbebe55 100644 +index 2bc3458..ea3041e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -109,10 +109,6 @@ endif() - - include(cmakescripts/GNUInstallDirs.cmake) +@@ -189,10 +189,6 @@ endif() + report_option(ENABLE_SHARED "Shared libraries") + report_option(ENABLE_STATIC "Static libraries") -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}}") + if(WITH_12BIT) + set(WITH_ARITH_DEC 0) + set(WITH_ARITH_ENC 0)
meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb renamed from meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.1.bb +2 -2
@@ -14,8 +14,8 @@ 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" +SRC_URI[md5sum] = "79f76fbfb0c6109631332762d10e16d2" +SRC_URI[sha256sum] = "acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
Signature · 1 line
2.17.1
PATCH 2/2 glib-networking: upgrade 2.54.1 -> 2.58.0
* Autotools support has been removed upstream, so migrate recipe to meson. For changes, see:
https://gitlab.gnome.org/GNOME/glib-networking/blob/glib-2-58/NEWS
* Remove unsupported configure options: pkcs11, ca-certificates. See:
https://bugzilla.gnome.org/show_bug.cgi?id=793281
https://bugzilla.gnome.org/show_bug.cgi?id=753260
License-Update: Change to LGPLv2.1
---
...ng_2.54.1.bb => glib-networking_2.58.0.bb} | 26 ++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
rename meta/recipes-core/glib-networking/{glib-networking_2.54.1.bb => glib-networking_2.58.0.bb} (40%)meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +14 -12
@@ -3,27 +3,29 @@ DESCRIPTION = "glib-networking contains the implementations of certain GLib netw HOMEPAGE = "https://gitlab.gnome.org/GNOME/glib-networking/" BUGTRACKER = "http://bugzilla.gnome.org" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SECTION = "libs" DEPENDS = "glib-2.0" -SRC_URI[archive.md5sum] = "99867463f182c2767bce0c74bc9cc981" -SRC_URI[archive.sha256sum] = "eaa787b653015a0de31c928e9a17eb57b4ce23c8cf6f277afaec0d685335012f" +SRC_URI[archive.md5sum] = "75b14b7e73a67753be9ce307751c661d" +SRC_URI[archive.sha256sum] = "bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068" -PACKAGECONFIG ??= "ca-certificates gnutls" +PACKAGECONFIG ??= "gnutls" -# No explicit dependency as it works without ca-certificates installed -PACKAGECONFIG[ca-certificates] = "--with-ca-certificates=${sysconfdir}/ssl/certs/ca-certificates.crt,--without-ca-certificates" -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" -PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit" +PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" +PACKAGECONFIG[libproxy] = "-Dlibproxy_support=true,-Dlibproxy_support=false,libproxy" -EXTRA_OECONF = "--without-gnome-proxy" +EXTRA_OEMESON = "-Dgnome_proxy_support=false" +GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext upstream-version-is-even gio-module-cache -FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/" +FILES_${PN} += "\ + ${libdir}/gio/modules/libgio*.so \ + ${datadir}/dbus-1/services/ \ + ${systemd_user_unitdir} \ + " FILES_${PN}-dev += "${libdir}/gio/modules/libgio*.la" FILES_${PN}-staticdev += "${libdir}/gio/modules/libgio*.a"
Signature · 1 line
2.17.1
Re: [PATCH 2/2] glib-networking: upgrade 2.54.1 -> 2.58.0
This does not build any more if USE_NLS = "no" is used. Has anyone looked at making this work together with meson? Otherwise I guess there is trouble ahead now that more and more packages are being converted to use meson, since the code in gettext.bbclass currently only supports autotools. A quick look at meson's i18n.py module does not indicate that there is any easy way to disable the gettext support, corresponding to autotools' --disable-nls. Apparently it was discussed in https://github.com/mesonbuild/meson/issues/821, but it seems they only added detection of the gettext tools without adding support for disabling gettext and then closed the issue.
Looking at 1d6648102 (json-glib: fix native build), it seems Ross encountered a similar problem for json-glib and opted to workaround the problem by overriding USE_NLS. However, that does not seem like a long term solution...
//Peter
Quoted 94 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Anuj Mittal
Sent: den 20 februari 2019 08:13
To: [email protected]
Subject: [OE-core] [PATCH 2/2] glib-networking: upgrade 2.54.1 -> 2.58.0* Autotools support has been removed upstream, so migrate recipe to meson. For changes, see:
https://gitlab.gnome.org/GNOME/glib-networking/blob/glib-2-58/NEWS* Remove unsupported configure options: pkcs11, ca-certificates. See:
https://bugzilla.gnome.org/show_bug.cgi?id=793281
https://bugzilla.gnome.org/show_bug.cgi?id=753260License-Update: Change to LGPLv2.1
Signed-off-by Anuj Mittal <[email protected]>--- ...ng_2.54.1.bb => glib-networking_2.58.0.bb} | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) rename meta/recipes-core/glib-networking/{glib-networking_2.54.1.bb =>glib-networking_2.58.0.bb} (40%)
(quoted diff) +0
-0networking_2.54.1.bb b/meta/recipes-core/glib-networking/glib- networking_2.58.0.bb
similarity index 40%
rename from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb rename to meta/recipes-core/glib-networking/glib-networking_2.58.0.bb index5d17a824f0..f3190e1cae100644meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +0
-0@@ -3,27 +3,29 @@ DESCRIPTION = "glib-networking contains theimplementations of certain GLib netw
HOMEPAGE = "https://gitlab.gnome.org/GNOME/glib-networking/" BUGTRACKER = "http://bugzilla.gnome.org"meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +0
-2-LICENSE = "LGPLv2" -LIC_FILES_CHKSUM ="file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +2
-0+LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM ="file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SECTION = "libs"
DEPENDS = "glib-2.0"meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +0
-2-SRC_URI[archive.md5sum] = "99867463f182c2767bce0c74bc9cc981" -SRC_URI[archive.sha256sum] ="
eaa787b653015a0de31c928e9a17eb57b4ce23c8cf6f277afaec0d685335012f"meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +2
-0+SRC_URI[archive.md5sum] = "75b14b7e73a67753be9ce307751c661d" +SRC_URI[archive.sha256sum] ="
bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068"meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +1
-3-PACKAGECONFIG ??= "ca-certificates gnutls" +PACKAGECONFIG ??= "gnutls" -# No explicit dependency as it works without ca-certificates installed -PACKAGECONFIG[ca-certificates] = "--with-ca-certificates=${sysconfdir}/ssl/certs/ca-certificates.crt,--without-ca- certificates"
meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +0
-2-PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" -PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +2
-1-PACKAGECONFIG[pkcs11] = "--with-pkcs11,--without-pkcs11,p11-kit" +PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" +PACKAGECONFIG[libproxy] = "-Dlibproxy_support=true,-Dlibproxy_support=false,libproxy"
meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +2
-2-EXTRA_OECONF = "--without-gnome-proxy" +EXTRA_OEMESON = "-Dgnome_proxy_support=false" +GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext upstream-version-is-even gio-module-cache -FILES_${PN} += "${libdir}/gio/modules/libgio*.so ${datadir}/dbus-1/services/"
meta/recipes-core/glib-networking/glib-networking_2.58.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.54.1.bb +5
-1+FILES_${PN} += "\ + ${libdir}/gio/modules/libgio*.so \ + ${datadir}/dbus-1/services/ \ + ${systemd_user_unitdir} \ + " FILES_${PN}-dev += "${libdir}/gio/modules/libgio*.la" FILES_${PN}-staticdev += "${libdir}/gio/modules/libgio*.a" --2.17.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH 2/2] glib-networking: upgrade 2.54.1 -> 2.58.0
Quoted 11 lines · Peter Kjellerstedt
This does not build any more if
USE_NLS= "no" is used. Has anyone looked at making this work together with meson? Otherwise I guess there is trouble ahead now that more and more packages are being converted to use meson, since the code in gettext.bbclass currently only supports autotools. A quick look at meson'si18n.pymodule does not indicate that there is any easy way to disable the gettext support, corresponding to autotools' --disable-nls. Apparently it was discussed in https://github.com/mesonbuild/meson/issues/821, but it seems they only added detection of the gettext tools without adding support for disabling gettext and then closed the issue.
Quoted 4 lines
Looking at
1d6648102(json-glib: fix native build), it seems Ross encountered a similar problem for json-glib and opted to workaround the problem by overridingUSE_NLS. However, that does not seem like a long term solution...
Once, we did have people who had interests in these things *and* time to be able to go and work on them. The way things are at the moment, the people who would have once done this are no longer available.
I agree this would be nice to have and we do rely on it for some parts of the build system but it will need someone to step up and work on it.
I don't know how to attract more people to help with these kinds of things, I think over time things will improve but we are struggling a bit with it right now.
It is worth opening a bug for so we can track it.
If someone had time to talk to upstream meson, that would also be useful, see if we can convince them its a good idea.
Cheers,
Richard