aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2020-03-09 15:17:09 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-03-09 15:17:09 +0100
commitfd99eb50168af3b4bf9bf1712158f5ac6154ec1b (patch)
tree2e216479103075c50a3c60a5bf51c36d4626cb8e
parentb806ded5759ccfac4b3de5ca967ce580666c45e9 (diff)
parent8a0443e9b443df37c5a595cb4d3e57cd0fb5d9a8 (diff)
downloadbuildroot-fd99eb50168af3b4bf9bf1712158f5ac6154ec1b.tar.gz
buildroot-fd99eb50168af3b4bf9bf1712158f5ac6154ec1b.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--DEVELOPERS13
-rw-r--r--board/freescale/imx8qmmek/readme.txt76
-rw-r--r--boot/opensbi/opensbi.hash2
-rw-r--r--boot/opensbi/opensbi.mk2
-rw-r--r--configs/freescale_imx8qmmek_defconfig38
-rw-r--r--package/Config.in5
-rw-r--r--package/armadillo/armadillo.hash8
-rw-r--r--package/armadillo/armadillo.mk2
-rw-r--r--package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch48
-rw-r--r--package/avahi/avahi.hash2
-rw-r--r--package/avahi/avahi.mk64
-rw-r--r--package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch45
-rw-r--r--package/avro-c/avro-c.hash6
-rw-r--r--package/avro-c/avro-c.mk2
-rw-r--r--package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch44
-rw-r--r--package/bctoolbox/Config.in5
-rw-r--r--package/bctoolbox/bctoolbox.hash2
-rw-r--r--package/bctoolbox/bctoolbox.mk7
-rw-r--r--package/bearssl/Config.in7
-rw-r--r--package/bearssl/bearssl.hash3
-rw-r--r--package/bearssl/bearssl.mk42
-rw-r--r--package/botan/botan.hash5
-rw-r--r--package/botan/botan.mk2
-rw-r--r--package/connman/0001-nat-build-failure.patch30
-rw-r--r--package/connman/Config.in22
-rw-r--r--package/connman/connman.hash2
-rw-r--r--package/connman/connman.mk83
-rw-r--r--package/cutelyst/cutelyst.mk2
-rw-r--r--package/drbd-utils/drbd-utils.hash4
-rw-r--r--package/drbd-utils/drbd-utils.mk2
-rw-r--r--package/eudev/Config.in1
-rw-r--r--package/eudev/eudev.mk6
-rw-r--r--package/freescale-imx/firmware-imx/firmware-imx.mk8
-rw-r--r--package/fswebcam/fswebcam.hash2
-rw-r--r--package/fswebcam/fswebcam.mk5
-rw-r--r--package/gdb/gdb.mk4
-rw-r--r--package/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch109
-rw-r--r--package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch29
-rw-r--r--package/gensio/gensio.hash6
-rw-r--r--package/gensio/gensio.mk2
-rw-r--r--package/gnuplot/0001-configure-add-without-demo-option.patch32
-rw-r--r--package/gnuplot/0002-use-gdlib-config-properly.patch27
-rw-r--r--package/gnuplot/gnuplot.hash8
-rw-r--r--package/gnuplot/gnuplot.mk2
-rw-r--r--package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch33
-rw-r--r--package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch163
-rw-r--r--package/gobject-introspection/0003-disable-tests.patch29
-rw-r--r--package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch52
-rw-r--r--package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch48
-rw-r--r--package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch73
-rw-r--r--package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch29
-rw-r--r--package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch28
-rw-r--r--package/gobject-introspection/Config.in42
-rw-r--r--package/gobject-introspection/g-ir-compiler.in3
-rw-r--r--package/gobject-introspection/g-ir-scanner-lddwrapper.in3
-rw-r--r--package/gobject-introspection/g-ir-scanner-qemuwrapper.in17
-rw-r--r--package/gobject-introspection/g-ir-scanner.in8
-rw-r--r--package/gobject-introspection/gobject-introspection.hash4
-rw-r--r--package/gobject-introspection/gobject-introspection.mk133
-rw-r--r--package/gstreamer1/gst1-plugins-base/Config.in6
-rw-r--r--package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk6
-rw-r--r--package/gstreamer1/gst1-plugins-good/Config.in6
-rw-r--r--package/i2pd/i2pd.hash4
-rw-r--r--package/i2pd/i2pd.mk2
-rw-r--r--package/inadyn/Config.in1
-rw-r--r--package/inadyn/inadyn.hash9
-rw-r--r--package/inadyn/inadyn.mk4
-rw-r--r--package/ipset/ipset.hash6
-rw-r--r--package/ipset/ipset.mk2
-rw-r--r--package/kexec-lite/kexec-lite.hash2
-rw-r--r--package/kexec-lite/kexec-lite.mk2
-rw-r--r--package/kf5/Config.in1
-rw-r--r--package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch75
-rw-r--r--package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch43
-rw-r--r--package/kmod/kmod.hash6
-rw-r--r--package/kmod/kmod.mk4
-rw-r--r--package/kodi-visualisation-fishbmc/Config.in6
-rw-r--r--package/kvm-unit-tests/kvm-unit-tests.mk8
-rw-r--r--package/libcpprestsdk/libcpprestsdk.hash4
-rw-r--r--package/libcpprestsdk/libcpprestsdk.mk2
-rw-r--r--package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch62
-rw-r--r--package/libeXosip2/libeXosip2.hash2
-rw-r--r--package/libeXosip2/libeXosip2.mk7
-rw-r--r--package/libevdev/0001-configure-add-disable-runtime-tests-option.patch44
-rw-r--r--package/libevdev/0001-meson.build-use-local-include-path-for-tools.patch54
-rw-r--r--package/libevdev/libevdev.hash12
-rw-r--r--package/libevdev/libevdev.mk15
-rw-r--r--package/libiberty/libiberty.hash5
-rw-r--r--package/libiberty/libiberty.mk32
-rw-r--r--package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch44
-rw-r--r--package/libiio/libiio.hash2
-rw-r--r--package/libiio/libiio.mk2
-rw-r--r--package/libite/libite.hash13
-rw-r--r--package/libite/libite.mk2
-rw-r--r--package/libmbim/libmbim.hash2
-rw-r--r--package/libmbim/libmbim.mk2
-rw-r--r--package/libmediaart/libmediaart.mk2
-rw-r--r--package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch30
-rw-r--r--package/libosip2/libosip2.hash2
-rw-r--r--package/libosip2/libosip2.mk2
-rw-r--r--package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch38
-rw-r--r--package/libsecret/libsecret.hash6
-rw-r--r--package/libsecret/libsecret.mk4
-rw-r--r--package/libubootenv/libubootenv.hash2
-rw-r--r--package/libubootenv/libubootenv.mk2
-rw-r--r--package/libv4l/libv4l.mk2
-rw-r--r--package/libxkbcommon/libxkbcommon.hash8
-rw-r--r--package/libxkbcommon/libxkbcommon.mk12
-rw-r--r--package/linux-firmware/Config.in7
-rw-r--r--package/linux-firmware/linux-firmware.hash7
-rw-r--r--package/linux-firmware/linux-firmware.mk50
-rw-r--r--package/mali-t76x/egl.pc2
-rw-r--r--package/mali-t76x/glesv2.pc2
-rw-r--r--package/mediastreamer/Config.in4
-rw-r--r--package/mesa3d-headers/mesa3d-headers.mk2
-rw-r--r--package/mesa3d/mesa3d.hash8
-rw-r--r--package/mesa3d/mesa3d.mk9
-rw-r--r--package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch2
-rw-r--r--package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch2
-rw-r--r--package/meson/0003-envconfig-add-pkg_config_libdir-property.patch4
-rw-r--r--package/meson/meson.hash4
-rw-r--r--package/meson/meson.mk2
-rw-r--r--package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch31
-rw-r--r--package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch28
-rw-r--r--package/mini-snmpd/mini-snmpd2
-rw-r--r--package/mini-snmpd/mini-snmpd.hash2
-rw-r--r--package/mini-snmpd/mini-snmpd.mk11
-rw-r--r--package/mini-snmpd/mini-snmpd.service12
-rw-r--r--package/mpd/mpd.hash2
-rw-r--r--package/mpd/mpd.mk2
-rw-r--r--package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch54
-rw-r--r--package/musl/musl.hash6
-rw-r--r--package/musl/musl.mk2
-rw-r--r--package/nvidia-driver/gl.pc2
-rw-r--r--package/openblas/openblas.hash4
-rw-r--r--package/openblas/openblas.mk2
-rw-r--r--package/opencv3/opencv3.hash4
-rw-r--r--package/opencv3/opencv3.mk6
-rw-r--r--package/openfpgaloader/Config.in18
-rw-r--r--package/openfpgaloader/openfpgaloader.hash3
-rw-r--r--package/openfpgaloader/openfpgaloader.mk18
-rw-r--r--package/openlayers/openlayers.hash2
-rw-r--r--package/openlayers/openlayers.mk2
-rw-r--r--package/ortp/Config.in4
-rw-r--r--package/ortp/ortp.hash4
-rw-r--r--package/ortp/ortp.mk23
-rw-r--r--package/pcre/0001-Kill-compatibility-bits.patch7
-rw-r--r--package/pcre/pcre.hash4
-rw-r--r--package/pcre/pcre.mk2
-rw-r--r--package/pcre2/pcre2.hash6
-rw-r--r--package/pcre2/pcre2.mk2
-rw-r--r--package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch13
-rw-r--r--package/prelink-cross/prelink-cross.hash3
-rw-r--r--package/prelink-cross/prelink-cross.mk16
-rw-r--r--package/protobuf/protobuf.hash2
-rw-r--r--package/protobuf/protobuf.mk2
-rw-r--r--package/psplash/psplash-quit.service11
-rw-r--r--package/psplash/psplash-start.service3
-rw-r--r--package/psplash/psplash-systemd.service12
-rw-r--r--package/psplash/psplash.hash2
-rw-r--r--package/psplash/psplash.mk14
-rw-r--r--package/python-asn1crypto/python-asn1crypto.hash4
-rw-r--r--package/python-asn1crypto/python-asn1crypto.mk4
-rw-r--r--package/python-autobahn/python-autobahn.hash4
-rw-r--r--package/python-autobahn/python-autobahn.mk4
-rw-r--r--package/python-avro/0001-fix-pycodestyle-regression.patch28
-rw-r--r--package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch46
-rw-r--r--package/python-avro/python-avro.hash6
-rw-r--r--package/python-avro/python-avro.mk2
-rw-r--r--package/python-cffi/python-cffi.hash4
-rw-r--r--package/python-cffi/python-cffi.mk4
-rw-r--r--package/python-crossbar/0001-Avoid-intentional-syntax-error.patch12
-rw-r--r--package/python-crossbar/python-crossbar.hash6
-rw-r--r--package/python-crossbar/python-crossbar.mk6
-rw-r--r--package/python-ecdsa/Config.in1
-rw-r--r--package/python-ecdsa/python-ecdsa.hash4
-rw-r--r--package/python-ecdsa/python-ecdsa.mk4
-rw-r--r--package/python-flatbuffers/Config.in6
-rw-r--r--package/python-flatbuffers/python-flatbuffers.hash3
-rw-r--r--package/python-flatbuffers/python-flatbuffers.mk13
-rw-r--r--package/python-httplib2/python-httplib2.hash6
-rw-r--r--package/python-httplib2/python-httplib2.mk4
-rw-r--r--package/python-jinja2/python-jinja2.hash4
-rw-r--r--package/python-jinja2/python-jinja2.mk6
-rw-r--r--package/python-lmdb/python-lmdb.hash4
-rw-r--r--package/python-lmdb/python-lmdb.mk4
-rw-r--r--package/python-lxml/python-lxml.hash2
-rw-r--r--package/python-lxml/python-lxml.mk4
-rw-r--r--package/python-mako/python-mako.hash6
-rw-r--r--package/python-mako/python-mako.mk4
-rw-r--r--package/python-markdown/python-markdown.hash6
-rw-r--r--package/python-markdown/python-markdown.mk4
-rw-r--r--package/python-msgpack/python-msgpack.hash6
-rw-r--r--package/python-msgpack/python-msgpack.mk4
-rw-r--r--package/python-paramiko/python-paramiko.hash4
-rw-r--r--package/python-paramiko/python-paramiko.mk4
-rw-r--r--package/python-passlib/python-passlib.hash6
-rw-r--r--package/python-passlib/python-passlib.mk4
-rw-r--r--package/python-pexpect/python-pexpect.hash4
-rw-r--r--package/python-pexpect/python-pexpect.mk4
-rw-r--r--package/python-pip/python-pip.hash4
-rw-r--r--package/python-pip/python-pip.mk4
-rw-r--r--package/python-protobuf/python-protobuf.hash2
-rw-r--r--package/python-txaio/python-txaio.hash4
-rw-r--r--package/python-txaio/python-txaio.mk4
-rw-r--r--package/python3-mako/python3-mako.mk4
-rw-r--r--package/qt5/Config.in5
-rw-r--r--package/qt5/qt53d/qt53d.hash3
-rw-r--r--package/qt5/qt53d/qt53d.mk10
-rw-r--r--package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch (renamed from package/qt5/qt5base/5.12.7/0001-qtbase-Fix-build-error-when-using-EGL.patch)0
-rw-r--r--package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch (renamed from package/qt5/qt5base/5.12.7/0002-double-conversion-enable-for-microblaze.patch)0
-rw-r--r--package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch (renamed from package/qt5/qt5base/5.12.7/0003-double-conversion-enable-for-nios2.patch)0
-rw-r--r--package/qt5/qt5base/5.12.7/qt5base.hash11
-rw-r--r--package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch45
-rw-r--r--package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch37
-rw-r--r--package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch29
-rw-r--r--package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch74
-rw-r--r--package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch32
-rw-r--r--package/qt5/qt5base/5.6.3/qt5base.hash10
-rw-r--r--package/qt5/qt5base/Config.in13
-rw-r--r--package/qt5/qt5base/qt5base.hash13
-rw-r--r--package/qt5/qt5base/qt5base.mk64
-rw-r--r--package/qt5/qt5canvas3d/qt5canvas3d.hash6
-rw-r--r--package/qt5/qt5canvas3d/qt5canvas3d.mk5
-rw-r--r--package/qt5/qt5charts/qt5charts.hash3
-rw-r--r--package/qt5/qt5charts/qt5charts.mk7
-rw-r--r--package/qt5/qt5connectivity/5.12.7/qt5connectivity.hash9
-rw-r--r--package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash10
-rw-r--r--package/qt5/qt5connectivity/qt5connectivity.hash11
-rw-r--r--package/qt5/qt5connectivity/qt5connectivity.mk6
-rw-r--r--package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch (renamed from package/qt5/qt5declarative/5.12.7/0001-qsgtexture-fix-debug-build-with-uclibc.patch)0
-rw-r--r--package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch32
-rw-r--r--package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch64
-rw-r--r--package/qt5/qt5declarative/Config.in4
-rw-r--r--package/qt5/qt5declarative/qt5declarative.hash7
-rw-r--r--package/qt5/qt5declarative/qt5declarative.mk5
-rw-r--r--package/qt5/qt5enginio/Config.in12
-rw-r--r--package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash8
-rw-r--r--package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk5
-rw-r--r--package/qt5/qt5imageformats/qt5imageformats.hash5
-rw-r--r--package/qt5/qt5imageformats/qt5imageformats.mk5
-rw-r--r--package/qt5/qt5location/qt5location.hash8
-rw-r--r--package/qt5/qt5location/qt5location.mk7
-rw-r--r--package/qt5/qt5multimedia/qt5multimedia.hash7
-rw-r--r--package/qt5/qt5multimedia/qt5multimedia.mk14
-rw-r--r--package/qt5/qt5quickcontrols/Config.in5
-rw-r--r--package/qt5/qt5quickcontrols/qt5quickcontrols.hash6
-rw-r--r--package/qt5/qt5quickcontrols/qt5quickcontrols.mk12
-rw-r--r--package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash7
-rw-r--r--package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash7
-rw-r--r--package/qt5/qt5quickcontrols2/Config.in5
-rw-r--r--package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash9
-rw-r--r--package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk10
-rw-r--r--package/qt5/qt5script/qt5script.hash6
-rw-r--r--package/qt5/qt5script/qt5script.mk5
-rw-r--r--package/qt5/qt5scxml/Config.in5
-rw-r--r--package/qt5/qt5sensors/qt5sensors.hash8
-rw-r--r--package/qt5/qt5sensors/qt5sensors.mk6
-rw-r--r--package/qt5/qt5serialbus/5.12.7/qt5serialbus.hash8
-rw-r--r--package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch36
-rw-r--r--package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash8
-rw-r--r--package/qt5/qt5serialbus/qt5serialbus.hash10
-rw-r--r--package/qt5/qt5serialport/5.12.7/qt5serialport.hash9
-rw-r--r--package/qt5/qt5serialport/5.6.3/qt5serialport.hash10
-rw-r--r--package/qt5/qt5serialport/qt5serialport.hash11
-rw-r--r--package/qt5/qt5serialport/qt5serialport.mk6
-rw-r--r--package/qt5/qt5svg/qt5svg.hash5
-rw-r--r--package/qt5/qt5svg/qt5svg.mk6
-rw-r--r--package/qt5/qt5tools/qt5tools.hash7
-rw-r--r--package/qt5/qt5tools/qt5tools.mk7
-rw-r--r--package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch38
-rw-r--r--package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash8
-rw-r--r--package/qt5/qt5virtualkeyboard/5.12.7/qt5virtualkeyboard.hash9
-rw-r--r--package/qt5/qt5virtualkeyboard/Config.in5
-rw-r--r--package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash11
-rw-r--r--package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk34
-rw-r--r--package/qt5/qt5wayland/qt5wayland.hash7
-rw-r--r--package/qt5/qt5wayland/qt5wayland.mk19
-rw-r--r--package/qt5/qt5webchannel/qt5webchannel.hash8
-rw-r--r--package/qt5/qt5webchannel/qt5webchannel.mk14
-rw-r--r--package/qt5/qt5webengine/0001-pkg_config-Fixes-when-use_sysroot-false.patch (renamed from package/qt5/qt5webengine/5.12.7/0001-pkg_config-Fixes-when-use_sysroot-false.patch)0
-rw-r--r--package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch35
-rw-r--r--package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch93
-rw-r--r--package/qt5/qt5webengine/5.6.3/qt5webengine.hash258
-rw-r--r--package/qt5/qt5webengine/Config.in2
-rw-r--r--package/qt5/qt5webengine/chromium-lts.inc253
-rw-r--r--package/qt5/qt5webengine/qt5webengine.hash (renamed from package/qt5/qt5webengine/5.12.7/qt5webengine.hash)0
-rw-r--r--package/qt5/qt5webengine/qt5webengine.mk9
-rw-r--r--package/qt5/qt5webkit-examples/qt5webkit-examples.hash3
-rw-r--r--package/qt5/qt5webkit-examples/qt5webkit-examples.mk7
-rw-r--r--package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch (renamed from package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch)0
-rw-r--r--package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch (renamed from package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch)0
-rw-r--r--package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch (renamed from package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch)0
-rw-r--r--package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch (renamed from package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch)0
-rw-r--r--package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch (renamed from package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch)0
-rw-r--r--package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch85
-rw-r--r--package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch44
-rw-r--r--package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch93
-rw-r--r--package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch48
-rw-r--r--package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch36
-rw-r--r--package/qt5/qt5webkit/qt5webkit.hash3
-rw-r--r--package/qt5/qt5webkit/qt5webkit.mk7
-rw-r--r--package/qt5/qt5websockets/qt5websockets.hash7
-rw-r--r--package/qt5/qt5websockets/qt5websockets.mk7
-rw-r--r--package/qt5/qt5webview/qt5webview.hash3
-rw-r--r--package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash10
-rw-r--r--package/qt5/qt5x11extras/qt5x11extras.hash (renamed from package/qt5/qt5x11extras/5.12.7/qt5x11extras.hash)0
-rw-r--r--package/qt5/qt5x11extras/qt5x11extras.mk6
-rw-r--r--package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash7
-rw-r--r--package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk7
-rw-r--r--package/scrypt/scrypt.hash6
-rw-r--r--package/scrypt/scrypt.mk4
-rw-r--r--package/sed/sed.hash6
-rw-r--r--package/sed/sed.mk2
-rw-r--r--package/ser2net/ser2net.hash6
-rw-r--r--package/ser2net/ser2net.mk2
-rw-r--r--package/sispmctl/sispmctl.hash2
-rw-r--r--package/sispmctl/sispmctl.mk2
-rw-r--r--package/smartmontools/0001-configure.ac-fix-stack-protector-detection.patch38
-rw-r--r--package/smartmontools/smartmontools.hash8
-rw-r--r--package/smartmontools/smartmontools.mk11
-rw-r--r--package/syslog-ng/syslog-ng.conf2
-rw-r--r--package/syslog-ng/syslog-ng.hash2
-rw-r--r--package/syslog-ng/syslog-ng.mk2
-rw-r--r--package/systemd/Config.in22
-rw-r--r--package/systemd/systemd.hash2
-rw-r--r--package/systemd/systemd.mk29
-rw-r--r--package/uacme/uacme.hash2
-rw-r--r--package/uacme/uacme.mk2
-rw-r--r--package/udev-gentoo-scripts/Config.in6
-rw-r--r--package/udev-gentoo-scripts/udev-gentoo-scripts.hash3
-rw-r--r--package/udev-gentoo-scripts/udev-gentoo-scripts.mk22
-rw-r--r--package/upmpdcli/upmpdcli.hash4
-rw-r--r--package/upmpdcli/upmpdcli.mk2
-rw-r--r--package/vala/vala.hash4
-rw-r--r--package/vala/vala.mk5
-rw-r--r--package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch8
-rw-r--r--package/wayland-protocols/wayland-protocols.hash10
-rw-r--r--package/wayland-protocols/wayland-protocols.mk2
-rwxr-xr-xsupport/scripts/pkg-stats241
-rwxr-xr-xutils/scanpypi6
342 files changed, 2169 insertions, 3082 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4dad3173e..d45b0a203b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -180,6 +180,7 @@ freescale_imx6sxsabresd_defconfig: { extends: .defconfig }
freescale_imx7dsabresd_defconfig: { extends: .defconfig }
freescale_imx8mmevk_defconfig: { extends: .defconfig }
freescale_imx8mqevk_defconfig: { extends: .defconfig }
+freescale_imx8qmmek_defconfig: { extends: .defconfig }
freescale_imx8qxpmek_defconfig: { extends: .defconfig }
freescale_p1025twr_defconfig: { extends: .defconfig }
freescale_t1040d4rdb_defconfig: { extends: .defconfig }
diff --git a/DEVELOPERS b/DEVELOPERS
index dd44331b85..3316f701ce 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -31,6 +31,7 @@ F: package/audit/
F: package/busybox/
F: package/checkpolicy/
F: package/cppdb/
+F: package/gobject-introspection/
F: package/gstreamer1/gstreamer1/
F: package/gstreamer1/gstreamer1-mm/
F: package/gstreamer1/gst1-plugins-bad/
@@ -53,6 +54,7 @@ F: package/openjdk/
F: package/openjdk-bin/
F: package/php/
F: package/policycoreutils/
+F: package/prelink-cross/
F: package/polkit/
F: package/python3/
F: package/python-aioredis/
@@ -503,6 +505,7 @@ F: package/skeleton-init-systemd/
F: package/skeleton-init-sysv/
F: package/skeleton/
F: package/sysvinit/
+F: package/udev-gentoo-scripts/
F: package/util-linux/
F: package/tpm2-abrmd/
F: package/tpm2-tools/
@@ -823,6 +826,7 @@ F: package/libmaxminddb/
F: package/openzwave/
N: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+F: package/bearssl/
F: package/boinc/
F: package/cairo/
F: package/duktape/
@@ -1167,6 +1171,7 @@ F: package/python-async-lru/
F: package/python-async-timeout/
F: package/python-brotli/
F: package/python-cchardet/
+F: package/python-flatbuffers/
F: package/python-frozenlist/
F: package/python-janus/
F: package/python-logstash/
@@ -1218,6 +1223,9 @@ F: package/quota/
N: Jason Pruitt <jrspruitt@gmail.com>
F: package/librtlsdr/
+N: Jean Burgat <jeanburgat33@gmail.com>
+F: package/openfpgaloader/
+
N: Jens Kleintje <scooby22@web.de>
F: package/gcnano-binaries/
@@ -1508,6 +1516,10 @@ F: package/python-simplejson/
F: package/python-versiontools/
F: package/wilc1000-firmware/
+N: Maeva Manuel <maeva.manuel@oss.nxp.com>
+F: board/freescale/imx8qmmek/
+F: configs/freescale_imx8qmmek_defconfig
+
N: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
F: package/ffmpeg/
F: package/mpv/
@@ -2558,6 +2570,7 @@ F: package/keyutils/
F: package/libbsd/
F: package/libedit/
F: package/libgsm/
+F: package/libiberty/
F: package/libinput/
F: package/libiscsi/
F: package/libpri/
diff --git a/board/freescale/imx8qmmek/readme.txt b/board/freescale/imx8qmmek/readme.txt
new file mode 100644
index 0000000000..b6bb3c4765
--- /dev/null
+++ b/board/freescale/imx8qmmek/readme.txt
@@ -0,0 +1,76 @@
+***************************
+Freescale i.MX8QM MEK board
+***************************
+
+This file documents the Buildroot support for the NXP i.MX8QM MEK board.
+
+You will find a reference to the board on nxp.com:
+https://www.nxp.com/design/development-boards/i.mx-evaluation-and-development-boards/i.mx-8quadmax-multisensory-enablement-kit-mek:MCIMX8QM-CPU
+
+You can also find the get started guide here:
+https://www.nxp.com/document/guide/get-started-with-the-i.mx-8quadmax-mek:GS-iMX-8QM-MEK
+
+Build
+=====
+
+First, configure Buildroot for the i.MX8QM MEK board:
+
+$ make freescale_imx8qmmek_defconfig
+
+Build all components:
+
+$ make
+
+You will find in output/images/ the following files:
+ - ahab-container.img
+ - bl31.bin
+ - boot.vfat
+ - fsl-imx8qm-mek.dtb
+ - Image
+ - imx8-boot-sd.bin
+ - mkimg.commit
+ - mx8qm-mek-scfw-tcm.bin
+ - mx8qm-val-scfw-tcm.bin
+ - mx8qm-a0-ddr4-scfw-tcm.bin
+ - mx8qm-a0-mek-scfw-tcm.bin
+ - mx8qm-a0-val-scfw-tcm.bin
+ - mx8qm-ddr4-scfw-tcm.bin
+ - rootfs.ext2
+ - rootfs.ext4
+ - rootfs.tar
+ - sdcard.img
+ - u-boot-atf.bin
+ - u-boot.bin
+ - u-boot-hash.bin
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+ cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a SD card. Launch the following
+command as root:
+
+ dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+
+*** WARNING! This will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/freescale/common/imx/genimage.cfg.template_imx8.
+
+Boot the i.MX8QM MEK board
+==========================
+
+To boot your newly created system:
+- insert the SD card in the SD slot of the board;
+- Configure the boot switch as follows:
+SW2: OFF OFF ON ON OFF OFF
+- put a micro USB cable into the Debug USB Port and connect using a terminal
+ emulator at 115200 bps, 8n1;
+- power on the board.
+
+Enjoy!
diff --git a/boot/opensbi/opensbi.hash b/boot/opensbi/opensbi.hash
index 47d5930ace..6e69d512dd 100644
--- a/boot/opensbi/opensbi.hash
+++ b/boot/opensbi/opensbi.hash
@@ -1,3 +1,3 @@
# locally computed
-sha256 bc82f1e63663cafb7976b324d8a01263510cfd816063dc89e0ccffb9763fb1dd opensbi-0.5.tar.gz
+sha256 46a93afd5465eba094ddba40015e754bf09f9e80e0702c00013d6bdb3ecd0a72 opensbi-0.6.tar.gz
sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD
diff --git a/boot/opensbi/opensbi.mk b/boot/opensbi/opensbi.mk
index 2df746ab00..00e3b05dd0 100644
--- a/boot/opensbi/opensbi.mk
+++ b/boot/opensbi/opensbi.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENSBI_VERSION = 0.5
+OPENSBI_VERSION = 0.6
OPENSBI_SITE = $(call github,riscv,opensbi,v$(OPENSBI_VERSION))
OPENSBI_LICENSE = BSD-2-Clause
OPENSBI_LICENSE_FILES = COPYING.BSD
diff --git a/configs/freescale_imx8qmmek_defconfig b/configs/freescale_imx8qmmek_defconfig
new file mode 100644
index 0000000000..ddc4767e08
--- /dev/null
+++ b/configs/freescale_imx8qmmek_defconfig
@@ -0,0 +1,38 @@
+BR2_aarch64=y
+BR2_ARM_FPU_VFPV4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8qm-mek"
+BR2_PACKAGE_FREESCALE_IMX=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y
+BR2_PACKAGE_FIRMWARE_IMX=y
+BR2_PACKAGE_IMX_SC_FIRMWARE=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_IMX_MKIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
diff --git a/package/Config.in b/package/Config.in
index edf7687ab7..910b26698e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -499,6 +499,7 @@ endmenu
source "package/ofono/Config.in"
source "package/on2-8170-modules/Config.in"
source "package/open2300/Config.in"
+ source "package/openfpgaloader/Config.in"
source "package/openipmi/Config.in"
source "package/openocd/Config.in"
source "package/openpowerlink/Config.in"
@@ -555,6 +556,7 @@ endmenu
source "package/ubus/Config.in"
source "package/uccp420wlan/Config.in"
source "package/udev/Config.in"
+ source "package/udev-gentoo-scripts/Config.in"
source "package/udisks/Config.in"
source "package/uhubctl/Config.in"
source "package/umtprd/Config.in"
@@ -940,6 +942,7 @@ menu "External python modules"
source "package/python-flask-jsonrpc/Config.in"
source "package/python-flask-login/Config.in"
source "package/python-flask-sqlalchemy/Config.in"
+ source "package/python-flatbuffers/Config.in"
source "package/python-flup/Config.in"
source "package/python-frozenlist/Config.in"
source "package/python-functools32/Config.in"
@@ -1275,6 +1278,7 @@ menu "Compression and decompression"
endmenu
menu "Crypto"
+ source "package/bearssl/Config.in"
source "package/beecrypt/Config.in"
source "package/botan/Config.in"
source "package/ca-certificates/Config.in"
@@ -1770,6 +1774,7 @@ menu "Other"
source "package/glibmm/Config.in"
source "package/glm/Config.in"
source "package/gmp/Config.in"
+ source "package/gobject-introspection/Config.in"
source "package/gsl/Config.in"
source "package/gtest/Config.in"
source "package/jemalloc/Config.in"
diff --git a/package/armadillo/armadillo.hash b/package/armadillo/armadillo.hash
index 6b3c4a855f..aa21570803 100644
--- a/package/armadillo/armadillo.hash
+++ b/package/armadillo/armadillo.hash
@@ -1,7 +1,7 @@
# From http://sourceforge.net/projects/arma/files/?source=navbar
-md5 5ef71763bd429a3d481499878351f3be armadillo-7.900.1.tar.xz
-sha1 8118faf1c6a7a39c55a1103a1f90e85e613cc377 armadillo-7.900.1.tar.xz
+md5 12c3b63c301d414659d7592ff58a71cb armadillo-9.850.1.tar.xz
+sha1 0a2d3ef140fd8587867def7359fe45f9df4a925a armadillo-9.850.1.tar.xz
# Locally computed:
-sha256 33eec7013990b5477ccc5ad3abc68bc2326c7a7a2790014d625cfcf37c0e07d3 armadillo-7.900.1.tar.xz
+sha256 d4c389b9597a5731500ad7a2656c11a6031757aaaadbcafdea5cc8ac0fd2c01f armadillo-9.850.1.tar.xz
# License files, locally calculated
-sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt
+sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt
diff --git a/package/armadillo/armadillo.mk b/package/armadillo/armadillo.mk
index 5d9e3eda57..d9a28e9878 100644
--- a/package/armadillo/armadillo.mk
+++ b/package/armadillo/armadillo.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ARMADILLO_VERSION = 7.900.1
+ARMADILLO_VERSION = 9.850.1
ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz
ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma
ARMADILLO_DEPENDENCIES = clapack
diff --git a/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch b/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch
deleted file mode 100644
index 0e8408c830..0000000000
--- a/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001
-From: Trent Lloyd <trent@lloyd.id.au>
-Date: Sat, 22 Dec 2018 09:06:07 +0800
-Subject: [PATCH] Drop legacy unicast queries from address not on local link
-
-When handling legacy unicast queries, ensure that the source IP is
-inside a subnet on the local link, otherwise drop the packet.
-
-Fixes #145
-Fixes #203
-CVE-2017-6519
-CVE-2018-100084
-
-Backported from: e111def44a7df4624a4aa3f85fe98054bffb6b4f
-Signed-off-by: Artem Panfilov <panfilov.artyom@gmail.com>
----
- avahi-core/server.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/avahi-core/server.c b/avahi-core/server.c
-index a2cb19a8..a2580e38 100644
---- a/avahi-core/server.c
-+++ b/avahi-core/server.c
-@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
-
- if (avahi_dns_packet_is_query(p)) {
- int legacy_unicast = 0;
-+ char t[AVAHI_ADDRESS_STR_MAX];
-
- /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the
- * AR section completely here, so far. Until the day we add
-@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
- legacy_unicast = 1;
- }
-
-+ if (!is_mdns_mcast_address(dst_address) &&
-+ !avahi_interface_address_on_link(i, src_address)) {
-+
-+ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol);
-+ return;
-+ }
-+
- if (legacy_unicast)
- reflect_legacy_unicast_query_packet(s, p, i, src_address, port);
-
---
-2.19.1
-
diff --git a/package/avahi/avahi.hash b/package/avahi/avahi.hash
index b4d36ffe50..cfc7ba020d 100644
--- a/package/avahi/avahi.hash
+++ b/package/avahi/avahi.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 avahi-0.7.tar.gz
+sha256 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda avahi-0.8.tar.gz
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index 53021f6b6d..39289bd636 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -4,62 +4,13 @@
#
################################################################################
-AVAHI_VERSION = 0.7
+AVAHI_VERSION = 0.8
AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION)
AVAHI_LICENSE = LGPL-2.1+
AVAHI_LICENSE_FILES = LICENSE
AVAHI_INSTALL_STAGING = YES
-AVAHI_CONF_ENV = \
- ac_cv_func_strtod=yes \
- ac_fsusage_space=yes \
- fu_cv_sys_stat_statfs2_bsize=yes \
- ac_cv_func_closedir_void=no \
- ac_cv_func_getloadavg=no \
- ac_cv_lib_util_getloadavg=no \
- ac_cv_lib_getloadavg_getloadavg=no \
- ac_cv_func_getgroups=yes \
- ac_cv_func_getgroups_works=yes \
- ac_cv_func_chown_works=yes \
- ac_cv_have_decl_euidaccess=no \
- ac_cv_func_euidaccess=no \
- ac_cv_have_decl_strnlen=yes \
- ac_cv_func_strnlen_working=yes \
- ac_cv_func_lstat_dereferences_slashed_symlink=yes \
- ac_cv_func_lstat_empty_string_bug=no \
- ac_cv_func_stat_empty_string_bug=no \
- vb_cv_func_rename_trailing_slash_bug=no \
- ac_cv_have_decl_nanosleep=yes \
- jm_cv_func_nanosleep_works=yes \
- gl_cv_func_working_utimes=yes \
- ac_cv_func_utime_null=yes \
- ac_cv_have_decl_strerror_r=yes \
- ac_cv_func_strerror_r_char_p=no \
- jm_cv_func_svid_putenv=yes \
- ac_cv_func_getcwd_null=yes \
- ac_cv_func_getdelim=yes \
- ac_cv_func_mkstemp=yes \
- utils_cv_func_mkstemp_limitations=no \
- utils_cv_func_mkdir_trailing_slash_bug=no \
- jm_cv_func_gettimeofday_clobber=no \
- am_cv_func_working_getline=yes \
- gl_cv_func_working_readdir=yes \
- jm_ac_cv_func_link_follows_symlink=no \
- utils_cv_localtime_cache=no \
- ac_cv_struct_st_mtim_nsec=no \
- gl_cv_func_tzset_clobber=no \
- gl_cv_func_getcwd_null=yes \
- gl_cv_func_getcwd_path_max=yes \
- ac_cv_func_fnmatch_gnu=yes \
- am_getline_needs_run_time_check=no \
- am_cv_func_working_getline=yes \
- gl_cv_func_mkdir_trailing_slash_bug=no \
- gl_cv_func_mkstemp_limitations=no \
- ac_cv_func_working_mktime=yes \
- jm_cv_func_working_re_compile_pattern=yes \
- ac_use_included_regex=no \
- avahi_cv_sys_cxx_works=yes \
- DATADIRNAME=share
+AVAHI_CONF_ENV = DATADIRNAME=share
# Note: even if we have Gtk2 and Gtk3 support in Buildroot, we
# explicitly disable support for them, in order to avoid the following
@@ -74,6 +25,7 @@ AVAHI_CONF_ENV = \
AVAHI_CONF_OPTS = \
--disable-qt3 \
--disable-qt4 \
+ --disable-qt5 \
--disable-gtk \
--disable-gtk3 \
--disable-gdbm \
@@ -89,9 +41,7 @@ AVAHI_CONF_OPTS = \
--with-autoipd-user=avahi \
--with-autoipd-group=avahi
-AVAHI_DEPENDENCIES = \
- host-intltool host-pkgconf \
- $(TARGET_NLS_DEPENDENCIES)
+AVAHI_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
AVAHI_CFLAGS = $(TARGET_CFLAGS)
@@ -130,6 +80,12 @@ else
AVAHI_CONF_OPTS += --disable-dbus
endif
+ifeq ($(BR2_PACKAGE_LIBEVENT),y)
+AVAHI_DEPENDENCIES += libevent
+else
+AVAHI_CONF_OPTS += --disable-libevent
+endif
+
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
AVAHI_DEPENDENCIES += libglib2
else
diff --git a/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch b/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch
deleted file mode 100644
index bfa7e8a60e..0000000000
--- a/package/avro-c/0001-Allow-avro-C-to-be-built-on-musl-based-systems.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 9b39a985bcd6cd34f0820f3680f145d46c0e56bd Mon Sep 17 00:00:00 2001
-From: Titouan Christophe <titouan.christophe@railnova.eu>
-Date: Sun, 8 Dec 2019 01:55:59 +0100
-Subject: [PATCH] Allow avro C to be built on musl based systems.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The type `ssize_t` is defined in sys/types.h, and nowhere else
-in the musl standard C library, so it should be included for the
-compilation to succeed.
-
-This fixes several errors like:
-
- In file included from src/generic.c:29:0:
- src/generic.c: In function ‘avro_generic_value_new’:
- src/avro_generic_internal.h:63:39:
- error: ‘ssize_t’ undeclared (first use in this function);
- did you mean ‘size_t’?
-
-Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
-[yann.morin.1998@free.fr:
- - backported from upstream 9b39a98, adapted to the release tarball
-]
-Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
----
- src/avro_generic_internal.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/avro_generic_internal.h b/src/avro_generic_internal.h
-index 709403c0..9843ed65 100644
---- a/src/avro_generic_internal.h
-+++ b/src/avro_generic_internal.h
-@@ -24,6 +24,8 @@ extern "C" {
- #define CLOSE_EXTERN
- #endif
-
-+#include <sys/types.h>
-+
- #include "avro/generic.h"
- #include "avro/schema.h"
- #include "avro/value.h"
---
-2.20.1
-
diff --git a/package/avro-c/avro-c.hash b/package/avro-c/avro-c.hash
index da74f3c052..fdddf0bd80 100644
--- a/package/avro-c/avro-c.hash
+++ b/package/avro-c/avro-c.hash
@@ -1,5 +1,5 @@
-# From https://www-eu.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz.sha512
-sha512 68b1f44f870c9b6f0b2380da9e34d91148ff4398cb300f4bdd4e3e1ad00820acd9084b73232b00d4cd4935fb992b41dc65afdafcbea14a3d87259608688df904 avro-c-1.9.1.tar.gz
+# From https://www-eu.apache.org/dist/avro/avro-1.9.2/c/avro-c-1.9.2.tar.gz.sha512
+sha512 1bc4bb22c88b70235e8e0280dbb7aeee7aa3f6cb7ff78a1aa5a7a6a1aca5522e8cfc89064096eace1c07a50e98f2397abd3620de1a29f9e5103b6f4c84316927 avro-c-1.9.2.tar.gz
# License files
-sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE
+sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE
diff --git a/package/avro-c/avro-c.mk b/package/avro-c/avro-c.mk
index a1b1931bf0..5cdbe362d8 100644
--- a/package/avro-c/avro-c.mk
+++ b/package/avro-c/avro-c.mk
@@ -4,7 +4,7 @@
#
################################################################################
-AVRO_C_VERSION = 1.9.1
+AVRO_C_VERSION = 1.9.2
AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c
AVRO_C_LICENSE = Apache-2.0
AVRO_C_LICENSE_FILES = LICENSE
diff --git a/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch b/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch
index a70c7c633a..342042d59c 100644
--- a/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch
+++ b/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch
@@ -1,49 +1,37 @@
-From c0b3dbb43aa3a38c47311556c85eadc6072e2d68 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
-Date: Tue, 14 Feb 2017 22:02:26 +0100
-Subject: [PATCH] Fix Libs.private flags for mbedtls
+From b7f14a800bbdad193f45695bc5b8c5173f3882ba Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 10 Feb 2019 17:51:05 +0100
+Subject: [PATCH] CMakeLists.txt: fix mbedtls libraries in bctoolbox.pc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-Static linking with bctoolbox fails when using pkg-config as the
-generated bctoolbox.pc file only consists of an '-L' string without any
-search path or libraries flags.
-
-That's because of an typo in `mbedtls_library_path`. However,
-`mbedtls_library_path` contains a string of the mbedtls libraries
-concatenated by an ';' which cannot be parsed by pkg-config.
-
-Therefore, use `MBEDTLS_LIBRARY` instead of `MBEDTLS_LIBRARIES` to get
-the library path.
-
-Furthermore, add the three mbedtls libraries *mbedtls*, *mbedcrypto*, and
-*mbedx509* to `LIBS_PRIVATE` so these libraries are added to the
-`Libs.private` field of bctoolbox.pc.
-
-Upstream status: Pending
+bctoolbox.pc should not contain the full libraries path, path should be
+given by -L and library names by -l
+So sent back the fix already suggested by Jörg Krause in
https://github.com/BelledonneCommunications/bctoolbox/pull/4
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status:
+https://github.com/BelledonneCommunications/bctoolbox/pull/7]
---
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed7aa00..4127f0e 100644
+index 29f3eb6..b2f26c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -103,8 +103,8 @@ else()
+@@ -101,9 +101,8 @@ else()
endif()
if(MBEDTLS_FOUND)
- get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH)
-- set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}")
+- string(REPLACE ";" " " MBEDTLS_LIBRARIES_STR "${MBEDTLS_LIBRARIES}")
+- set(LIBS_PRIVATE "${LIBS_PRIVATE} ${MBEDTLS_LIBRARIES_STR}")
+ get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH)
+ set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path} -lmbedtls -lmbedcrypto -lmbedx509")
endif()
if(POLARSSL_FOUND)
get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH)
---
-2.11.1
-
diff --git a/package/bctoolbox/Config.in b/package/bctoolbox/Config.in
index 048d01282c..1cf2b7e236 100644
--- a/package/bctoolbox/Config.in
+++ b/package/bctoolbox/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_BCTOOLBOX
bool "bctoolbox"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
+ select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
Utilities library used by Belledonne Communications
softwares like belle-sip, mediastreamer2 and linphone.
@@ -12,3 +14,6 @@ config BR2_PACKAGE_BCTOOLBOX
comment "bctoolbox needs a toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+comment "bctoolbox needs a toolchain not affected by GCC bug 64735"
+ depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/package/bctoolbox/bctoolbox.hash b/package/bctoolbox/bctoolbox.hash
index 6242355ee2..7d64c32013 100644
--- a/package/bctoolbox/bctoolbox.hash
+++ b/package/bctoolbox/bctoolbox.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 da7df7ff359a9829e9e6ef98dfe9fead0cf735b8a4a5da1b1047f467dee1b2a9 bctoolbox-0.4.0.tar.gz
+sha256 d8501e3793c10abbf913759d7a0e5f6eb3140af6bacf5e2bdcd532049bde69c0 bctoolbox-4.3.1.tar.gz
sha256 849dd903d98f12a964466ccfbaf3a1de1f94ad0ebd49a59d12f8ce4506f9f647 COPYING
diff --git a/package/bctoolbox/bctoolbox.mk b/package/bctoolbox/bctoolbox.mk
index 281a0bf2a1..f9d740820d 100644
--- a/package/bctoolbox/bctoolbox.mk
+++ b/package/bctoolbox/bctoolbox.mk
@@ -4,7 +4,7 @@
#
################################################################################
-BCTOOLBOX_VERSION = 0.4.0
+BCTOOLBOX_VERSION = 4.3.1
BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION))
BCTOOLBOX_LICENSE = GPL-2.0+
BCTOOLBOX_LICENSE_FILES = COPYING
@@ -20,6 +20,11 @@ BCTOOLBOX_CONF_OPTS = \
-DGIT_EXECUTABLE=OFF \
-DCMAKE_SKIP_RPATH=ON
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+BCTOOLBOX_DEPENDENCIES += libiconv
+BCTOOLBOX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -liconv"
+endif
+
ifeq ($(BR2_PACKAGE_MBEDTLS),y)
BCTOOLBOX_DEPENDENCIES += mbedtls
BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON
diff --git a/package/bearssl/Config.in b/package/bearssl/Config.in
new file mode 100644
index 0000000000..b10ce6025a
--- /dev/null
+++ b/package/bearssl/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_BEARSSL
+ bool "bearssl"
+ help
+ BearSSL is an implementation of the SSL/TLS protocol
+ (RFC 5246) written in C.
+
+ https://bearssl.org
diff --git a/package/bearssl/bearssl.hash b/package/bearssl/bearssl.hash
new file mode 100644
index 0000000000..e000762668
--- /dev/null
+++ b/package/bearssl/bearssl.hash
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256 6705bba1714961b41a728dfc5debbe348d2966c117649392f8c8139efc83ff14 bearssl-0.6.tar.gz
+sha256 771bf18c8633ea69ec9b07d2e604c4b99b7bef41b0f5ce6385d24df4448f61ca LICENSE.txt
diff --git a/package/bearssl/bearssl.mk b/package/bearssl/bearssl.mk
new file mode 100644
index 0000000000..e85626153c
--- /dev/null
+++ b/package/bearssl/bearssl.mk
@@ -0,0 +1,42 @@
+################################################################################
+#
+# bearssl
+#
+################################################################################
+
+BEARSSL_VERSION = 0.6
+BEARSSL_SITE = https://bearssl.org
+BEARSSL_LICENSE = MIT
+BEARSSL_LICENSE_FILES = LICENSE.txt
+BEARSSL_INSTALL_STAGING = YES
+
+BEARSSL_MAKE_OPTS = \
+ $(TARGET_CONFIGURE_OPTS) \
+ LDDLL=$(TARGET_CC)
+
+ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+BEARSSL_TARGETS += dll
+endif
+
+ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+BEARSSL_TARGETS += lib
+endif
+
+define BEARSSL_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) $(BEARSSL_MAKE_OPTS) -C $(@D) \
+ $(BEARSSL_TARGETS)
+endef
+
+define BEARSSL_INSTALL_STAGING_CMDS
+ mkdir -p $(STAGING_DIR)/usr/include
+ cp -dpfr $(@D)/inc/*.h $(STAGING_DIR)/usr/include
+ mkdir -p $(STAGING_DIR)/usr/lib
+ cp -dpfr $(@D)/build/lib* $(STAGING_DIR)/usr/lib
+endef
+
+define BEARSSL_INSTALL_TARGET_CMDS
+ mkdir -p $(TARGET_DIR)/usr/lib
+ cp -dpfr $(@D)/build/lib* $(TARGET_DIR)/usr/lib
+endef
+
+$(eval $(generic-package))
diff --git a/package/botan/botan.hash b/package/botan/botan.hash
index a04825a758..29efddb35c 100644
--- a/package/botan/botan.hash
+++ b/package/botan/botan.hash
@@ -1,4 +1,3 @@
-# From https://botan.randombit.net/releases/sha256sums.txt
-sha256 f7874da2aeb8c018fd77df40b2137879bf90b66f5589490c991e83fb3e8094be Botan-2.11.0.tar.xz
# Locally computed
-sha256 161011a9be56a6e825c06257005055a148056b5c756f75a0b99dae0883fcab7a license.txt
+sha256 f57ae42a41e1091bca58f44f41addebd9a390b651603952c881ec89d50187e90 Botan-2.13.0.tar.xz
+sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt
diff --git a/package/botan/botan.mk b/package/botan/botan.mk
index 62027280d3..6394b5ef95 100644
--- a/package/botan/botan.mk
+++ b/package/botan/botan.mk
@@ -4,7 +4,7 @@
#
################################################################################
-BOTAN_VERSION = 2.11.0
+BOTAN_VERSION = 2.13.0
BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz
BOTAN_SITE = http://botan.randombit.net/releases
BOTAN_LICENSE = BSD-2-Clause
diff --git a/package/connman/0001-nat-build-failure.patch b/package/connman/0001-nat-build-failure.patch
deleted file mode 100644
index 0ab58501d0..0000000000
--- a/package/connman/0001-nat-build-failure.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 68f4b4f5b220f256b17ad2f084d61fe89f3632ae Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 19 Apr 2016 08:38:38 -0300
-Subject: [PATCH] nat: fix build failure
-
-_GNU_SOURCE needs to be defined so that O_CLOEXEC symbols can be found in
-system header files.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Status: submitted upstream
-
- src/nat.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/nat.c b/src/nat.c
-index 33ae6df..62e21d4 100644
---- a/src/nat.c
-+++ b/src/nat.c
-@@ -24,6 +24,7 @@
- #include <config.h>
- #endif
-
-+#define _GNU_SOURCE
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
---
-2.7.3
-
diff --git a/package/connman/Config.in b/package/connman/Config.in
index 30eae23c96..ac012dda54 100644
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_CONNMAN
depends on !BR2_TOOLCHAIN_USES_MUSL # missing res_ninit()
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_IPTABLES
help
The Connection Manager (ConnMan) project provides a daemon
for managing internet connections within embedded devices
@@ -18,6 +17,27 @@ config BR2_PACKAGE_CONNMAN
if BR2_PACKAGE_CONNMAN
+choice
+ prompt "Firewall type"
+ default BR2_PACKAGE_CONNMAN_IPTABLES
+ help
+ Select which firewall type is used.
+
+config BR2_PACKAGE_CONNMAN_IPTABLES
+ bool "iptables"
+ select BR2_PACKAGE_IPTABLES
+ help
+ Use iptables as firewall.
+
+config BR2_PACKAGE_CONNMAN_NFTABLES
+ bool "nftables"
+ depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
+ select BR2_PACKAGE_NFTABLES
+ help
+ Use nftables as firewall.
+endchoice
+
config BR2_PACKAGE_CONNMAN_ETHERNET
bool "enable Ethernet support"
default y
diff --git a/package/connman/connman.hash b/package/connman/connman.hash
index ff5b4d48f0..3039105027 100644
--- a/package/connman/connman.hash
+++ b/package/connman/connman.hash
@@ -1,4 +1,4 @@
# From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc
-sha256 6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16 connman-1.37.tar.xz
+sha256 cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b connman-1.38.tar.xz
# Locally computed
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 2cbf3fe752..701be8b59d 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -4,29 +4,78 @@
#
################################################################################
-CONNMAN_VERSION = 1.37
+CONNMAN_VERSION = 1.38
CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
CONNMAN_DEPENDENCIES = libglib2 dbus iptables
CONNMAN_INSTALL_STAGING = YES
CONNMAN_LICENSE = GPL-2.0
CONNMAN_LICENSE_FILES = COPYING
-CONNMAN_CONF_OPTS += \
- --with-dbusconfdir=/etc \
- $(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
- $(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
- $(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
- $(if $(BR2_PACKAGE_CONNMAN_WISPR),--enable-wispr,--disable-wispr) \
- $(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \
- $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \
- $(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \
- $(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono) \
- $(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system)
-
-CONNMAN_DEPENDENCIES += \
- $(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \
- $(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono) \
- $(if $(BR2_PACKAGE_CONNMAN_WISPR),gnutls)
+
+CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+CONNMAN_CONF_OPTS += --with-systemdunitdir=/usr/lib/systemd/system
+endif
+
+ifeq ($(BR2_PACKAGE_CONNMAN_BLUETOOTH),y)
+CONNMAN_CONF_OPTS += --enable-bluetooth
+else
+CONNMAN_CONF_OPTS += --disable-bluetooth
+endif
+
+ifeq ($(BR2_PACKAGE_CONNMAN_DEBUG),y)
+CONNMAN_CONF_OPTS += --enable-debug
+else
+CONNMAN_CONF_OPTS += --disable-debug
+endif
+
+ifeq ($(BR2_PACKAGE_CONNMAN_ETHERNET),y)
+CONNMAN_CONF_OPTS += --enable-ethernet
+else
+CONNMAN_CONF_OPTS += --disable-ethernet
+endif
+
+ifeq ($(BR2_PACKAGE_CONNMAN_IPTABLES),y)
+CONNMAN_CONF_OPTS += --with-firewall=iptables
+CONNMAN_DEPENDENCIES += iptables
+else ifeq ($(BR2_PACKAGE_CONNMAN_NFTABLES),y)
+CONNMAN_CONF_OPTS += --with-firewall=nftables
+CONNMAN_DEPENDENCIES += nftables
+endif
+
+ifeq ($(BR2_PACKAGE_CONNMAN_LOOPBACK),y)
+CONNMAN_CONF_OPTS += --enable-loopback
+else
+CONNMAN_CONF_OPTS += --disable-loopback
+endif
+
+ifeq ($(BR2_PACKAGE_CONNMAN_NEARD),y)
+CONNMAN_CONF_OPTS += --enable-neard
+CONNMAN_DEPENDENCIES += neard
+else
+CONNMAN_CONF_OPTS += --disable-neard
+endif
+
+ifeq ($(BR2_PACKAGE_CONNMAN_OFONO),y)
+CONNMAN_CONF_OPTS += --enable-ofono
+CONNMAN_DEPENDENCIES += ofono
+else
+CONNMAN_CONF_OPTS += --disable-ofono
+endif
+
+ifeq ($(BR2_PACKAGE_CONNMAN_WIFI),y)
+CONNMAN_CONF_OPTS += --enable-wifi
+else
+CONNMAN_CONF_OPTS += --disable-wifi
+endif
+
+ifeq ($(BR2_PACKAGE_CONNMAN_WISPR),y)
+CONNMAN_CONF_OPTS += --enable-wispr
+CONNMAN_DEPENDENCIES += gnutls
+else
+CONNMAN_CONF_OPTS += --disable-wispr
+endif
define CONNMAN_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman
diff --git a/package/cutelyst/cutelyst.mk b/package/cutelyst/cutelyst.mk
index 709d9443ca..f2129312d5 100644
--- a/package/cutelyst/cutelyst.mk
+++ b/package/cutelyst/cutelyst.mk
@@ -17,7 +17,7 @@ CUTELYST_CONF_OPTS += \
-DPLUGIN_VIEW_GRANTLEE=OFF
# Qt 5.8 needs atomics, which on various architectures are in -latomic
-ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy)
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
CUTELYST_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
endif
diff --git a/package/drbd-utils/drbd-utils.hash b/package/drbd-utils/drbd-utils.hash
index 884d6790ec..79914af508 100644
--- a/package/drbd-utils/drbd-utils.hash
+++ b/package/drbd-utils/drbd-utils.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 e07d156ce6e3d93ac1b69fa9bf8695038e6e5edfb2c80c91a1098d1477478ecb drbd-utils-9.11.0.tar.gz
-sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING
+sha256 16a6d000aac7f746419839a2c2afcb71fa8779fe0b5898e967767791cb8f4bc7 drbd-utils-9.12.0.tar.gz
+sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING
diff --git a/package/drbd-utils/drbd-utils.mk b/package/drbd-utils/drbd-utils.mk
index 55ac9d9dc0..a24cc4ade6 100644
--- a/package/drbd-utils/drbd-utils.mk
+++ b/package/drbd-utils/drbd-utils.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DRBD_UTILS_VERSION = 9.11.0
+DRBD_UTILS_VERSION = 9.12.0
DRBD_UTILS_SITE = http://www.linbit.com/downloads/drbd/utils
DRBD_UTILS_LICENSE = GPL-2.0+
DRBD_UTILS_LICENSE_FILES = COPYING
diff --git a/package/eudev/Config.in b/package/eudev/Config.in
index b1d2f37a72..b0ce76171a 100644
--- a/package/eudev/Config.in
+++ b/package/eudev/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_EUDEV
depends on BR2_USE_WCHAR # needs C99 compiler
depends on !BR2_STATIC_LIBS # kmod
select BR2_PACKAGE_HAS_UDEV
+ select BR2_PACKAGE_UDEV_GENTOO_SCRIPTS if BR2_INIT_OPENRC
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_KMOD
diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk
index 99b5befd09..8b677e76b6 100644
--- a/package/eudev/eudev.mk
+++ b/package/eudev/eudev.mk
@@ -48,6 +48,12 @@ define EUDEV_INSTALL_INIT_SYSV
$(INSTALL) -D -m 0755 package/eudev/S10udev $(TARGET_DIR)/etc/init.d/S10udev
endef
+# Avoid installing S10udev with openrc, as the service is started by a unit
+# from the udev-gentoo-scripts package.
+define EUDEV_INSTALL_INIT_OPENRC
+ @:
+endef
+
# Required by default rules for input devices
define EUDEV_USERS
- - input -1 * - - - Input device group
diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk
index b251fcda2a..7f14062f89 100644
--- a/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -45,6 +45,14 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \
$(BINARIES_DIR)/signed_hdmi_imx8m.bin
endef
+else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y)
+FIRMWARE_IMX_INSTALL_IMAGES = YES
+define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
+ # SECO firmware is needed when generating imx8-boot-sd.bin which
+ # is done in post-image script.
+ cp $(@D)/firmware/seco/mx8qm-ahab-container.img \
+ $(BINARIES_DIR)/ahab-container.img
+endef
else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y)
FIRMWARE_IMX_INSTALL_IMAGES = YES
define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
diff --git a/package/fswebcam/fswebcam.hash b/package/fswebcam/fswebcam.hash
index 28f604547c..bac1626785 100644
--- a/package/fswebcam/fswebcam.hash
+++ b/package/fswebcam/fswebcam.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 444d6a8a82102e09e935540c64a731021de36db03e1e74181f41ca6f39aa6474 fswebcam-20140113.tar.xz
+sha256 5702771cee6e3fa0f2bbbb72ecf3e5a253ff458c1f648f7e7c0d477e39f0ec80 fswebcam-e9f8094b6a3d1a49f99b2abec4e6ab4df33e2e33.tar.gz
sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE
diff --git a/package/fswebcam/fswebcam.mk b/package/fswebcam/fswebcam.mk
index 8f823f4d04..3a5b8c9eef 100644
--- a/package/fswebcam/fswebcam.mk
+++ b/package/fswebcam/fswebcam.mk
@@ -4,9 +4,8 @@
#
################################################################################
-FSWEBCAM_VERSION = 20140113
-FSWEBCAM_SOURCE = fswebcam-$(FSWEBCAM_VERSION).tar.xz
-FSWEBCAM_SITE = http://www.firestorm.cx/fswebcam/files
+FSWEBCAM_VERSION = e9f8094b6a3d1a49f99b2abec4e6ab4df33e2e33
+FSWEBCAM_SITE = $(call github,fsphil,fswebcam,$(FSWEBCAM_VERSION))
FSWEBCAM_LICENSE = GPL-2.0
FSWEBCAM_LICENSE_FILES = LICENSE
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
index 46d745a897..01f7e14460 100644
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -35,7 +35,9 @@ endif
# For the host variant, we really want to build with XML support,
# which is needed to read XML descriptions of target architectures. We
# also need ncurses.
-HOST_GDB_DEPENDENCIES = host-expat host-ncurses
+# As for libiberty, gdb may use a system-installed one if present, so
+# we must ensure ours is installed first.
+HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses
# Disable building documentation
GDB_MAKE_OPTS += MAKEINFO=true
diff --git a/package/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch b/package/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch
new file mode 100644
index 0000000000..fdc78d334d
--- /dev/null
+++ b/package/gensio/0001-filter-Rename-some-variables-to-tr_stdxxx.patch
@@ -0,0 +1,109 @@
+From 601e6e56f44b91d957bb643662455f52540f336a Mon Sep 17 00:00:00 2001
+From: Corey Minyard <cminyard@mvista.com>
+Date: Tue, 25 Feb 2020 16:08:40 -0600
+Subject: [PATCH] filter: Rename some variables to tr_stdxxx
+
+stdout and stderr can be macros, don't use the names directly.
+
+Signed-off-by: Corey Minyard <cminyard@mvista.com>
+[james.hilliard1@gmail.com: backport from upstream commit
+601e6e56f44b91d957bb643662455f52540f336a]
+Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
+---
+ lib/gensio_filter_trace.c | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/lib/gensio_filter_trace.c b/lib/gensio_filter_trace.c
+index d39d58b..abe2db6 100644
+--- a/lib/gensio_filter_trace.c
++++ b/lib/gensio_filter_trace.c
+@@ -32,8 +32,8 @@ struct trace_filter {
+ enum trace_dir dir;
+ bool raw;
+ char *filename;
+- bool stdout;
+- bool stderr;
++ bool tr_stdout;
++ bool tr_stderr;
+
+ FILE *tr;
+ };
+@@ -82,9 +82,9 @@ trace_try_connect(struct gensio_filter *filter, struct timeval *timeout)
+ {
+ struct trace_filter *tfilter = filter_to_trace(filter);
+
+- if (tfilter->stdout) {
++ if (tfilter->tr_stdout) {
+ tfilter->tr = stdout;
+- } else if (tfilter->stderr) {
++ } else if (tfilter->tr_stderr) {
+ tfilter->tr = stderr;
+ } else if (tfilter->filename) {
+ tfilter->tr = fopen(tfilter->filename, "a+");
+@@ -99,7 +99,7 @@ trace_try_disconnect(struct gensio_filter *filter, struct timeval *timeout)
+ {
+ struct trace_filter *tfilter = filter_to_trace(filter);
+
+- if (!tfilter->stdout && !tfilter->stderr && tfilter->tr)
++ if (!tfilter->tr_stdout && !tfilter->tr_stderr && tfilter->tr)
+ fclose(tfilter->tr);
+ tfilter->tr = NULL;
+ return 0;
+@@ -331,12 +331,12 @@ static int gensio_trace_filter_func(struct gensio_filter *filter, int op,
+
+ static struct gensio_filter *
+ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir,
+- bool raw, const char *filename, bool stdout,
+- bool stderr)
++ bool raw, const char *filename, bool tr_stdout,
++ bool tr_stderr)
+ {
+ struct trace_filter *tfilter;
+
+- if (!filename && !stdout && !stderr)
++ if (!filename && !tr_stdout && !tr_stderr)
+ dir = TRACE_NONE;
+
+ tfilter = o->zalloc(o, sizeof(*tfilter));
+@@ -351,8 +351,8 @@ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir,
+ if (!tfilter->filename)
+ goto out_nomem;
+ }
+- tfilter->stdout = stdout;
+- tfilter->stderr = stderr;
++ tfilter->tr_stdout = tr_stdout;
++ tfilter->tr_stderr = tr_stderr;
+
+ tfilter->lock = o->alloc_lock(o);
+ if (!tfilter->lock)
+@@ -385,7 +385,7 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o,
+ {
+ struct gensio_filter *filter;
+ int dir = TRACE_NONE;
+- bool raw = false, stdout = false, stderr = false;
++ bool raw = false, tr_stdout = false, tr_stderr = false;
+ const char *filename = NULL;
+ unsigned int i;
+
+@@ -396,15 +396,15 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o,
+ continue;
+ if (gensio_check_keyvalue(args[i], "file", &filename) > 0)
+ continue;
+- if (gensio_check_keybool(args[i], "stdout", &stdout) > 0)
++ if (gensio_check_keybool(args[i], "stdout", &tr_stdout) > 0)
+ continue;
+- if (gensio_check_keybool(args[i], "stderr", &stderr) > 0)
++ if (gensio_check_keybool(args[i], "stderr", &tr_stderr) > 0)
+ continue;
+ return GE_INVAL;
+ }
+
+ filter = gensio_trace_filter_raw_alloc(o, dir, raw, filename,
+- stdout, stderr);
++ tr_stdout, tr_stderr);
+ if (!filter)
+ return GE_NOMEM;
+
+--
+2.20.1
+
diff --git a/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch b/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch
deleted file mode 100644
index 5a9f3b7da5..0000000000
--- a/package/gensio/0001-tests-Makefile-am-don-t-add-lpthread.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f63b15e690581d898da56ef2540b6199f5728e58 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 11 Feb 2020 19:14:53 +0100
-Subject: [PATCH] tests/Makefile.am: don't add -lpthread
-
-Don't add -lpthread unconditionally to oomtest_LDADD to avoid a build
-failure without threads, it will be added to LIBS by configure.ac if
-needed
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/cminyard/gensio/commit/f63b15e690581d898da56ef2540b6199f5728e58]
----
- tests/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index a280acc..b4335c5 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -127,7 +127,7 @@ test_fuzz: test_fuzz_certauth test_fuzz_mux test_fuzz_ssl test_fuzz_telnet \
-
- oomtest_SOURCES = oomtest.c
-
--oomtest_LDADD = $(top_builddir)/lib/libgensio.la $(OPENSSL_LIBS) -lpthread
-+oomtest_LDADD = $(top_builddir)/lib/libgensio.la $(OPENSSL_LIBS)
-
- noinst_PROGRAMS = oomtest
-
diff --git a/package/gensio/gensio.hash b/package/gensio/gensio.hash
index 623b41904c..202548bc40 100644
--- a/package/gensio/gensio.hash
+++ b/package/gensio/gensio.hash
@@ -1,7 +1,7 @@
# From https://sourceforge.net/projects/ser2net/files/ser2net/
-md5 53c027dfaaf374f57d5f36a6250fc018 gensio-1.5.1.tar.gz
-sha1 8329d7828016e643f60b8b3e70564d32cd03008f gensio-1.5.1.tar.gz
+md5 d6b0665266f738973b13450c53d83032 gensio-1.5.3.tar.gz
+sha1 8d041babe8d29f8acb48c6cb0fa543e6f9f63238 gensio-1.5.3.tar.gz
# Locally computed:
-sha256 c1ed28f5bd72185dba666a900d29afbecba58727d6c0dde4a182143273fc1e6b gensio-1.5.1.tar.gz
+sha256 f5097add3f269594e7a81016af93c147e8f5e8312f27f3d0bfbeeb3aad1ace53 gensio-1.5.3.tar.gz
sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING
sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB
diff --git a/package/gensio/gensio.mk b/package/gensio/gensio.mk
index 0386b30fd7..06e55875c0 100644
--- a/package/gensio/gensio.mk
+++ b/package/gensio/gensio.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GENSIO_VERSION = 1.5.1
+GENSIO_VERSION = 1.5.3
GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
GENSIO_LICENSE_FILES = COPYING.LIB COPYING
diff --git a/package/gnuplot/0001-configure-add-without-demo-option.patch b/package/gnuplot/0001-configure-add-without-demo-option.patch
index a9abfd06ba..a50e6c2c1b 100644
--- a/package/gnuplot/0001-configure-add-without-demo-option.patch
+++ b/package/gnuplot/0001-configure-add-without-demo-option.patch
@@ -8,10 +8,9 @@ Originally written by Anthony Viallard
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-diff -rup a/configure.in b/configure.in
---- a/configure.in 2016-09-07 05:14:29.000000000 +0100
-+++ b/configure.in 2016-12-01 12:09:31.487464774 +0000
-@@ -818,6 +818,16 @@ if test "$with_cwdrc" = yes; then
+--- a/configure.ac 2019-11-27 23:52:29.000000000 +0100
++++ b/configure.ac 2020-02-13 10:24:50.801842269 +0100
+@@ -755,6 +755,16 @@ if test "$with_cwdrc" = yes; then
[ Define if you want to read .gnuplot from current directory (SECURITY RISK!).])
fi
@@ -25,12 +24,12 @@ diff -rup a/configure.in b/configure.in
+AC_ARG_ENABLE(demo,dnl
+[ --disable-demo do not build demo files])
+
- dnl Sort help/subtopic tables by row or column
- AC_ARG_WITH(row-help,dnl
- [ --with-row-help format help and subtopic tables by row (default)
-@@ -1303,6 +1313,24 @@ fi
- dnl No configuration option for this one yet
- AC_DEFINE(MAX_PARALLEL_AXES,7, [Maximum number of parallel axes supported])
+ dnl Disable experimental support for nonlinear axes
+ AC_ARG_WITH(nonlinear-axes,dnl
+ [ --without-nonlinear-axes disable support for nonlinear axes])
+@@ -1236,6 +1246,24 @@ if test -n "${DIST_CONTACT}"; then
+ AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions])
+ fi
+dnl build doc files
+if test "$enable_doc" != no; then
@@ -53,15 +52,14 @@ diff -rup a/configure.in b/configure.in
dnl Substitute variables
AC_SUBST(PACKAGE)
AC_SUBST(VERSION_MAJOR)
-diff -rup a/Makefile.am b/Makefile.am
---- a/Makefile.am 2014-05-30 17:38:08.000000000 +0100
-+++ b/Makefile.am 2016-12-01 12:09:31.488464794 +0000
+--- a/Makefile.am 2019-11-19 22:57:18.000000000 +0100
++++ b/Makefile.am 2020-02-13 10:17:55.753012739 +0100
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
AUTOMAKE_OPTIONS = foreign
--SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
-+SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share
+-SUBDIRS = config m4 term src docs man demo tutorial share
++SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) tutorial share
- EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
- Makefile.maint PATCHLEVEL PGPKEYS PORTING README RELEASE_NOTES \
+ EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \
diff --git a/package/gnuplot/0002-use-gdlib-config-properly.patch b/package/gnuplot/0002-use-gdlib-config-properly.patch
deleted file mode 100644
index 690a82652a..0000000000
--- a/package/gnuplot/0002-use-gdlib-config-properly.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix usage of gdlib-config
-
-gnuplot configure.in script properly takes care of finding
-gdlib-config using AC_PATH_PROG... but then directly uses gdlib-config
-instead of going through the GDLIB_CONFIG variable that AC_PATH_PROG
-has defined. Which means that whenever a gdlib-config binary not in
-the PATH is being used, it does not use it.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -537,9 +537,9 @@
- if test "$with_gd" != no; then
- AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config])
- if test -n "$GDLIB_CONFIG"; then
-- libgd_CPPFLAGS=`gdlib-config --cflags`
-- libgd_LDFLAGS=`gdlib-config --ldflags`
-- libgd_LIBS=`gdlib-config --libs`
-+ libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags`
-+ libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags`
-+ libgd_LIBS=`$GDLIB_CONFIG --libs`
- elif test -d "$with_gd"; then
- libgd_CPPFLAGS="-I$with_gd/include"
- libgd_LDFLAGS="-L$with_gd/lib"
diff --git a/package/gnuplot/gnuplot.hash b/package/gnuplot/gnuplot.hash
index 1f3a08bb00..ef80a29d3d 100644
--- a/package/gnuplot/gnuplot.hash
+++ b/package/gnuplot/gnuplot.hash
@@ -1,6 +1,6 @@
-# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.6/
-md5 8ec46520a86a61163a701b00404faf1a gnuplot-5.0.6.tar.gz
-sha1 f7b8948166b22e5bd658d5cf7579716f4821dba0 gnuplot-5.0.6.tar.gz
+# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.2.8/
+md5 2df8767c7399bee57a96296d46b4d5fb gnuplot-5.2.8.tar.gz
+sha1 dc018b1e0a31b770d4635958badff13498babc4d gnuplot-5.2.8.tar.gz
# Locally computed
-sha256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 gnuplot-5.0.6.tar.gz
+sha256 60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37 gnuplot-5.2.8.tar.gz
sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright
diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk
index d59605c570..694b6cb886 100644
--- a/package/gnuplot/gnuplot.mk
+++ b/package/gnuplot/gnuplot.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GNUPLOT_VERSION = 5.0.6
+GNUPLOT_VERSION = 5.2.8
GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
GNUPLOT_LICENSE = gnuplot license (open source)
GNUPLOT_LICENSE_FILES = Copyright
diff --git a/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
new file mode 100644
index 0000000000..1e8bd3518a
--- /dev/null
+++ b/package/gobject-introspection/0001-Revert-an-incomplete-upstream-attempt-at-cross-compi.patch
@@ -0,0 +1,33 @@
+From 3a9d1e5ee0aae56fafec0beba2014c19e4ff310c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 23 Mar 2016 17:07:28 +0200
+Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile support
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ common.mk | 4 ----
+ giscanner/gdumpparser.py | 6 ------
+ 2 files changed, 10 deletions(-)
+
+diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
+index 1134f33..9bdc2bc 100644
+--- a/giscanner/gdumpparser.py
++++ b/giscanner/gdumpparser.py
+@@ -156,12 +156,6 @@ blob containing data gleaned from GObject's primitive introspection."""
+ out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
+
+ args = []
+-
+- # Prepend the launcher command and arguments, if defined
+- launcher = os.environ.get('GI_CROSS_LAUNCHER')
+- if launcher:
+- args.extend(launcher.split())
+-
+ args.extend(self._binary.args)
+ args.append('--introspect-dump=%s,%s' % (in_path, out_path))
+
+--
+2.7.0
+
diff --git a/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch b/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
new file mode 100644
index 0000000000..5e3ac59dd9
--- /dev/null
+++ b/package/gobject-introspection/0002-add-cross-compilation-support-to-meson.patch
@@ -0,0 +1,163 @@
+From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 15 Nov 2018 15:10:05 +0100
+Subject: [PATCH] add cross-compilation support to meson
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ gir/meson.build | 62 ++++++++++++++++++++++++++++++++++-------------
+ meson.build | 4 ++-
+ meson_options.txt | 20 +++++++++++++++
+ 3 files changed, 68 insertions(+), 18 deletions(-)
+
+diff --git a/gir/meson.build b/gir/meson.build
+index 85ae575..327c134 100644
+--- a/gir/meson.build
++++ b/gir/meson.build
+@@ -36,16 +36,29 @@ gir_files = [
+ typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
+ install_data(gir_files, install_dir: girdir)
+
+-scanner_command = [
+- python,
+- girscanner,
+- '--output=@OUTPUT@',
+- '--no-libtool',
+- '--quiet',
+- '--reparse-validate',
+- '--add-include-path', join_paths(meson.current_build_dir()),
+- '--add-include-path', join_paths(meson.current_source_dir()),
+-]
++if get_option('enable-host-gi')
++ scanner_command = [
++ 'g-ir-scanner',
++ '--output=@OUTPUT@',
++ '--no-libtool',
++ '--quiet',
++ '--reparse-validate',
++ '--add-include-path', join_paths(meson.current_build_dir()),
++ '--add-include-path', join_paths(meson.current_source_dir()),
++ ]
++else
++ scanner_command = [
++ python,
++ girscanner,
++ '--output=@OUTPUT@',
++ '--no-libtool',
++ '--quiet',
++ '--reparse-validate',
++ '--add-include-path', join_paths(meson.current_build_dir()),
++ '--add-include-path', join_paths(meson.current_source_dir()),
++ ]
++endif
++
+
+ dep_type = glib_dep.type_name()
+ if dep_type == 'internal'
+@@ -58,6 +71,12 @@ if dep_type == 'internal'
+ '--extra-library=glib-2.0', '--extra-library=gobject-2.0']
+ endif
+
++if get_option('enable-gi-cross-wrapper') != ''
++ scanner_command += ['--use-binary-wrapper=' + get_option('enable-gi-cross-wrapper')]
++endif
++if get_option('enable-gi-ldd-wrapper') != ''
++ scanner_command += ['--use-ldd-wrapper=' + get_option('enable-gi-ldd-wrapper')]
++endif
+ # Take a glob and print to newlines
+ globber = '''
+ from glob import glob
+@@ -84,8 +103,8 @@ glib_command = scanner_command + [
+
+ if dep_type == 'pkgconfig'
+ glib_command += ['--external-library', '--pkg=glib-2.0']
+- glib_libdir = glib_dep.get_pkgconfig_variable('libdir')
+- glib_incdir = join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
++ glib_libdir = get_option('pkgconfig-sysroot-path') + glib_dep.get_pkgconfig_variable('libdir')
++ glib_incdir = get_option('pkgconfig-sysroot-path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
+ glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
+ glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
+ glib_files += join_paths(glib_libincdir, 'glibconfig.h')
+@@ -339,7 +358,7 @@ endforeach
+ if giounix_dep.found()
+ if dep_type == 'pkgconfig'
+ gio_command += ['--pkg=gio-unix-2.0']
+- giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
++ giounix_includedir = get_option('pkgconfig-sysroot-path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
+ # Get the installed gio-unix header list
+ ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
+ if ret.returncode() != 0
+@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository',
+ )
+
+ typelibs = []
++if get_option('enable-gi-cross-wrapper') != ''
++ gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@',
++ '--includedir', meson.current_build_dir(),
++ '--includedir', meson.current_source_dir(),
++ ]
++else
++ gircompiler_command = [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
++ '--includedir', meson.current_build_dir(),
++ '--includedir', meson.current_source_dir(),
++ ]
++endif
++
+ foreach gir : gir_files
+ typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(),
+ input: gir,
+ output: '@BASENAME@.typelib',
+ depends: [gobject_gir, ],
+- command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
+- '--includedir', meson.current_build_dir(),
+- '--includedir', meson.current_source_dir(),
+- ],
++ command: gircompiler_command,
+ install: true,
+ install_dir: typelibdir,
+ )
+diff --git a/meson.build b/meson.build
+index 95bbd2b..f7baefd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -163,7 +163,9 @@ endif
+ subdir('girepository')
+ subdir('tools')
+ subdir('giscanner')
+-subdir('gir')
++if get_option('enable-introspection-data') == true
++ subdir('gir')
++endif
+ subdir('examples')
+ subdir('docs')
+ subdir('tests')
+diff --git a/meson_options.txt b/meson_options.txt
+index 445a68a..a325511 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3',
+ option('gir_dir_prefix', type: 'string',
+ description: 'Intermediate prefix for gir installation under ${prefix}'
+ )
++
++option('enable-host-gi', type: 'boolean', value : false,
++ description: 'Use gobject introspection tools installed in the host system (useful when cross-compiling)'
++)
++
++option('enable-gi-cross-wrapper', type: 'string',
++ description: 'Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)'
++)
++
++option('enable-gi-ldd-wrapper', type: 'string',
++ description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)'
++)
++
++option('enable-introspection-data', type: 'boolean', value : true,
++ description: 'Build introspection data (.gir and .typelib files) in addition to library and tools'
++)
++
++option('pkgconfig-sysroot-path', type: 'string',
++ description: 'Specify a sysroot path to prepend to pkgconfig output (useful when cross-compiling)'
++)
diff --git a/package/gobject-introspection/0003-disable-tests.patch b/package/gobject-introspection/0003-disable-tests.patch
new file mode 100644
index 0000000000..fcc5a794f3
--- /dev/null
+++ b/package/gobject-introspection/0003-disable-tests.patch
@@ -0,0 +1,29 @@
+From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Mon, 3 Feb 2020 10:07:15 -0800
+Subject: [PATCH] disable tests
+
+If introspection data on the host is not built, meson throws the error:
+"Unknown variable "typelibs". Because tests are not required, removing
+the subdir tests alltogether fixes this issue.
+
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a5e825f..981e936 100644
+--- a/meson.build
++++ b/meson.build
+@@ -171,7 +171,6 @@ subdir('giscanner')
+ subdir('gir')
+ subdir('examples')
+ subdir('docs')
+-subdir('tests')
+
+ install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'))
+ install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
+--
+2.24.1
+
diff --git a/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch b/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch
new file mode 100644
index 0000000000..cffc2d954d
--- /dev/null
+++ b/package/gobject-introspection/0004-giscanner-add-use-binary-wrapper-option.patch
@@ -0,0 +1,52 @@
+From 704b888d0abfb01067352c40156f49f655691c7c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 19 Oct 2015 18:26:40 +0300
+Subject: [PATCH] giscanner: add --use-binary-wrapper option
+
+With this option, giscanner will use a wrapper executable to run
+binaries it's producing, instead of running them directly. This
+is useful when binaries are cross-compiled and cannot be run directly,
+but they can be run using for example QEMU emulation.
+
+Upstream-Status: Pending [review on oe-core list]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ giscanner/scannermain.py | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index 633496f..d684cd0 100755
+--- a/giscanner/scannermain.py
++++ b/giscanner/scannermain.py
+@@ -120,6 +120,9 @@ def _get_option_parser():
+ parser.add_option("", "--program",
+ action="store", dest="program", default=None,
+ help="program to execute")
++ parser.add_option("", "--use-binary-wrapper",
++ action="store", dest="wrapper", default=None,
++ help="wrapper to use for running programs (useful when cross-compiling)")
+ parser.add_option("", "--program-arg",
+ action="append", dest="program_args", default=[],
+ help="extra arguments to program")
+@@ -417,6 +420,17 @@ def create_binary(transformer, options, args):
+ gdump_parser.get_error_quark_functions())
+
+ shlibs = resolve_shlibs(options, binary, options.libraries)
++ if options.wrapper:
++ # The wrapper needs the binary itself, not the libtool wrapper script,
++ # so we check if libtool has sneaked the binary into .libs subdirectory
++ # and adjust the path accordingly
++ import os.path
++ dir_name, binary_name = os.path.split(binary.args[0])
++ libtool_binary = os.path.join(dir_name, '.libs', binary_name)
++ if os.path.exists(libtool_binary):
++ binary.args[0] = libtool_binary
++ # Then prepend the wrapper to the command line to execute
++ binary.args = [options.wrapper] + binary.args
+ gdump_parser.set_introspection_binary(binary)
+ gdump_parser.parse()
+ return shlibs
+--
+2.7.0
+
diff --git a/package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch b/package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch
new file mode 100644
index 0000000000..386c1c34b0
--- /dev/null
+++ b/package/gobject-introspection/0005-giscanner-add-a-use-ldd-wrapper-option.patch
@@ -0,0 +1,48 @@
+From d4ad57fd4a32c4f0d2f0522a3090ef940746431b Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 30 Oct 2015 16:28:46 +0200
+Subject: [PATCH] giscanner: add a --use-ldd-wrapper option
+
+This is useful in cross-compile environments where system's ldd
+command does not work on binaries built for a different architecture
+
+Upstream-Status: Pending [review in oe-core]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ giscanner/scannermain.py | 3 +++
+ giscanner/shlibs.py | 4 +++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index d684cd0..1b3b369 100755
+--- a/giscanner/scannermain.py
++++ b/giscanner/scannermain.py
+@@ -123,6 +123,9 @@ def _get_option_parser():
+ parser.add_option("", "--use-binary-wrapper",
+ action="store", dest="wrapper", default=None,
+ help="wrapper to use for running programs (useful when cross-compiling)")
++ parser.add_option("", "--use-ldd-wrapper",
++ action="store", dest="ldd_wrapper", default=None,
++ help="wrapper to use instead of ldd (useful when cross-compiling)")
+ parser.add_option("", "--program-arg",
+ action="append", dest="program_args", default=[],
+ help="extra arguments to program")
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index c93d20c..c5b5942 100644
+--- a/giscanner/shlibs.py
++++ b/giscanner/shlibs.py
+@@ -97,7 +97,9 @@ def _resolve_non_libtool(options, binary, libraries):
+ args.extend(libtool)
+ args.append('--mode=execute')
+ platform_system = platform.system()
+- if platform_system == 'Darwin':
++ if options.ldd_wrapper:
++ args.extend([options.ldd_wrapper, binary.args[0]])
++ elif platform_system == 'Darwin':
+ args.extend(['otool', '-L', binary.args[0]])
+ else:
+ args.extend(['ldd', binary.args[0]])
+--
+2.7.0
+
diff --git a/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
new file mode 100644
index 0000000000..06f5635610
--- /dev/null
+++ b/package/gobject-introspection/0006-giscanner-add-a-lib-dirs-envvar-option.patch
@@ -0,0 +1,73 @@
+From 3a9b3d8179b7eb9d2cc93da31578945bc03a45c3 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 27 Apr 2018 12:56:15 -0400
+Subject: [PATCH] giscanner: add a --lib-dirs-envvar option
+
+By default LD_LIBRARY_PATH is set to the list of target library paths;
+this breaks down in cross-compilation environment, as we need to run a
+native emulation wrapper rather than the target binary itself. This patch
+allows exporting those paths to a different environment variable
+which can be picked up and used by the wrapper.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ giscanner/ccompiler.py | 4 ++--
+ giscanner/dumper.py | 3 ++-
+ giscanner/scannermain.py | 3 +++
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
+index d10327c..6cf25d5 100644
+--- a/giscanner/ccompiler.py
++++ b/giscanner/ccompiler.py
+@@ -174,7 +174,7 @@ class CCompiler(object):
+
+ self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations"
+
+- def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths):
++ def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths, lib_dirs_envvar):
+ # An "internal" link is where the library to be introspected
+ # is being built in the current directory.
+
+@@ -184,7 +184,7 @@ class CCompiler(object):
+ if os.name == 'nt':
+ runtime_path_envvar = ['LIB', 'PATH']
+ else:
+- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
++ runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
+ # Search the current directory first
+ # (This flag is not supported nor needed for Visual C++)
+ args.append('-L.')
+diff --git a/giscanner/dumper.py b/giscanner/dumper.py
+index 3c7220b..0abd565 100644
+--- a/giscanner/dumper.py
++++ b/giscanner/dumper.py
+@@ -244,7 +244,8 @@ class DumpCompiler(object):
+ libtool,
+ self._options.libraries,
+ self._options.extra_libraries,
+- self._options.library_paths)
++ self._options.library_paths,
++ self._options.lib_dirs_envvar)
+ args.extend(pkg_config_libs)
+
+ else:
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index d262785..51c9570 100755
+--- a/giscanner/scannermain.py
++++ b/giscanner/scannermain.py
+@@ -126,6 +126,9 @@ def _get_option_parser():
+ parser.add_option("", "--use-ldd-wrapper",
+ action="store", dest="ldd_wrapper", default=None,
+ help="wrapper to use instead of ldd (useful when cross-compiling)")
++ parser.add_option("", "--lib-dirs-envvar",
++ action="store", dest="lib_dirs_envvar", default=None,
++ help="environment variable to write a list of library directories to (for running the transient binary), instead of standard LD_LIBRARY_PATH")
+ parser.add_option("", "--program-arg",
+ action="append", dest="program_args", default=[],
+ help="extra arguments to program")
+--
+2.14.3
+
diff --git a/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch b/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch
new file mode 100644
index 0000000000..08835d3ecc
--- /dev/null
+++ b/package/gobject-introspection/0007-Add-rpath-links-to-ccompiler.patch
@@ -0,0 +1,29 @@
+From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Wed, 14 Mar 2018 12:07:10 -0400
+Subject: [PATCH] Add rpath links to ccompiler
+
+This patch allows gobject-introspection to process extra paths passed to the
+compiler via the GIR_EXTRA_LIBS_PATH variable.
+
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ giscanner/ccompiler.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
+index a8bd5b1..51bb9bc 100644
+--- a/giscanner/ccompiler.py
++++ b/giscanner/ccompiler.py
+@@ -229,6 +229,8 @@ class CCompiler(object):
+
+ for envvar in runtime_path_envvar:
+ if envvar in os.environ:
++ for envvar_path in os.environ[envvar].split(':'):
++ args.append("-Wl,-rpath-link," + envvar_path)
+ os.environ[envvar] = \
+ os.pathsep.join(runtime_paths + [os.environ[envvar]])
+ else:
+--
+2.14.3
+
diff --git a/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch b/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch
new file mode 100644
index 0000000000..568758d332
--- /dev/null
+++ b/package/gobject-introspection/0008-ignore-error-return-codes-from-ldd-wrapper.patch
@@ -0,0 +1,28 @@
+From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Wed, 5 Sep 2018 16:46:52 +0200
+Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
+
+prelink-rtld, which we use instead of ldd returns 127 when it can't find a library.
+It is not an error per se, but it breaks subprocess.check_output().
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ giscanner/shlibs.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index d67df95..80352a6 100644
+--- a/giscanner/shlibs.py
++++ b/giscanner/shlibs.py
+@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries):
+ args.extend(['otool', '-L', binary.args[0]])
+ else:
+ args.extend(['ldd', binary.args[0]])
+- output = subprocess.check_output(args)
++ output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout
+ if isinstance(output, bytes):
+ output = output.decode("utf-8", "replace")
+
diff --git a/package/gobject-introspection/Config.in b/package/gobject-introspection/Config.in
new file mode 100644
index 0000000000..e312852cf2
--- /dev/null
+++ b/package/gobject-introspection/Config.in
@@ -0,0 +1,42 @@
+config BR2_PACKAGE_GOBJECT_INTROSPECTION
+ bool "gobject-introspection"
+ depends on BR2_USE_MMU # python3, libglib2
+ depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
+ # While gcc 4.8 might be compatible with gobject-introspection,
+ # The autobuilders use some toolchains from codesourcery which
+ # have gcc 4.8 and a very old version of glibc, which will cause
+ # compile errors with locale.c. As such, require 4.9 until this
+ # can be verified.
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+ depends on BR2_TOOLCHAIN_USES_GLIBC
+ # gobject-introspection does not require python3 to run on the
+ # target; however, because the tools run in a qemu wrapper, a
+ # cross-compiled python3 must be installed to staging. As there
+ # is no current mechanism to tell Buildroot only to install
+ # python to staging, then python must also be installed
+ # unconditionally to the target when building
+ # gobject-introspection.
+ depends on BR2_PACKAGE_PYTHON3
+ select BR2_PACKAGE_HOST_QEMU
+ select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE
+ select BR2_PACKAGE_LIBFFI
+ select BR2_PACKAGE_LIBGLIB2
+ select BR2_PACKAGE_ZLIB
+ help
+ GObject introspection is a middleware layer between C
+ libraries (using GObject) and language bindings. The C library
+ can be scanned at compile time and generate a metadata file,
+ in addition to the actual native C library. Then at runtime,
+ language bindings can read this metadata and automatically
+ provide bindings to call into the C library.
+
+ https://wiki.gnome.org/action/show/Projects/GObjectIntrospection
+
+comment "gobject-introspection needs python3"
+ depends on !BR2_PACKAGE_PYTHON3
+
+comment "gobject-introspection needs a glibc toolchain, gcc >= 4.9"
+ depends on BR2_USE_MMU
+ depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
+ depends on !BR2_TOOLCHAIN_USES_GLIBC || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
diff --git a/package/gobject-introspection/g-ir-compiler.in b/package/gobject-introspection/g-ir-compiler.in
new file mode 100644
index 0000000000..3313cc501f
--- /dev/null
+++ b/package/gobject-introspection/g-ir-compiler.in
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+$(dirname $0)/g-ir-scanner-qemuwrapper $(dirname $0)/g-ir-compiler.real "$@"
diff --git a/package/gobject-introspection/g-ir-scanner-lddwrapper.in b/package/gobject-introspection/g-ir-scanner-lddwrapper.in
new file mode 100644
index 0000000000..c19314566a
--- /dev/null
+++ b/package/gobject-introspection/g-ir-scanner-lddwrapper.in
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+${HOST_DIR}/sbin/prelink-rtld --root=$(dirname $0)/../../ "$@"
diff --git a/package/gobject-introspection/g-ir-scanner-qemuwrapper.in b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
new file mode 100644
index 0000000000..cad7ef875e
--- /dev/null
+++ b/package/gobject-introspection/g-ir-scanner-qemuwrapper.in
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# Pass -r to qemu-user as to trick glibc into not errorings out if the host kernel
+# is older than the target kernel.
+# Use a modules directory which does not exist so we don't load random things
+# which may then get deleted (or their dependencies) and potentially segfault
+GIO_MODULE_DIR=$(dirname $0)/../lib/gio/modules-dummy \
+@QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \
+-L $(dirname $0)/../../ \
+-E LD_LIBRARY_PATH=${GIR_EXTRA_LIBS_PATH}:.libs:$(dirname $0)/../lib:$(dirname $0)/../../lib \
+"$@"
+
+if [[ $? -ne 0 ]]; then
+ echo "If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help."
+ echo 'Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs"'
+ exit 1
+fi
diff --git a/package/gobject-introspection/g-ir-scanner.in b/package/gobject-introspection/g-ir-scanner.in
new file mode 100644
index 0000000000..9f97497b7e
--- /dev/null
+++ b/package/gobject-introspection/g-ir-scanner.in
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+export GI_SCANNER_DISABLE_CACHE=1
+${HOST_DIR}/bin/g-ir-scanner \
+--lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \
+--use-binary-wrapper=$(dirname $0)/g-ir-scanner-qemuwrapper \
+--use-ldd-wrapper=$(dirname $0)/g-ir-scanner-lddwrapper \
+--add-include-path=$(dirname $0)/../share/gir-1.0 "$@"
diff --git a/package/gobject-introspection/gobject-introspection.hash b/package/gobject-introspection/gobject-introspection.hash
new file mode 100644
index 0000000000..0454c59565
--- /dev/null
+++ b/package/gobject-introspection/gobject-introspection.hash
@@ -0,0 +1,4 @@
+#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.62/gobject-introspection-1.62.0.sha256sum
+sha256 b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2 gobject-introspection-1.62.0.tar.xz
+sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL
diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk
new file mode 100644
index 0000000000..67e5e37dee
--- /dev/null
+++ b/package/gobject-introspection/gobject-introspection.mk
@@ -0,0 +1,133 @@
+################################################################################
+#
+# gobject-introspection
+#
+################################################################################
+
+GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.62
+GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0
+GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
+GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
+GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
+GOBJECT_INTROSPECTION_AUTORECONF = YES
+GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause
+GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l
+
+GOBJECT_INTROSPECTION_DEPENDENCIES = \
+ host-autoconf-archive \
+ host-gobject-introspection \
+ host-prelink-cross \
+ host-qemu \
+ libffi \
+ libglib2 \
+ python3 \
+ zlib
+
+HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = \
+ host-bison \
+ host-flex \
+ host-libglib2 \
+ host-python3
+
+# g-ir-scanner will default to /usr/bin/ld for linking if this is not set.
+GOBJECT_INTROSPECTION_NINJA_ENV += \
+ CC="$(TARGET_CC)"
+
+# Disable introspection data on the host, as it is not needed and
+# the package will attempt to use the systems libglib2 which will fail
+# if the systems libglib2 version is older than 2.60.
+HOST_GOBJECT_INTROSPECTION_CONF_OPTS = \
+ -Denable-introspection-data=false
+
+# Use the host gi-scanner to prevent the scanner from generating incorrect
+# elf classes.
+GOBJECT_INTROSPECTION_CONF_OPTS = \
+ -Denable-host-gi=true \
+ -Denable-gi-cross-wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \
+ -Denable-gi-ldd-wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \
+ -Denable-introspection-data=true
+
+ifeq ($(BR2_PACKAGE_CAIRO),y)
+GOBJECT_INTROSPECTION_DEPENDENCIES += cairo
+GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=true
+endif
+
+# GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME}
+GOBJECT_INTROSPECTION_CONF_ENV = \
+ GI_SCANNER_DISABLE_CACHE=1
+
+HOST_GOBJECT_INTROSPECTION_CONF_ENV = \
+ GI_SCANNER_DISABLE_CACHE=1
+
+# Make sure g-ir-tool-template uses the host python.
+define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
+ $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in
+endef
+HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
+
+# Perform the following:
+# - Just as above, Ensure that g-ir-tool-template.in uses the host python.
+# - Install all of the wrappers needed to build gobject-introspection.
+# - Create a safe modules directory which does not exist so we don't load random things
+# which may then get deleted (or their dependencies) and potentially segfault
+define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
+ $(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in
+
+ $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \
+ $(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper
+
+ $(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-qemuwrapper.in \
+ $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
+ $(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \
+ $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
+ $(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \
+ $(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
+
+ # Use a modules directory which does not exist so we don't load random things
+ # which may then get deleted (or their dependencies) and potentially segfault
+ mkdir -p $(STAGING_DIR)/usr/lib/gio/modules-dummy
+endef
+GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
+
+# Move the real compiler and scanner to .real, and replace them with the wrappers.
+# Using .real has the following advantages:
+# - There is no need to change the logic for other packages.
+# - The wrappers call the .real files using qemu.
+define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
+ # Move the real binaries to their names.real, then replace them with
+ # the wrappers.
+ $(foreach w,g-ir-compiler g-ir-scanner,
+ mv $(STAGING_DIR)/usr/bin/$(w) $(STAGING_DIR)/usr/bin/$(w).real
+ $(INSTALL) -D -m 755 \
+ $(GOBJECT_INTROSPECTION_PKGDIR)/$(w).in $(STAGING_DIR)/usr/bin/$(w)
+ )
+ # Gobject-introspection installs Makefile.introspection in
+ # $(STAGING_DIR)/usr/share which is needed for autotools-based programs to
+ # build .gir and .typelib files. Unfortuantly, gobject-introspection-1.0.pc
+ # uses $(prefix)/share as the directory, which
+ # causes the host /usr/share being used instead of $(STAGING_DIR)/usr/share.
+ # Change datarootdir to $(libdir)/../share which will prefix $(STAGING_DIR)
+ # to the correct location.
+ $(SED) "s%datarootdir=.*%datarootdir=\$${libdir}/../share%g" \
+ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
+
+ # By default, girdir and typelibdir use datadir and libdir as their prefix,
+ # of which pkg-config appends the sysroot directory. This results in files
+ # being installed in $(STAGING_DIR)/$(STAGING_DIR)/path/to/files.
+ # Changing the prefix to exec_prefix prevents this error.
+ $(SED) "s%girdir=.*%girdir=\$${exec_prefix}/share/gir-1.0%g" \
+ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
+
+ $(SED) "s%typelibdir=.*%typelibdir=\$${exec_prefix}/lib/girepository-1.0%g" \
+ $(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
+endef
+GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
+
+# Only .typelib files are needed to run.
+define GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES
+ find $(TARGET_DIR)/usr/share \( -iname "*.gir" -o -iname \*.rnc \) -delete
+endef
+GOBJECT_INTROSPECTION_TARGET_FINALIZE_HOOKS += GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES
+
+$(eval $(meson-package))
+$(eval $(host-meson-package))
diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in
index f60d540337..db916ed219 100644
--- a/package/gstreamer1/gst1-plugins-base/Config.in
+++ b/package/gstreamer1/gst1-plugins-base/Config.in
@@ -10,6 +10,12 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE
if BR2_PACKAGE_GST1_PLUGINS_BASE
+config BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS
+ bool "install tools"
+ help
+ Install the gst-discoverer, gst-device-monitor and gst-play
+ tools.
+
comment "dependency-less plugins"
config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER
diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index 1781a5d461..ccecbb3c08 100644
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -26,6 +26,12 @@ GST1_PLUGINS_BASE_CONF_OPTS += \
-Dlibvisual=disabled \
-Diso-codes=disabled
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS),y)
+GST1_PLUGINS_BASE_CONF_OPTS += -Dtools=enabled
+else
+GST1_PLUGINS_BASE_CONF_OPTS += -Dtools=disabled
+endif
+
GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 $(TARGET_NLS_DEPENDENCIES)
GST1_PLUGINS_BASE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index c8bf58bb89..20aebc473e 100644
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -279,7 +279,6 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL
bool "qmlgl (qt5)"
depends on BR2_PACKAGE_QT5
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
- depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative-quick
select BR2_PACKAGE_QT5BASE_WIDGETS
select BR2_PACKAGE_QT5DECLARATIVE
select BR2_PACKAGE_QT5DECLARATIVE_QUICK
@@ -287,11 +286,6 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL
help
QT5 plugin which includes elements qmlglsrc and qmlglsink
-comment "qmlgl (qt5) plugin needs an OpenGL-capable Qt5 backend"
- depends on BR2_PACKAGE_QT5
- depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
-
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHOUT2
bool "shout2"
select BR2_PACKAGE_LIBSHOUT
diff --git a/package/i2pd/i2pd.hash b/package/i2pd/i2pd.hash
index 0ae6ea05fb..26d3be6914 100644
--- a/package/i2pd/i2pd.hash
+++ b/package/i2pd/i2pd.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 fd0474c33b411593b9dc8197f3799d37d68455c11a9ee3994ec993a96388ec06 i2pd-2.29.0.tar.gz
-sha256 d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c LICENSE
+sha256 25915cbd33a9f53c89ddf7fbd68fccc5ffc89ab40d4445ccc813da74fae154f2 i2pd-2.30.0.tar.gz
+sha256 d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c LICENSE
diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk
index c031145472..56af5cb44b 100644
--- a/package/i2pd/i2pd.mk
+++ b/package/i2pd/i2pd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-I2PD_VERSION = 2.29.0
+I2PD_VERSION = 2.30.0
I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION))
I2PD_LICENSE = BSD-3-Clause
I2PD_LICENSE_FILES = LICENSE
diff --git a/package/inadyn/Config.in b/package/inadyn/Config.in
index d03db83e3a..3589823da4 100644
--- a/package/inadyn/Config.in
+++ b/package/inadyn/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_INADYN
depends on BR2_USE_MMU # Uses fork()
depends on !BR2_STATIC_LIBS # dlopen()
select BR2_PACKAGE_LIBCONFUSE
- select BR2_PACKAGE_LIBITE
help
INADYN is a free DynDNS client. It gives the possibility
to have your own fixed hostname registered on the internet,
diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash
index 2691ba0ef9..52bd6abd38 100644
--- a/package/inadyn/inadyn.hash
+++ b/package/inadyn/inadyn.hash
@@ -1,5 +1,6 @@
-# From https://github.com/troglobit/inadyn/releases/download/v2.5/inadyn-2.5.tar.xz.md5
-md5 8a864d5186e54d24de2d7554fc01b3ec inadyn-2.5.tar.xz
+# From https://github.com/troglobit/inadyn/releases/download/v2.6/inadyn-2.6.tar.xz.md5
+md5 62ec986b73d24b1b755bf0ed3efe54f2 inadyn-2.6.tar.xz
+
# Locally computed
-sha256 4a9ad208671f62912428413da0282450b2d2c4da38f3c95c4ac975d048c41fcd inadyn-2.5.tar.xz
-sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
+sha256 9f4198764abbd2798472b349d8867e86b4692c76ee304f1f9c607f67c9b582a4 inadyn-2.6.tar.xz
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk
index 5f67849252..b1ebeeb2fe 100644
--- a/package/inadyn/inadyn.mk
+++ b/package/inadyn/inadyn.mk
@@ -4,12 +4,12 @@
#
################################################################################
-INADYN_VERSION = 2.5
+INADYN_VERSION = 2.6
INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION)
INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz
INADYN_LICENSE = GPL-2.0+
INADYN_LICENSE_FILES = COPYING
-INADYN_DEPENDENCIES = host-pkgconf libconfuse libite
+INADYN_DEPENDENCIES = host-pkgconf libconfuse
ifeq ($(BR2_PACKAGE_OPENSSL),y)
INADYN_CONF_OPTS += --enable-openssl
diff --git a/package/ipset/ipset.hash b/package/ipset/ipset.hash
index 9c95ca420f..fb200585d1 100644
--- a/package/ipset/ipset.hash
+++ b/package/ipset/ipset.hash
@@ -1,6 +1,6 @@
-# From http://ipset.netfilter.org/ipset-7.5.tar.bz2.md5sum.txt
-md5 1f3156c68f6fa6de03d8f3ca0539fb78 ipset-7.5.tar.bz2
+# From http://ipset.netfilter.org/ipset-7.6.tar.bz2.md5sum.txt
+md5 e107b679c3256af795261cece864d6d9 ipset-7.6.tar.bz2
# Calculated based on the hash above
-sha256 a57aee54ab6ffe9e04603a464bbf69d66db976500bb04dd04fd3fbd6efb36a0b ipset-7.5.tar.bz2
+sha256 0e7d44caa9c153d96a9b5f12644fbe35a632537a5a7f653792b72e53d9d5c2db ipset-7.6.tar.bz2
# Locally calculated
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 383e90af38..869763d322 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -4,7 +4,7 @@
#
################################################################################
-IPSET_VERSION = 7.5
+IPSET_VERSION = 7.6
IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
IPSET_SITE = http://ipset.netfilter.org
IPSET_DEPENDENCIES = libmnl host-pkgconf
diff --git a/package/kexec-lite/kexec-lite.hash b/package/kexec-lite/kexec-lite.hash
index 01008236a7..e2426a45c5 100644
--- a/package/kexec-lite/kexec-lite.hash
+++ b/package/kexec-lite/kexec-lite.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 6eb115c8db3a071b970d7ba985ea5e2425e1e716952186f9a4fe329a2e2bb1ca kexec-lite-18ec88310c4134eca2f9e3c417cd09f5914bf633.tar.gz
+sha256 1027c69721e8ee21614273a540e1dd505370d8d814845c0adaf838496105a35d kexec-lite-6b0130b3c1ea489e061cda2805e6f8b68dc96a76.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/kexec-lite/kexec-lite.mk b/package/kexec-lite/kexec-lite.mk
index e44c6df8f2..45c5d4d8b7 100644
--- a/package/kexec-lite/kexec-lite.mk
+++ b/package/kexec-lite/kexec-lite.mk
@@ -4,7 +4,7 @@
#
################################################################################
-KEXEC_LITE_VERSION = 18ec88310c4134eca2f9e3c417cd09f5914bf633
+KEXEC_LITE_VERSION = 6b0130b3c1ea489e061cda2805e6f8b68dc96a76
KEXEC_LITE_SITE = $(call github,antonblanchard,kexec-lite,$(KEXEC_LITE_VERSION))
KEXEC_LITE_LICENSE = GPL-2.0+
KEXEC_LITE_LICENSE_FILES = COPYING
diff --git a/package/kf5/Config.in b/package/kf5/Config.in
index aecbb932f5..030759f376 100644
--- a/package/kf5/Config.in
+++ b/package/kf5/Config.in
@@ -1,7 +1,6 @@
menuconfig BR2_PACKAGE_KF5
bool "KF5"
depends on BR2_PACKAGE_QT5
- depends on BR2_PACKAGE_QT5_VERSION_LATEST
help
This option enables the KF5 KDE Frameworks. Sub-options
allow to select which modules should be built.
diff --git a/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch b/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch
deleted file mode 100644
index 3be40d4993..0000000000
--- a/package/kmod/0002-Do-not-check-for-undefined-symbols-when-building-the.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 55a0a0aac503f5012ff2df7af37107544c757f19 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Tue, 22 Oct 2019 09:56:32 +0200
-Subject: [PATCH kmod] Do not check for undefined symbols when building the
- Python modules
-
-kmod's configure.ac uses the -Wl,--no-undefined linker flag to verify
-at link time that all symbols of shared libraries are available, and
-that there are no undefined symbols.
-
-This make perfect sense for regular shared libraries. However, for
-Python extensions, which will be dlopen()ed inside the Python
-interpreter, it makes less sense.
-
-Since Python 3.8, there is a change in python-config script and
-Python's pkg-config file: it no longer links Python extensions with
-the libpython library. See
-https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
-which states:
-
- On the other hand, pkg-config python3.8 --libs no longer contains
- -lpython3.8. C extensions must not be linked to libpython (except on
- Android and Cygwin, whose cases are handled by the script); this
- change is backward incompatible on purpose. (Contributed by Victor
- Stinner in bpo-36721.)
-
-So, when linking the kmod Python extensions, it currently fails with
-numerous unresolved symbols, that were previously provided by
-libpython:
-
-/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__Pyx_PyObject_GetAttrStr':
-list.c:(.text.__Pyx_PyObject_GetAttrStr+0x48): undefined reference to `PyObject_GetAttr'
-/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__pyx_tp_dealloc_4kmod_4list_ModListItem':
-list.c:(.text.__pyx_tp_dealloc_4kmod_4list_ModListItem+0x78): undefined reference to `PyObject_CallFinalizerFromDealloc'
-/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__pyx_tp_dealloc_4kmod_4list_ModList':
-list.c:(.text.__pyx_tp_dealloc_4kmod_4list_ModList+0x30): undefined reference to `PyErr_Fetch'
-
-[Complete log at http://autobuild.buildroot.net/results/79a/79a5a0398723e8cfea0d0aa3dec5f7649aee4c63/build-end.log]
-
-Linking with libpython is no longer recommended: those symbols should
-remain unresolved in the Python extensions, as they wil be properly
-resolved when the Python extension gets loaded into the Python
-interpreter.
-
-Since we want to keep -Wl,--no-undefined globally in kmod, we leave
-the configure.ac file unchanged, and instead, specifically in the
-LDFLAGS used to build the Python extensions, we override
--Wl,--no-undefined with -Wl,-z,undefs. Ideally, -Wl,--no-undefined is
-the same as -Wl,-z,defs, and the effect of these options can be
-canceled on the linker command line by a following -Wl,-z,undefs (see
-the ld man page for details).
-
-Upstream: https://lore.kernel.org/linux-modules/20191024174710.9441-1-thomas.petazzoni@bootlin.com/
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Cc: Victor Stinner <victor.stinner@gmail.com>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c5c2f06..8e9c90d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -173,7 +173,7 @@ CPYTHON_MODULE_CFLAGS = \
- $(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \
- $(PYTHON_NOWARN) $(PYTHON_CFLAGS) \
- -fvisibility=default
--CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared
-+CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs
-
- if BUILD_PYTHON
- pkgpyexec_LTLIBRARIES = \
---
-2.21.0
-
diff --git a/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch b/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch
deleted file mode 100644
index f4d90d4c24..0000000000
--- a/package/kmod/0003-Makefile.am-filter-Wl-no-undefined.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7a55f18e14f606500fdeab6bc116ec74f3e5b1c3 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 16 Nov 2019 17:40:32 +0100
-Subject: [PATCH] Makefile.am: filter -Wl,--no-undefined
-
-Commit 1d14ef82f4a3be741bcdf6b1c6d51ce9dce43567 does not completely fix
-the build with python 3.8 as we still get link failure due to
-'-z undefs' being ignored by some versions of ld:
-
-/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/5.3.0/../../../../mips-linux-gnu/bin/ld: warning: -z undefs ignored.
-
-/home/naourr/work/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-linux-gnu/7.3.1/../../../../aarch64_be-linux-gnu/bin/ld: warning: -z undefs ignored.
-
-So filter -Wl,--no-undefined to fix the issue
-
-Fixes:
- - http://autobuild.buildroot.org/results/e9645d9969481b09f507f6e0d0b35faaa283eb60
- - http://autobuild.buildroot.org/results/06a6d865b6b7d8ebd793bde214f4a4c40e0962e1
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- Makefile.am | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8e9c90d..47505c1 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -173,7 +173,10 @@ CPYTHON_MODULE_CFLAGS = \
- $(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \
- $(PYTHON_NOWARN) $(PYTHON_CFLAGS) \
- -fvisibility=default
--CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs
-+# Filter -Wl,--no-undefined to fix build with python 3.8
-+comma = ,
-+CPYTHON_MODULE_LDFLAGS = $(subst -Wl$(comma)--no-undefined,,$(AM_LDFLAGS))
-+CPYTHON_MODULE_LDFLAGS += -module -avoid-version -shared
-
- if BUILD_PYTHON
- pkgpyexec_LTLIBRARIES = \
---
-2.24.0
-
diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash
index dea5c0c107..3cb60b2dd3 100644
--- a/package/kmod/kmod.hash
+++ b/package/kmod/kmod.hash
@@ -1,6 +1,6 @@
# From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc
-sha256 57bb22c8bb56435991f6b0810a042b0a65e2f1e217551efa58235b7034cdbb9d kmod-26.tar.xz
+sha256 c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c kmod-27.tar.xz
# Locally calculated
-sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING
-sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
+sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING
+sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
index e21f40a845..e2dfea5c7b 100644
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -4,12 +4,10 @@
#
################################################################################
-KMOD_VERSION = 26
+KMOD_VERSION = 27
KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
KMOD_INSTALL_STAGING = YES
-# 0002-Do-not-check-for-undefined-symbols-when-building-the.patch
-KMOD_AUTORECONF = YES
KMOD_DEPENDENCIES = host-pkgconf
HOST_KMOD_DEPENDENCIES = host-pkgconf
diff --git a/package/kodi-visualisation-fishbmc/Config.in b/package/kodi-visualisation-fishbmc/Config.in
index 9e2eabbdbc..66c1565bd7 100644
--- a/package/kodi-visualisation-fishbmc/Config.in
+++ b/package/kodi-visualisation-fishbmc/Config.in
@@ -1,10 +1,6 @@
config BR2_PACKAGE_KODI_VISUALISATION_FISHBMC
bool "kodi-visualisation-fishbmc"
- depends on BR2_PACKAGE_HAS_LIBGL
help
Fische visualiser for Kodi
- https://github.com/notspiff/visualization.fishbmc
-
-comment "kodi-visualisation-fishbmc needs OpenGL"
- depends on !BR2_PACKAGE_HAS_LIBGL
+ https://github.com/xbmc/visualization.fishbmc
diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk
index 2637066701..d83d31d2ee 100644
--- a/package/kvm-unit-tests/kvm-unit-tests.mk
+++ b/package/kvm-unit-tests/kvm-unit-tests.mk
@@ -35,13 +35,7 @@ KVM_UNIT_TESTS_CONF_OPTS =\
# compiler. However, for x86-64, we use the host compiler, as
# kvm-unit-tests builds 32 bit code, which Buildroot toolchains for
# x86-64 cannot do.
-ifeq ($(BR2_x86_64),y)
-# Arch Linux adds -fstack-protector even when building with -ffreestanding, but
-# it doesn't link with the stack-protector library when -nostdlib is passed,
-# which leads to a link error. Therefore, disable it explicitly to work around
-# this bug in Arch Linux. https://bugs.archlinux.org/task/64270
-KVM_UNIT_TESTS_MAKE_OPTS += EXTRA_CFLAGS=-fno-stack-protector
-else
+ifeq ($(BR2_x86_64),)
KVM_UNIT_TESTS_CONF_OPTS += --cross-prefix="$(TARGET_CROSS)"
endif
diff --git a/package/libcpprestsdk/libcpprestsdk.hash b/package/libcpprestsdk/libcpprestsdk.hash
index e226a581be..1f79a4ad95 100644
--- a/package/libcpprestsdk/libcpprestsdk.hash
+++ b/package/libcpprestsdk/libcpprestsdk.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 f2628b248f714d7bbd6a536553bc3782602c68ca1b129017985dd70cc3515278 libcpprestsdk-2.10.14.tar.gz
-sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt
+sha256 1c027a53457e87b0b3a475e5c8045b94400c475898c8bd51b0fbd218b99a7f7b libcpprestsdk-2.10.15.tar.gz
+sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt
diff --git a/package/libcpprestsdk/libcpprestsdk.mk b/package/libcpprestsdk/libcpprestsdk.mk
index 8b9c7d4da7..8404b5096c 100644
--- a/package/libcpprestsdk/libcpprestsdk.mk
+++ b/package/libcpprestsdk/libcpprestsdk.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBCPPRESTSDK_VERSION = 2.10.14
+LIBCPPRESTSDK_VERSION = 2.10.15
LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,v$(LIBCPPRESTSDK_VERSION))
LIBCPPRESTSDK_LICENSE = MIT
LIBCPPRESTSDK_LICENSE_FILES = license.txt
diff --git a/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch b/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch
deleted file mode 100644
index 69e349f205..0000000000
--- a/package/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-configure: use pkg-config to find openssl
-
-The current check is broken for static linking, since the openssl
-libs need to be linked against libz, which is missing in the link
-command when doing a static build:
- http://autobuild.buildroot.net/results/787/787cd9992b00d8008641af208f5fb7c4afb40b06/build-end.log
-
-Instead of trying convoluted tests to decide what additional libs
-are required, just delegate this job to pkg-config.
-
-At the same time, fix a few legacy, deprecated constructs in favour
-of their new counterparts.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
----
-Upstream status: submitted, but no public mailing list (sent to the
-mail documented in: http://www.antisip.com/doc/exosip2/index.html )
-
-diff -durN libeXosip2-3.6.0.orig/configure.in libeXosip2-3.6.0/configure.in
---- libeXosip2-3.6.0.orig/configure.in 2014-06-22 23:58:26.549487427 +0200
-+++ libeXosip2-3.6.0/configure.in 2014-06-22 23:59:12.822008499 +0200
-@@ -44,7 +44,7 @@
- AC_CONFIG_AUX_DIR(scripts)
- AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
--AM_ACLOCAL_INCLUDE(scripts)
-+AC_CONFIG_MACRO_DIR([scripts])
-
- AC_CANONICAL_HOST
-
-@@ -371,13 +371,15 @@
-
- AC_ARG_ENABLE(openssl,
- [ --enable-openssl enable support for openssl],
-- enable_openssl=$enableval,enable_openssl="yes")
-+ enable_openssl=$enableval,enable_openssl="auto")
-
--if test "$enable_openssl" = "yes" ; then
-- AC_CHECK_HEADERS(openssl/ssl.h)
-- AC_CHECK_LIB(ssl,SSL_CTX_new,[EXOSIP_LIB="$EXOSIP_LIB -lssl"])
-- AC_CHECK_LIB(crypto,X509_get_issuer_name,[EXOSIP_LIB="$EXOSIP_LIB -lcrypto"])
--fi
-+AS_IF([test "$enable_openssl" = "yes" -o "$enable_openssl" = "auto"],
-+ [PKG_CHECK_MODULES([SSL], [openssl],
-+ [EXOSIP_LIB="$EXOSIP_LIB $SSL_LIBS"],
-+ [AS_IF([test "$enable_openssl" = "yes"],
-+ [AC_MSG_ERROR([can not find openssl])])
-+ ])
-+ ])
-
- AC_ARG_ENABLE(srvrec,
- [ --enable-srvrec enable support for SRV records DNS queries (yes) ],
-diff -durN build/libeXosip2-3.6.0.orig/Makefile.am build/libeXosip2-3.6.0/Makefile.am
---- libeXosip2-3.6.0.orig/Makefile.am 2014-06-23 00:14:25.328226745 +0200
-+++ libeXosip2-3.6.0/Makefile.am 2014-06-23 00:14:38.296371236 +0200
-@@ -1,4 +1,4 @@
--
-+ACLOCAL_AMFLAGS = -I scripts
- EXTRA_DIST = README autogen.sh
-
- SUBDIRS = scripts platform src include tools help
diff --git a/package/libeXosip2/libeXosip2.hash b/package/libeXosip2/libeXosip2.hash
index 86335a3c47..a7d3c56d00 100644
--- a/package/libeXosip2/libeXosip2.hash
+++ b/package/libeXosip2/libeXosip2.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 91da1a084c9ab663afe04b493342e075ad59ac54a1af011c7f2ba4543a923564 libeXosip2-3.6.0.tar.gz
+sha256 21420c00bf8e0895ff36161766beec12b7e6f1d371030c389dba845e271272e2 libexosip2-5.1.1.tar.gz
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
index 04f8672c40..4bd8922b41 100644
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -4,7 +4,9 @@
#
################################################################################
-LIBEXOSIP2_VERSION = 3.6.0
+LIBEXOSIP2_VERSION = 5.1.1
+# Since version 5.0, letter 'X' in library's name is in lower case
+LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz
LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip
LIBEXOSIP2_INSTALL_STAGING = YES
LIBEXOSIP2_LICENSE = GPL-2.0+
@@ -12,9 +14,6 @@ LIBEXOSIP2_LICENSE_FILES = COPYING
LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
-# We are touching configure.in and Makefile.am with one of our patches
-LIBEXOSIP2_AUTORECONF = YES
-
ifeq ($(BR2_arc),y)
# toolchain __arc__ define conflicts with libeXosip2 source
LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
diff --git a/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch b/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch
deleted file mode 100644
index 745903178c..0000000000
--- a/package/libevdev/0001-configure-add-disable-runtime-tests-option.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 93f6bc2b97a2b76a5e725d63d4b6c2dfe7baf63b Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Sun, 11 Oct 2015 13:33:19 +0200
-Subject: [PATCH] configure: add '--disable-runtime-tests' option
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
-[Rebased libevdev-1.6.0]
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- configure.ac | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5161d93..2b3bb26 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,14 @@ else
- AC_MSG_WARN([check not found - skipping building unit tests])
- fi
- AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
--AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x$HAVE_CHECK" = "xyes"])
-+
-+AC_ARG_ENABLE([runtime-tests],
-+ AS_HELP_STRING([--disable-runtime-tests], [Disable runtime tests]))
-+AS_IF([test "x$enable_runtime_tests" != "xno"],
-+ [enable_runtime_tests=yes],
-+ [enable_runtime_tests=no])
-+
-+AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x${enable_runtime_tests}x$HAVE_CHECK" = "xyesxyes"])
- AM_CONDITIONAL(ENABLE_STATIC_LINK_TEST, [test "x$enable_static" = "xyes"])
-
- with_cflags=""
-@@ -162,7 +169,7 @@ AC_MSG_RESULT([
- Libdir ${libdir}
-
- Build documentation ${have_doxygen}
-- Enable unit-tests ${HAVE_CHECK}
-+ Enable unit-tests ${HAVE_CHECK} (runtime-tests: ${enable_runtime_tests})
- Enable profiling ${enable_gcov}
- Static library symbol check ${static_symbol_leaks_test}
- ])
---
-2.19.1
-
diff --git a/package/libevdev/0001-meson.build-use-local-include-path-for-tools.patch b/package/libevdev/0001-meson.build-use-local-include-path-for-tools.patch
new file mode 100644
index 0000000000..aa0af75055
--- /dev/null
+++ b/package/libevdev/0001-meson.build-use-local-include-path-for-tools.patch
@@ -0,0 +1,54 @@
+From 83eb5bbac775d46b74e7f99fbd243d53f0118b37 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Mon, 2 Mar 2020 15:43:14 +0100
+Subject: [PATCH] meson.build: use local include path for tools
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following compile failure with old toolchains and meson
+build (autotools build not affected):
+
+ ../tools/mouse-dpi-tool.c: In function ‘handle_event’:
+ ../tools/mouse-dpi-tool.c:115:13: error: ‘const struct input_event’ has no member named ‘input_event_sec’
+ m->us = ev->input_event_sec * 1000000 + ev->input_event_usec;
+ ^
+ ../tools/mouse-dpi-tool.c:115:45: error: ‘const struct input_event’ has no member named ‘input_event_usec’
+ m->us = ev->input_event_sec * 1000000 + ev->input_event_usec;
+ ^
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ meson.build | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 4831f8e..5500a83 100644
+--- a/meson.build
++++ b/meson.build
+@@ -102,18 +102,22 @@ install_man(manpage)
+ # tools
+ executable('libevdev-events',
+ sources: ['tools/libevdev-events.c'],
++ include_directories: [includes_include],
+ dependencies: dep_libevdev,
+ install: false)
+ executable('touchpad-edge-detector',
+ sources: ['tools/touchpad-edge-detector.c'],
++ include_directories: [includes_include],
+ dependencies: [dep_libevdev, dep_lm],
+ install: true)
+ executable('mouse-dpi-tool',
+ sources: ['tools/mouse-dpi-tool.c'],
++ include_directories: [includes_include],
+ dependencies: dep_libevdev,
+ install: true)
+ executable('libevdev-tweak-device',
+ sources: ['tools/libevdev-tweak-device.c'],
++ include_directories: [includes_include],
+ dependencies: dep_libevdev,
+ install: true)
+
+--
+2.25.1
+
diff --git a/package/libevdev/libevdev.hash b/package/libevdev/libevdev.hash
index 0d2c999222..5a28275319 100644
--- a/package/libevdev/libevdev.hash
+++ b/package/libevdev/libevdev.hash
@@ -1,8 +1,8 @@
-# From https://lists.freedesktop.org/archives/input-tools/2019-August/001521.html
-md5 879631080be18526737e33b63d848039 libevdev-1.8.0.tar.xz
-sha1 4392d28fb91a5f6eb404aab531526f5fa0bbe73d libevdev-1.8.0.tar.xz
-sha256 20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211 libevdev-1.8.0.tar.xz
-sha512 8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4 libevdev-1.8.0.tar.xz
+# From https://lists.freedesktop.org/archives/input-tools/2020-March/001530.html
+md5 13c3f0911f9326d4b9fa103365f84421 libevdev-1.9.0.tar.xz
+sha1 ab5040ee88dd4cb49a75da72e8fded91b282c108 libevdev-1.9.0.tar.xz
+sha256 e7e18a64264f2dea19b6c50a481f8c062529d42919ccda0bc861495bce28eb9e libevdev-1.9.0.tar.xz
+sha512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a libevdev-1.9.0.tar.xz
# Hash for license files:
-sha256 f063d1279b31e73007e1c54493391818b4cb5f9162d590120397e0347b932137 COPYING
+sha256 f063d1279b31e73007e1c54493391818b4cb5f9162d590120397e0347b932137 COPYING
diff --git a/package/libevdev/libevdev.mk b/package/libevdev/libevdev.mk
index 8b243be74e..78e3146b9a 100644
--- a/package/libevdev/libevdev.mk
+++ b/package/libevdev/libevdev.mk
@@ -4,20 +4,19 @@
#
################################################################################
-LIBEVDEV_VERSION = 1.8.0
+LIBEVDEV_VERSION = 1.9.0
LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev
LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz
LIBEVDEV_LICENSE = X11
LIBEVDEV_LICENSE_FILES = COPYING
-# patch touches configure.ac
-LIBEVDEV_AUTORECONF = YES
-
-# Uses PKG_CHECK_MODULES() in configure.ac
-LIBEVDEV_DEPENDENCIES = host-pkgconf host-python
+LIBEVDEV_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY)
LIBEVDEV_INSTALL_STAGING = YES
-LIBEVDEV_CONF_OPTS += --disable-runtime-tests
+LIBEVDEV_CONF_OPTS += \
+ -Dtests=disabled \
+ -Ddocumentation=disabled \
+ -Dcoverity=false
-$(eval $(autotools-package))
+$(eval $(meson-package))
diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash
new file mode 100644
index 0000000000..0dafcea520
--- /dev/null
+++ b/package/libiberty/libiberty.hash
@@ -0,0 +1,5 @@
+# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum
+sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz
+
+# Locally computed, same as binutils.hash
+sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB
diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk
new file mode 100644
index 0000000000..6235a8b956
--- /dev/null
+++ b/package/libiberty/libiberty.mk
@@ -0,0 +1,32 @@
+################################################################################
+#
+# libiberty
+#
+################################################################################
+
+LIBIBERTY_VERSION = 2.32
+LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz
+LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils
+HOST_LIBIBERTY_DL_SUBDIR = binutils
+
+# We're only building libiberty here, not the full binutils suite
+LIBIBERTY_LICENSE = LGPL-2.1+
+LIBIBERTY_LICENSE_FILES = COPYING.LIB
+
+LIBIBERTY_SUBDIR = libiberty
+
+# We explicitly disable multilib, as we do in binutils.
+# By default, libiberty installs nothing, so we must force it.
+HOST_LIBIBERTY_CONF_OPTS = \
+ --disable-multilib \
+ --enable-install-libiberty
+
+# Some packages (e.g. host-gdb) will pick this library and build shared
+# objects with it. But libiberty does not honour the --enable-shared and
+# --disable-static flags; it only ever builds a static library no matter
+# what. So we must force -fPIC in build flags.
+HOST_LIBIBERTY_CONF_ENV = \
+ CFLAGS="$(HOST_CFLAGS) -fPIC" \
+ LDFLAGS="$(HOST_LDFLAGS) -fPIC"
+
+$(eval $(host-autotools-package))
diff --git a/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch b/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch
deleted file mode 100644
index a02bb60558..0000000000
--- a/package/libiio/0001-fix-install-of-binaries-with-a-static-only-library.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5090603d01779bb1717fb0c50953330e8770550f Mon Sep 17 00:00:00 2001
-From: Pierre-Jean Texier <pjtexier@koncepto.io>
-Date: Sun, 23 Jun 2019 14:11:37 +0200
-Subject: [PATCH] fix install of binaries with a static only library
-
-Define CMAKE_INSTALL_RPATH only if ENABLE_SHARED is set otherwise the
-following issue occured:
-
-CMake Error at iiod/cmake_install.cmake:45 (file):
- file RPATH_CHANGE could not write new RPATH:
-
- /usr/lib
-
- to the file:
-
- /home/pjtexier/<path>/usr/sbin/iiod
-
- No valid ELF RPATH or RUNPATH entry exists in the file; File does not have
- a valid ELF identification.
-Call Stack (most recent call first):
- cmake_install.cmake:50 (include)
-
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
-[Upstream status: https://github.com/analogdevicesinc/libiio/pull/283]
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9b7ea1..634e553 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,7 +15,7 @@ endif()
-
- set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR}-doc)")
- include(GNUInstallDirs)
--if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+if(ENABLE_SHARED AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- endif()
---
-2.7.4
-
diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash
index 34c3144277..dd85ffa695 100644
--- a/package/libiio/libiio.hash
+++ b/package/libiio/libiio.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 bc2c5299974b65cfe9aa4a06d8c74d7651594e026bce416db48a2c5aa7ba2554 libiio-0.18.tar.gz
+sha256 81c414d5c47b715d9bc9275b9fabbfd9e9483e60c035f3001b5977932049595d libiio-0.19.tar.gz
sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt
diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk
index 8c8f79bd74..efd582a5ea 100644
--- a/package/libiio/libiio.mk
+++ b/package/libiio/libiio.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBIIO_VERSION = 0.18
+LIBIIO_VERSION = 0.19
LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION))
LIBIIO_INSTALL_STAGING = YES
LIBIIO_LICENSE = LGPL-2.1+
diff --git a/package/libite/libite.hash b/package/libite/libite.hash
index db3f6232b2..e16e78c01f 100644
--- a/package/libite/libite.hash
+++ b/package/libite/libite.hash
@@ -1,7 +1,8 @@
-# From https://github.com/troglobit/libite/releases/download/v2.1.0/libite-2.1.0.tar.xz.md5
-md5 701aa509f27ee35156bc53601e69fa74 libite-2.1.0.tar.xz
+# From https://github.com/troglobit/libite/releases/download/v2.1.2/libite-2.1.2.tar.xz.md5
+md5 3c23186dec3f3ae135ec4e8b58581f4e libite-2.1.2.tar.xz
+
# Locally calculated
-sha256 cf56e720146243749e0af5763d4a84eef738e20f2bef2d867497fefc39dee991 libite-2.1.0.tar.xz
-sha256 0e97ab27b60e20a7ddb8e9638189ad159124e51d2c12e12735b05423df224da5 LICENSE
-sha256 9e0fb98d251dddf5ba81a355f6b4d89835ec53bc5d7f5fcd2c866b54ec5ccec8 src/chomp.c
-sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d src/pidfile.c
+sha256 7a16825c6d02040767ccb9f3faed4bf0e6841857a46cc4cb9e9f36b78a6c7cb3 libite-2.1.2.tar.xz
+sha256 dc6eae50f69af0e848fd6957cdf48895563b4d15fdde7c9d20ae2bfdefbc2b83 LICENSE
+sha256 89053891d46d04a21d4a492f68038703e179986baffa458201810f4222b57427 src/chomp.c
+sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d src/pidfile.c
diff --git a/package/libite/libite.mk b/package/libite/libite.mk
index c598da1b4a..62fc0df00a 100644
--- a/package/libite/libite.mk
+++ b/package/libite/libite.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBITE_VERSION = 2.1.0
+LIBITE_VERSION = 2.1.2
LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz
LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION)
LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause
diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash
index bbf2c63afc..828bea0f92 100644
--- a/package/libmbim/libmbim.hash
+++ b/package/libmbim/libmbim.hash
@@ -1,4 +1,4 @@
# Locally computed:
-sha256 ac2708a409b09f1f6f1786a8a9e39c36619aa8d6f285ea943daa7a48ea36d3e8 libmbim-1.20.4.tar.xz
+sha256 5c0778eb1cd12c3604523134e55183f5147b0cae71150e875b583768f7aa1f38 libmbim-1.22.0.tar.xz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk
index dc5c9a59de..67cfd2bc0b 100644
--- a/package/libmbim/libmbim.mk
+++ b/package/libmbim/libmbim.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBMBIM_VERSION = 1.20.4
+LIBMBIM_VERSION = 1.22.0
LIBMBIM_SITE = https://www.freedesktop.org/software/libmbim
LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
diff --git a/package/libmediaart/libmediaart.mk b/package/libmediaart/libmediaart.mk
index a81542ac69..4933b74c19 100644
--- a/package/libmediaart/libmediaart.mk
+++ b/package/libmediaart/libmediaart.mk
@@ -22,9 +22,7 @@ LIBMEDIAART_CONF_OPTS += \
--disable-qt
else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y)
# qt5 needs c++11 (since qt-5.7)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
-endif
LIBMEDIAART_DEPENDENCIES += qt5base
LIBMEDIAART_CONF_OPTS += \
--disable-gdkpixbuf \
diff --git a/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch b/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch
deleted file mode 100644
index 7f2c2d46d2..0000000000
--- a/package/libosip2/0001-fix-bug-report-sr-109133-Heap-buffer-overflow-in-uti.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7e0793e15e21f68337e130c67b031ca38edf055f Mon Sep 17 00:00:00 2001
-From: Aymeric Moizard <amoizard@gmail.com>
-Date: Mon, 5 Sep 2016 15:01:53 +0200
-Subject: [PATCH] * fix bug report: sr #109133: Heap buffer overflow in
- utility function *osip_clrncpy* https://savannah.gnu.org/support/?109133
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/osipparser2/osip_port.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/osipparser2/osip_port.c b/src/osipparser2/osip_port.c
-index 0e64147..d8941b0 100644
---- a/src/osipparser2/osip_port.c
-+++ b/src/osipparser2/osip_port.c
-@@ -1291,8 +1291,10 @@ osip_clrncpy (char *dst, const char *src, size_t len)
- char *p;
- size_t spaceless_length;
-
-- if (src == NULL)
-+ if (src == NULL || len == 0) {
-+ *dst = '\0';
- return NULL;
-+ }
-
- /* find the start of relevant text */
- pbeg = src;
---
-2.11.0
-
diff --git a/package/libosip2/libosip2.hash b/package/libosip2/libosip2.hash
index c6df5f2362..76bc29d5fe 100644
--- a/package/libosip2/libosip2.hash
+++ b/package/libosip2/libosip2.hash
@@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
-sha256 c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd libosip2-3.6.0.tar.gz
+sha256 61bb28317221a630e47f65389d5ff3e4693996d3128e9e0d5d1399e4feebf64d libosip2-5.1.1.tar.gz
# Hash for license file:
sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
index 9302b9912e..e608f671c8 100644
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBOSIP2_VERSION = 3.6.0
+LIBOSIP2_VERSION = 5.1.1
LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
LIBOSIP2_INSTALL_STAGING = YES
LIBOSIP2_LICENSE = LGPL-2.1+
diff --git a/package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch b/package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch
deleted file mode 100644
index 62bc84c87e..0000000000
--- a/package/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 754897490d9478025d174c2b1c1849305f728324 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Mon, 28 Dec 2015 12:13:07 +0100
-Subject: [PATCH] libsecret.pc: add Libs.private field for libgcrypt
-
-When libgcrypt is available, libsecret links with it. When dynamic
-linking is used, there is no problem: libsecret.so has a NEEDED
-pointing to libgcrypt, so linking an application with -lsecret works
-fine. However, when doing static linking, you must specify the entire
-chain of libraries, otherwise you get unresolved symbols errors, such
-as:
-
-host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libsecret-1.a(libsecret_1_la-secret-session.o): In function `request_open_session_aes':
-build/libsecret-0.18.3/libsecret/secret-session.c:99: undefined reference to `gcry_mpi_release'
-build/libsecret-0.18.3/libsecret/secret-session.c:101: undefined reference to `gcry_mpi_aprint'
-build/libsecret-0.18.3/libsecret/secret-session.c:107: undefined reference to `gcry_free'
-
-In order to solve this, we simply need to indicate in the Libs.private
-field of the .pc file that we depend on libgcrypt.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libsecret/libsecret.pc.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libsecret/libsecret.pc.in b/libsecret/libsecret.pc.in
-index 0c342ef..d99cf44 100644
---- a/libsecret/libsecret.pc.in
-+++ b/libsecret/libsecret.pc.in
-@@ -11,4 +11,5 @@ Description: GObject bindings for Secret Service API
- Version: @VERSION@
- Requires: glib-2.0 gobject-2.0 gio-2.0
- Libs: -L${libdir} -lsecret-@SECRET_MAJOR@
-+Libs.private: @LIBGCRYPT_LIBS@
- Cflags: -I${includedir}/libsecret-@SECRET_MAJOR@
---
-2.6.4
-
diff --git a/package/libsecret/libsecret.hash b/package/libsecret/libsecret.hash
index 00fdfd06f6..3a256fd700 100644
--- a/package/libsecret/libsecret.hash
+++ b/package/libsecret/libsecret.hash
@@ -1,5 +1,5 @@
-# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.8.sha256sum
-sha256 3bfa889d260e0dbabcf5b9967f2aae12edcd2ddc9adc365de7a5cc840c311d15 libsecret-0.18.8.tar.xz
+# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.20/libsecret-0.20.1.sha256sum
+sha256 57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447 libsecret-0.20.1.tar.xz
# Hash for license file:
-sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING
+sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b COPYING
diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk
index c699e16d99..b48d2e7086 100644
--- a/package/libsecret/libsecret.mk
+++ b/package/libsecret/libsecret.mk
@@ -4,8 +4,8 @@
#
################################################################################
-LIBSECRET_VERSION_MAJOR = 0.18
-LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).8
+LIBSECRET_VERSION_MAJOR = 0.20
+LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).1
LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR)
LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz
LIBSECRET_INSTALL_STAGING = YES
diff --git a/package/libubootenv/libubootenv.hash b/package/libubootenv/libubootenv.hash
index bde2ac30e8..383f550359 100644
--- a/package/libubootenv/libubootenv.hash
+++ b/package/libubootenv/libubootenv.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 332c45d46401f1859f0781fd0fd316bb1c251264674677c26a4d9b9e1c592719 libubootenv-879c0731fa0725785b9fa4499bbf6aacd04ee4c2.tar.gz
+sha256 dc84eefd7dcde46e6754517be37dc0c5a6cd07d38db06564eb54acd9b9ff936e libubootenv-ba952d05ec9ab16029816a06d956bac7fb4e9832.tar.gz
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 Licenses/lgpl-2.1.txt
diff --git a/package/libubootenv/libubootenv.mk b/package/libubootenv/libubootenv.mk
index 99cbd0da23..44f8478833 100644
--- a/package/libubootenv/libubootenv.mk
+++ b/package/libubootenv/libubootenv.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBUBOOTENV_VERSION = 879c0731fa0725785b9fa4499bbf6aacd04ee4c2
+LIBUBOOTENV_VERSION = ba952d05ec9ab16029816a06d956bac7fb4e9832
LIBUBOOTENV_SITE = $(call github,sbabic,libubootenv,$(LIBUBOOTENV_VERSION))
LIBUBOOTENV_LICENSE = LGPL-2.1
LIBUBOOTENV_LICENSE_FILES = Licenses/lgpl-2.1.txt
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index a3bf099221..e095e3d7e1 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -70,9 +70,7 @@ LIBV4L_CONF_ENV += \
ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \
ac_cv_prog_UIC=$(HOST_DIR)/bin/uic
# qt5 needs c++11 (since qt-5.7)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
-endif
else
LIBV4L_CONF_OPTS += --disable-qv4l2
endif
diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash
index c734f3ad9f..5d4c3af10a 100644
--- a/package/libxkbcommon/libxkbcommon.hash
+++ b/package/libxkbcommon/libxkbcommon.hash
@@ -1,7 +1,7 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2019-February/040102.html
-md5 3c4409058dfd203f641a563358e0187d libxkbcommon-0.8.4.tar.xz
-sha1 0ce9df42239d451f61b2112c6ba8d0a1a0879009 libxkbcommon-0.8.4.tar.xz
-sha256 60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b libxkbcommon-0.8.4.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2020-January/041133.html
+md5 2d9ad3a46b317138b5e72a91cf105451 libxkbcommon-0.10.0.tar.xz
+sha1 d8f956f4bc5382d5d8e0e4dd590c4f090e0e985a libxkbcommon-0.10.0.tar.xz
+sha256 57c3630cdc38fb4734cd57fa349e92244f5ae3862813e533cedbd86721a0b6f2 libxkbcommon-0.10.0.tar.xz
# License file:
sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE
diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk
index 1f54de4267..3923d69c8d 100644
--- a/package/libxkbcommon/libxkbcommon.mk
+++ b/package/libxkbcommon/libxkbcommon.mk
@@ -4,22 +4,20 @@
#
################################################################################
-LIBXKBCOMMON_VERSION = 0.8.4
+LIBXKBCOMMON_VERSION = 0.10.0
LIBXKBCOMMON_SITE = http://xkbcommon.org/download
LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz
LIBXKBCOMMON_LICENSE = MIT/X11
LIBXKBCOMMON_LICENSE_FILES = LICENSE
LIBXKBCOMMON_INSTALL_STAGING = YES
LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex
-LIBXKBCOMMON_CONF_OPTS = --disable-wayland
-# uses C99 features
-LIBXKBCOMMON_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
+LIBXKBCOMMON_CONF_OPTS = -Denable-docs=false -Denable-wayland=false
ifeq ($(BR2_PACKAGE_XORG7),y)
-LIBXKBCOMMON_CONF_OPTS += --enable-x11
+LIBXKBCOMMON_CONF_OPTS += -Denable-x11=true
LIBXKBCOMMON_DEPENDENCIES += libxcb
else
-LIBXKBCOMMON_CONF_OPTS += --disable-x11
+LIBXKBCOMMON_CONF_OPTS += -Denable-x11=false
endif
-$(eval $(autotools-package))
+$(eval $(meson-package))
diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in
index 9d142d2c54..4768ea6772 100644
--- a/package/linux-firmware/Config.in
+++ b/package/linux-firmware/Config.in
@@ -367,6 +367,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_INTEL_E100
Firmware files for Intel 825xx handled by driver e100
(e100)
+config BR2_PACKAGE_LINUX_FIRMWARE_MICROCHIP_VSC85XX_PHY
+ bool "Microchip VSC85xx PHYs"
+ help
+ Firmware files for Microchip/Microsemi VSC85xx networking
+ PHYs (VSC8504, VSC8552, VSC8572, VSC8574, VSC856X, VSC8575,
+ VSC8582 and VSC8584)
+
config BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X
bool "QLogic FastLinQ 4xxxx"
help
diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash
index b7c9753955..3878d92881 100644
--- a/package/linux-firmware/linux-firmware.hash
+++ b/package/linux-firmware/linux-firmware.hash
@@ -1,7 +1,7 @@
# Locally calculated
-sha256 270f4b2dd89feb6ed7d9e166bb1677f27d8f93da9d95312e6d188b0e1efaba73 linux-firmware-20190717.tar.gz
+sha256 83646c58fc4e3ee9a73f4fa74213c849109f48c719322346393f3e5b0fa55044 linux-firmware-20200122.tar.gz
sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis
-sha256 ac7c42c8331ef69221039f770193a2120bc67c7bba357e51a5b3f557bca0037c LICENSE.amdgpu
+sha256 8d5847d2971241d4d6a51c16e206379de53a6d4e203fa6f8e1c1e9279c7c4ad0 LICENSE.amdgpu
sha256 2d6062d63b91eb750bf741498691604f75184b9fee97608ec537cd09bd6a42b4 LICENCE.Marvell
sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware
sha256 3b5eb392b2d9d8c46d6aae26d06c187e5ea3029b12d13bc2b8deb8b3ce6bfa53 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt
@@ -12,6 +12,7 @@ sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.
sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware
sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x
sha256 e295020afd7597dc1b3bbe50a84a7e432d9cb92bc053c1c5e657b50d2517627b LICENCE.iwlwifi_firmware
+sha256 0fc67bd715b3395f3f2af464781910e9e69c4ba23da304352229b42dc9e986c3 LICENCE.microchip
sha256 2051d5bf0755a0668f8c3d9a0d1c41d4b8cc411aba70f720fda71ae9e3b4d25c LICENCE.qat_firmware
sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx
sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt
@@ -28,6 +29,6 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENSE.
sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom
sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon
sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware
-sha256 440c2ed4fba90edb52847f1550ff33fbfb36f61688eecced84c22dfc247f31e9 WHENCE
+sha256 74d203d2fd433b73b63e8e31d8928e3817f6eaf3407c9e607802c20a5c02e6c4 WHENCE
sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt
sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 9d86ce57b2..aec76d54b9 100644
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LINUX_FIRMWARE_VERSION = 20190717
+LINUX_FIRMWARE_VERSION = 20200122
LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
LINUX_FIRMWARE_SITE_METHOD = git
@@ -71,9 +71,7 @@ endif
# rt2xx
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX),y)
-# rt3090.bin is a symlink to rt2860.bin
-# rt3070.bin is a symlink to rt2870.bin
-LINUX_FIRMWARE_FILES += rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin
+LINUX_FIRMWARE_FILES += rt2860.bin rt2870.bin rt3071.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink-firmware.txt
endif
@@ -214,8 +212,6 @@ endif
# sd8688
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688),y)
-LINUX_FIRMWARE_FILES += libertas/sd8688.bin libertas/sd8688_helper.bin
-# The two files above are but symlinks to those two ones:
LINUX_FIRMWARE_FILES += mrvl/sd8688.bin mrvl/sd8688_helper.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell
endif
@@ -320,12 +316,10 @@ endif
# wl127x
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y)
-# wl1271-nvs.bin is a symlink to wl127x-nvs.bin
LINUX_FIRMWARE_FILES += \
ti-connectivity/wl1271-fw-2.bin \
ti-connectivity/wl1271-fw-ap.bin \
ti-connectivity/wl1271-fw.bin \
- ti-connectivity/wl1271-nvs.bin \
ti-connectivity/wl127x-fw-3.bin \
ti-connectivity/wl127x-fw-plt-3.bin \
ti-connectivity/wl127x-nvs.bin \
@@ -341,15 +335,12 @@ endif
# wl128x
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X),y)
-# wl1271-nvs.bin and wl12xx-nvs.bin are symlinks to wl127x-nvs.bin
LINUX_FIRMWARE_FILES += \
ti-connectivity/wl128x-fw-3.bin \
ti-connectivity/wl128x-fw-ap.bin \
ti-connectivity/wl128x-fw-plt-3.bin \
ti-connectivity/wl128x-fw.bin \
- ti-connectivity/wl1271-nvs.bin \
ti-connectivity/wl128x-nvs.bin \
- ti-connectivity/wl12xx-nvs.bin \
ti-connectivity/wl127x-nvs.bin \
ti-connectivity/wl128x-fw-4-mr.bin \
ti-connectivity/wl128x-fw-4-plt.bin \
@@ -363,13 +354,11 @@ endif
# wl18xx
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX),y)
-# wl1271-nvs.bin is a symlink to wl127x-nvs.bin
LINUX_FIRMWARE_FILES += \
ti-connectivity/wl18xx-fw.bin \
ti-connectivity/wl18xx-fw-2.bin \
ti-connectivity/wl18xx-fw-3.bin \
ti-connectivity/wl18xx-fw-4.bin \
- ti-connectivity/wl1271-nvs.bin \
ti-connectivity/wl127x-nvs.bin \
ti-connectivity/TIInit_7.2.31.bts
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
@@ -455,6 +444,11 @@ LINUX_FIRMWARE_FILES += e100/*.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.e100
endif
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MICROCHIP_VSC85XX_PHY),y)
+LINUX_FIRMWARE_FILES += microchip/mscc_vsc85*.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.microchip
+endif
+
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_4X),y)
LINUX_FIRMWARE_FILES += \
qed/qed_init_values_zipped-*.bin
@@ -467,6 +461,9 @@ LINUX_FIRMWARE_FILES += \
rtl_nic/rtl8105e-1.fw \
rtl_nic/rtl8106e-1.fw \
rtl_nic/rtl8106e-2.fw \
+ rtl_nic/rtl8107e-1.fw \
+ rtl_nic/rtl8107e-2.fw \
+ rtl_nic/rtl8125a-3.fw \
rtl_nic/rtl8168d-1.fw \
rtl_nic/rtl8168d-2.fw \
rtl_nic/rtl8168e-1.fw \
@@ -474,6 +471,7 @@ LINUX_FIRMWARE_FILES += \
rtl_nic/rtl8168e-3.fw \
rtl_nic/rtl8168f-1.fw \
rtl_nic/rtl8168f-2.fw \
+ rtl_nic/rtl8168fp-3.fw \
rtl_nic/rtl8168g-2.fw \
rtl_nic/rtl8168g-3.fw \
rtl_nic/rtl8168h-1.fw \
@@ -559,8 +557,7 @@ LINUX_FIRMWARE_FILES += \
endif
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QAT_DH895XCC),y)
-# qat_mmp.bin is a symlink to qat_895xcc_mmp.bin
-LINUX_FIRMWARE_FILES += qat_895xcc.bin qat_895xcc_mmp.bin qat_mmp.bin
+LINUX_FIRMWARE_FILES += qat_895xcc.bin qat_895xcc_mmp.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware
endif
@@ -611,10 +608,33 @@ LINUX_FIRMWARE_LICENSE_FILES = $(sort $(LINUX_FIRMWARE_ALL_LICENSE_FILES))
endif
+# Some firmware are distributed as a symlink, for drivers to load them using a
+# defined name other than the real one. Since 9cfefbd7fbda ("Remove duplicate
+# symlinks") those symlink aren't distributed in linux-firmware but are created
+# automatically by its copy-firmware.sh script during the installation, which
+# parses the WHENCE file where symlinks are described. We follow the same logic
+# here, adding symlink only for firmwares installed in the target directory.
+#
+# For testing the presence of firmwares in the target directory we first make
+# sure we canonicalize the pointed-to file, to cover the symlinks of the form
+# a/foo -> ../b/foo where a/ (the directory where to put the symlink) does
+# not yet exist.
+define LINUX_FIRMWARE_CREATE_SYMLINKS
+ cd $(TARGET_DIR)/lib/firmware/ ; \
+ sed -r -e '/^Link: (.+) -> (.+)$$/!d; s//\1 \2/' $(@D)/WHENCE | \
+ while read f d; do \
+ if test -f $$(readlink -m $$(dirname $$f)/$$d); then \
+ mkdir -p $$(dirname $$f) || exit 1; \
+ ln -sf $$d $$f || exit 1; \
+ fi ; \
+ done
+endef
+
define LINUX_FIRMWARE_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/lib/firmware
$(LINUX_FIRMWARE_INSTALL_FILES)
$(LINUX_FIRMWARE_INSTALL_DIRS)
+ $(LINUX_FIRMWARE_CREATE_SYMLINKS)
endef
$(eval $(generic-package))
diff --git a/package/mali-t76x/egl.pc b/package/mali-t76x/egl.pc
index 614b700d64..3de3c3ffd3 100644
--- a/package/mali-t76x/egl.pc
+++ b/package/mali-t76x/egl.pc
@@ -8,4 +8,4 @@ Description: ARM Mali implementation of EGL
Version: 1.5
Requires:
Libs: -L${libdir} -lEGL -lGLESv2
-Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS
+Cflags: -I${includedir} -DEGL_NO_X11
diff --git a/package/mali-t76x/glesv2.pc b/package/mali-t76x/glesv2.pc
index 5997eac63f..6521a3862d 100644
--- a/package/mali-t76x/glesv2.pc
+++ b/package/mali-t76x/glesv2.pc
@@ -8,4 +8,4 @@ Description: ARM Mali implementation of OpenGL ESv2
Version: 2.0
Requires:
Libs: -L${libdir} -lGLESv2 -lGLESv1_CM
-Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS
+Cflags: -I${includedir} -DEGL_NO_X11
diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in
index b18c83c5e5..91861c16c1 100644
--- a/package/mediastreamer/Config.in
+++ b/package/mediastreamer/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_MEDIASTREAMER
bool "mediastreamer"
depends on BR2_INSTALL_LIBSTDCPP # ortp
depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
+ depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # ortp
select BR2_PACKAGE_ORTP
help
Mediastreamer is a powerful and lightweighted streaming
@@ -15,3 +16,6 @@ config BR2_PACKAGE_MEDIASTREAMER
comment "mediastreamer needs a toolchain w/ threads, C++"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+comment "mediastreamer needs a toolchain not affected by GCC bug 64735"
+ depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index 7d428f2322..f4927a28c6 100644
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,7 +12,7 @@ endif
# Not possible to directly refer to mesa3d variables, because of
# first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 19.3.4
+MESA3D_HEADERS_VERSION = 20.0.0
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive
MESA3D_HEADERS_DL_SUBDIR = mesa3d
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index 3237135b1c..e2ec6e625d 100644
--- a/package/mesa3d/mesa3d.hash
+++ b/package/mesa3d/mesa3d.hash
@@ -1,6 +1,6 @@
-# From https://lists.freedesktop.org/archives/mesa-announce/2020-February/000570.html
-sha256 1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4 mesa-19.3.4.tar.xz
-sha512 2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb mesa-19.3.4.tar.xz
+# From https://lists.freedesktop.org/archives/mesa-announce/2020-February/000572.html
+sha256 bb6db3e54b608d2536d4000b3de7dd3ae115fc114e8acbb5afff4b3bbed04b34 mesa-20.0.0.tar.xz
+sha512 3968820029434682fb6644947c76e12b6bb991a3d05cb519a6ea971ecc4aa9b21d03f84b9a452cc21cc77a7981db9e40dd2dfd3ea3dee85b3dd88a59b4842bbb mesa-20.0.0.tar.xz
# License
-sha256 d8d662974fc86e2e640362015e42de3fcc161d435a9f2111ecd8561412feca73 docs/license.html
+sha256 1ddae7da415352a5b5360ff3a9d7ecf23ba81408f62eeecce0011f32e3ef9da6 docs/license.html
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 2a22d2fddc..9c9f38d17e 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -5,7 +5,7 @@
################################################################################
# When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 19.3.4
+MESA3D_VERSION = 20.0.0
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = https://mesa.freedesktop.org/archive
MESA3D_LICENSE = MIT, SGI, Khronos
@@ -257,4 +257,11 @@ else
MESA3D_CONF_OPTS += -Dlmsensors=false
endif
+ifeq ($(BR2_PACKAGE_ZSTD),y)
+MESA3D_CONF_OPTS += -Dzstd=true
+MESA3D_DEPENDENCIES += zstd
+else
+MESA3D_CONF_OPTS += -Dzstd=false
+endif
+
$(eval $(meson-package))
diff --git a/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch b/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
index a7b66c1067..79e99adf4a 100644
--- a/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
+++ b/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch
@@ -14,7 +14,7 @@ diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
index 8ac6aab1..7ef04116 100644
--- a/mesonbuild/minstall.py
+++ b/mesonbuild/minstall.py
-@@ -478,8 +478,14 @@ class Installer:
+@@ -489,8 +489,14 @@ class Installer:
printed_symlink_error = True
if os.path.isfile(outname):
try:
diff --git a/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch b/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch
index 798cd65299..b859d8372e 100644
--- a/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch
+++ b/package/meson/0002-Prefer-ext-static-libs-when-default-library-static.patch
@@ -30,7 +30,7 @@ diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/
index 5d50b7d..8f5f1c6 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
-@@ -858,6 +858,9 @@ class CLikeCompiler:
+@@ -857,6 +857,9 @@ class CLikeCompiler:
elif env.machines[self.for_machine].is_cygwin():
shlibext = ['dll', 'dll.a']
prefixes = ['cyg'] + prefixes
diff --git a/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch b/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch
index ae40ab8b1c..8ae34b999d 100644
--- a/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch
+++ b/package/meson/0003-envconfig-add-pkg_config_libdir-property.patch
@@ -53,7 +53,7 @@ diff --git a/run_unittests.py b/run_unittests.py
index 676604f4..382c0964 100755
--- a/run_unittests.py
+++ b/run_unittests.py
-@@ -3621,6 +3621,34 @@ recommended as it is not supported on some platforms''')
+@@ -3629,6 +3629,34 @@ recommended as it is not supported on some platforms''')
self.wipe()
self.init(testdir, extra_args=['-Dstart_native=true'], override_envvars=env)
@@ -88,7 +88,7 @@ index 676604f4..382c0964 100755
def __reconfigure(self, change_minor=False):
# Set an older version to force a reconfigure from scratch
filename = os.path.join(self.privatedir, 'coredata.dat')
-@@ -6847,7 +6875,7 @@ class NativeFileTests(BasePlatformTests):
+@@ -6863,7 +6891,7 @@ class NativeFileTests(BasePlatformTests):
class CrossFileTests(BasePlatformTests):
diff --git a/package/meson/meson.hash b/package/meson/meson.hash
index 881d4211cf..3777a51542 100644
--- a/package/meson/meson.hash
+++ b/package/meson/meson.hash
@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature
-# https://github.com/mesonbuild/meson/releases/download/0.53.1/meson-0.53.1.tar.gz.asc
-sha256 ec1ba33eea701baca2c1607dac458152dc8323364a51fdef6babda2623413b04 meson-0.53.1.tar.gz
+# https://github.com/mesonbuild/meson/releases/download/0.53.2/meson-0.53.2.tar.gz.asc
+sha256 3e8f830f33184397c2eb0b651ec502adb63decb28978bdc84b3558d71284c21f meson-0.53.2.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING
diff --git a/package/meson/meson.mk b/package/meson/meson.mk
index 810c84690a..29c7ed1800 100644
--- a/package/meson/meson.mk
+++ b/package/meson/meson.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MESON_VERSION = 0.53.1
+MESON_VERSION = 0.53.2
MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
MESON_LICENSE = Apache-2.0
MESON_LICENSE_FILES = COPYING
diff --git a/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch b/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch
deleted file mode 100644
index 36ddee422f..0000000000
--- a/package/mini-snmpd/0001-Prepend-zero-byte-before-unsigned-integers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 949ae648bf7c654b8fae607a0988bfa672607156 Mon Sep 17 00:00:00 2001
-From: Patrick Rauscher <prauscher@prauscher.de>
-Date: Fri, 18 Aug 2017 17:31:23 +0200
-Subject: [PATCH] Prepend zero-byte before unsigned integers
-
-fixes #8
-
-Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
----
- mib.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/mib.c b/mib.c
-index 7d2e513..a9ffbe2 100644
---- a/mib.c
-+++ b/mib.c
-@@ -207,6 +207,11 @@ static int encode_unsigned(data_t *data, int type, unsigned int ticks_value)
- else
- length = 1;
-
-+ /* check if the integer could be interpreted negative during a signed decode and prepend a zero-byte if necessary */
-+ if ((ticks_value >> (8 * (length - 1))) & 0x80) {
-+ length++;
-+ }
-+
- *buffer++ = type;
- *buffer++ = length;
- while (length--)
---
-2.13.2
-
diff --git a/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch b/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch
deleted file mode 100644
index 045d296913..0000000000
--- a/package/mini-snmpd/0002-mib.c-allow-unsigned-integers-to-have-an-extra-byte.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 556c8a406c9e08dd9444222e072f7eb9c82a81e8 Mon Sep 17 00:00:00 2001
-From: Patrick Rauscher <prauscher@prauscher.de>
-Date: Fri, 18 Aug 2017 17:44:32 +0200
-Subject: [PATCH] mib.c: allow unsigned integers to have an extra byte
-
-The extra byte can be needed when encoding huge unsigned numbers (i.e. 0x80000000 or higher). In this case, during encoding we need an extra byte to make sure clients decoding as signed int do not get negative numbers. For further details, see commit 949ae648
-
-Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
----
- mib.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mib.c b/mib.c
-index a9ffbe2..83cc20d 100644
---- a/mib.c
-+++ b/mib.c
-@@ -372,7 +372,7 @@ static int data_alloc(data_t *data, int type)
- case BER_TYPE_COUNTER:
- case BER_TYPE_GAUGE:
- case BER_TYPE_TIME_TICKS:
-- data->max_length = sizeof(unsigned int) + 2;
-+ data->max_length = sizeof(unsigned int) + 3;
- data->encoded_length = 0;
- data->buffer = allocate(data->max_length);
- break;
---
-2.13.2
-
diff --git a/package/mini-snmpd/mini-snmpd b/package/mini-snmpd/mini-snmpd
new file mode 100644
index 0000000000..0ca9901d58
--- /dev/null
+++ b/package/mini-snmpd/mini-snmpd
@@ -0,0 +1,2 @@
+# Require client authentication, thus SNMP version 2c
+EXTRA_PARAMS=-a
diff --git a/package/mini-snmpd/mini-snmpd.hash b/package/mini-snmpd/mini-snmpd.hash
index de72bb59eb..2d66809291 100644
--- a/package/mini-snmpd/mini-snmpd.hash
+++ b/package/mini-snmpd/mini-snmpd.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 59f84e94ef7c9ff36d243c7974a100903a4a9a0bb529b67cf6f0d3352138a86b mini-snmpd-1.4.tar.gz
+sha256 de00c475a3c70c56f3ee97cd683cb71009d3521d60b1f589c5a91b4671ede9f3 mini-snmpd-1.6.tar.gz
sha256 8a43b895972a24567297f44f35dab0f5f9ed3b7db6dac0bf6094075b27ab9d56 COPYING
diff --git a/package/mini-snmpd/mini-snmpd.mk b/package/mini-snmpd/mini-snmpd.mk
index 698402bc51..570241c256 100644
--- a/package/mini-snmpd/mini-snmpd.mk
+++ b/package/mini-snmpd/mini-snmpd.mk
@@ -4,15 +4,18 @@
#
################################################################################
-MINI_SNMPD_VERSION = 1.4
+MINI_SNMPD_VERSION = 1.6
MINI_SNMPD_SITE = $(call github,troglobit,mini-snmpd,v$(MINI_SNMPD_VERSION))
MINI_SNMPD_LICENSE = GPL-2.0
MINI_SNMPD_LICENSE_FILES = COPYING
MINI_SNMPD_AUTORECONF = YES
+MINI_SNMPD_DEPENDENCIES = host-pkgconf
-define MINI_SNMPD_INSTALL_INIT_SYSTEMD
- $(INSTALL) -D -m 644 package/mini-snmpd/mini-snmpd.service \
- $(TARGET_DIR)/usr/lib/systemd/system/mini-snmpd.service
+define MINI_SNMPD_INSTALL_ETC_DEFAULT
+ $(INSTALL) -D -m 644 package/mini-snmpd/mini-snmpd \
+ $(TARGET_DIR)/etc/default/mini-snmpd
endef
+MINI_SNMPD_POST_INSTALL_TARGET_HOOKS += MINI_SNMPD_INSTALL_ETC_DEFAULT
+
$(eval $(autotools-package))
diff --git a/package/mini-snmpd/mini-snmpd.service b/package/mini-snmpd/mini-snmpd.service
deleted file mode 100644
index 8a15585e6e..0000000000
--- a/package/mini-snmpd/mini-snmpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Mini SNMP Daemon
-StartLimitIntervalSec=0
-
-[Service]
-Environment='COMMUNITY=public'
-ExecStart=/sbin/mini_snmpd -a -n -c ${COMMUNITY} $EXTRA_PARAMS
-Restart=always
-RestartSec=1
-
-[Install]
-WantedBy=multi-user.target
diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash
index ecc2ee42a5..70ca9df582 100644
--- a/package/mpd/mpd.hash
+++ b/package/mpd/mpd.hash
@@ -1,3 +1,3 @@
# Locally calculated after checking pgp signature
-sha256 d3275e11d85637adde250cadf3b4f5aec2144228f0d8085767493fc46c55b2f9 mpd-0.21.19.tar.xz
+sha256 422ef0a996d961f3ebc6856395f3a855b45fa0059910e878fb98281007e510e1 mpd-0.21.20.tar.xz
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 647cac4f32..a879a33d33 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -5,7 +5,7 @@
################################################################################
MPD_VERSION_MAJOR = 0.21
-MPD_VERSION = $(MPD_VERSION_MAJOR).19
+MPD_VERSION = $(MPD_VERSION_MAJOR).20
MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
MPD_DEPENDENCIES = host-pkgconf boost
diff --git a/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch b/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch
deleted file mode 100644
index 8221c0ea30..0000000000
--- a/package/musl/0003-move-riscv64-register-index-constants-to-signal.h.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 329e79299daaa994b8e75941331a1093051ea5d9 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Tue, 4 Feb 2020 09:29:13 -0500
-Subject: move riscv64 register index constants to signal.h
-
-under _GNU_SOURCE for namespace cleanliness, analogous to other archs.
-the original placement in sys/reg.h seems not to have been motivated;
-such a header isn't even present on other implementations.
-
-Downloaded from upstream commit
-https://git.musl-libc.org/cgit/musl/commit/?id=329e79299daaa994b8e75941331a1093051ea5d9
-
-Signed-off-by: Mark Corbin <mark@dibsco.co.uk>
----
- arch/riscv64/bits/reg.h | 6 ------
- arch/riscv64/bits/signal.h | 9 +++++++++
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/arch/riscv64/bits/reg.h b/arch/riscv64/bits/reg.h
-index c800788c..2633f39d 100644
---- a/arch/riscv64/bits/reg.h
-+++ b/arch/riscv64/bits/reg.h
-@@ -1,8 +1,2 @@
- #undef __WORDSIZE
- #define __WORDSIZE 64
--#define REG_PC 0
--#define REG_RA 1
--#define REG_SP 2
--#define REG_TP 4
--#define REG_S0 8
--#define REG_A0 10
-diff --git a/arch/riscv64/bits/signal.h b/arch/riscv64/bits/signal.h
-index 2ff4be30..b006334f 100644
---- a/arch/riscv64/bits/signal.h
-+++ b/arch/riscv64/bits/signal.h
-@@ -35,6 +35,15 @@ typedef struct mcontext_t {
- union __riscv_mc_fp_state __fpregs;
- } mcontext_t;
-
-+#if defined(_GNU_SOURCE)
-+#define REG_PC 0
-+#define REG_RA 1
-+#define REG_SP 2
-+#define REG_TP 4
-+#define REG_S0 8
-+#define REG_A0 10
-+#endif
-+
- #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
- typedef unsigned long greg_t;
- typedef unsigned long gregset_t[32];
---
-cgit v1.2.1
-
diff --git a/package/musl/musl.hash b/package/musl/musl.hash
index f0450897c0..9d8b61e165 100644
--- a/package/musl/musl.hash
+++ b/package/musl/musl.hash
@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature from
-# http://www.musl-libc.org/releases/musl-1.1.24.tar.gz.asc
-sha256 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 musl-1.1.24.tar.gz
-sha256 3520d478bccbdf68d9dc0c03984efb0fa4b99868ab2599f5b5f72f3fb3b07a49 COPYRIGHT
+# https://musl.libc.org/releases/musl-1.2.0.tar.gz.asc
+sha256 c6de7b191139142d3f9a7b5b702c9cae1b5ee6e7f57e582da9328629408fd4e8 musl-1.2.0.tar.gz
+sha256 afe1df384787fce3577f3356b8b0d417381483f7c704eacb63f8050349fac77a COPYRIGHT
diff --git a/package/musl/musl.mk b/package/musl/musl.mk
index df68c5f51b..9482c0b246 100644
--- a/package/musl/musl.mk
+++ b/package/musl/musl.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MUSL_VERSION = 1.1.24
+MUSL_VERSION = 1.2.0
MUSL_SITE = http://www.musl-libc.org/releases
MUSL_LICENSE = MIT
MUSL_LICENSE_FILES = COPYRIGHT
diff --git a/package/nvidia-driver/gl.pc b/package/nvidia-driver/gl.pc
index d822763f57..d01f5d6944 100644
--- a/package/nvidia-driver/gl.pc
+++ b/package/nvidia-driver/gl.pc
@@ -7,5 +7,5 @@ Name: gl
Description: Nvidia OpenGL library
Version: 10.4.2
Libs: -L${libdir} -lGL -lm -lXext -lX11 -ldl
-Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS
+Cflags: -I${includedir} -DEGL_NO_X11
glx_tls: no
diff --git a/package/openblas/openblas.hash b/package/openblas/openblas.hash
index 5b1fb17fa7..0683d2a646 100644
--- a/package/openblas/openblas.hash
+++ b/package/openblas/openblas.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 bde136122cef3dd6efe2de1c6f65c10955bbb0cc01a520c2342f5287c28f9379 openblas-0.3.7.tar.gz
-sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE
+sha256 8f86ade36f0dbed9ac90eb62575137388359d97d8f93093b38abe166ad7ef3a8 openblas-0.3.8.tar.gz
+sha256 190b5a9c8d9723fe958ad33916bd7346d96fab3c5ea90832bb02d854f620fcff LICENSE
diff --git a/package/openblas/openblas.mk b/package/openblas/openblas.mk
index f068402269..105c03713b 100644
--- a/package/openblas/openblas.mk
+++ b/package/openblas/openblas.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENBLAS_VERSION = 0.3.7
+OPENBLAS_VERSION = 0.3.8
OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,v$(OPENBLAS_VERSION))
OPENBLAS_LICENSE = BSD-3-Clause
OPENBLAS_LICENSE_FILES = LICENSE
diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash
index 4953d01a1c..ef95f24ad3 100644
--- a/package/opencv3/opencv3.hash
+++ b/package/opencv3/opencv3.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a opencv3-3.4.9.tar.gz
-sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE
+sha256 9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec opencv3-4.2.0.tar.gz
+sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE
diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
index 2c5d6b041d..8a8257b387 100644
--- a/package/opencv3/opencv3.mk
+++ b/package/opencv3/opencv3.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENCV3_VERSION = 3.4.9
+OPENCV3_VERSION = 4.2.0
OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION))
OPENCV3_INSTALL_STAGING = YES
OPENCV3_LICENSE = BSD-3-Clause
@@ -282,10 +282,10 @@ OPENCV3_CONF_OPTS += -DWITH_PNG=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PROTOBUF),y)
-OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=ON
+OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=ON -DPROTOBUF_UPDATE_FILES=ON
OPENCV3_DEPENDENCIES += protobuf
else
-OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF
+OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF -DPROTOBUF_UPDATE_FILES=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y)
diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in
new file mode 100644
index 0000000000..9835b84b64
--- /dev/null
+++ b/package/openfpgaloader/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_OPENFPGALOADER
+ bool "openfpgaloader"
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi1
+ depends on BR2_PACKAGE_HAS_UDEV
+ depends on BR2_INSTALL_LIBSTDCPP # libftdipp1
+ depends on BR2_USE_WCHAR # libftdipp1
+ select BR2_PACKAGE_ARGP_STANDALONE \
+ if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL # argp
+ select BR2_PACKAGE_LIBFTDI1
+ select BR2_PACKAGE_LIBFTDI1_LIBFTDIPP1
+ help
+ Universal utility for programming FPGA
+
+ https://github.com/trabucayre/openFPGALoader/
+
+comment "openfpgaloader needs udev, a toolchain w/ threads, wchar, C++"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
+ !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_UDEV
diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash
new file mode 100644
index 0000000000..a084e938b0
--- /dev/null
+++ b/package/openfpgaloader/openfpgaloader.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 fcff4999164ee2d3734f16b7f1d2063b3a68e237921e8d63c2afe75e16cdc7ce openfpgaloader-849e5751e06d4d00f323205d5f02ee01f9f59a61.tar.gz
+sha256 8486a10c4393cee1c25392769ddd3b2d6c242d6ec7928e1414efff7dfb2f07ef LICENSE
diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk
new file mode 100644
index 0000000000..f806fd68f9
--- /dev/null
+++ b/package/openfpgaloader/openfpgaloader.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# openfpgaloader
+#
+################################################################################
+
+OPENFPGALOADER_VERSION = 849e5751e06d4d00f323205d5f02ee01f9f59a61
+OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,$(OPENFPGALOADER_VERSION))
+OPENFPGALOADER_LICENSE = AGPL-3.0
+OPENFPGALOADER_LICENSE_FILES = LICENSE
+OPENFPGALOADER_DEPENDENCIES = libftdi1 udev
+
+ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
+OPENFPGALOADER_DEPENDENCIES += argp-standalone
+OPENFPGALOADER_CONF_OPTS += -DCMAKE_CXX_STANDARD_LIBRARIES="-largp"
+endif
+
+$(eval $(cmake-package))
diff --git a/package/openlayers/openlayers.hash b/package/openlayers/openlayers.hash
index b9efd448a1..f1678507d7 100644
--- a/package/openlayers/openlayers.hash
+++ b/package/openlayers/openlayers.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 9513cf83d5a2c6093e8c4321fc50ef03cb16fb7c455858924059f5924b0fa20c v6.1.1-dist.zip
+sha256 e133a2ad952f4a31002b1a3217f6b4b68bc9f02bcf6c0b9970638a2627887101 v6.2.1-dist.zip
diff --git a/package/openlayers/openlayers.mk b/package/openlayers/openlayers.mk
index 85003b620d..65a1fe00fa 100644
--- a/package/openlayers/openlayers.mk
+++ b/package/openlayers/openlayers.mk
@@ -4,7 +4,7 @@
#
################################################################################
-OPENLAYERS_VERSION = 6.1.1
+OPENLAYERS_VERSION = 6.2.1
OPENLAYERS_SOURCE = v$(OPENLAYERS_VERSION)-dist.zip
OPENLAYERS_SITE = https://github.com/openlayers/openlayers/releases/download/v$(OPENLAYERS_VERSION)
OPENLAYERS_LICENSE = BSD-2-Clause
diff --git a/package/ortp/Config.in b/package/ortp/Config.in
index 052ff1d397..e296e82f7a 100644
--- a/package/ortp/Config.in
+++ b/package/ortp/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_ORTP
bool "oRTP"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # bctoolbox
select BR2_PACKAGE_BCTOOLBOX
help
oRTP, a Real-time Transport Protocol (RTP,RFC3550) library
@@ -10,3 +11,6 @@ config BR2_PACKAGE_ORTP
comment "ortp needs a toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+comment "ortp needs a toolchain not affected by GCC bug 64735"
+ depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/package/ortp/ortp.hash b/package/ortp/ortp.hash
index 93ec39297f..65a5141609 100644
--- a/package/ortp/ortp.hash
+++ b/package/ortp/ortp.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 eb61a833ab3ad80978d7007411240f46e9b2d1034373b9d9dfaac88c1b6ec0af ortp-0.27.0.tar.gz
-sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 COPYING
+sha256 55d12b71ed7c3958abb8d892105e616499d66c88200c46e3ec3cfbbe79771b2e ortp-4.3.1.tar.gz
+sha256 1b3782ccad7b8614100cda30d3faf42fc39f2e97932908c543005053b654ca68 LICENSE.txt
diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk
index 0bd61e88d9..436e04c14d 100644
--- a/package/ortp/ortp.mk
+++ b/package/ortp/ortp.mk
@@ -4,13 +4,22 @@
#
################################################################################
-ORTP_VERSION = 0.27.0
-ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
-
-ORTP_CONF_OPTS = --disable-strict
+ORTP_VERSION = 4.3.1
+ORTP_SITE = https://gitlab.linphone.org/BC/public/ortp/-/archive/$(ORTP_VERSION)
+ORTP_LICENSE = GPL-3.0+
+ORTP_LICENSE_FILES = LICENSE.txt
ORTP_INSTALL_STAGING = YES
-ORTP_LICENSE = LGPL-2.1+
-ORTP_LICENSE_FILES = COPYING
ORTP_DEPENDENCIES = bctoolbox
+ORTP_CONF_OPTS = \
+ -DENABLE_DOC=OFF \
+ -DENABLE_STRICT=OFF
+
+ifeq ($(BR2_STATIC_LIBS),y)
+ORTP_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=OFF
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+ORTP_CONF_OPTS += -DENABLE_STATIC=ON -DENABLE_SHARED=ON
+else ifeq ($(BR2_SHARED_LIBS),y)
+ORTP_CONF_OPTS += -DENABLE_STATIC=OFF -DENABLE_SHARED=ON
+endif
-$(eval $(autotools-package))
+$(eval $(cmake-package))
diff --git a/package/pcre/0001-Kill-compatibility-bits.patch b/package/pcre/0001-Kill-compatibility-bits.patch
index 3563e4b714..d2cf76bf8d 100644
--- a/package/pcre/0001-Kill-compatibility-bits.patch
+++ b/package/pcre/0001-Kill-compatibility-bits.patch
@@ -7,6 +7,8 @@ Kill ABI compatibility bits, we don't need them.
Fixes build failures on non-ELF targets.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[Fabrice: update for 8.44]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
pcrecpp.cc | 16 ----------------
1 file changed, 16 deletions(-)
@@ -15,7 +17,7 @@ diff --git a/pcrecpp.cc b/pcrecpp.cc
index d09c9ab..6910db0 100644
--- a/pcrecpp.cc
+++ b/pcrecpp.cc
-@@ -58,22 +58,6 @@ static const int kVecSize = (1 + kMaxArgs) * 3; // results + PCRE workspace
+@@ -58,23 +58,6 @@ static const int kVecSize = (1 + kMaxArgs) * 3; // results + PCRE workspace
// Special object that stands-in for no argument
Arg RE::no_arg((void*)NULL);
@@ -27,7 +29,8 @@ index d09c9ab..6910db0 100644
-// inclusive test if we ever needed it. (Note that not only the
-// __attribute__ syntax, but also __USER_LABEL_PREFIX__, are
-// gnu-specific.)
--#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) && !defined(__INTEL_COMPILER)
+-#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) \
+- && !defined(__INTEL_COMPILER) && !defined(__LCC__)
-# define ULP_AS_STRING(x) ULP_AS_STRING_INTERNAL(x)
-# define ULP_AS_STRING_INTERNAL(x) #x
-# define USER_LABEL_PREFIX_STR ULP_AS_STRING(__USER_LABEL_PREFIX__)
diff --git a/package/pcre/pcre.hash b/package/pcre/pcre.hash
index 7513d5f198..628d617353 100644
--- a/package/pcre/pcre.hash
+++ b/package/pcre/pcre.hash
@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature
-sha256 91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b pcre-8.43.tar.bz2
+sha256 19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d pcre-8.44.tar.bz2
# License files, locally calculated
-sha256 a5fce68baf797e0918463a4437ef75984c41118f43850ddeabda1b5a90154309 LICENCE
+sha256 0dd9c13864dbb9ee4d77a1557e96be29b2d719fb6584192ee36611aae264c4a3 LICENCE
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index 595cda8a53..3c280e593f 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PCRE_VERSION = 8.43
+PCRE_VERSION = 8.44
PCRE_SITE = https://ftp.pcre.org/pub/pcre
PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2
PCRE_LICENSE = BSD-3-Clause
diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash
index 03f7eb32db..9b83ccf135 100644
--- a/package/pcre2/pcre2.hash
+++ b/package/pcre2/pcre2.hash
@@ -1,4 +1,4 @@
-# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.33.tar.bz2.sig
-sha256 35514dff0ccdf02b55bd2e9fa586a1b9d01f62332c3356e379eabb75f789d8aa pcre2-10.33.tar.bz2
+# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.34.tar.bz2.sig
+sha256 74c473ffaba9e13db6951fd146e0143fe9887852ce73406a03277af1d9b798ca pcre2-10.34.tar.bz2
# Locally computed
-sha256 982293becea3f18eb4e3ce2145f66638e46d105a27b88418766caf321a684d03 LICENCE
+sha256 982293becea3f18eb4e3ce2145f66638e46d105a27b88418766caf321a684d03 LICENCE
diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk
index 61f41e06ea..cedf4652a8 100644
--- a/package/pcre2/pcre2.mk
+++ b/package/pcre2/pcre2.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PCRE2_VERSION = 10.33
+PCRE2_VERSION = 10.34
PCRE2_SITE = https://ftp.pcre.org/pub/pcre
PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2
PCRE2_LICENSE = BSD-3-Clause
diff --git a/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
index 5a9713d651..a7811752d2 100644
--- a/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
+++ b/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
@@ -15,11 +15,13 @@ be prefixed by the sysroot, and which path should not be prefixed by
the sysroot.
So, let's simply have a whitelist of paths that should be prefixed:
-includedir, libdir, mapdir, pkgdatadir and sdkdir. This list of
-variables was collected over years of Buildroot development. All other
-paths are not prefixed by the sysroot.
+g_ir_scanner, g_ir_compiler, g_ir_generate, includedir, libdir, mapdir,
+pkgdatadir and sdkdir. This list of variables was collected over years of
+Buildroot development. All other paths are not prefixed by the sysroot.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+[Updated to include gobject-introspection paths]
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
---
libpkgconf/tuple.c | 60 ++++++++++++++++++++++++++++++++--------------
1 file changed, 42 insertions(+), 18 deletions(-)
@@ -28,7 +30,7 @@ diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c
index 8523709..7cd2fff 100644
--- a/libpkgconf/tuple.c
+++ b/libpkgconf/tuple.c
-@@ -160,6 +160,18 @@ dequote(const char *value)
+@@ -160,6 +160,21 @@ dequote(const char *value)
return buf;
}
@@ -36,6 +38,9 @@ index 8523709..7cd2fff 100644
+pkgconf_tuple_parse_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars, const char *value, bool add_sysroot);
+
+const char *sysrooted_keys[] = {
++ "g_ir_scanner",
++ "g_ir_compiler",
++ "g_ir_generate",
+ "includedir",
+ "libdir",
+ "mapdir",
diff --git a/package/prelink-cross/prelink-cross.hash b/package/prelink-cross/prelink-cross.hash
new file mode 100644
index 0000000000..3ac33ac3d0
--- /dev/null
+++ b/package/prelink-cross/prelink-cross.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 cb3f5d833cd74b7e90e38465c9c948b0f4138c017509cb91e391b0931063429e prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2.tar.gz
+sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING
diff --git a/package/prelink-cross/prelink-cross.mk b/package/prelink-cross/prelink-cross.mk
new file mode 100644
index 0000000000..2312ee53e6
--- /dev/null
+++ b/package/prelink-cross/prelink-cross.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# host-prelink-cross
+#
+################################################################################
+
+PRELINK_CROSS_VERSION = a853a5d715d84eec93aa68e8f2df26b7d860f5b2
+PRELINK_CROSS_SITE = https://git.yoctoproject.org/git/prelink-cross
+PRELINK_CROSS_SITE_METHOD = git
+PRELINK_CROSS_LICENSE = GPL-2.0+
+PRELINK_CROSS_LICENSE_FILES = COPYING
+# Sources from git, no configure script present
+PRELINK_CROSS_AUTORECONF = YES
+HOST_PRELINK_CROSS_DEPENDENCIES = host-elfutils host-libiberty
+
+$(eval $(host-autotools-package))
diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash
index 5ebf99a993..c82ae84f22 100644
--- a/package/protobuf/protobuf.hash
+++ b/package/protobuf/protobuf.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 5abfd5bf11dc0a14bb2303883fa76ecde48a4b447eb2f9f90b84592ce8b8707c protobuf-cpp-3.11.0.tar.gz
+sha256 9ffb1fe6091240f2e7bcaca5b65fb19cb7b951ffc9a60d8b2c9d73f89f0e0a51 protobuf-cpp-3.11.3.tar.gz
sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
index ed21f13c41..1531bfffb2 100644
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -7,7 +7,7 @@
# When bumping this package, make sure to also verify if the
# python-protobuf package still works, as they share the same
# version/site variables.
-PROTOBUF_VERSION = 3.11.0
+PROTOBUF_VERSION = 3.11.3
PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)
PROTOBUF_LICENSE = BSD-3-Clause
diff --git a/package/psplash/psplash-quit.service b/package/psplash/psplash-quit.service
deleted file mode 100644
index 14bd4994b5..0000000000
--- a/package/psplash/psplash-quit.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Terminate Psplash Boot Screen
-After=psplash-start.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/psplash-write QUIT
-TimeoutSec=20
-
-[Install]
-WantedBy=multi-user.target
diff --git a/package/psplash/psplash-start.service b/package/psplash/psplash-start.service
index 2de3cfce22..b97e883e54 100644
--- a/package/psplash/psplash-start.service
+++ b/package/psplash/psplash-start.service
@@ -1,8 +1,7 @@
[Unit]
Description=Starts Psplash Boot screen
-Wants=systemd-vconsole-setup.service
-After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service
DefaultDependencies=no
+RequiresMountsFor=/run
[Service]
ExecStart=/usr/bin/psplash -n
diff --git a/package/psplash/psplash-systemd.service b/package/psplash/psplash-systemd.service
new file mode 100644
index 0000000000..249aa54039
--- /dev/null
+++ b/package/psplash/psplash-systemd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Start psplash-systemd progress communication helper
+DefaultDependencies=no
+After=systemd-start.service
+Requires=psplash-start.service
+RequiresMountsFor=/run
+
+[Service]
+ExecStart=/usr/bin/psplash-systemd
+
+[Install]
+WantedBy=sysinit.target
diff --git a/package/psplash/psplash.hash b/package/psplash/psplash.hash
index c8865697c4..46d5e12ceb 100644
--- a/package/psplash/psplash.hash
+++ b/package/psplash/psplash.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 aaddb20ef892dfb03d4e046cc634159bbcdfe555f7291652dde2b7d4cf491289 psplash-5b3c1cc28f5abdc2c33830150b48b278cc4f7bca.tar.gz
+sha256 0042192bf94be4f5792d9ff6b7a2ddff77c79e51274745180d14be5815b3a0f4 psplash-fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c.tar.gz
sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING
diff --git a/package/psplash/psplash.mk b/package/psplash/psplash.mk
index 3dd2f4d579..39fcc2235f 100644
--- a/package/psplash/psplash.mk
+++ b/package/psplash/psplash.mk
@@ -4,18 +4,26 @@
#
################################################################################
-PSPLASH_VERSION = 5b3c1cc28f5abdc2c33830150b48b278cc4f7bca
+PSPLASH_VERSION = fd33a9b3d68c89fa22ff6873f4f9fd28bd85830c
PSPLASH_SITE = git://git.yoctoproject.org/psplash
PSPLASH_LICENSE = GPL-2.0+
PSPLASH_LICENSE_FILES = COPYING
PSPLASH_AUTORECONF = YES
+PSPLASH_DEPENDENCIES = host-pkgconf
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+PSPLASH_DEPENDENCIES += systemd
+PSPLASH_CONF_OPTS += --with-systemd
+else
+PSPLASH_CONF_OPTS += --without-systemd
+endif
define PSPLASH_INSTALL_INIT_SYSTEMD
$(INSTALL) -D -m 644 package/psplash/psplash-start.service \
$(TARGET_DIR)/usr/lib/systemd/system/psplash-start.service
- $(INSTALL) -D -m 644 package/psplash/psplash-quit.service \
- $(TARGET_DIR)/usr/lib/systemd/system/psplash-quit.service
+ $(INSTALL) -D -m 644 package/psplash/psplash-systemd.service \
+ $(TARGET_DIR)/usr/lib/systemd/system/psplash-systemd.service
endef
$(eval $(autotools-package))
diff --git a/package/python-asn1crypto/python-asn1crypto.hash b/package/python-asn1crypto/python-asn1crypto.hash
index d2c8487b83..b00474bdcd 100644
--- a/package/python-asn1crypto/python-asn1crypto.hash
+++ b/package/python-asn1crypto/python-asn1crypto.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/asn1crypto/json
-md5 fc3815cdd4812505e3ee297740c5f5d3 asn1crypto-1.2.0.tar.gz
-sha256 87620880a477123e01177a1f73d0f327210b43a3cdbd714efcd2fa49a8d7b384 asn1crypto-1.2.0.tar.gz
+md5 daad112940181917e3ff169b47b9bd9a asn1crypto-1.3.0.tar.gz
+sha256 5a215cb8dc12f892244e3a113fe05397ee23c5c4ca7a69cd6e69811755efc42d asn1crypto-1.3.0.tar.gz
# Locally computed sha256 checksums
sha256 a88480656ec98943fb04344f6a477ee74062896f3ddb1a6f99e5f05f0109a286 LICENSE
diff --git a/package/python-asn1crypto/python-asn1crypto.mk b/package/python-asn1crypto/python-asn1crypto.mk
index 43d3842ff6..2d8d384cca 100644
--- a/package/python-asn1crypto/python-asn1crypto.mk
+++ b/package/python-asn1crypto/python-asn1crypto.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_ASN1CRYPTO_VERSION = 1.2.0
+PYTHON_ASN1CRYPTO_VERSION = 1.3.0
PYTHON_ASN1CRYPTO_SOURCE = asn1crypto-$(PYTHON_ASN1CRYPTO_VERSION).tar.gz
-PYTHON_ASN1CRYPTO_SITE = https://files.pythonhosted.org/packages/c1/a9/86bfedaf41ca590747b4c9075bc470d0b2ec44fb5db5d378bc61447b3b6b
+PYTHON_ASN1CRYPTO_SITE = https://files.pythonhosted.org/packages/9f/3d/8beae739ed8c1c8f00ceac0ab6b0e97299b42da869e24cf82851b27a9123
PYTHON_ASN1CRYPTO_SETUP_TYPE = setuptools
PYTHON_ASN1CRYPTO_LICENSE = MIT
PYTHON_ASN1CRYPTO_LICENSE_FILES = LICENSE
diff --git a/package/python-autobahn/python-autobahn.hash b/package/python-autobahn/python-autobahn.hash
index 1dc6c1eeaf..204aba7783 100644
--- a/package/python-autobahn/python-autobahn.hash
+++ b/package/python-autobahn/python-autobahn.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/autobahn/json
-md5 472d965c75dba0f8cb5f3b9f9001ed1b autobahn-19.11.1.tar.gz
-sha256 201b9879b49c6e259d4126dbafe9e3c73807de0c242d50065fbebc62c6ccb181 autobahn-19.11.1.tar.gz
+md5 8889605311865aa8fedd1819c6df2c30 autobahn-20.2.1.tar.gz
+sha256 1ec603ea374a3b9d85540c499709c41f35f7c6e288b571d12da14aba6c381211 autobahn-20.2.1.tar.gz
# Locally computed sha256 checksums
sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE
diff --git a/package/python-autobahn/python-autobahn.mk b/package/python-autobahn/python-autobahn.mk
index 6c5c608b9a..5d69253095 100644
--- a/package/python-autobahn/python-autobahn.mk
+++ b/package/python-autobahn/python-autobahn.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_AUTOBAHN_VERSION = 19.11.1
+PYTHON_AUTOBAHN_VERSION = 20.2.1
PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz
-PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/3f/f4/e907b172d3c1d912b8da57560b8b298ebad22f900f8a412002247716328a
+PYTHON_AUTOBAHN_SITE = https://files.pythonhosted.org/packages/ef/6d/74e6ceea815ee836a64846ace4f754dacaf8fae58a37b4d3c912bc9d37ea
PYTHON_AUTOBAHN_LICENSE = MIT
PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE
PYTHON_AUTOBAHN_SETUP_TYPE = setuptools
diff --git a/package/python-avro/0001-fix-pycodestyle-regression.patch b/package/python-avro/0001-fix-pycodestyle-regression.patch
new file mode 100644
index 0000000000..63cb5da294
--- /dev/null
+++ b/package/python-avro/0001-fix-pycodestyle-regression.patch
@@ -0,0 +1,28 @@
+From a66459dd654489bf2c17e2828d5c314a4048be70 Mon Sep 17 00:00:00 2001
+From: Ryan Skraba <ryan@skraba.com>
+Date: Thu, 13 Feb 2020 09:57:02 +0100
+Subject: [PATCH] AVRO-2737: Fix pycodestyle regression.
+
+An erroneous import was added in the Avro 1.9.2 Python3 package.
+The issue has been fixed and released on pypi as version 1.9.2.1, but has
+not been published on the Apache download website, hence this patch.
+
+[Titouan: add detailed commit message]
+Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
+---
+ setup.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 20dd4e240..f6297bb1b 100755
+--- a/setup.py
++++ b/setup.py
+@@ -38,8 +38,6 @@
+
+ import setuptools
+
+-import pycodestyle
+-
+ _HERE = os.path.dirname(os.path.abspath(__file__))
+ _AVRO_DIR = os.path.join(_HERE, 'avro')
+ _VERSION_FILE_NAME = 'VERSION.txt'
diff --git a/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch b/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch
new file mode 100644
index 0000000000..41231e923d
--- /dev/null
+++ b/package/python-avro/0002-drop-install-time-linting-and-imports-sorting.patch
@@ -0,0 +1,46 @@
+From 3446a4af8474cd863efddeae7f3e5dd3f9b8e25e Mon Sep 17 00:00:00 2001
+From: Titouan Christophe <titouan.christophe@railnova.eu>
+Date: Mon, 17 Feb 2020 15:12:13 +0100
+Subject: [PATCH] drop install time linting and imports sorting
+
+Since the 1.9.2 release, the setup script is also performing code linting
+tasks, which require additional python libraries.
+
+These linting tasks are not needed anyway, since they are intended to prepare
+the code for distribution, but the Buildroot package is already using a
+distributed version. We therefore simply remove them.
+
+Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
+---
+ setup.cfg | 2 --
+ setup.py | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/setup.cfg b/setup.cfg
+index 7b5de18..d46a36e 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -25,8 +25,6 @@ package_dir =
+ include_package_data = true
+ packages = avro
+ setup_requires =
+- isort
+- pycodestyle
+ install_requires =
+ zip_safe = true
+ scripts =
+diff --git a/setup.py b/setup.py
+index f6297bb..91d3287 100755
+--- a/setup.py
++++ b/setup.py
+@@ -164,7 +164,6 @@ def main():
+ setuptools.setup(cmdclass={
+ "clean": CleanCommand,
+ "generate_interop_data": GenerateInteropDataCommand,
+- "lint": LintCommand,
+ })
+
+
+--
+2.24.1
+
diff --git a/package/python-avro/python-avro.hash b/package/python-avro/python-avro.hash
index f63b37ee0a..fbc466a94f 100644
--- a/package/python-avro/python-avro.hash
+++ b/package/python-avro/python-avro.hash
@@ -1,5 +1,5 @@
-# From https://www-eu.apache.org/dist/avro/avro-1.9.1/py3/avro-python3-1.9.1.tar.gz.sha512
-sha512 771ce6e5ca6315f5b9108cb4f5dd9488575cc3433ffdd744f96ce7989763728259c89475319fd9c411ed6b65c996b762548c50a697eb1fba9ab024112ca17daa avro-python3-1.9.1.tar.gz
+# From https://www-eu.apache.org/dist/avro/avro-1.9.2/py3/avro-python3-1.9.2.tar.gz.sha512
+sha512 f981fd72bc64eb71e6c132c551700e89a8ebdd6cd9d7e6fa7559831cee69749fc255a49ee0859afd106e0d913c36327b27ca4c7b36efbf740515881b92076cb6 avro-python3-1.9.2.tar.gz
# License files
-sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE
+sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 avro/LICENSE
diff --git a/package/python-avro/python-avro.mk b/package/python-avro/python-avro.mk
index 3f9140e946..dd6008b1ba 100644
--- a/package/python-avro/python-avro.mk
+++ b/package/python-avro/python-avro.mk
@@ -5,7 +5,7 @@
################################################################################
PYTHON_AVRO_VERSION = $(AVRO_C_VERSION)
-PYTHON_AVRO_SITE = https://www-eu.apache.org/dist/avro/avro-1.9.1/py3
+PYTHON_AVRO_SITE = https://www-eu.apache.org/dist/avro/avro-$(PYTHON_AVRO_VERSION)/py3
PYTHON_AVRO_SOURCE = avro-python3-$(PYTHON_AVRO_VERSION).tar.gz
PYTHON_AVRO_LICENSE = Apache-2.0
PYTHON_AVRO_LICENSE_FILES = avro/LICENSE
diff --git a/package/python-cffi/python-cffi.hash b/package/python-cffi/python-cffi.hash
index dd8720e822..8c2beb06a4 100644
--- a/package/python-cffi/python-cffi.hash
+++ b/package/python-cffi/python-cffi.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/cffi/json
-md5 824ad9f228fbc6ce203c334e2ff4ab8f cffi-1.13.1.tar.gz
-sha256 558b3afef987cf4b17abd849e7bedf64ee12b28175d564d05b628a0f9355599b cffi-1.13.1.tar.gz
+md5 74845f8d2b7b583dd9a3574f402edf39 cffi-1.14.0.tar.gz
+sha256 2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6 cffi-1.14.0.tar.gz
# Locally computed sha256 checksums
sha256 04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33 LICENSE
diff --git a/package/python-cffi/python-cffi.mk b/package/python-cffi/python-cffi.mk
index b43e8887e5..8f76e7c1d1 100644
--- a/package/python-cffi/python-cffi.mk
+++ b/package/python-cffi/python-cffi.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_CFFI_VERSION = 1.13.1
+PYTHON_CFFI_VERSION = 1.14.0
PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz
-PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/0d/aa/c5ac2f337d9a10ee95d160d47beb8d9400e1b2a46bb94990a0409fe6d133
+PYTHON_CFFI_SITE = https://files.pythonhosted.org/packages/05/54/3324b0c46340c31b909fcec598696aaec7ddc8c18a63f2db352562d3354c
PYTHON_CFFI_SETUP_TYPE = setuptools
PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi
PYTHON_CFFI_LICENSE = MIT
diff --git a/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch b/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch
index fb8e4a2763..0ff7cae21a 100644
--- a/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch
+++ b/package/python-crossbar/0001-Avoid-intentional-syntax-error.patch
@@ -1,4 +1,4 @@
-From 9ab2b96c2ee679c6dcb387174be211db5d70fa97 Mon Sep 17 00:00:00 2001
+From 423a1b081f6b7198f6a921ca83043270ebbace1a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 1 May 2016 15:35:32 +0200
Subject: [PATCH] Avoid intentional syntax error
@@ -15,15 +15,15 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
1 file changed, 2 deletions(-)
diff --git a/crossbar/worker/test/examples/syntaxerror.py b/crossbar/worker/test/examples/syntaxerror.py
-index a5947cc..585c995 100644
+index 7b88e088..cd7de901 100644
--- a/crossbar/worker/test/examples/syntaxerror.py
+++ b/crossbar/worker/test/examples/syntaxerror.py
-@@ -29,5 +29,3 @@
+@@ -27,5 +27,3 @@
+ # with this program. If not, see <http://www.gnu.org/licenses/agpl-3.0.en.html>.
+ #
#####################################################################################
-
- from __future__ import absolute_import, division
-
-class # noqa
--
-2.7.4
+2.20.1
diff --git a/package/python-crossbar/python-crossbar.hash b/package/python-crossbar/python-crossbar.hash
index f956dc27e1..903d11d330 100644
--- a/package/python-crossbar/python-crossbar.hash
+++ b/package/python-crossbar/python-crossbar.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/crossbar/json
-md5 462a204da3c776cbb770b98f9047e8e7 crossbar-19.1.2.tar.gz
-sha256 269d534a65c136a5c952a6accccf256f457569f731ee65e201e5a14e69db471a crossbar-19.1.2.tar.gz
+md5 f19fb0995f42e2970fb1b1b077b01d61 crossbar-20.1.2.tar.gz
+sha256 3f4ee0bc73d7e6d25af74b163495eb8892bfe2f0ccbc3153dc4cf807af6163fa crossbar-20.1.2.tar.gz
# Locally computed
-sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 LICENSE
+sha256 57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6 crossbar/LICENSE
diff --git a/package/python-crossbar/python-crossbar.mk b/package/python-crossbar/python-crossbar.mk
index 064d2d92b6..df4d7cc4d5 100644
--- a/package/python-crossbar/python-crossbar.mk
+++ b/package/python-crossbar/python-crossbar.mk
@@ -4,11 +4,11 @@
#
################################################################################
-PYTHON_CROSSBAR_VERSION = 19.1.2
+PYTHON_CROSSBAR_VERSION = 20.1.2
PYTHON_CROSSBAR_SOURCE = crossbar-$(PYTHON_CROSSBAR_VERSION).tar.gz
-PYTHON_CROSSBAR_SITE = https://files.pythonhosted.org/packages/86/19/54c7bd9da1ac70643b9ae7d3d4592a73391f62fcb376fcd30f8328c1c5ce
+PYTHON_CROSSBAR_SITE = https://files.pythonhosted.org/packages/2a/cd/e8be30a9ba4db52dc04e530f19a24d225d743aa36f5074ec0b3ef316637a
PYTHON_CROSSBAR_LICENSE = AGPL-3.0
-PYTHON_CROSSBAR_LICENSE_FILES = LICENSE
+PYTHON_CROSSBAR_LICENSE_FILES = crossbar/LICENSE
PYTHON_CROSSBAR_SETUP_TYPE = setuptools
$(eval $(python-package))
diff --git a/package/python-ecdsa/Config.in b/package/python-ecdsa/Config.in
index ce11910e8b..eb0d65801f 100644
--- a/package/python-ecdsa/Config.in
+++ b/package/python-ecdsa/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_PYTHON_ECDSA
bool "python-ecdsa"
+ select BR2_PACKAGE_PYTHON_SIX # runtime
help
ECDSA cryptographic signature library (pure python).
diff --git a/package/python-ecdsa/python-ecdsa.hash b/package/python-ecdsa/python-ecdsa.hash
index 3e24783657..efe396bf0a 100644
--- a/package/python-ecdsa/python-ecdsa.hash
+++ b/package/python-ecdsa/python-ecdsa.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/ecdsa/json
-md5 b1b33f7fe171eb1278de6f93eefc34f8 ecdsa-0.13.3.tar.gz
-sha256 163c80b064a763ea733870feb96f9dd9b92216cfcacd374837af18e4e8ec3d4d ecdsa-0.13.3.tar.gz
+md5 821d543047941dd26f543f62912230d4 ecdsa-0.15.tar.gz
+sha256 8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277 ecdsa-0.15.tar.gz
# Locally computed sha256 checksums
sha256 3eca9845773d2e5b8cc9d8c119d345f00a4806e4bd660d4a3d6cdf9c0e9d8bb2 LICENSE
diff --git a/package/python-ecdsa/python-ecdsa.mk b/package/python-ecdsa/python-ecdsa.mk
index 90e359f8b7..ffb51a3aa5 100644
--- a/package/python-ecdsa/python-ecdsa.mk
+++ b/package/python-ecdsa/python-ecdsa.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_ECDSA_VERSION = 0.13.3
+PYTHON_ECDSA_VERSION = 0.15
PYTHON_ECDSA_SOURCE = ecdsa-$(PYTHON_ECDSA_VERSION).tar.gz
-PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/8c/d8/9c3596fd0f18ae0a76333492a119c00183323d8e64de1a4f4bd642856963
+PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/e3/7c/b508ade1feb47cd79222e06d85e477f5cfc4fb0455ad3c70eb6330fc49aa
PYTHON_ECDSA_SETUP_TYPE = setuptools
PYTHON_ECDSA_LICENSE = MIT
PYTHON_ECDSA_LICENSE_FILES = LICENSE
diff --git a/package/python-flatbuffers/Config.in b/package/python-flatbuffers/Config.in
new file mode 100644
index 0000000000..b24b5aaf64
--- /dev/null
+++ b/package/python-flatbuffers/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_FLATBUFFERS
+ bool "python-flatbuffers"
+ help
+ The FlatBuffers serialization format for Python.
+
+ https://github.com/google/flatbuffers
diff --git a/package/python-flatbuffers/python-flatbuffers.hash b/package/python-flatbuffers/python-flatbuffers.hash
new file mode 100644
index 0000000000..0cb5437906
--- /dev/null
+++ b/package/python-flatbuffers/python-flatbuffers.hash
@@ -0,0 +1,3 @@
+# md5, sha256 from https://pypi.org/pypi/flatbuffers/json
+md5 b5f6c2246f45636dd49d9ff8a00d7f1c flatbuffers-1.11.tar.gz
+sha256 f24185db54193540e3d684dc98aa7c2d89882341641548ceb36fd2589fef6c4e flatbuffers-1.11.tar.gz
diff --git a/package/python-flatbuffers/python-flatbuffers.mk b/package/python-flatbuffers/python-flatbuffers.mk
new file mode 100644
index 0000000000..d0374c4787
--- /dev/null
+++ b/package/python-flatbuffers/python-flatbuffers.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-flatbuffers
+#
+################################################################################
+
+PYTHON_FLATBUFFERS_VERSION = 1.11
+PYTHON_FLATBUFFERS_SOURCE = flatbuffers-$(PYTHON_FLATBUFFERS_VERSION).tar.gz
+PYTHON_FLATBUFFERS_SITE = https://files.pythonhosted.org/packages/c6/b6/21478b76aa7ccab58da3beb85746b6844dee2112c0cc25b51ec64b46bdbb
+PYTHON_FLATBUFFERS_LICENSE = Apache-2.0
+PYTHON_FLATBUFFERS_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/package/python-httplib2/python-httplib2.hash b/package/python-httplib2/python-httplib2.hash
index d299b61bc8..fe9995a9b3 100644
--- a/package/python-httplib2/python-httplib2.hash
+++ b/package/python-httplib2/python-httplib2.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/httplib2/json
-md5 427cda9f4d55762db325bd2eb46b7fe0 httplib2-0.14.0.tar.gz
-sha256 34537dcdd5e0f2386d29e0e2c6d4a1703a3b982d34c198a5102e6e5d6194b107 httplib2-0.14.0.tar.gz
+md5 4a55ae1d33721110bf81b4d197bfa862 httplib2-0.17.0.tar.gz
+sha256 de96d0a49f46d0ee7e0aae80141d37b8fcd6a68fb05d02e0b82c128592dd8261 httplib2-0.17.0.tar.gz
# Locally computer sha256 checksums
-sha256 d8b8e99f77a260b8ca939f6a73ed0ea86977229a3d97f85547f499a62f61f5af PKG-INFO
+sha256 bbc124e160cd5c0381fe9560aaed43462dd60371210dbb2c87f00b7fec9a05ba PKG-INFO
diff --git a/package/python-httplib2/python-httplib2.mk b/package/python-httplib2/python-httplib2.mk
index a74c0e7c72..f9e1d8b3d7 100644
--- a/package/python-httplib2/python-httplib2.mk
+++ b/package/python-httplib2/python-httplib2.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_HTTPLIB2_VERSION = 0.14.0
+PYTHON_HTTPLIB2_VERSION = 0.17.0
PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz
-PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/ce/2e/87461bfbb7e561203b759b3f7f639e2144226604372830d00a8279960ae1
+PYTHON_HTTPLIB2_SITE = https://files.pythonhosted.org/packages/6d/97/8225643419a53dd52d84c34d9d1e99bdbe18083dc760e7a2d0c47c0fab93
PYTHON_HTTPLIB2_SETUP_TYPE = setuptools
PYTHON_HTTPLIB2_LICENSE = MIT
PYTHON_HTTPLIB2_LICENSE_FILES = PKG-INFO
diff --git a/package/python-jinja2/python-jinja2.hash b/package/python-jinja2/python-jinja2.hash
index 7231123b58..e366b9e180 100644
--- a/package/python-jinja2/python-jinja2.hash
+++ b/package/python-jinja2/python-jinja2.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/jinja2/json
-md5 7883559bc5cc3e2781d94b4be61cfdcd Jinja2-2.10.3.tar.gz
-sha256 9fe95f19286cfefaa917656583d020be14e7859c6b0252588391e47db34527de Jinja2-2.10.3.tar.gz
+md5 5d88c7e77aa63fc852a04f65dbfe5594 Jinja2-2.11.1.tar.gz
+sha256 93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250 Jinja2-2.11.1.tar.gz
# Locally computed sha256
sha256 3b49dcee4105eb37bac10faf1be260408fe85d252b8e9df2e0979fc1e094437b LICENSE.rst
diff --git a/package/python-jinja2/python-jinja2.mk b/package/python-jinja2/python-jinja2.mk
index 5f011aa1ab..64b4c60c9b 100644
--- a/package/python-jinja2/python-jinja2.mk
+++ b/package/python-jinja2/python-jinja2.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_JINJA2_VERSION = 2.10.3
+PYTHON_JINJA2_VERSION = 2.11.1
PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz
-PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/7b/db/1d037ccd626d05a7a47a1b81ea73775614af83c2b3e53d86a0bb41d8d799
+PYTHON_JINJA2_SITE = https://files.pythonhosted.org/packages/d8/03/e491f423379ea14bb3a02a5238507f7d446de639b623187bccc111fbecdf
PYTHON_JINJA2_SETUP_TYPE = setuptools
PYTHON_JINJA2_LICENSE = BSD-3-Clause
PYTHON_JINJA2_LICENSE_FILES = LICENSE.rst
@@ -20,7 +20,7 @@ HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe
# Hence remove both files after package extraction.
ifeq ($(BR2_PACKAGE_PYTHON),y)
define PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT
- rm $(@D)/jinja2/asyncsupport.py $(@D)/jinja2/asyncfilters.py
+ rm $(@D)/src/jinja2/asyncsupport.py $(@D)/src/jinja2/asyncfilters.py
endef
PYTHON_JINJA2_POST_EXTRACT_HOOKS = PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT
diff --git a/package/python-lmdb/python-lmdb.hash b/package/python-lmdb/python-lmdb.hash
index f57437b5f0..569d1d0bd6 100644
--- a/package/python-lmdb/python-lmdb.hash
+++ b/package/python-lmdb/python-lmdb.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/lmdb/json
-md5 917f611903283a05d43a85ad1e7d05d3 lmdb-0.97.tar.gz
-sha256 173d71ade5fd402c7e9ecb0a1d6022c92a7f89c313132ef4e5e561d349b0834b lmdb-0.97.tar.gz
+md5 ae2efef18202e51c9e4a807a47900ce2 lmdb-0.98.tar.gz
+sha256 0625bc28bf0893e6000a83be7234f915ca078c32f9e73d8ae48b3508db7af708 lmdb-0.98.tar.gz
# Locally computed sha256 checksums
sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE
diff --git a/package/python-lmdb/python-lmdb.mk b/package/python-lmdb/python-lmdb.mk
index 5e1c0f4c79..f92c7f775b 100644
--- a/package/python-lmdb/python-lmdb.mk
+++ b/package/python-lmdb/python-lmdb.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_LMDB_VERSION = 0.97
+PYTHON_LMDB_VERSION = 0.98
PYTHON_LMDB_SOURCE = lmdb-$(PYTHON_LMDB_VERSION).tar.gz
-PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/9f/8f/37cc080deb867305bf2d3ec4639e33b981d0def8d78949454a4654ca16bf
+PYTHON_LMDB_SITE = https://files.pythonhosted.org/packages/c0/5c/d56dbc2532ecf14fa004c543927500c0f645eaca8bd7ec39420c7546396a
PYTHON_LMDB_LICENSE = OLDAP-2.8
PYTHON_LMDB_LICENSE_FILES = LICENSE
PYTHON_LMDB_SETUP_TYPE = setuptools
diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash
index eb7acbaabd..593a5e1c56 100644
--- a/package/python-lxml/python-lxml.hash
+++ b/package/python-lxml/python-lxml.hash
@@ -1,5 +1,5 @@
# Locally computed
-sha256 c81cb40bff373ab7a7446d6bbca0190bccc5be3448b47b51d729e37799bb5692 lxml-4.4.1.tar.gz
+sha256 8620ce80f50d023d414183bf90cc2576c2837b88e00bea3f33ad2630133bbb60 lxml-4.5.0.tar.gz
sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt
sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt
sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt
diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk
index 0eb837080a..cfb87bb6fd 100644
--- a/package/python-lxml/python-lxml.mk
+++ b/package/python-lxml/python-lxml.mk
@@ -4,8 +4,8 @@
#
################################################################################
-PYTHON_LXML_VERSION = 4.4.1
-PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/c4/43/3f1e7d742e2a7925be180b6af5e0f67d38de2f37560365ac1a0b9a04c015
+PYTHON_LXML_VERSION = 4.5.0
+PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/39/2b/0a66d5436f237aff76b91e68b4d8c041d145ad0a2cdeefe2c42f76ba2857
PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz
# Not including the GPL, because it is used only for the test scripts.
diff --git a/package/python-mako/python-mako.hash b/package/python-mako/python-mako.hash
index 0f0dadcd0c..a1c18c9916 100644
--- a/package/python-mako/python-mako.hash
+++ b/package/python-mako/python-mako.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/mako/json
-md5 6c3f2da0b74af529a4c4a537d0848bf2 Mako-1.1.0.tar.gz
-sha256 a36919599a9b7dc5d86a7a8988f23a9a3a3d083070023bab23d64f7f1d1e0a4b Mako-1.1.0.tar.gz
+md5 2660a4916f2f63456e6885c727b7cd2f Mako-1.1.1.tar.gz
+sha256 2984a6733e1d472796ceef37ad48c26f4a984bb18119bb2dbc37a44d8f6e75a4 Mako-1.1.1.tar.gz
# Locally computed sha256 checksums
-sha256 c3b124673c93872156757a934c75b498d68eec09510e25e549d9dc2013776499 LICENSE
+sha256 47cd0d41b1092f9161cfb629ed15e5cea185144710ff4633a4281ef088ff5de7 LICENSE
diff --git a/package/python-mako/python-mako.mk b/package/python-mako/python-mako.mk
index 622359493a..5be9937fee 100644
--- a/package/python-mako/python-mako.mk
+++ b/package/python-mako/python-mako.mk
@@ -6,9 +6,9 @@
# Please keep in sync with
# package/python3-mako/python3-mako.mk
-PYTHON_MAKO_VERSION = 1.1.0
+PYTHON_MAKO_VERSION = 1.1.1
PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz
-PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/b0/3c/8dcd6883d009f7cae0f3157fb53e9afb05a0d3d33b3db1268ec2e6f4a56b
+PYTHON_MAKO_SITE = https://files.pythonhosted.org/packages/28/03/329b21f00243fc2d3815399413845dbbfb0745cff38a29d3597e97f8be58
PYTHON_MAKO_SETUP_TYPE = setuptools
PYTHON_MAKO_LICENSE = MIT
PYTHON_MAKO_LICENSE_FILES = LICENSE
diff --git a/package/python-markdown/python-markdown.hash b/package/python-markdown/python-markdown.hash
index 6eff2035bb..4d54ce9243 100644
--- a/package/python-markdown/python-markdown.hash
+++ b/package/python-markdown/python-markdown.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/markdown/json
-md5 d84732ecc65b3a1bff693d9d4c24277f Markdown-3.1.1.tar.gz
-sha256 2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a Markdown-3.1.1.tar.gz
+md5 7a894dc55992b37cdbcba5c4049455fc Markdown-3.2.1.tar.gz
+sha256 90fee683eeabe1a92e149f7ba74e5ccdc81cd397bd6c516d93a8da0ef90b6902 Markdown-3.2.1.tar.gz
# Locally computed sha256
-sha256 6f1193cb634718e65c3a537d6e25ebd614820ec0ef693cfc12248112638d64da LICENSE.md
+sha256 6f1193cb634718e65c3a537d6e25ebd614820ec0ef693cfc12248112638d64da LICENSE.md
diff --git a/package/python-markdown/python-markdown.mk b/package/python-markdown/python-markdown.mk
index a8311168f5..1f352fd7f1 100644
--- a/package/python-markdown/python-markdown.mk
+++ b/package/python-markdown/python-markdown.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_MARKDOWN_VERSION = 3.1.1
+PYTHON_MARKDOWN_VERSION = 3.2.1
PYTHON_MARKDOWN_SOURCE = Markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz
-PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/ac/df/0ae25a9fd5bb528fe3c65af7143708160aa3b47970d5272003a1ad5c03c6
+PYTHON_MARKDOWN_SITE = https://files.pythonhosted.org/packages/98/79/ce6984767cb9478e6818bd0994283db55c423d733cc62a88a3ffb8581e11
PYTHON_MARKDOWN_LICENSE = BSD-3-Clause
PYTHON_MARKDOWN_LICENSE_FILES = LICENSE.md
PYTHON_MARKDOWN_SETUP_TYPE = setuptools
diff --git a/package/python-msgpack/python-msgpack.hash b/package/python-msgpack/python-msgpack.hash
index e58537d062..e34ea118ed 100644
--- a/package/python-msgpack/python-msgpack.hash
+++ b/package/python-msgpack/python-msgpack.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/msgpack/json
-md5 ba46fdee995565f40e332bd7eea882f1 msgpack-0.6.2.tar.gz
-sha256 ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830 msgpack-0.6.2.tar.gz
-# Locally computed sha256
+md5 c35ee8f991dad3969884e9585e56ebba msgpack-1.0.0.tar.gz
+sha256 9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0 msgpack-1.0.0.tar.gz
+# Locally computed sha256 checksums
sha256 492dedba85da5872f78e6091bcd1fea474d660d35acb4dee964b8aab3f007427 COPYING
diff --git a/package/python-msgpack/python-msgpack.mk b/package/python-msgpack/python-msgpack.mk
index f4e059f5ea..18d5a998ff 100644
--- a/package/python-msgpack/python-msgpack.mk
+++ b/package/python-msgpack/python-msgpack.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_MSGPACK_VERSION = 0.6.2
+PYTHON_MSGPACK_VERSION = 1.0.0
PYTHON_MSGPACK_SOURCE = msgpack-$(PYTHON_MSGPACK_VERSION).tar.gz
-PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/74/0a/de673c1c987f5779b65ef69052331ec0b0ebd22958bda77a8284be831964
+PYTHON_MSGPACK_SITE = https://files.pythonhosted.org/packages/e4/4f/057549afbd12fdd5d9aae9df19a6773a3d91988afe7be45b277e8cee2f4d
PYTHON_MSGPACK_LICENSE = Apache-2.0
PYTHON_MSGPACK_LICENSE_FILES = COPYING
PYTHON_MSGPACK_SETUP_TYPE = setuptools
diff --git a/package/python-paramiko/python-paramiko.hash b/package/python-paramiko/python-paramiko.hash
index 48cc79e7eb..6054e8d492 100644
--- a/package/python-paramiko/python-paramiko.hash
+++ b/package/python-paramiko/python-paramiko.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/paramiko/json
-md5 f729a45c9122bf975b9177ec5aaa3791 paramiko-2.6.0.tar.gz
-sha256 f4b2edfa0d226b70bd4ca31ea7e389325990283da23465d572ed1f70a7583041 paramiko-2.6.0.tar.gz
+md5 bf8239dc820ca86dd3c3226f4281c35f paramiko-2.7.1.tar.gz
+sha256 920492895db8013f6cc0179293147f830b8c7b21fdfc839b6bad760c27459d9f paramiko-2.7.1.tar.gz
# Locally computed sha256 checksums
sha256 5fa25bf5f395fd26e701c2e1de4ca7d162816986dc791c22f8f4226857ad1bb2 LICENSE
diff --git a/package/python-paramiko/python-paramiko.mk b/package/python-paramiko/python-paramiko.mk
index 381cd2df21..c9e144c96e 100644
--- a/package/python-paramiko/python-paramiko.mk
+++ b/package/python-paramiko/python-paramiko.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PARAMIKO_VERSION = 2.6.0
+PYTHON_PARAMIKO_VERSION = 2.7.1
PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz
-PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/54/68/dde7919279d4ecdd1607a7eb425a2874ccd49a73a5a71f8aa4f0102d3eb8
+PYTHON_PARAMIKO_SITE = https://files.pythonhosted.org/packages/ac/15/4351003352e11300b9f44a13576bff52dcdc6e4a911129c07447bda0a358
PYTHON_PARAMIKO_SETUP_TYPE = setuptools
PYTHON_PARAMIKO_LICENSE = LGPL-2.1+
PYTHON_PARAMIKO_LICENSE_FILES = LICENSE
diff --git a/package/python-passlib/python-passlib.hash b/package/python-passlib/python-passlib.hash
index 8e7f790af0..867223e19a 100644
--- a/package/python-passlib/python-passlib.hash
+++ b/package/python-passlib/python-passlib.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/passlib/json
-md5 254869dae3fd9f09f0746a3cb29a0b15 passlib-1.7.1.tar.gz
-sha256 3d948f64138c25633613f303bcc471126eae67c04d5e3f6b7b8ce6242f8653e0 passlib-1.7.1.tar.gz
+md5 b908529cfd4c33057c244324c692eae7 passlib-1.7.2.tar.gz
+sha256 8d666cef936198bc2ab47ee9b0410c94adf2ba798e5a84bf220be079ae7ab6a8 passlib-1.7.2.tar.gz
# Locally computed sha256 checksums
-sha256 ae8cd74bd5be7be586c52def8bcddfe817872cf2e0782b159d37f88bf0ff11fc LICENSE
+sha256 49a74ad666f456493d6b9e2cda7c55e46ad512ce2c67db4accaddb27bb240bb9 LICENSE
diff --git a/package/python-passlib/python-passlib.mk b/package/python-passlib/python-passlib.mk
index 1a3726b607..6ab94fd66e 100644
--- a/package/python-passlib/python-passlib.mk
+++ b/package/python-passlib/python-passlib.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PASSLIB_VERSION = 1.7.1
+PYTHON_PASSLIB_VERSION = 1.7.2
PYTHON_PASSLIB_SOURCE = passlib-$(PYTHON_PASSLIB_VERSION).tar.gz
-PYTHON_PASSLIB_SITE = https://files.pythonhosted.org/packages/25/4b/6fbfc66aabb3017cd8c3bd97b37f769d7503ead2899bf76e570eb91270de
+PYTHON_PASSLIB_SITE = https://files.pythonhosted.org/packages/6d/6b/4bfca0c13506535289b58f9c9761d20f56ed89439bfe6b8e07416ce58ee1
PYTHON_PASSLIB_SETUP_TYPE = setuptools
PYTHON_PASSLIB_LICENSE = BSD-3-Clause
PYTHON_PASSLIB_LICENSE_FILES = LICENSE
diff --git a/package/python-pexpect/python-pexpect.hash b/package/python-pexpect/python-pexpect.hash
index 6972cdb806..87df05d881 100644
--- a/package/python-pexpect/python-pexpect.hash
+++ b/package/python-pexpect/python-pexpect.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/pexpect/json
-md5 ed003242cbf308aee1b1eaecdef59e43 pexpect-4.7.0.tar.gz
-sha256 9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb pexpect-4.7.0.tar.gz
+md5 153eb25184249d6a85fde9acf4804085 pexpect-4.8.0.tar.gz
+sha256 fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c pexpect-4.8.0.tar.gz
# Locally computed sha256 checksums
sha256 4a483ae1c4dc738a6c8b73feb49074e1835da02ab5aa686f2675029906fa364d LICENSE
diff --git a/package/python-pexpect/python-pexpect.mk b/package/python-pexpect/python-pexpect.mk
index 45e331f647..a9609cbe79 100644
--- a/package/python-pexpect/python-pexpect.mk
+++ b/package/python-pexpect/python-pexpect.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PEXPECT_VERSION = 4.7.0
+PYTHON_PEXPECT_VERSION = 4.8.0
PYTHON_PEXPECT_SOURCE = pexpect-$(PYTHON_PEXPECT_VERSION).tar.gz
-PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/1c/b1/362a0d4235496cb42c33d1d8732b5e2c607b0129ad5fdd76f5a583b9fcb3
+PYTHON_PEXPECT_SITE = https://files.pythonhosted.org/packages/e5/9b/ff402e0e930e70467a7178abb7c128709a30dfb22d8777c043e501bc1b10
PYTHON_PEXPECT_LICENSE = ISC
PYTHON_PEXPECT_LICENSE_FILES = LICENSE
PYTHON_PEXPECT_SETUP_TYPE = distutils
diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash
index 7d02a51023..58bc239154 100644
--- a/package/python-pip/python-pip.hash
+++ b/package/python-pip/python-pip.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/pip/json
-md5 1aaaf90fbafc50e7ba1e66ffceb00960 pip-19.3.1.tar.gz
-sha256 21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7 pip-19.3.1.tar.gz
+md5 7d42ba49b809604f0df3d55df1c3fd86 pip-20.0.2.tar.gz
+sha256 7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f pip-20.0.2.tar.gz
# Locally computed sha256 checksums
sha256 5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431 LICENSE.txt
diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk
index b8be234d24..cc40eecdfe 100644
--- a/package/python-pip/python-pip.mk
+++ b/package/python-pip/python-pip.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_PIP_VERSION = 19.3.1
+PYTHON_PIP_VERSION = 20.0.2
PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz
-PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/ce/ea/9b445176a65ae4ba22dce1d93e4b5fe182f953df71a145f557cffaffc1bf
+PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/8e/76/66066b7bc71817238924c7e4b448abdb17eb0c92d645769c223f9ace478f
PYTHON_PIP_SETUP_TYPE = setuptools
PYTHON_PIP_LICENSE = MIT
PYTHON_PIP_LICENSE_FILES = LICENSE.txt
diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash
index e299b8c760..0ede47ec20 100644
--- a/package/python-protobuf/python-protobuf.hash
+++ b/package/python-protobuf/python-protobuf.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 a5ef6dccfe29f46168af8ab5194147f24701727a84661611fe80532ba83d3edd protobuf-python-3.11.0.tar.gz
+sha256 a9c6c3821ece08f8db55392edbbec4d4a5392fa5df148188309ed6c5a842e3b7 protobuf-python-3.11.3.tar.gz
sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE
diff --git a/package/python-txaio/python-txaio.hash b/package/python-txaio/python-txaio.hash
index 8b43a3dc8f..778efed8a3 100644
--- a/package/python-txaio/python-txaio.hash
+++ b/package/python-txaio/python-txaio.hash
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/txaio/json
-md5 ecdd4d0f401c7f01f22830b4d2788593 txaio-18.8.1.tar.gz
-sha256 67e360ac73b12c52058219bb5f8b3ed4105d2636707a36a7cdafb56fe06db7fe txaio-18.8.1.tar.gz
+md5 53ec110dd7c7d84606abc151f607f0ae txaio-20.1.1.tar.gz
+sha256 f24e10396f026c75364ae23ffac8d72c156dc5f3733d332febb356c9d8d6b58d txaio-20.1.1.tar.gz
# Locally computed sha256 checksums
sha256 0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef LICENSE
diff --git a/package/python-txaio/python-txaio.mk b/package/python-txaio/python-txaio.mk
index 8f73f36748..409213b3de 100644
--- a/package/python-txaio/python-txaio.mk
+++ b/package/python-txaio/python-txaio.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_TXAIO_VERSION = 18.8.1
+PYTHON_TXAIO_VERSION = 20.1.1
PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz
-PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/c1/99/81de004578e9afe017bb1d4c8968088a33621c05449fe330bdd7016d5377
+PYTHON_TXAIO_SITE = https://files.pythonhosted.org/packages/50/ea/dd4c34ade00ddfcd2f32b4f1e7136a50ae13894009d64024a9d03f8c594f
PYTHON_TXAIO_LICENSE = MIT
PYTHON_TXAIO_LICENSE_FILES = LICENSE
PYTHON_TXAIO_SETUP_TYPE = setuptools
diff --git a/package/python3-mako/python3-mako.mk b/package/python3-mako/python3-mako.mk
index 31df4194eb..6d5c1a185e 100644
--- a/package/python3-mako/python3-mako.mk
+++ b/package/python3-mako/python3-mako.mk
@@ -6,9 +6,9 @@
# Please keep in sync with
# package/python-mako/python-mako.mk
-PYTHON3_MAKO_VERSION = 1.1.0
+PYTHON3_MAKO_VERSION = 1.1.1
PYTHON3_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz
-PYTHON3_MAKO_SITE = https://files.pythonhosted.org/packages/b0/3c/8dcd6883d009f7cae0f3157fb53e9afb05a0d3d33b3db1268ec2e6f4a56b
+PYTHON3_MAKO_SITE = https://files.pythonhosted.org/packages/28/03/329b21f00243fc2d3815399413845dbbfb0745cff38a29d3597e97f8be58
PYTHON3_MAKO_SETUP_TYPE = setuptools
PYTHON3_MAKO_LICENSE = MIT
PYTHON3_MAKO_LICENSE_FILES = LICENSE
diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 7051bf517a..e257b92b99 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -36,11 +36,6 @@ menuconfig BR2_PACKAGE_QT5
http://qt.io
if BR2_PACKAGE_QT5
-
-config BR2_PACKAGE_QT5_VERSION_LATEST
- bool
- default y
-
source "package/qt5/qt53d/Config.in"
source "package/qt5/qt5base/Config.in"
source "package/qt5/qt5canvas3d/Config.in"
diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash
index 1ccc9f00e9..54dbda367d 100644
--- a/package/qt5/qt53d/qt53d.hash
+++ b/package/qt5/qt53d/qt53d.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qt3d-everywhere-src-5.12.7.tar.xz.sha256
sha256 2030de3dc93fd4062f677f61938229af9cd7aa4c3d2932cdda2ccb663d681126 qt3d-everywhere-src-5.12.7.tar.xz
diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk
index 7674b44558..1028dd6a65 100644
--- a/package/qt5/qt53d/qt53d.mk
+++ b/package/qt5/qt53d/qt53d.mk
@@ -36,19 +36,13 @@ endef
endif
ifeq ($(BR2_STATIC_LIBS),)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-# Available since 5.9
-define QT53D_INSTALL_TARGET_LATEST
- cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders $(TARGET_DIR)/usr/lib/qt/plugins
- cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins $(TARGET_DIR)/usr/lib/qt/plugins
-endef
-endif
define QT53D_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins
cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
- $(QT53D_INSTALL_TARGET_LATEST)
+ cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders $(TARGET_DIR)/usr/lib/qt/plugins
+ cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins $(TARGET_DIR)/usr/lib/qt/plugins
$(QT53D_INSTALL_TARGET_EXAMPLES)
endef
endif
diff --git a/package/qt5/qt5base/5.12.7/0001-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch
index 6876498022..6876498022 100644
--- a/package/qt5/qt5base/5.12.7/0001-qtbase-Fix-build-error-when-using-EGL.patch
+++ b/package/qt5/qt5base/0001-qtbase-Fix-build-error-when-using-EGL.patch
diff --git a/package/qt5/qt5base/5.12.7/0002-double-conversion-enable-for-microblaze.patch b/package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch
index c91d812695..c91d812695 100644
--- a/package/qt5/qt5base/5.12.7/0002-double-conversion-enable-for-microblaze.patch
+++ b/package/qt5/qt5base/0002-double-conversion-enable-for-microblaze.patch
diff --git a/package/qt5/qt5base/5.12.7/0003-double-conversion-enable-for-nios2.patch b/package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch
index 79e276b17f..79e276b17f 100644
--- a/package/qt5/qt5base/5.12.7/0003-double-conversion-enable-for-nios2.patch
+++ b/package/qt5/qt5base/0003-double-conversion-enable-for-nios2.patch
diff --git a/package/qt5/qt5base/5.12.7/qt5base.hash b/package/qt5/qt5base/5.12.7/qt5base.hash
deleted file mode 100644
index 0697464cb9..0000000000
--- a/package/qt5/qt5base/5.12.7/qt5base.hash
+++ /dev/null
@@ -1,11 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtbase-everywhere-src-5.12.7.tar.xz.sha256
-sha256 b18939cb25d90aef8721fb12ec34c3632d3490ced958e41f6c7a52064643665d qtbase-everywhere-src-5.12.7.tar.xz
-
-# Hashes for license files:
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
-sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
-sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
-sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3
-sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 1f4fa3d202198f5d836993748eac9d91157e2cec7fb8426f56000a02a677cdc5 header.BSD
-sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING
diff --git a/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch b/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch
deleted file mode 100644
index f1f6d9b0b7..0000000000
--- a/package/qt5/qt5base/5.6.3/0001-eglfs-rasp-pi-header-inclusion.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001
-From: Julien Corjon <corjon.j@ecagroup.com>
-Date: Tue, 21 Jul 2015 09:58:14 +0200
-Subject: [PATCH] eglfs - fix rasp-pi header inclusion
-
-eglplateform.h include headers for low level instruction and fail on brcm
-headers inclusion
- For the brcm presence test we use egl pkg-config file
- For the eglfs-plugin compilation we use the egl configuration
-
-Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339
-Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
----
- config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 2 ++
- src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-index ce16a3a..192a8ad 100644
---- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
-@@ -1,6 +1,8 @@
- SOURCES = eglfs-brcm.cpp
-
- CONFIG -= qt
-+CONFIG += link_pkgconfig
-+PKGCONFIG += egl
-
- INCLUDEPATH += $$QMAKE_INCDIR_EGL
-
-diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-index 0f493fd..8479496 100644
---- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
-+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin
- load(qt_plugin)
-
- QT += platformsupport-private eglfs_device_lib-private
-+CONFIG += egl
-
- SOURCES += $$PWD/qeglfsmain.cpp
-
---
-2.1.0
-
diff --git a/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch
deleted file mode 100644
index 0d0e0f922b..0000000000
--- a/package/qt5/qt5base/5.6.3/0002-qtbase-Fix-build-error-when-using-EGL.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d69bd3fd52502c7eb2799397fea14afe350e2cbf Mon Sep 17 00:00:00 2001
-From: Yuqing Zhu <carol.zhu@nxp.com>
-Date: Mon, 27 Mar 2017 15:33:35 +0800
-Subject: [PATCH] qtbase: Fix build error when using EGL
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-A build error was occurring due to missing EGL configuration.
-
-Fixed by adding the necessary ties to the EGL pkg-config.
-
-Task-number: QTBUG-61712
-Change-Id: I87190ea39392b4604c563cf9d89edb85068d85fc
-Upstream-Status: Pending
-Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
----
- mkspecs/features/egl.prf | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf
-index 9fa0c9e219..85d5852ba6 100644
---- a/mkspecs/features/egl.prf
-+++ b/mkspecs/features/egl.prf
-@@ -1,3 +1,9 @@
-+# egl headers need a definition
-+PKG_CONFIG = $$pkgConfigExecutable()
-+PKGCONFIG_CFLAGS = $$system($$PKG_CONFIG --cflags egl)
-+PKGCONFIG_CFLAGS = $$find(PKGCONFIG_CFLAGS, ^-D.*)
-+QMAKE_CFLAGS_EGL = $$PKGCONFIG_CFLAGS
-+
- INCLUDEPATH += $$QMAKE_INCDIR_EGL
- LIBS_PRIVATE += $$QMAKE_LIBS_EGL
- QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
---
-2.16.1
-
diff --git a/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch b/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch
deleted file mode 100644
index c8fc426f79..0000000000
--- a/package/qt5/qt5base/5.6.3/0003-libressl-add-fpermissive-gcc-flag-to-allow-compilati.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 62588f2d8267c67c2337004e83e80695280db9eb Mon Sep 17 00:00:00 2001
-From: James Grant <jamesg@zaltys.org>
-Date: Sun, 3 Mar 2019 17:29:29 +1300
-Subject: [PATCH 1/1] libressl - add -fpermissive gcc flag to allow
- compilation.
-
-Workaround for 'const BIO_METHOD *' vs. 'BIO_METHOD *' changes to BIO_new() and BIO_s_mem() function signatures.
-
-Signed-off-by: James Grant <jamesg@zaltys.org>
----
- src/network/ssl/ssl.pri | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
-index 29c47cd7..f0aad448 100644
---- a/src/network/ssl/ssl.pri
-+++ b/src/network/ssl/ssl.pri
-@@ -77,7 +77,7 @@ android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp
- LIBS_PRIVATE += $$OPENSSL_LIBS_RELEASE
- }
-
-- QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS
-+ QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS -fpermissive
- LIBS_PRIVATE += $$OPENSSL_LIBS
- win32: LIBS_PRIVATE += -lcrypt32
- }
---
-2.18.1
-
diff --git a/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch b/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch
deleted file mode 100644
index 0d166b848a..0000000000
--- a/package/qt5/qt5base/5.6.3/0004-fix-icu-build-for-qt5webkit.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Mon, 23 Nov 2015 03:54:00 +0000
-Subject: [PATCH 1/1] When UChar is defined as char16_t in ICU, then qtbase fails to detect ICU.
-
-Build fails with following error:
-
-ICU auto-detection... ()
-x86_64-pc-linux-gnu-g++ -c -march=core2 -O2 -fno-ident \
- -frecord-gcc-switches -pipe -Wall -O2 -Wall -W -fPIC -I. \
- -I/var/tmp/portage/dev-qt/qtcore-5.5.1/work/qtbase-opensource-src-5.5.1/mkspecs/linux-g++ -o icu.o icu.cpp
-In file included from /usr/include/unicode/utypes.h:36:0,
- from icu.cpp:34:
-/usr/include/unicode/umachine.h:306:13: error: 'char16_t' does not name a type
- typedef char16_t UChar;
- ^
-In file included from /usr/include/unicode/utypes.h:37:0,
- from icu.cpp:34:
-/usr/include/unicode/uversion.h:165:55: error: 'UChar' does not name a type
- u_versionFromUString(UVersionInfo versionArray, const UChar *versionString);
- ^
-...
-Makefile:177: recipe for target 'icu.o' failed
-gmake: *** [icu.o] Error 1
-ICU disabled.
-The ICU library support cannot be enabled.
-
-This change isn't needed for new Qt versions, because c++11 is mandatory since 5.7.
-Upstream desided not to merge this change into old branches, like 5.6.
-Original patch was slightly modified to apply cleanly on Qt 5.6.3.
-
-Fetch from: https://bugreports.qt.io/secure/attachment/52478/qtbase-5.5.1-icu.patch
-Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>
-
----
-diff -purN qt5base-5.6.3.orig/config.tests/unix/compile.test qt5base-5.6.3/config.tests/unix/compile.test
---- qt5base-5.6.3.orig/config.tests/unix/compile.test 2019-08-11 00:35:33.181545706 +0300
-+++ qt5base-5.6.3/config.tests/unix/compile.test 2017-09-06 15:13:54.000000000 +0300
-@@ -47,7 +47,7 @@ while [ "$#" -gt 0 ]; do
- INC=`echo $PARAM | sed -e 's/^-I//'`
- INCLUDEPATH="$INCLUDEPATH \"$INC\""
- ;;
-- -f*|-D*)
-+ -f*|-D*|-std=*)
- CFLAGS="$CFLAGS \"$PARAM\""
- CXXFLAGS="$CXXFLAGS \"$PARAM\""
- ;;
-diff -purN qt5base-5.6.3.orig/configure qt5base-5.6.3/configure
---- qt5base-5.6.3.orig/configure 2019-08-11 00:57:45.488214036 +0300
-+++ qt5base-5.6.3/configure 2017-09-06 15:13:54.000000000 +0300
-@@ -5183,8 +5183,10 @@ fi
-
- # auto-detect libicu support
- if [ "$CFG_ICU" != "no" ]; then
-- if compileTest unix/icu "ICU"; then
-+ QT_CXXFLAGS_ICU=`icu-config --cxxflags 2>/dev/null`
-+ if compileTest unix/icu "ICU" $QT_CXXFLAGS_ICU; then
- [ "$CFG_ICU" = "auto" ] && CFG_ICU=yes
-+ QMakeVar set QT_CXXFLAGS_ICU "$QT_CXXFLAGS_ICU"
- else
- if [ "$CFG_ICU" = "auto" ]; then
- CFG_ICU=no
-diff -purN qt5base-5.6.3.orig/doc/Makefile qt5base-5.6.3/doc/Makefile
-diff -purN qt5base-5.6.3.orig/src/corelib/tools/tools.pri qt5base-5.6.3/src/corelib/tools/tools.pri
---- qt5base-5.6.3.orig/src/corelib/tools/tools.pri 2019-08-11 00:45:45.073818635 +0300
-+++ qt5base-5.6.3/src/corelib/tools/tools.pri 2017-09-06 15:13:54.000000000 +0300
-@@ -169,6 +169,7 @@ contains(QT_CONFIG,icu) {
- tools/qcollator_icu.cpp \
- tools/qtimezoneprivate_icu.cpp
- DEFINES += QT_USE_ICU
-+ QMAKE_CXXFLAGS += $$QT_CXXFLAGS_ICU
- } else: win32 {
- SOURCES += tools/qcollator_win.cpp
- } else: macx {
diff --git a/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch b/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch
deleted file mode 100644
index 4acd42f005..0000000000
--- a/package/qt5/qt5base/5.6.3/0005-Do-not-load-plugin-from-the-PWD.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001
-From: Olivier Goffart <ogoffart@woboq.com>
-Date: Fri, 8 Nov 2019 11:30:40 +0100
-Subject: [PATCH] Do not load plugin from the $PWD
-
-I see no reason why this would make sense to look for plugins in the current
-directory. And when there are plugins there, it may actually be wrong
-
-Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-
-Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bf131e8d2181b3404f5293546ed390999f760404
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- src/corelib/plugin/qpluginloader.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
-index cadff4f32b..c2443dbdda 100644
---- a/src/corelib/plugin/qpluginloader.cpp
-+++ b/src/corelib/plugin/qpluginloader.cpp
-@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName)
- paths.append(fileName.left(slash)); // don't include the '/'
- } else {
- paths = QCoreApplication::libraryPaths();
-- paths.prepend(QStringLiteral(".")); // search in current dir first
- }
-
- for (const QString &path : qAsConst(paths)) {
---
-2.25.0
-
diff --git a/package/qt5/qt5base/5.6.3/qt5base.hash b/package/qt5/qt5base/5.6.3/qt5base.hash
deleted file mode 100644
index 2dae2e8bf0..0000000000
--- a/package/qt5/qt5base/5.6.3/qt5base.hash
+++ /dev/null
@@ -1,10 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtbase-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1 qtbase-opensource-src-5.6.3.tar.xz
-
-# Hashes for license files:
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 66f6bb53f6d985a4d651bf1ecfe8bbcbe32b0f744708d588f047580ee85d8ec8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
-sha256 68afaf3392f8c04218fbf29db43cc0b18bf651c1db086556aa584046de9f3e35 LICENSE.LGPLv3
-sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 1d05f2662f0be7544c4cc238d0957d1ed5d0edc45210e9108f905df354241a0e header.BSD
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in
index 2b4ed13876..60a611e292 100644
--- a/package/qt5/qt5base/Config.in
+++ b/package/qt5/qt5base/Config.in
@@ -1,11 +1,8 @@
config BR2_PACKAGE_QT5BASE
bool "qt5base"
select BR2_PACKAGE_ZLIB
- select BR2_PACKAGE_PCRE if BR2_PACKAGE_QT5_VERSION_5_6
- select BR2_PACKAGE_PCRE_16 if BR2_PACKAGE_QT5_VERSION_5_6
- select BR2_PACKAGE_PCRE_UTF if BR2_PACKAGE_QT5_VERSION_5_6
- select BR2_PACKAGE_PCRE2 if BR2_PACKAGE_QT5_VERSION_LATEST
- select BR2_PACKAGE_PCRE2_16 if BR2_PACKAGE_QT5_VERSION_LATEST
+ select BR2_PACKAGE_PCRE2
+ select BR2_PACKAGE_PCRE2_16
help
Qt is a cross-platform application and UI framework for
developers using C++.
@@ -286,12 +283,6 @@ comment "icu support needs a toolchain w/ gcc >= 4.8"
depends on !BR2_BINFMT_FLAT
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
-config BR2_PACKAGE_QT5BASE_OPENSSL
- bool
- # No OpenSSL 1.1.x support in Qt 5.6.x
- default y if BR2_PACKAGE_QT5_VERSION_5_6 && BR2_PACKAGE_LIBRESSL
- default y if BR2_PACKAGE_QT5_VERSION_LATEST && BR2_PACKAGE_OPENSSL
-
config BR2_PACKAGE_QT5BASE_TSLIB
bool "Enable Tslib support"
select BR2_PACKAGE_TSLIB
diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash
index 5316f03b10..0697464cb9 100644
--- a/package/qt5/qt5base/qt5base.hash
+++ b/package/qt5/qt5base/qt5base.hash
@@ -1,2 +1,11 @@
-# This hash file is not used; instead, update the
-# hash files in the per-version sub-directories.
+# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtbase-everywhere-src-5.12.7.tar.xz.sha256
+sha256 b18939cb25d90aef8721fb12ec34c3632d3490ced958e41f6c7a52064643665d qtbase-everywhere-src-5.12.7.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 1f4fa3d202198f5d836993748eac9d91157e2cec7fb8426f56000a02a677cdc5 header.BSD
+sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 774c771bc9..c392c06627 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -8,7 +8,7 @@ QT5BASE_VERSION = $(QT5_VERSION)
QT5BASE_SITE = $(QT5_SITE)
QT5BASE_SOURCE = qtbase-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5BASE_VERSION).tar.xz
-QT5BASE_DEPENDENCIES = host-pkgconf zlib
+QT5BASE_DEPENDENCIES = host-pkgconf pcre2 zlib
QT5BASE_INSTALL_STAGING = YES
# A few comments:
@@ -30,9 +30,7 @@ QT5BASE_CONFIGURE_OPTS += \
# starting from version 5.9.0, -optimize-debug is enabled by default
# for debug builds and it overrides -O* with -Og which is not what we
# want.
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5BASE_CONFIGURE_OPTS += -no-optimize-debug
-endif
QT5BASE_CFLAGS = $(TARGET_CFLAGS)
QT5BASE_CXXFLAGS = $(TARGET_CXXFLAGS)
@@ -42,12 +40,6 @@ QT5BASE_CFLAGS += -O0
QT5BASE_CXXFLAGS += -O0
endif
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-QT5BASE_DEPENDENCIES += pcre
-else
-QT5BASE_DEPENDENCIES += pcre2
-endif
-
ifeq ($(BR2_X86_CPU_HAS_SSE2),)
QT5BASE_CONFIGURE_OPTS += -no-sse2
else ifeq ($(BR2_X86_CPU_HAS_SSE3),)
@@ -64,7 +56,7 @@ else ifeq ($(BR2_X86_CPU_HAS_AVX2),)
QT5BASE_CONFIGURE_OPTS += -no-avx2
else
# no buildroot BR2_X86_CPU_HAS_AVX512 option yet for qt configure
-# option '-no-avx512' (available for latest only)
+# option '-no-avx512'
endif
ifeq ($(BR2_PACKAGE_LIBDRM),y)
@@ -94,18 +86,9 @@ else
QT5BASE_CONFIGURE_OPTS += -release
endif
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-QT5BASE_CONFIGURE_OPTS += -largefile
-endif
-
QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
-else
-QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5BASE_LICENSE += , BSD-3-Clause (examples)
QT5BASE_LICENSE_FILES += header.BSD
@@ -145,7 +128,6 @@ endif
ifeq ($(BR2_PACKAGE_QT5BASE_GUI),y)
QT5BASE_CONFIGURE_OPTS += -gui -system-freetype
-QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5_VERSION_5_6),-I$(STAGING_DIR)/usr/include/freetype2)
QT5BASE_DEPENDENCIES += freetype
else
QT5BASE_CONFIGURE_OPTS += -no-gui -no-freetype
@@ -175,11 +157,7 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
QT5BASE_CONFIGURE_OPTS += -xcb
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-QT5BASE_CONFIGURE_OPTS += -system-xkbcommon-x11
-else
QT5BASE_CONFIGURE_OPTS += -xkbcommon
-endif
QT5BASE_DEPENDENCIES += \
libxcb \
@@ -215,15 +193,8 @@ else
QT5BASE_CONFIGURE_OPTS += -no-eglfs
endif
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-# No OpenSSL 1.1.x support in Qt 5.6.x
-# LibreSSL works with shared linkage only and -fpermissive patch
-QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBRESSL),-openssl-linked,-no-openssl)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBRESSL),openssl)
-else
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
-endif
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
@@ -247,16 +218,6 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-# gstreamer 0.10 support is broken in qt5multimedia
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
-QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0
-QT5BASE_DEPENDENCIES += gst1-plugins-base
-else
-QT5BASE_CONFIGURE_OPTS += -no-gstreamer
-endif
-endif
-
ifeq ($(BR2_PACKAGE_LIBINPUT),y)
QT5BASE_CONFIGURE_OPTS += -libinput
QT5BASE_DEPENDENCIES += libinput
@@ -264,7 +225,6 @@ else
QT5BASE_CONFIGURE_OPTS += -no-libinput
endif
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
# only enable gtk support if libgtk3 X11 backend is enabled
ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy)
QT5BASE_CONFIGURE_OPTS += -gtk
@@ -272,7 +232,6 @@ QT5BASE_DEPENDENCIES += libgtk3
else
QT5BASE_CONFIGURE_OPTS += -no-gtk
endif
-endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
QT5BASE_CONFIGURE_OPTS += -journald
@@ -290,7 +249,6 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport
@@ -298,9 +256,6 @@ endif
ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y)
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport
endif
-else
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration
-endif
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
@@ -308,7 +263,6 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y)
# use vivante backend
QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv
@@ -316,7 +270,6 @@ else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y)
# use mali backend
QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali
endif
-endif
ifneq ($(QT5BASE_CONFIG_FILE),)
define QT5BASE_CONFIGURE_CONFIG_FILE
@@ -325,7 +278,7 @@ endef
endif
QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf
-ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy)
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
# Qt 5.8 needs atomics, which on various architectures are in -latomic
define QT5BASE_CONFIGURE_ARCH_CONFIG
printf 'LIBS += -latomic\n' >$(QT5BASE_ARCH_CONFIG_FILE)
@@ -403,15 +356,6 @@ define QT5BASE_INSTALL_TARGET_PLUGINS
fi
endef
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-define QT5BASE_INSTALL_TARGET_FONTS
- if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \
- mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \
- cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \
- fi
-endef
-endif
-
define QT5BASE_INSTALL_TARGET_EXAMPLES
if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \
mkdir -p $(TARGET_DIR)/usr/lib/qt/examples ; \
@@ -421,14 +365,12 @@ endef
ifeq ($(BR2_STATIC_LIBS),y)
define QT5BASE_INSTALL_TARGET_CMDS
- $(QT5BASE_INSTALL_TARGET_FONTS)
$(QT5BASE_INSTALL_TARGET_EXAMPLES)
endef
else
define QT5BASE_INSTALL_TARGET_CMDS
$(QT5BASE_INSTALL_TARGET_LIBS)
$(QT5BASE_INSTALL_TARGET_PLUGINS)
- $(QT5BASE_INSTALL_TARGET_FONTS)
$(QT5BASE_INSTALL_TARGET_EXAMPLES)
endef
endif
diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash
index 2c7046a87e..c6eca2e779 100644
--- a/package/qt5/qt5canvas3d/qt5canvas3d.hash
+++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcanvas3d-everywhere-src-5.12.7.tar.xz.sha256
sha256 b63a513a2ee11548b122e0fd640b1fa22d3eb83cdc51ddfdf3b97c2ecd0d0c50 qtcanvas3d-everywhere-src-5.12.7.tar.xz
@@ -9,6 +6,3 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.mk b/package/qt5/qt5canvas3d/qt5canvas3d.mk
index b550ff00f2..2366afb352 100644
--- a/package/qt5/qt5canvas3d/qt5canvas3d.mk
+++ b/package/qt5/qt5canvas3d/qt5canvas3d.mk
@@ -10,13 +10,8 @@ QT5CANVAS3D_SOURCE = qtcanvas3d-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CANVAS3D_VERSI
QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative
QT5CANVAS3D_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5CANVAS3D_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools)
QT5CANVAS3D_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3
-else
-QT5CANVAS3D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0
-QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
-endif
define QT5CANVAS3D_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash
index fb077b95af..10a92bd55f 100644
--- a/package/qt5/qt5charts/qt5charts.hash
+++ b/package/qt5/qt5charts/qt5charts.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist
-sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f qtcharts-opensource-src-2.1.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtcharts-everywhere-src-5.12.7.tar.xz.sha256
sha256 434065526d0b1d8921e96cc1827b1a3579e073b930fe536455c4c1da2f15cf5f qtcharts-everywhere-src-5.12.7.tar.xz
diff --git a/package/qt5/qt5charts/qt5charts.mk b/package/qt5/qt5charts/qt5charts.mk
index e359747503..f7adcc1cd5 100644
--- a/package/qt5/qt5charts/qt5charts.mk
+++ b/package/qt5/qt5charts/qt5charts.mk
@@ -4,21 +4,14 @@
#
################################################################################
-# Qt5Charts does not follow Qt versionning for 5.6
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5CHARTS_VERSION = $(QT5_VERSION)
-else
-QT5CHARTS_VERSION = 2.1.3
-endif
QT5CHARTS_SITE = $(QT5_SITE)
QT5CHARTS_SOURCE = qtcharts-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CHARTS_VERSION).tar.xz
QT5CHARTS_DEPENDENCIES = qt5base
QT5CHARTS_INSTALL_STAGING = YES
QT5CHARTS_LICENSE = GPL-3.0
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5CHARTS_LICENSE_FILES = LICENSE.GPL3
-endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5CHARTS_DEPENDENCIES += qt5declarative
diff --git a/package/qt5/qt5connectivity/5.12.7/qt5connectivity.hash b/package/qt5/qt5connectivity/5.12.7/qt5connectivity.hash
deleted file mode 100644
index 9af3a57c12..0000000000
--- a/package/qt5/qt5connectivity/5.12.7/qt5connectivity.hash
+++ /dev/null
@@ -1,9 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtconnectivity-everywhere-src-5.12.7.tar.xz.sha256
-sha256 647148b9b1a0d3e54f788b66797b81bb87434faf6fb12ac481f9165eda0d071a qtconnectivity-everywhere-src-5.12.7.tar.xz
-
-# Hashes for license files:
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
-sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
-sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
-sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
-sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash b/package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash
deleted file mode 100644
index c1a03c5e00..0000000000
--- a/package/qt5/qt5connectivity/5.6.3/qt5connectivity.hash
+++ /dev/null
@@ -1,10 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtconnectivity-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnectivity-opensource-src-5.6.3.tar.xz
-
-# Hashes for license files:
-sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
diff --git a/package/qt5/qt5connectivity/qt5connectivity.hash b/package/qt5/qt5connectivity/qt5connectivity.hash
index 5316f03b10..9af3a57c12 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.hash
+++ b/package/qt5/qt5connectivity/qt5connectivity.hash
@@ -1,2 +1,9 @@
-# This hash file is not used; instead, update the
-# hash files in the per-version sub-directories.
+# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtconnectivity-everywhere-src-5.12.7.tar.xz.sha256
+sha256 647148b9b1a0d3e54f788b66797b81bb87434faf6fb12ac481f9165eda0d071a qtconnectivity-everywhere-src-5.12.7.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
index 0ade9876de..eb9f0141c3 100644
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -10,13 +10,9 @@ QT5CONNECTIVITY_SOURCE = qtconnectivity-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5CONNEC
QT5CONNECTIVITY_DEPENDENCIES = qt5base
QT5CONNECTIVITY_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
+
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5CONNECTIVITY_LICENSE += , BSD-3-Clause (examples)
endif
diff --git a/package/qt5/qt5declarative/5.12.7/0001-qsgtexture-fix-debug-build-with-uclibc.patch b/package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch
index 1c0f6eccc5..1c0f6eccc5 100644
--- a/package/qt5/qt5declarative/5.12.7/0001-qsgtexture-fix-debug-build-with-uclibc.patch
+++ b/package/qt5/qt5declarative/0001-qsgtexture-fix-debug-build-with-uclibc.patch
diff --git a/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch b/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch
deleted file mode 100644
index aeaaa91770..0000000000
--- a/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b616a7e2a7e03e2eb189dca3dc428c0e19e1652b Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Thu, 6 Apr 2017 21:53:40 +0200
-Subject: [PATCH] examples: photoviewer needs widgets support
-
-Fixes:
-
- .../qt5declarative-5.8.0/examples/quick/demos/photoviewer/photoviewer.pro
- Project ERROR: Unknown module(s) in QT: widgets
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- examples/quick/demos/demos.pro | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
-index 0644b81a2..5a6fd52ba 100644
---- a/examples/quick/demos/demos.pro
-+++ b/examples/quick/demos/demos.pro
-@@ -7,5 +7,7 @@ SUBDIRS = samegame \
- photosurface \
- stocqt
-
--qtHaveModule(xmlpatterns): SUBDIRS += rssnews photoviewer
--
-+qtHaveModule(xmlpatterns) {
-+ SUBDIRS += rssnews
-+ qtHaveModule(widgets): SUBDIRS += photoviewer
-+}
---
-2.11.0
-
diff --git a/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch b/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
deleted file mode 100644
index 7959d38946..0000000000
--- a/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b4db5c6cef877b33b5e7cd5a07fe4a7e6797dcfc Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Tue, 16 May 2017 19:47:19 +0200
-Subject: [PATCH] examples: qquickviewcomparison and quickwidget needs OpenGL
- support
-
-Fixes:
-
- main.cpp:(.text._ZN11QQmlPrivate10createIntoI6FbItemEEvPv[_ZN11QQmlPrivate10createIntoI6FbItemEEvPv]+0x18): undefined reference to `QQuickFramebufferObject::QQuickFramebufferObject(QQuickItem*)'
- .obj/main.o: In function `QQmlPrivate::QQmlElement<FbItem>::~QQmlElement()':
- main.cpp:(.text._ZN11QQmlPrivate11QQmlElementI6FbItemED2Ev[_ZN11QQmlPrivate11QQmlElementI6FbItemED5Ev]+0x5c): undefined reference to `vtable for QQuickFramebufferObject'
- .obj/main.o: In function `QQmlPrivate::QQmlElement<FbItem>::~QQmlElement()':
- main.cpp:(.text._ZN11QQmlPrivate11QQmlElementI6FbItemED0Ev[_ZN11QQmlPrivate11QQmlElementI6FbItemED0Ev]+0x64): undefined reference to `vtable for QQuickFramebufferObject'
- .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0x48): undefined reference to `QQuickFramebufferObject::isTextureProvider() const'
- .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0x4c): undefined reference to `QQuickFramebufferObject::textureProvider() const'
- .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xb4): undefined reference to `QQuickFramebufferObject::geometryChanged(QRectF const&, QRectF const&)'
- .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xb8): undefined reference to `QQuickFramebufferObject::updatePaintNode(QSGNode*, QQuickItem::UpdatePaintNodeData*)'
- .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xbc): undefined reference to `QQuickFramebufferObject::releaseResources()'
- .obj/moc_fbitem.o: In function `FbItem::qt_metacast(char const*)':
- moc_fbitem.cpp:(.text+0x70): undefined reference to `QQuickFramebufferObject::qt_metacast(char const*)'
- .obj/moc_fbitem.o: In function `FbItem::qt_metacall(QMetaObject::Call, int, void**)':
- moc_fbitem.cpp:(.text+0x80): undefined reference to `QQuickFramebufferObject::qt_metacall(QMetaObject::Call, int, void**)'
- .obj/moc_fbitem.o: In function `FbItem::~FbItem()':
- moc_fbitem.cpp:(.text._ZN6FbItemD2Ev[_ZN6FbItemD5Ev]+0x38): undefined reference to `vtable for QQuickFramebufferObject'
- .obj/moc_fbitem.o: In function `FbItem::~FbItem()':
- moc_fbitem.cpp:(.text._ZN6FbItemD0Ev[_ZN6FbItemD0Ev]+0x40): undefined reference to `vtable for QQuickFramebufferObject'
- .obj/moc_fbitem.o:(.data.rel.ro+0x8): undefined reference to `typeinfo for QQuickFramebufferObject'
- .obj/moc_fbitem.o:(.data.rel.ro+0x58): undefined reference to `QQuickFramebufferObject::isTextureProvider() const'
- .obj/moc_fbitem.o:(.data.rel.ro+0x5c): undefined reference to `QQuickFramebufferObject::textureProvider() const'
- .obj/moc_fbitem.o:(.data.rel.ro+0xc4): undefined reference to `QQuickFramebufferObject::geometryChanged(QRectF const&, QRectF const&)'
- .obj/moc_fbitem.o:(.data.rel.ro+0xc8): undefined reference to `QQuickFramebufferObject::updatePaintNode(QSGNode*, QQuickItem::UpdatePaintNodeData*)'
- .obj/moc_fbitem.o:(.data.rel.ro+0xcc): undefined reference to `QQuickFramebufferObject::releaseResources()'
- .obj/moc_fbitem.o:(.data.rel.ro+0xf0): undefined reference to `QQuickFramebufferObject::staticMetaObject'
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
-
-Note:
-An equivalent patch is upstream for qt5declarative 5.10, but it is not suitable for
-backporting to this version due to license differences.
-
----
- examples/quick/quick.pro | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
-index 445dfb0fa..26ca0138e 100644
---- a/examples/quick/quick.pro
-+++ b/examples/quick/quick.pro
-@@ -36,7 +36,10 @@ qtConfig(opengl(es1|es2)?) {
- # Widget dependent examples
- qtHaveModule(widgets) {
- SUBDIRS += embeddedinwidgets
-- qtHaveModule(quickwidgets): SUBDIRS += quickwidgets
-+ # OpenGL Support Required
-+ qtConfig(opengl(es1|es2)?) {
-+ qtHaveModule(quickwidgets): SUBDIRS += quickwidgets
-+ }
- }
-
- EXAMPLE_FILES = \
---
-2.11.0
-
diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index 3a353a8326..32ea8f0d0c 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -16,12 +16,8 @@ config BR2_PACKAGE_QT5DECLARATIVE
if BR2_PACKAGE_QT5DECLARATIVE
-comment "quick module needs an OpenGL-capable backend"
- depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
-
config BR2_PACKAGE_QT5DECLARATIVE_QUICK
bool "quick module"
- depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST
select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE
endif
diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash
index 71e9cb2118..85e99082f3 100644
--- a/package/qt5/qt5declarative/qt5declarative.hash
+++ b/package/qt5/qt5declarative/qt5declarative.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtdeclarative-everywhere-src-5.12.7.tar.xz.sha256
sha256 5cdc05a035f240ab73b6b37dd3831c1350cd80e5799da47929974085f6eae9bd qtdeclarative-everywhere-src-5.12.7.tar.xz
@@ -10,7 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 6210611961..e9b86701bb 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -10,13 +10,8 @@ QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARAT
QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
QT5DECLARATIVE_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
define QT5DECLARATIVE_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in
index f84d234771..d445d91dea 100644
--- a/package/qt5/qt5enginio/Config.in
+++ b/package/qt5/qt5enginio/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_QT5ENGINIO
bool "qt5enginio"
- depends on BR2_PACKAGE_QT5BASE_OPENSSL
+ select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_QT5BASE_GUI
select BR2_PACKAGE_QT5BASE_NETWORK
help
@@ -14,13 +14,3 @@ config BR2_PACKAGE_QT5ENGINIO
5.6 and not recommended for new design.
http://doc.qt.io/archives/qt-5.5/enginio-index.html
-
-# When Qt 5.6 is removed, replace the depends on
-# BR2_PACKAGE_QT5BASE_OPENSSL above by a select BR2_PACKAGE_OPENSSL.
-comment "qt5enginio needs libressl"
- depends on BR2_PACKAGE_QT5_VERSION_5_6
- depends on !BR2_PACKAGE_QT5BASE_OPENSSL
-
-comment "qt5enginio needs openssl"
- depends on BR2_PACKAGE_QT5_VERSION_LATEST
- depends on !BR2_PACKAGE_QT5BASE_OPENSSL
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
index 8e327de296..ae800fe07a 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtgraphicaleffects-everywhere-src-5.12.7.tar.xz.sha256
sha256 02f0328420c623da8f9ae949fec01e99ba84213dd2ad559cb00c204502bbcace qtgraphicaleffects-everywhere-src-5.12.7.tar.xz
@@ -10,8 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index c5011a94f0..2961c89fcb 100644
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -10,13 +10,8 @@ QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-$(QT5_SOURCE_TARBALL_PREFIX)-$(Q
QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash
index de977f15ba..3358b6d79c 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.hash
+++ b/package/qt5/qt5imageformats/qt5imageformats.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtimageformats-everywhere-src-5.12.7.tar.xz.sha256
sha256 9bd19ee24fb85f249d01c78e637c95377dd738feb61da0deeee6b770fa62f70b qtimageformats-everywhere-src-5.12.7.tar.xz
@@ -10,5 +7,3 @@ sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
index fa13ebedaf..b8e581c489 100644
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -10,13 +10,8 @@ QT5IMAGEFORMATS_SOURCE = qtimageformats-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5IMAGEF
QT5IMAGEFORMATS_DEPENDENCIES = qt5base
QT5IMAGEFORMATS_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
-else
-QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
define QT5IMAGEFORMATS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash
index 80bcfaf0ab..3c94df0079 100644
--- a/package/qt5/qt5location/qt5location.hash
+++ b/package/qt5/qt5location/qt5location.hash
@@ -1,17 +1,9 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtlocation-everywhere-src-5.12.7.tar.xz.sha256
sha256 d1e905b80befda3c9aaad92ea984e6dbf722568b5c91e8d15b027bc5bc22781f qtlocation-everywhere-src-5.12.7.tar.xz
# Hashes for license files:
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
diff --git a/package/qt5/qt5location/qt5location.mk b/package/qt5/qt5location/qt5location.mk
index a69e8f41a6..5edb9170a6 100644
--- a/package/qt5/qt5location/qt5location.mk
+++ b/package/qt5/qt5location/qt5location.mk
@@ -10,13 +10,8 @@ QT5LOCATION_SOURCE = qtlocation-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5LOCATION_VERSI
QT5LOCATION_DEPENDENCIES = qt5base
QT5LOCATION_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5LOCATION_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5LOCATION_DEPENDENCIES += qt5declarative
@@ -43,11 +38,9 @@ define QT5LOCATION_INSTALL_TARGET_LOCATION
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Location.so.* $(TARGET_DIR)/usr/lib
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geoservices $(TARGET_DIR)/usr/lib/qt/plugins/
endef
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
define QT5LOCATION_INSTALL_TARGET_POSITION_QUICK
cp -dpf $(STAGING_DIR)/usr/lib/libQt5PositioningQuick.so.* $(TARGET_DIR)/usr/lib
endef
-endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
define QT5LOCATION_INSTALL_TARGET_EXAMPLES
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/location $(TARGET_DIR)/usr/lib/qt/examples/
diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash
index 016ec44cee..a4df5af5dc 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.hash
+++ b/package/qt5/qt5multimedia/qt5multimedia.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtmultimedia-everywhere-src-5.12.7.tar.xz.sha256
sha256 28bdaa81371f922223775ae5171c4d589a2c07f255abbe5ccf130ecbbdb4db1d qtmultimedia-everywhere-src-5.12.7.tar.xz
@@ -10,8 +7,4 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
sha256 c1d75c15db4409bcbb182180d582f410a263dc9a631cd546b256e95f1da42165 examples/multimedia/spectrum/3rdparty/fftreal/license.txt
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index e598140a9a..0e9a6b97c9 100644
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -10,13 +10,8 @@ QT5MULTIMEDIA_SOURCE = qtmultimedia-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5MULTIMEDIA
QT5MULTIMEDIA_DEPENDENCIES = qt5base
QT5MULTIMEDIA_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
QT5MULTIMEDIA_DEPENDENCIES += gst1-plugins-base
@@ -47,18 +42,9 @@ define QT5MULTIMEDIA_INSTALL_STAGING_CMDS
endef
ifeq ($(BR2_STATIC_LIBS),)
-# since Qt5.10.1 libqgsttools was renamed to libQtMultimediaGstTools
-# and is installed by the default target install step below
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)x$(BR2_PACKAGE_GST1_PLUGINS_BASE),xy)
-define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB
- cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib
-endef
-endif
-
define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Multimedia*.so.* $(TARGET_DIR)/usr/lib
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins
- $(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB)
endef
endif # !BR2_STATIC_LIBS
diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in
index 59f6ca4114..56fcaf7053 100644
--- a/package/qt5/qt5quickcontrols/Config.in
+++ b/package/qt5/qt5quickcontrols/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_QT5QUICKCONTROLS
bool "qt5quickcontrols"
- depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
select BR2_PACKAGE_QT5DECLARATIVE
select BR2_PACKAGE_QT5DECLARATIVE_QUICK
@@ -12,7 +11,3 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
that can be used to build complete interfaces in Qt Quick.
http://doc.qt.io/qt-5/qtquickcontrols-index.html
-
-comment "qt5quickcontrols needs an OpenGL-capable backend"
- depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
- depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
index 9ae6ac76d7..a0f8dab10b 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
@@ -1,13 +1,7 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols-everywhere-src-5.12.7.tar.xz.sha256
sha256 1038bbc76bba53f9634f40cd9c8ebf0ed8ae82e791f727b228bd81bdcf1859e5 qtquickcontrols-everywhere-src-5.12.7.tar.xz
# Hashes for license files:
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 3e0c5effb3..a3b3a3f64a 100644
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -11,12 +11,7 @@ QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
QT5QUICKCONTROLS_INSTALL_STAGING = YES
QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
-
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL
-else
-QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
-endif
define QT5QUICKCONTROLS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
@@ -42,18 +37,11 @@ define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS
endef
endif
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS
- cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick
-endef
-endif
-
define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick
$(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS)
- $(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS)
$(QT5QUICKCONTROLS_INSTALL_TARGET_EXAMPLES)
endef
diff --git a/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash
deleted file mode 100644
index 689a7e5284..0000000000
--- a/package/qt5/qt5quickcontrols2/5.12.7/qt5quickcontrols2.hash
+++ /dev/null
@@ -1,7 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols2-everywhere-src-5.12.7.tar.xz.sha256
-sha256 3a9526e5ad01edbfb796a6631983c391ea1b7e22ae6e07840048156a9e92a237 qtquickcontrols2-everywhere-src-5.12.7.tar.xz
-
-# Hashes for license files:
-sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3
-sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3
-sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash
deleted file mode 100644
index 01fe5dcd61..0000000000
--- a/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash
+++ /dev/null
@@ -1,7 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickcontrols2-opensource-src-5.6.3.tar.xz
-
-# Hashes for license files:
-sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 0ec5b37a28dd638c5c05c8cc940276e55c808353fe8d942c7f993c2c8b4cbe62 LICENSE.LGPLv3
diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in
index d036f74bab..3f81e20d52 100644
--- a/package/qt5/qt5quickcontrols2/Config.in
+++ b/package/qt5/qt5quickcontrols2/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_QT5QUICKCONTROLS2
bool "qt5quickcontrols2"
- depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
select BR2_PACKAGE_QT5DECLARATIVE
select BR2_PACKAGE_QT5DECLARATIVE_QUICK
@@ -14,7 +13,3 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
to a core module in Qt 5.7.0.
https://doc.qt.io/qt-5/qtquickcontrols2-index.html
-
-comment "qt5quickcontrols2 needs an OpenGL-capable backend"
- depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
- depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
index 5316f03b10..689a7e5284 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
@@ -1,2 +1,7 @@
-# This hash file is not used; instead, update the
-# hash files in the per-version sub-directories.
+# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtquickcontrols2-everywhere-src-5.12.7.tar.xz.sha256
+sha256 3a9526e5ad01edbfb796a6631983c391ea1b7e22ae6e07840048156a9e92a237 qtquickcontrols2-everywhere-src-5.12.7.tar.xz
+
+# Hashes for license files:
+sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3
+sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index c2004c2ee7..632bc47205 100644
--- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -31,7 +31,6 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES
endef
endif
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib
@@ -41,14 +40,5 @@ define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick
$(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES)
endef
-else
-define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS
- cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib
- cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs
- cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs
- cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs
- $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES)
-endef
-endif
$(eval $(generic-package))
diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash
index bddcceb813..8d87cd6f60 100644
--- a/package/qt5/qt5script/qt5script.hash
+++ b/package/qt5/qt5script/qt5script.hash
@@ -1,16 +1,10 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtscript-everywhere-src-5.12.7.tar.xz.sha256
sha256 ca1dbc66d4125a678638dd0c9c030b72fdfc4ec2c229b9316a8bc80a86104019 qtscript-everywhere-src-5.12.7.tar.xz
# Hashes for license files:
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB
sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
index a3b8cb7e34..641af6f62c 100644
--- a/package/qt5/qt5script/qt5script.mk
+++ b/package/qt5/qt5script/qt5script.mk
@@ -14,14 +14,9 @@ QT5SCRIPT_INSTALL_STAGING = YES
# This is linked into libQt5Script, which also contains Qt sources under
# LGPL-2.1 (only). Therefore, the library is LGPL-2.1 and BSD-3-Clause.
# libQt5ScriptTools is under the normal Qt opensource license.
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-3.0 or GPL-2.0+ (libQt5ScriptTools), GFDL-1.3 (docs)
# LGPL-2.1 license file is missing
QT5SCRIPT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL
-else
-QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-2.1 with exception or LGPL-3.0 with exception (libQt5ScriptTools), GFDL-1.3 (docs)
-QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.FDL
-endif
# License files from JavaScriptCore
QT5SCRIPT_LICENSE_FILES += \
src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB \
diff --git a/package/qt5/qt5scxml/Config.in b/package/qt5/qt5scxml/Config.in
index d94b5ea1c6..5510821d24 100644
--- a/package/qt5/qt5scxml/Config.in
+++ b/package/qt5/qt5scxml/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_QT5SCXML
bool "qt5scxml"
- depends on BR2_PACKAGE_QT5_VERSION_LATEST
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5DECLARATIVE
@@ -12,7 +11,3 @@ config BR2_PACKAGE_QT5SCXML
machines from SCXML files.
https://doc.qt.io/qt-5/qtscxml-index.html
-
-comment "qt5scxml needs at least qt-5.9"
- depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- depends on !BR2_PACKAGE_QT5_VERSION_LATEST
diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash
index 1e298d1674..dba376d9a6 100644
--- a/package/qt5/qt5sensors/qt5sensors.hash
+++ b/package/qt5/qt5sensors/qt5sensors.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtsensors-everywhere-src-5.12.7.tar.xz.sha256
sha256 2b9aea9f4e2f681b4067f2b9d97c5073c135e41d26601c71f18f199bc980e740 qtsensors-everywhere-src-5.12.7.tar.xz
@@ -10,8 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
index 10498a4970..21fc3203b2 100644
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -9,14 +9,8 @@ QT5SENSORS_SITE = $(QT5_SITE)
QT5SENSORS_SOURCE = qtsensors-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SENSORS_VERSION).tar.xz
QT5SENSORS_DEPENDENCIES = qt5base
QT5SENSORS_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5SENSORS_DEPENDENCIES += qt5declarative
diff --git a/package/qt5/qt5serialbus/5.12.7/qt5serialbus.hash b/package/qt5/qt5serialbus/5.12.7/qt5serialbus.hash
deleted file mode 100644
index fa3ccc1475..0000000000
--- a/package/qt5/qt5serialbus/5.12.7/qt5serialbus.hash
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtserialbus-everywhere-src-5.12.7.tar.xz.sha256
-sha256 82201edf971e957d849b041ab2914f7497226939c62884ec2906b37576987eae qtserialbus-everywhere-src-5.12.7.tar.xz
-
-# Hashes for license files:
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
-sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch b/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch
deleted file mode 100644
index 8573e304fa..0000000000
--- a/package/qt5/qt5serialbus/5.6.3/0001-SocketCAN-Fix-compiler-error-SIOCGSTAMP-was-not-declared.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 43d746c2c0c87c8694e835f3b052317c8fa02482 Mon Sep 17 00:00:00 2001
-From: Andre Hartmann <aha_1980@gmx.de>
-Date: Mon, 8 Jul 2019 21:35:12 +0200
-Subject: =?UTF-8?q?SocketCAN:=20Fix=20compiler=20error=20"=E2=80=98SIOCGST?=
- =?UTF-8?q?AMP=E2=80=99=20was=20not=20declared"?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes: QTBUG-76957
-Change-Id: I8c4c86aa23137d67f5d20eedfe1c46a241c0632b
-Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
-
-[Retrieved from:
-https://code.qt.io/cgit/qt/qtserialbus.git/commit/?id=43d746c2c0c87c8694e835f3b052317c8fa02482]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/plugins/canbus/socketcan/socketcanbackend.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp
-index 74b0d1d..a2da146 100644
---- a/src/plugins/canbus/socketcan/socketcanbackend.cpp
-+++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp
-@@ -45,6 +45,7 @@
-
- #include <linux/can/error.h>
- #include <linux/can/raw.h>
-+#include <linux/sockios.h>
- #include <errno.h>
- #include <unistd.h>
- #include <net/if.h>
---
-cgit v1.2.1
-
diff --git a/package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash b/package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash
deleted file mode 100644
index 6715392eba..0000000000
--- a/package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialbus-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 71c89be3879414e2a11cad93a4882758f9259b1c0aec980560309192c99f9a9e qtserialbus-opensource-src-5.6.3.tar.xz
-
-# Hashes for license files:
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
-sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL
diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
index 5316f03b10..fa3ccc1475 100644
--- a/package/qt5/qt5serialbus/qt5serialbus.hash
+++ b/package/qt5/qt5serialbus/qt5serialbus.hash
@@ -1,2 +1,8 @@
-# This hash file is not used; instead, update the
-# hash files in the per-version sub-directories.
+# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtserialbus-everywhere-src-5.12.7.tar.xz.sha256
+sha256 82201edf971e957d849b041ab2914f7497226939c62884ec2906b37576987eae qtserialbus-everywhere-src-5.12.7.tar.xz
+
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt5/qt5serialport/5.12.7/qt5serialport.hash b/package/qt5/qt5serialport/5.12.7/qt5serialport.hash
deleted file mode 100644
index 43136542d8..0000000000
--- a/package/qt5/qt5serialport/5.12.7/qt5serialport.hash
+++ /dev/null
@@ -1,9 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtserialport-everywhere-src-5.12.7.tar.xz.sha256
-sha256 224c282ebed750f46b72dfe18260c3d26fbb74e928dec64bd8c51e7beed8721f qtserialport-everywhere-src-5.12.7.tar.xz
-
-# Hashes for license files:
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
-sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
-sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
-sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
-sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt5/qt5serialport/5.6.3/qt5serialport.hash b/package/qt5/qt5serialport/5.6.3/qt5serialport.hash
deleted file mode 100644
index e6f46c1c57..0000000000
--- a/package/qt5/qt5serialport/5.6.3/qt5serialport.hash
+++ /dev/null
@@ -1,10 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialport-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 082d1fee2703aed19f840c4e4031e37c9b929e5bd8ebef2ebac4b28c509bae1a qtserialport-opensource-src-5.6.3.tar.xz
-
-# Hashes for license files:
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 79949ee74297883df6e4e7c4bfe1e75a6e7695376b4a87ffc013e27bda509cb2 LGPL_EXCEPTION.txt
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
-sha256 e1251235ce9853eecfecfa905da9ee29e9b76e4db2a1c9c4a20699f460419b08 LICENSE.FDL
diff --git a/package/qt5/qt5serialport/qt5serialport.hash b/package/qt5/qt5serialport/qt5serialport.hash
index 5316f03b10..43136542d8 100644
--- a/package/qt5/qt5serialport/qt5serialport.hash
+++ b/package/qt5/qt5serialport/qt5serialport.hash
@@ -1,2 +1,9 @@
-# This hash file is not used; instead, update the
-# hash files in the per-version sub-directories.
+# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtserialport-everywhere-src-5.12.7.tar.xz.sha256
+sha256 224c282ebed750f46b72dfe18260c3d26fbb74e928dec64bd8c51e7beed8721f qtserialport-everywhere-src-5.12.7.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
index 5c2abd82da..3f88ebf58e 100644
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -9,14 +9,8 @@ QT5SERIALPORT_SITE = $(QT5_SITE)
QT5SERIALPORT_SOURCE = qtserialport-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SERIALPORT_VERSION).tar.xz
QT5SERIALPORT_DEPENDENCIES = qt5base
QT5SERIALPORT_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
define QT5SERIALPORT_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash
index 5a34479534..d3128a60bc 100644
--- a/package/qt5/qt5svg/qt5svg.hash
+++ b/package/qt5/qt5svg/qt5svg.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtsvg-everywhere-src-5.12.7.tar.xz.sha256
sha256 4bf60916d4e398d9609f1b3a17fc7345a0e13c7c1cc407298df20da4c7c67bb8 qtsvg-everywhere-src-5.12.7.tar.xz
@@ -9,5 +6,3 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.
sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
index cb91844efd..f91c75694e 100644
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -9,14 +9,8 @@ QT5SVG_SITE = $(QT5_SITE)
QT5SVG_SOURCE = qtsvg-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5SVG_VERSION).tar.xz
QT5SVG_DEPENDENCIES = qt5base
QT5SVG_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
-else
-QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
define QT5SVG_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash
index 5fb75d9fa9..d6b2b50932 100644
--- a/package/qt5/qt5tools/qt5tools.hash
+++ b/package/qt5/qt5tools/qt5tools.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qttools-everywhere-src-5.12.7.tar.xz.sha256
sha256 860a97114d518f83c0a9ab3742071da16bb018e6eb387179d5764a8dcca03948 qttools-everywhere-src-5.12.7.tar.xz
@@ -10,7 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 8ab0b8fe7c8e580e8c571b8fa455baf307e9394d4b3ac53ce50d8e960a8934c5 LICENSE.GPLv3
-sha256 66f6bb53f6d985a4d651bf1ecfe8bbcbe32b0f744708d588f047580ee85d8ec8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
-sha256 68afaf3392f8c04218fbf29db43cc0b18bf651c1db086556aa584046de9f3e35 LICENSE.LGPLv3
diff --git a/package/qt5/qt5tools/qt5tools.mk b/package/qt5/qt5tools/qt5tools.mk
index 0d00022998..401b57a211 100644
--- a/package/qt5/qt5tools/qt5tools.mk
+++ b/package/qt5/qt5tools/qt5tools.mk
@@ -19,13 +19,8 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5TOOLS_DEPENDENCIES += qt5declarative
endif
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \
linguist/lconvert linguist/lrelease linguist/lupdate
@@ -35,7 +30,7 @@ QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \
ifeq ($(BR2_PACKAGE_QT5TOOLS_QDOC_TOOL),y)
QT5TOOLS_BUILD_DIRS_y += qdoc
QT5TOOLS_INSTALL_STAGING_DIR_y += qdoc
-QT5TOOLS_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5_VERSION_LATEST),host-clang)
+QT5TOOLS_DEPENDENCIES += host-clang
endif
QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool
diff --git a/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch b/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch
deleted file mode 100644
index 367cc4a1f7..0000000000
--- a/package/qt5/qt5virtualkeyboard/2.0/0001-remove-weird-install-path-for-example.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From aef55eb7b3470ba6dee4abc67acda1d308c90e97 Mon Sep 17 00:00:00 2001
-From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-Date: Mon, 4 Apr 2016 14:25:54 +0200
-Subject: [PATCH 1/1] remove weird install path for example
-
-the deployment system on top should deal with this.
-
-Upstream-Status: Backport [with adaptations]
-Change-Id: I1befb3e0c9bb6546afc59a40e525d1d600475a86
-Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
-[gportay: update basic.pro path]
----
- examples/virtualkeyboard/basic/basic.pro | 8 ++-----
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/examples/virtualkeyboard/basic/basic.pro b/examples/virtualkeyboard/basic/basic.pro
-index 28cc4dc..0f71e0e 100644
---- a/examples/virtualkeyboard/basic/basic.pro
-+++ b/examples/virtualkeyboard/basic/basic.pro
-@@ -7,12 +7,8 @@ static {
- QT += svg
- QTPLUGIN += qtvirtualkeyboardplugin
- }
--android-no-sdk|!isEmpty(CROSS_COMPILE) {
-- TARGETPATH = /data/user/qt/virtualkeyboard/basic
--} else {
-- TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
--}
--target.path = $$TARGETPATH
-+
-+target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
- INSTALLS += target
-
- RESOURCES += \
---
-2.17.1
-
diff --git a/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash
deleted file mode 100644
index 0cc4f9c82e..0000000000
--- a/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtvirtualkeyboard-opensource-src-2.0.tar.xz.mirrorlist
-sha256 1d543a851e83fc3de40f48c2935f70278e842589b9a235c2b22f41733e561aec qtvirtualkeyboard-opensource-src-2.0.tar.xz
-
-# Hashes for license files:
-sha256 6148d2793ca4e62ba3935a27bd3e46971a5d7c871dbe8f2687a867bd2c2589fb src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt
-sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/virtualkeyboard/3rdparty/openwnn/NOTICE
-sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/virtualkeyboard/3rdparty/pinyin/NOTICE
-sha256 ca3dd653e13c4a935622cfce00dc4e2d7a8295b64da99bd1d4f2a8ddb6b0956e src/virtualkeyboard/3rdparty/tcime/COPYING
diff --git a/package/qt5/qt5virtualkeyboard/5.12.7/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/5.12.7/qt5virtualkeyboard.hash
deleted file mode 100644
index 668f971bea..0000000000
--- a/package/qt5/qt5virtualkeyboard/5.12.7/qt5virtualkeyboard.hash
+++ /dev/null
@@ -1,9 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz.sha256
-sha256 aaa52aaff923df22de8472d71843dadb80f3f6fe0312122e64ffe5436db40daa qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz
-
-# Hashes for license files:
-sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
-sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt
-sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE
-sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE
-sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING
diff --git a/package/qt5/qt5virtualkeyboard/Config.in b/package/qt5/qt5virtualkeyboard/Config.in
index 8e9cacd3c8..4cac6fd275 100644
--- a/package/qt5/qt5virtualkeyboard/Config.in
+++ b/package/qt5/qt5virtualkeyboard/Config.in
@@ -1,11 +1,6 @@
-comment "qt5virtualkeyboard needs an OpenGL-capable backend"
- depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
- depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
-
config BR2_PACKAGE_QT5VIRTUALKEYBOARD
bool "qt5virtualkeyboard"
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
- depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick
select BR2_PACKAGE_QT5DECLARATIVE
select BR2_PACKAGE_QT5DECLARATIVE_QUICK
select BR2_PACKAGE_QT5SVG
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
index 5316f03b10..668f971bea 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
@@ -1,2 +1,9 @@
-# This hash file is not used; instead, update the
-# hash files in the per-version sub-directories.
+# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz.sha256
+sha256 aaa52aaff923df22de8472d71843dadb80f3f6fe0312122e64ffe5436db40daa qtvirtualkeyboard-everywhere-src-5.12.7.tar.xz
+
+# Hashes for license files:
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE
+sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
index c13fa699a6..3823b8e017 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -4,21 +4,14 @@
#
################################################################################
-# Module does not follow Qt versionning for 5.6
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION)
-else
-QT5VIRTUALKEYBOARD_VERSION = 2.0
-endif
QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)
QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz
QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg
QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES
QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3
-endif
QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS))
ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
@@ -26,44 +19,26 @@ QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LA
ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/openwnn/NOTICE
-else
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/openwnn/3rdparty/openwnn/NOTICE
endif
-endif
ifneq ($(filter zh_CN all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (pinyin)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
-QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/pinyin/NOTICE
-else
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/pinyin/3rdparty/pinyin/NOTICE
endif
-endif
ifneq ($(filter zh_TW all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (tcime), BSD-3-Clause (tcime)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
-QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/tcime/COPYING
-else
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/tcime/3rdparty/tcime/COPYING
endif
endif
-endif
ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING),y)
QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=handwriting
QT5VIRTUALKEYBOARD_LICENSE += , MIT (lipi-toolkit)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt
-else
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt
endif
-endif
ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION),y)
QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=arrow-key-navigation
@@ -87,17 +62,10 @@ define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
endef
-ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
-define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
- mkdir -p $(TARGET_DIR)/usr/qml/QtQuick/Enterprise
- cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Enterprise/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/Enterprise/
-endef
-else
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML
mkdir -p $(TARGET_DIR)/usr/qml/QtQuick
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick/
endef
-endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES
@@ -105,7 +73,7 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES
endef
endif
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST):$(BR2_STATIC_LIBS),y:)
+ifeq ($(BR2_STATIC_LIBS),)
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib
endef
diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash
index 43ca77a393..1ffa22cadf 100644
--- a/package/qt5/qt5wayland/qt5wayland.hash
+++ b/package/qt5/qt5wayland/qt5wayland.hash
@@ -1,6 +1,3 @@
-# hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwayland-everywhere-src-5.12.7.tar.xz.sha256
sha256 fc1ab8e25461580e37090e4f82422411dee71a3de48a54be1f4b6569e00f66c5 qtwayland-everywhere-src-5.12.7.tar.xz
@@ -10,7 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
index 4790efc660..6ea974f49a 100644
--- a/package/qt5/qt5wayland/qt5wayland.mk
+++ b/package/qt5/qt5wayland/qt5wayland.mk
@@ -18,13 +18,8 @@ ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y)
QT5WAYLAND_DEPENDENCIES += libxkbcommon
endif
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WAYLAND_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5WAYLAND_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5WAYLAND_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5WAYLAND_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y)
QT5WAYLAND_QMAKEFLAGS += CONFIG+=wayland-compositor
@@ -43,16 +38,10 @@ define QT5WAYLAND_INSTALL_STAGING_CMDS
endef
ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
define QT5WAYLAND_INSTALL_COMPOSITOR
cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandCompositor.so* $(TARGET_DIR)/usr/lib
endef
-else
-define QT5WAYLAND_INSTALL_COMPOSITOR
- cp -dpf $(STAGING_DIR)/usr/lib/libQt5Compositor.so* $(TARGET_DIR)/usr/lib
-endef
-endif
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy)
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5WAYLAND_INSTALL_COMPOSITOR_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/QtWayland $(TARGET_DIR)/usr/qml/
endef
@@ -60,17 +49,11 @@ endif
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL),y)
define QT5WAYLAND_INSTALL_TARGET_EXAMPLES
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/
endef
endif
-else
-define QT5WAYLAND_INSTALL_TARGET_EXAMPLES
- cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/wayland $(TARGET_DIR)/usr/lib/qt/examples/
-endef
-endif
endif
define QT5WAYLAND_INSTALL_TARGET_CMDS
diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash
index c863a6ea60..d45f293821 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.hash
+++ b/package/qt5/qt5webchannel/qt5webchannel.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebchannel-everywhere-src-5.12.7.tar.xz.sha256
sha256 b0ae72e5957aa4b281a37d2e169fcf91f92382bc36bd0cf09c80b2bb961bce75 qtwebchannel-everywhere-src-5.12.7.tar.xz
@@ -10,8 +7,3 @@ sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/package/qt5/qt5webchannel/qt5webchannel.mk b/package/qt5/qt5webchannel/qt5webchannel.mk
index 22523036e7..0f1b3bafbf 100644
--- a/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -9,14 +9,9 @@ QT5WEBCHANNEL_SITE = $(QT5_SITE)
QT5WEBCHANNEL_SOURCE = qtwebchannel-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBCHANNEL_VERSION).tar.xz
QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets
QT5WEBCHANNEL_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
+
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5WEBCHANNEL_LICENSE += , BSD-3-Clause (examples)
endif
@@ -37,17 +32,10 @@ define QT5WEBCHANNEL_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
endef
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT
$(INSTALL) -m 0644 -D $(@D)/examples/webchannel/shared/qwebchannel.js \
$(TARGET_DIR)/var/www/qwebchannel.js
endef
-else
-define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT
- $(INSTALL) -m 0644 -D $(@D)/src/webchannel/qwebchannel.js \
- $(TARGET_DIR)/var/www/qwebchannel.js
-endef
-endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5WEBCHANNEL_INSTALL_TARGET_QMLS
diff --git a/package/qt5/qt5webengine/5.12.7/0001-pkg_config-Fixes-when-use_sysroot-false.patch b/package/qt5/qt5webengine/0001-pkg_config-Fixes-when-use_sysroot-false.patch
index a0fdad4da3..a0fdad4da3 100644
--- a/package/qt5/qt5webengine/5.12.7/0001-pkg_config-Fixes-when-use_sysroot-false.patch
+++ b/package/qt5/qt5webengine/0001-pkg_config-Fixes-when-use_sysroot-false.patch
diff --git a/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch b/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch
deleted file mode 100644
index 15cd9f87bb..0000000000
--- a/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fc41c0f572ff347142cca4bf5d82b87782bb5906 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
-Date: Thu, 23 Nov 2017 16:18:06 -0500
-Subject: [PATCH] Change default SSL directory
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Change the default SSL directory, as buildroot ca-cert package is
-installed at /etc/ssl. That way, we don't have to use the SSL_CERT_DIR
-environment at runtime.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
-Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
----
- src/core/qtwebengine_extras.gypi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
-index 229421ef..3b2386c0 100644
---- a/src/core/qtwebengine_extras.gypi
-+++ b/src/core/qtwebengine_extras.gypi
-@@ -96,7 +96,7 @@
- 'GL_GLEXT_PROTOTYPES',
- 'EGL_EGLEXT_PROTOTYPES',
- # At runtime the env variable SSL_CERT_DIR can be used to override this
-- 'OPENSSLDIR="/usr/lib/ssl"',
-+ 'OPENSSLDIR="/etc/ssl"',
- 'OPENSSL_LOAD_CONF',
- 'EGL_API_FB=1',
- 'LINUX=1',
---
-2.15.0
-
diff --git a/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch b/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch
deleted file mode 100644
index 05ed2956d2..0000000000
--- a/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From bdfd084296681bcead17c42f1e5cf0e24ee04f65 Mon Sep 17 00:00:00 2001
-From: Viktor Engelmann <viktor.engelmann@qt.io>
-Date: Fri, 7 Jul 2017 12:56:19 +0200
-Subject: [PATCH] Load libEGL and libGLES2 symbols implicitly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Instead of explicitly loading libraries from hard-coded locations,
-we now just call dlopen(NULL, RTLD_LAZY). This returns a handle to
-the host process'es context, which already contains the symbols of
-both these libraries, because we link against them.
-It was necessary to bypass LoadLibrary, because that expects a non-NULL
-file path, so we couldn't pass NULL through that interface.
-
-Upstream-Status: Merged
-Task-number: QTBUG-57761
-Change-Id: I29f037dfe542222b5188a33c7727c81a464a87bb
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
-[gportay: backport from 5.9 and merge conflicts]
----
- src/core/surface_factory_qt.cpp | 40 ++++++++--------------------------------
- 1 file changed, 8 insertions(+), 32 deletions(-)
-
-diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp
-index 48c91bfc..c6059b67 100644
---- a/src/core/surface_factory_qt.cpp
-+++ b/src/core/surface_factory_qt.cpp
-@@ -51,51 +51,27 @@
- #if defined(USE_OZONE)
-
- #include <EGL/egl.h>
--
--#ifndef QT_LIBDIR_EGL
--#define QT_LIBDIR_EGL "/usr/lib"
--#endif
--#ifndef QT_LIBDIR_GLES2
--#define QT_LIBDIR_GLES2 QT_LIBDIR_EGL
--#endif
-+#include <dlfcn.h>
-
- namespace QtWebEngineCore {
-
--base::NativeLibrary LoadLibrary(const base::FilePath& filename) {
-- base::NativeLibraryLoadError error;
-- base::NativeLibrary library = base::LoadNativeLibrary(filename, &error);
-- if (!library) {
-- LOG(ERROR) << "Failed to load " << filename.MaybeAsASCII() << ": " << error.ToString();
-- return NULL;
-- }
-- return library;
--}
--
- bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address)
- {
-- base::FilePath libEGLPath = QtWebEngineCore::toFilePath(QT_LIBDIR_EGL);
-- libEGLPath = libEGLPath.Append("libEGL.so.1");
-- base::NativeLibrary eglLibrary = LoadLibrary(libEGLPath);
-- if (!eglLibrary)
-- return false;
--
-- base::FilePath libGLES2Path = QtWebEngineCore::toFilePath(QT_LIBDIR_GLES2);
-- libGLES2Path = libGLES2Path.Append("libGLESv2.so.2");
-- base::NativeLibrary gles2Library = LoadLibrary(libGLES2Path);
-- if (!gles2Library)
-+ base::NativeLibrary eglgles2Library = dlopen(NULL, RTLD_LAZY);
-+ if (!eglgles2Library) {
-+ LOG(ERROR) << "Failed to open EGL/GLES2 context " << dlerror();
- return false;
-+ }
-
-- gfx::GLGetProcAddressProc get_proc_address = reinterpret_cast<gfx::GLGetProcAddressProc>(base::GetFunctionPointerFromNativeLibrary(eglLibrary, "eglGetProcAddress"));
-+ gfx::GLGetProcAddressProc get_proc_address = reinterpret_cast<gfx::GLGetProcAddressProc>(base::GetFunctionPointerFromNativeLibrary(eglgles2Library, "eglGetProcAddress"));
- if (!get_proc_address) {
- LOG(ERROR) << "eglGetProcAddress not found.";
-- base::UnloadNativeLibrary(eglLibrary);
-- base::UnloadNativeLibrary(gles2Library);
-+ base::UnloadNativeLibrary(eglgles2Library);
- return false;
- }
-
- gfx::SetGLGetProcAddressProc(get_proc_address);
-- gfx::AddGLNativeLibrary(eglLibrary);
-- gfx::AddGLNativeLibrary(gles2Library);
-+ gfx::AddGLNativeLibrary(eglgles2Library);
- return true;
- }
-
---
-2.15.0
-
diff --git a/package/qt5/qt5webengine/5.6.3/qt5webengine.hash b/package/qt5/qt5webengine/5.6.3/qt5webengine.hash
deleted file mode 100644
index f062ae1633..0000000000
--- a/package/qt5/qt5webengine/5.6.3/qt5webengine.hash
+++ /dev/null
@@ -1,258 +0,0 @@
-# Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz
-
-# Locally calculated
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
-sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
-sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3
-
-# Locally calculated with:
-# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done | sort --key=3
-sha256 d04360743ae3338bb08ab2106b51e24309e3ca4b1c6b1186139531ade351b7e3 src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE
-sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE
-sha256 4074881f47972aedda83940935bb1d03fa74a56f94445945ce80fe952eed6834 src/3rdparty/chromium/base/third_party/icu/LICENSE
-sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE
-sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE
-sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE
-sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE
-sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE
-sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE
-sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE
-sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE
-sha256 5a12a0c01bfcdbc90b550c9cd8bfc3e90e6be9c9bbfdb58bfb5daaf6817eb78f src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE
-sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE
-sha256 dd6019aa7edc5b25a220306cd480da21c206964f86b30d08b8db8e4659b65c58 src/3rdparty/chromium/crypto/third_party/nss/LICENSE
-sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE
-sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os
-sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE
-sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE
-sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE
-sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE
-sha256 891970cf216f708de2bfd77184b3e32d5cdba8dc4c3a75e60628c0375f5657e4 src/3rdparty/chromium/sdch/open-vcdiff/COPYING
-sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/testing/gmock/LICENSE
-sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE
-sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/testing/gtest/LICENSE
-sha256 77af9c9fc2710ee66b8282291a9392a9a61f1d5b3ad6e478d0b6c544de5f9aca src/3rdparty/chromium/third_party/angle/LICENSE
-sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE
-sha256 d8a0f4dab052ff6f56e9d6fa68efb66de8ff3956a805110930f8ee297376047f src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE
-sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE
-sha256 fddff1da5115ebb2f735b31fd17bac3166bf0c67d941287dfd490a111bca1c52 src/3rdparty/chromium/third_party/appurify-python/LICENSE
-sha256 f53f4201f4bd4b7a07b5e5830d89d75219211fa76214b761bcb181e5c95a56ce src/3rdparty/chromium/third_party/bintrees/LICENSE.txt
-sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE
-sha256 def7352915ac84bea5e2ed16f6fff712d35de519799777bf927e2a567ab53b7e src/3rdparty/chromium/third_party/boringssl/src/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/brotli/LICENSE
-sha256 0af2a39b2cb31f540a1178f176367761751454779431be92a73a62f87df91440 src/3rdparty/chromium/third_party/bspatch/LICENSE
-sha256 d415cefbadc3a8083475e30d8690a1103a2601226f725abf43a263c516345190 src/3rdparty/chromium/third_party/cardboard-java/LICENSE
-sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE
-sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20
-sha256 0acbdae3346bc7593c57471aaf47fb45326a26b3c29cfbbf8ce729d99a7e458a src/3rdparty/chromium/third_party/class-dump/LICENSE
-sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/cld/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE
-sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/third_party/closure_linter/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE
-sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE
-sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE
-sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE
-sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE
-sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE
-sha256 10054db83ace18e5a455749d0d247857ec50508cecda79a5abe66fe4778d7721 src/3rdparty/chromium/third_party/d3/src/LICENSE
-sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE
-sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING
-sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE
-sha256 8545f6c8d9497acf953ca93b9264032616e6430eb536e21142a381455c8085df src/3rdparty/chromium/third_party/drmemory/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/errorprone/LICENSE
-sha256 e2fa3a3e38af6d7d0cb374883a89b3507fe3b053faef16485f37ff3c9d93a5d2 src/3rdparty/chromium/third_party/expat/files/COPYING
-sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt
-sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt
-sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt
-sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2
-sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3
-sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1
-sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3
-sha256 cb77a08f3ee3deb5240a8b3d197436710621ee87f4f0fed03947f825e082fb28 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md
-sha256 5d0c892ea452c3828f1e311637cde4e3a04eb6431554308b3fcdac8c1b330168 src/3rdparty/chromium/third_party/fips181/COPYING
-sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL
-sha256 0b1975de0a048180c5ea7179be1a3e751e05f79d225ac4be6481141970527e69 src/3rdparty/chromium/third_party/flac/COPYING.GPL
-sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL
-sha256 eafd0d3fac93964d4274a2f99be928d41c167a925a9ddb8621ab9aee065f8fee src/3rdparty/chromium/third_party/flac/COPYING.Xiph
-sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c src/3rdparty/chromium/third_party/flot/LICENSE.txt
-sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE
-sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING
-sha256 246491bb21ec320b0396d218339305d8b7073c7cb94fa5adb77ebb9c84a87a0b src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT
-sha256 32ce83e370dc31db74f20d8bb0febbb5f61b099f0e0212587e81fdc11ae7fcbc src/3rdparty/chromium/third_party/gardiner_mod/LICENSE
-sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE
-sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING
-sha256 1e33ef99129bb6e84b6bb84e8c9edb4c6dba9f876bc16bc143cb9a136627cdeb src/3rdparty/chromium/third_party/hunspell/COPYING
-sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL
-sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL
-sha256 93720ce4be6cca7dbfdd55f9cc9e1614865a4578b474612713fdbe06c3d34002 src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell
-sha256 dcda061adeed22b26f276c01ec374f930789ae0d684e5aa8f8be309dd680ff20 src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell
-sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/hwcplus/LICENSE
-sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE
-sha256 28d1d994f6f85ce2f605e214609a3a7925278039aa7a870b5cd089ef95b82445 src/3rdparty/chromium/third_party/iccjpeg/LICENSE
-sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu/LICENSE
-sha256 7d149647f825d89af1268d9a53ebb414af1354a1815e26f8e44ef99820ba21db src/3rdparty/chromium/third_party/icu/license.html
-sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE
-sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE
-sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE
-sha256 923e74e5ae41345038da0a56dfdc983356917fbbb139176e654d1b33100b723f src/3rdparty/chromium/third_party/jmake/LICENSE
-sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING
-sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE
-sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/lcov/COPYING
-sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE
-sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 src/3rdparty/chromium/third_party/libexif/sources/COPYING
-sha256 0382f4433a2b1b0b5c0af8cc769de0c7302c1b663ea569e67c0b5452e374e142 src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING
-sha256 dea8cf0d3604b861d3a89dd1d193b02404414957b6ee7ab6ebeacf47daece976 src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY
-sha256 19af539b1ec692ea9ccf71b6ea97d602bcf7187eab27b0ea806aea1cd10b0b13 src/3rdparty/chromium/third_party/libjpeg/LICENSE
-sha256 0570fc4ebfee96ed20720ed8f2cd5b928930bdd7340dfdfa96bb00e8c4f89677 src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt
-sha256 5fe714f37f27dcc5d59dee2601ac3e7fe1cf2e497e5fcdba00ddb9b1297f61cb src/3rdparty/chromium/third_party/libpng/LICENSE
-sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE
-sha256 8defed37d52096ae14b60adc499c33d43975109bc265552ee67e9a888c634b93 src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE
-sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE
-sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING
-sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de src/3rdparty/chromium/third_party/libva/COPYING
-sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE
-sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE
-sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT
-sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE
-sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT
-sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE
-sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright
-sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE
-sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/Copyright
-sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE
-sha256 d62df95ee2ada2637151bc125cadbe2703ef07ed5d9cbe163eaa53bda3949af4 src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY
-sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE
-sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE
-sha256 7973776647df23457a9910075547e3f345fbc5e0e41147b4586d714582dfdd76 src/3rdparty/chromium/third_party/mach_override/LICENSE
-sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE
-sha256 c93465d6a75e6ade8785edb4ec125ece083ab0910ed0417b4ff346792ba0f851 src/3rdparty/chromium/third_party/mesa/LICENSE
-sha256 e8800bd573e8f844a5b87cf43cc4d55767314b4e95a6092cf26ce9c6ed00b877 src/3rdparty/chromium/third_party/mesa/src/docs/COPYING
-sha256 1efd6dec259877be94db3dbd005c93a5c94a73a492bd85eede6e14885e480e0e src/3rdparty/chromium/third_party/mesa/src/docs/license.html
-sha256 704179825bb7c4600acbff3d1fcd95f1eb61b2c4a11b66bb150d7cefea8f6371 src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT
-sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE
-sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/mocha/LICENSE
-sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE
-sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE
-sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/mojo/LICENSE
-sha256 5f593432ef4e7ecefa6326042babb8a03d8d6ce502b4f0b78b105e18d19f8052 src/3rdparty/chromium/third_party/molokocacao/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE
-sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE
-sha256 c69a473064e2246a3123066eaec702b454422b2701934187f0e433f773c57305 src/3rdparty/chromium/third_party/mt19937ar/LICENSE
-sha256 7c7f6dc97beb9eac776c285bee22a58b83aba1d26e1d4e949e509717b5124540 src/3rdparty/chromium/third_party/npapi/LICENSE
-sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 src/3rdparty/chromium/third_party/nss/nspr/LICENSE
-sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/third_party/nss/nss/COPYING
-sha256 74ab31565472f8347d36849b6b330e5f741f6e2dff5d9147b93ba0a900a4a577 src/3rdparty/chromium/third_party/ocmock/License.txt
-sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE
-sha256 1599cc232dbd003e6691c7f4e360f2068f84ebaef6510a26ab919c3a7fec27fd src/3rdparty/chromium/third_party/openmax_dl/LICENSE
-sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING
-sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt
-sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d src/3rdparty/chromium/third_party/ots/LICENSE
-sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE
-sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE
-sha256 685b3b09870f1361f8db2d3f37acdb765d5da1722a18b182765da4b79a8f63ff src/3rdparty/chromium/third_party/ply/license.patch
-sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt
-sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE
-sha256 31c7505c31a1ea8557a5362cd69946dc9f5ee80fac8fa1d1b1531c08530497b0 src/3rdparty/chromium/third_party/protobuf/COPYING.txt
-sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE
-sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE
-sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE
-sha256 e88ae39d2e7c9ae8f5470bb23fdd7ce55fe58aca06f3d4399182f5bb0ffcf1dd src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE
-sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt
-sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 src/3rdparty/chromium/third_party/python_gflags/COPYING
-sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md
-sha256 9b17bd282aac6d5729c700c823ddaaa6fa0e048d88e321f46252646f28791752 src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE
-sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE
-sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING
-sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE
-sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE
-sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE
-sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE
-sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE
-sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt
-sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt
-sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt
-sha256 1af74cc402d50be09edd134ed5c31ade063fc0e7546670bc23ceeecc0004c142 src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE
-sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/COPYING.txt
-sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt
-sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/sfntly/src/java/COPYING
-sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt
-sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE
-sha256 1f04103e3a61b91343b3f9d2ed2cc8543062917e2cc7d52a739ffe6429ccaf61 src/3rdparty/chromium/third_party/skia/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE
-sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE
-sha256 99750e3fa5e132e1b93a56538ab9c585f8fc62b9e11ab62adec0cd3803315c70 src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE
-sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE
-sha256 5221a36a801b981fbdfda7b87db64cff231a3b88223a066c325411b539df796f src/3rdparty/chromium/third_party/snappy/src/COPYING
-sha256 bd2368428b63facfc9586d4be1bd6efb6abce76a9339ba058dd9f399f3efb3b4 src/3rdparty/chromium/third_party/speech-dispatcher/COPYING
-sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE
-sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms
-sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms
-sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE
-sha256 0cd682f22d04b97de1a6ce05c27c4ae5fddec1e330babc46f5f4f6c586c19f17 src/3rdparty/chromium/third_party/swiftshader/LICENSE
-sha256 0eff14f27fd948e2382ef5751b9b6ed596fc59369260510bd9230d08f9404f3e src/3rdparty/chromium/third_party/talloc/LICENSE
-sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE
-sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING
-sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE
-sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a src/3rdparty/chromium/third_party/typ/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE
-sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE
-sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE
-sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md
-sha256 650cb519e09f781bf4fbd65fa6fc64449ea0d86d62d95172acdf5da74ca0eaf6 src/3rdparty/chromium/third_party/v4l2capture/LICENSE
-sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l
-sha256 778a9c936b9fa24f3842b6071e3cc5c794d3f7cc6d6fddbf356b6f2202afb6a0 src/3rdparty/chromium/third_party/wayland/LICENSE
-sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 src/3rdparty/chromium/third_party/wayland-protocols/LICENSE
-sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING
-sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 src/3rdparty/chromium/third_party/wayland/src/COPYING
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING
-sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING
-sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE
-sha256 7de3660b411bdcb1c690c0e0a907ed94626792a1b5139f1cedd3d919b968ecc8 src/3rdparty/chromium/third_party/WebKit/LICENSE
-sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS
-sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE
-sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2
-sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1
-sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE
-sha256 c7bae4ff453a099c61e5906014d3644319181834a47db839696dca0a85a76378 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE
-sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python
-sha256 c7bae4ff453a099c61e5906014d3644319181834a47db839696dca0a85a76378 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING
-sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING
-sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE
-sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING
-sha256 32b824d99c7e31f7035b6a9b39eac8e8205bfc54cf8573cfe830a367a8735161 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE
-sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE
-sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/webpagereplay/COPYING
-sha256 ac611349a262c2ceab06cd7c4fa104b794986486d3898c4d234a0fbc49e9bf07 src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING
-sha256 b3055a036e3bc37a1b9ff2b8316723d06df3997273aa9cb79223a85a48ad6dee src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE
-sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE
-sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md
-sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE
-sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE
-sha256 2feb814384635271a0a43dec65955439a8b659ddf0a5adae5b5333264dc6518a src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY
-sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/chromium/third_party/webtreemap/src/COPYING
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE
-sha256 1df4adc57d45b1639d3edb2127ee9e33e54b5a4b0809e9dc83ddaff5a62d9ae1 src/3rdparty/chromium/third_party/x86inc/LICENSE
-sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE
-sha256 9dc0f229412e40d7f1fc4d94de07fcc812a6f31e27718b4dae315305408160fa src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING
-sha256 282644c64aa8c4f0a4a589fd38d2213e41f37b4e0e4f639e01149d09b67117db src/3rdparty/chromium/third_party/zlib/LICENSE
-sha256 70eb89e4cb460d1b27173348c9f9fca5cf67c09d722ddaa07c5d0fcd6262a97e src/3rdparty/chromium/tools/gyp/LICENSE
-sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt
-sha256 2337a9caeb13854242af8d0022f8e57389e5eae56fa3bf7887f5f38492b57199 src/3rdparty/chromium/v8/LICENSE
-sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk
-sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8
-sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind
-sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE
-sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE
-sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE
-sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING
diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
index 0e776ecb61..a05205c7ad 100644
--- a/package/qt5/qt5webengine/Config.in
+++ b/package/qt5/qt5webengine/Config.in
@@ -37,7 +37,7 @@ config BR2_PACKAGE_QT5WEBENGINE
select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 # v8/chromium
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_LIBNSS if !BR2_PACKAGE_QT5_VERSION_5_6
+ select BR2_PACKAGE_LIBNSS
select BR2_PACKAGE_LIBVPX
select BR2_PACKAGE_OPUS
select BR2_PACKAGE_WEBP
diff --git a/package/qt5/qt5webengine/chromium-lts.inc b/package/qt5/qt5webengine/chromium-lts.inc
deleted file mode 100644
index fbc1f9b639..0000000000
--- a/package/qt5/qt5webengine/chromium-lts.inc
+++ /dev/null
@@ -1,253 +0,0 @@
-# Generated with:
-# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \
-# find src/3rdparty/ -type f \
-# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \)\
-# -a -not -name '*.cc' -not -name '*.py' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \
-# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-lts.inc
-QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \
- src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \
- src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \
- src/3rdparty/chromium/base/third_party/icu/LICENSE \
- src/3rdparty/chromium/base/third_party/libevent/LICENSE \
- src/3rdparty/chromium/base/third_party/nspr/LICENSE \
- src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \
- src/3rdparty/chromium/base/third_party/symbolize/LICENSE \
- src/3rdparty/chromium/base/third_party/valgrind/LICENSE \
- src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \
- src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \
- src/3rdparty/chromium/buildtools/LICENSE \
- src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \
- src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \
- src/3rdparty/chromium/crypto/third_party/nss/LICENSE \
- src/3rdparty/chromium/LICENSE \
- src/3rdparty/chromium/LICENSE.chromium_os \
- src/3rdparty/chromium/mojo/public/LICENSE \
- src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \
- src/3rdparty/chromium/net/third_party/nss/LICENSE \
- src/3rdparty/chromium/ppapi/LICENSE \
- src/3rdparty/chromium/sdch/open-vcdiff/COPYING \
- src/3rdparty/chromium/testing/gmock/LICENSE \
- src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE \
- src/3rdparty/chromium/testing/gtest/LICENSE \
- src/3rdparty/chromium/third_party/angle/LICENSE \
- src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \
- src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE \
- src/3rdparty/chromium/third_party/apple_apsl/LICENSE \
- src/3rdparty/chromium/third_party/appurify-python/LICENSE \
- src/3rdparty/chromium/third_party/bintrees/LICENSE.txt \
- src/3rdparty/chromium/third_party/blanketjs/LICENSE \
- src/3rdparty/chromium/third_party/boringssl/src/LICENSE \
- src/3rdparty/chromium/third_party/brotli/LICENSE \
- src/3rdparty/chromium/third_party/bspatch/LICENSE \
- src/3rdparty/chromium/third_party/cardboard-java/LICENSE \
- src/3rdparty/chromium/third_party/chaijs/LICENSE \
- src/3rdparty/chromium/third_party/checkstyle/LICENSE \
- src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \
- src/3rdparty/chromium/third_party/class-dump/LICENSE \
- src/3rdparty/chromium/third_party/cld/LICENSE \
- src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \
- src/3rdparty/chromium/third_party/closure_compiler/LICENSE \
- src/3rdparty/chromium/third_party/closure_linter/LICENSE \
- src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \
- src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE \
- src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \
- src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \
- src/3rdparty/chromium/third_party/cros_system_api/LICENSE \
- src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \
- src/3rdparty/chromium/third_party/d3/src/LICENSE \
- src/3rdparty/chromium/third_party/decklink/LICENSE \
- src/3rdparty/chromium/third_party/devscripts/COPYING \
- src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \
- src/3rdparty/chromium/third_party/drmemory/LICENSE \
- src/3rdparty/chromium/third_party/errorprone/LICENSE \
- src/3rdparty/chromium/third_party/expat/files/COPYING \
- src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \
- src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \
- src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \
- src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \
- src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \
- src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \
- src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \
- src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \
- src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \
- src/3rdparty/chromium/third_party/fips181/COPYING \
- src/3rdparty/chromium/third_party/flac/COPYING.FDL \
- src/3rdparty/chromium/third_party/flac/COPYING.GPL \
- src/3rdparty/chromium/third_party/flac/COPYING.LGPL \
- src/3rdparty/chromium/third_party/flac/COPYING.Xiph \
- src/3rdparty/chromium/third_party/flot/LICENSE.txt \
- src/3rdparty/chromium/third_party/fontconfig/LICENSE \
- src/3rdparty/chromium/third_party/fontconfig/src/COPYING \
- src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT \
- src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \
- src/3rdparty/chromium/third_party/gif_player/LICENSE \
- src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \
- src/3rdparty/chromium/third_party/hunspell/COPYING \
- src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL \
- src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \
- src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell \
- src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell \
- src/3rdparty/chromium/third_party/hwcplus/LICENSE \
- src/3rdparty/chromium/third_party/iaccessible2/LICENSE \
- src/3rdparty/chromium/third_party/iccjpeg/LICENSE \
- src/3rdparty/chromium/third_party/icu/LICENSE \
- src/3rdparty/chromium/third_party/icu/license.html \
- src/3rdparty/chromium/third_party/ijar/LICENSE \
- src/3rdparty/chromium/third_party/isimpledom/LICENSE \
- src/3rdparty/chromium/third_party/jinja2/LICENSE \
- src/3rdparty/chromium/third_party/jmake/LICENSE \
- src/3rdparty/chromium/third_party/jsoncpp/LICENSE \
- src/3rdparty/chromium/third_party/jstemplate/COPYING \
- src/3rdparty/chromium/third_party/khronos/LICENSE \
- src/3rdparty/chromium/third_party/lcov/COPYING \
- src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \
- src/3rdparty/chromium/third_party/libexif/sources/COPYING \
- src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING \
- src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY \
- src/3rdparty/chromium/third_party/libjpeg/LICENSE \
- src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt \
- src/3rdparty/chromium/third_party/libpng/LICENSE \
- src/3rdparty/chromium/third_party/libsecret/LICENSE \
- src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE \
- src/3rdparty/chromium/third_party/libudev/LICENSE \
- src/3rdparty/chromium/third_party/libusb/src/COPYING \
- src/3rdparty/chromium/third_party/libva/COPYING \
- src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE \
- src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE \
- src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT \
- src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE \
- src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \
- src/3rdparty/chromium/third_party/libwebp/LICENSE \
- src/3rdparty/chromium/third_party/libxml/src/Copyright \
- src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \
- src/3rdparty/chromium/third_party/libxslt/Copyright \
- src/3rdparty/chromium/third_party/libyuv/LICENSE \
- src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \
- src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE \
- src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \
- src/3rdparty/chromium/third_party/mach_override/LICENSE \
- src/3rdparty/chromium/third_party/markupsafe/LICENSE \
- src/3rdparty/chromium/third_party/mesa/LICENSE \
- src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \
- src/3rdparty/chromium/third_party/mesa/src/docs/license.html \
- src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \
- src/3rdparty/chromium/third_party/minigbm/LICENSE \
- src/3rdparty/chromium/third_party/mocha/LICENSE \
- src/3rdparty/chromium/third_party/mockito/LICENSE \
- src/3rdparty/chromium/third_party/modp_b64/LICENSE \
- src/3rdparty/chromium/third_party/mojo/LICENSE \
- src/3rdparty/chromium/third_party/molokocacao/LICENSE \
- src/3rdparty/chromium/third_party/motemplate/LICENSE \
- src/3rdparty/chromium/third_party/mozilla/LICENSE \
- src/3rdparty/chromium/third_party/mt19937ar/LICENSE \
- src/3rdparty/chromium/third_party/npapi/LICENSE \
- src/3rdparty/chromium/third_party/nss/nspr/LICENSE \
- src/3rdparty/chromium/third_party/nss/nss/COPYING \
- src/3rdparty/chromium/third_party/ocmock/License.txt \
- src/3rdparty/chromium/third_party/openh264/src/LICENSE \
- src/3rdparty/chromium/third_party/openmax_dl/LICENSE \
- src/3rdparty/chromium/third_party/opus/src/COPYING \
- src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \
- src/3rdparty/chromium/third_party/ots/LICENSE \
- src/3rdparty/chromium/third_party/pexpect/LICENSE \
- src/3rdparty/chromium/third_party/ply/LICENSE \
- src/3rdparty/chromium/third_party/ply/license.patch \
- src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \
- src/3rdparty/chromium/third_party/proguard/LICENSE \
- src/3rdparty/chromium/third_party/protobuf/COPYING.txt \
- src/3rdparty/chromium/third_party/pycoverage/LICENSE \
- src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \
- src/3rdparty/chromium/third_party/pyelftools/LICENSE \
- src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \
- src/3rdparty/chromium/third_party/pymock/LICENSE.txt \
- src/3rdparty/chromium/third_party/python_gflags/COPYING \
- src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \
- src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE \
- src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \
- src/3rdparty/chromium/third_party/qcms/src/COPYING \
- src/3rdparty/chromium/third_party/qunit/LICENSE \
- src/3rdparty/chromium/third_party/re2/LICENSE \
- src/3rdparty/chromium/third_party/re2/src/LICENSE \
- src/3rdparty/chromium/third_party/requests/LICENSE \
- src/3rdparty/chromium/third_party/robolectric/LICENSE \
- src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \
- src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \
- src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \
- src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE \
- src/3rdparty/chromium/third_party/sfntly/COPYING.txt \
- src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \
- src/3rdparty/chromium/third_party/sfntly/src/java/COPYING \
- src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \
- src/3rdparty/chromium/third_party/sinonjs/LICENSE \
- src/3rdparty/chromium/third_party/skia/LICENSE \
- src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE \
- src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \
- src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE \
- src/3rdparty/chromium/third_party/smhasher/LICENSE \
- src/3rdparty/chromium/third_party/snappy/src/COPYING \
- src/3rdparty/chromium/third_party/speech-dispatcher/COPYING \
- src/3rdparty/chromium/third_party/sqlite/LICENSE \
- src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms \
- src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \
- src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \
- src/3rdparty/chromium/third_party/swiftshader/LICENSE \
- src/3rdparty/chromium/third_party/talloc/LICENSE \
- src/3rdparty/chromium/third_party/tcmalloc/LICENSE \
- src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \
- src/3rdparty/chromium/third_party/tlslite/LICENSE \
- src/3rdparty/chromium/third_party/typ/LICENSE \
- src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \
- src/3rdparty/chromium/third_party/usb_ids/LICENSE \
- src/3rdparty/chromium/third_party/usrsctp/LICENSE \
- src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \
- src/3rdparty/chromium/third_party/v4l2capture/LICENSE \
- src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \
- src/3rdparty/chromium/third_party/wayland/LICENSE \
- src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \
- src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \
- src/3rdparty/chromium/third_party/wayland/src/COPYING \
- src/3rdparty/chromium/third_party/web-animations-js/LICENSE \
- src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \
- src/3rdparty/chromium/third_party/webdriver/COPYING \
- src/3rdparty/chromium/third_party/webdriver/LICENSE \
- src/3rdparty/chromium/third_party/WebKit/LICENSE \
- src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \
- src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \
- src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \
- src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \
- src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE \
- src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \
- src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \
- src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \
- src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \
- src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING \
- src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE \
- src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \
- src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE \
- src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE \
- src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \
- src/3rdparty/chromium/third_party/webpagereplay/COPYING \
- src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE \
- src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING \
- src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE \
- src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \
- src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \
- src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE \
- src/3rdparty/chromium/third_party/webrtc/LICENSE \
- src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \
- src/3rdparty/chromium/third_party/webtreemap/src/COPYING \
- src/3rdparty/chromium/third_party/woff2/LICENSE \
- src/3rdparty/chromium/third_party/x86inc/LICENSE \
- src/3rdparty/chromium/third_party/xdg-utils/LICENSE \
- src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \
- src/3rdparty/chromium/third_party/zlib/LICENSE \
- src/3rdparty/chromium/tools/gyp/LICENSE \
- src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \
- src/3rdparty/chromium/v8/LICENSE \
- src/3rdparty/chromium/v8/LICENSE.strongtalk \
- src/3rdparty/chromium/v8/LICENSE.v8 \
- src/3rdparty/chromium/v8/LICENSE.valgrind \
- src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE \
- src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \
- src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \
- src/3rdparty/ninja/COPYING
diff --git a/package/qt5/qt5webengine/5.12.7/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash
index 8308ef4920..8308ef4920 100644
--- a/package/qt5/qt5webengine/5.12.7/qt5webengine.hash
+++ b/package/qt5/qt5webengine/qt5webengine.hash
diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
index 898725937b..34573e2042 100644
--- a/package/qt5/qt5webengine/qt5webengine.mk
+++ b/package/qt5/qt5webengine/qt5webengine.mk
@@ -12,11 +12,8 @@ QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx opus webp qt5base \
host-pkgconf host-python
QT5WEBENGINE_INSTALL_STAGING = YES
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
include package/qt5/qt5webengine/chromium-latest.inc
-else
-include package/qt5/qt5webengine/chromium-lts.inc
-endif
+
QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception
QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \
LICENSE.GPLv3 LICENSE.LGPL3 $(QT5WEBENGINE_CHROMIUM_LICENSE_FILES)
@@ -26,9 +23,7 @@ QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \
xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst
endif
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss
-endif
QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_system_ffmpeg
@@ -54,14 +49,12 @@ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config
chmod +x $(@D)/host-bin/host-pkg-config
endef
QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
QT5WEBENGINE_ENV += GN_PKG_CONFIG_HOST=$(@D)/host-bin/host-pkg-config
-endif
define QT5WEBENGINE_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBENGINE_QMAKEFLAGS))
diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash
index 0d48ecdffa..736dbef5e9 100644
--- a/package/qt5/qt5webkit-examples/qt5webkit-examples.hash
+++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-examples-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 2d6ce7146298d03b443cca4390bbfee17c4c0b08a31efcbf9fe0732291a6169e qtwebkit-examples-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist
sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz
diff --git a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
index 94153fd652..6dab61d913 100644
--- a/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
+++ b/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
@@ -4,15 +4,8 @@
#
################################################################################
-# no 5.10 package available, fall back to 5.9.1 version
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WEBKIT_EXAMPLES_VERSION = 5.9.1
QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules
-else
-QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION)
-QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/community_releases/5.6/$(QT5_VERSION)
-endif
-
QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5base qt5webkit
diff --git a/package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
index 669c7e6aa2..669c7e6aa2 100644
--- a/package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+++ b/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
diff --git a/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
index a2597a54bb..a2597a54bb 100644
--- a/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
+++ b/package/qt5/qt5webkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
diff --git a/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch
index 9c2205dd94..9c2205dd94 100644
--- a/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch
+++ b/package/qt5/qt5webkit/0003-Detect-32-bits-armv8-a-architecture.patch
diff --git a/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch b/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch
index 92aab57111..92aab57111 100644
--- a/package/qt5/qt5webkit/5.9.1/0004-Fix-installation-of-class-headers.patch
+++ b/package/qt5/qt5webkit/0004-Fix-installation-of-class-headers.patch
diff --git a/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch b/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch
index 1a99eb7f84..1a99eb7f84 100644
--- a/package/qt5/qt5webkit/5.9.1/0005-Fix-ICU-related-compile-failures.patch
+++ b/package/qt5/qt5webkit/0005-Fix-ICU-related-compile-failures.patch
diff --git a/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch b/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch
deleted file mode 100644
index 14352a160c..0000000000
--- a/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From ae16ce17cc7060274a0b0c165b953fc32540f977 Mon Sep 17 00:00:00 2001
-From: Magnus Granberg <zorry@gentoo.org>
-Date: Fri, 27 Feb 2015 11:55:09 +0100
-Subject: [PATCH] Remove TEXTREL tag in x86
-
-Fix textrel QA warnings when building qtwebkit for x86:
-
- WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel]
-
-Patch from upstream webkit:
-
- https://bugs.webkit.org/show_bug.cgi?id=70610
-
-Minor refresh required to apply cleanly to the older webkit sources used
-by qtwebkit. Specifically, the patch needed to be modified to account
-for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not
-part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ).
-
-Upstream status [webkit] : backport
-Upstream status [qtwebkit] : unclear
-
-Bug: https://bugs.webkit.org/show_bug.cgi?id=70610
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-Downloaded from:
-https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/
-0002-Remove-TEXTREL-tag-in-x86.patch
-
-Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
----
- Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++
- Source/WTF/wtf/InlineASM.h | 2 ++
- 2 files changed, 26 insertions(+)
-
-diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
-index 9684df2..8af82d8 100644
---- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp
-+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
-@@ -524,6 +524,30 @@ double jsRound(double d)
- } \
- static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
-
-+#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__)
-+#define defineUnaryDoubleOpWrapper(function) \
-+ asm( \
-+ ".text\n" \
-+ ".globl " SYMBOL_STRING(function##Thunk) "\n" \
-+ HIDE_SYMBOL(function##Thunk) "\n" \
-+ SYMBOL_STRING(function##Thunk) ":" "\n" \
-+ "pushl %ebx\n" \
-+ "subl $20, %esp\n" \
-+ "movsd %xmm0, (%esp) \n" \
-+ "call __x86.get_pc_thunk.bx\n" \
-+ "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \
-+ "call " GLOBAL_REFERENCE(function) "\n" \
-+ "fstpl (%esp) \n" \
-+ "movsd (%esp), %xmm0 \n" \
-+ "addl $20, %esp\n" \
-+ "popl %ebx\n" \
-+ "ret\n" \
-+ );\
-+ extern "C" { \
-+ MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \
-+ } \
-+ static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
-+
- #elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX))
- #define defineUnaryDoubleOpWrapper(function) \
- asm( \
-diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h
-index 0a2fe78..2dc40ef 100644
---- a/Source/WTF/wtf/InlineASM.h
-+++ b/Source/WTF/wtf/InlineASM.h
-@@ -46,6 +46,8 @@
- #define GLOBAL_REFERENCE(name) #name "@plt"
- #elif CPU(X86) && COMPILER(MINGW)
- #define GLOBAL_REFERENCE(name) "@" #name "@4"
-+#elif OS(LINUX) && CPU(X86) && defined(__PIC__)
-+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt"
- #else
- #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
- #endif
---
-2.7.0
-
diff --git a/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
deleted file mode 100644
index a2597a54bb..0000000000
--- a/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 5 Jun 2015 19:55:05 -0700
-Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
-
-It was excluding musl with current checks, so lets make it such that it
-considers only glibc when using backtrace API
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Downloaded from:
-https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/
-0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
-
-Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
----
- Source/WTF/wtf/Assertions.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
-index 1b2091f..ba03a28 100644
---- a/Source/WTF/wtf/Assertions.cpp
-+++ b/Source/WTF/wtf/Assertions.cpp
-@@ -61,7 +61,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
---
-2.7.0
-
diff --git a/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch b/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch
deleted file mode 100644
index f3b590eadd..0000000000
--- a/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-Date: Thu, 4 May 2017 15:12:37 +0300
-Subject: [PATCH] Fix compilation with ICU 59
-
-Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612
-
-Task-number: QTBUG-60532
-Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++---
- Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++-
- Source/WTF/wtf/TypeTraits.h | 3 +++
- Source/WebKit2/Shared/API/c/WKString.cpp | 2 +-
- 4 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
-index 812f3d413..77a3fd0f4 100644
---- a/Source/JavaScriptCore/API/JSStringRef.cpp
-+++ b/Source/JavaScriptCore/API/JSStringRef.cpp
-@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
- JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
- {
- initializeThreading();
-- return OpaqueJSString::create(chars, numChars).leakRef();
-+ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
- }
-
- JSStringRef JSStringCreateWithUTF8CString(const char* string)
-@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
- JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
- {
- initializeThreading();
-- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
-+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
- }
-
- JSStringRef JSStringRetain(JSStringRef string)
-@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
-
- const JSChar* JSStringGetCharactersPtr(JSStringRef string)
- {
-- return string->characters();
-+ return reinterpret_cast<const JSChar*>(string->characters());
- }
-
- size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
-diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp
-index 0b57f012d..05e27338b 100644
---- a/Source/JavaScriptCore/runtime/DateConversion.cpp
-+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
-@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as
- #if OS(WINDOWS)
- TIME_ZONE_INFORMATION timeZoneInformation;
- GetTimeZoneInformation(&timeZoneInformation);
-- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
-+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
-+ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
- #else
- struct tm gtm = t;
- char timeZoneName[70];
-diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
-index 9df2c95cf..f5d6121fd 100644
---- a/Source/WTF/wtf/TypeTraits.h
-+++ b/Source/WTF/wtf/TypeTraits.h
-@@ -72,6 +72,9 @@ namespace WTF {
- template<> struct IsInteger<unsigned long> { static const bool value = true; };
- template<> struct IsInteger<long long> { static const bool value = true; };
- template<> struct IsInteger<unsigned long long> { static const bool value = true; };
-+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT)
-+ template<> struct IsInteger<char16_t> { static const bool value = true; };
-+#endif
- #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
- template<> struct IsInteger<wchar_t> { static const bool value = true; };
- #endif
-diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp
-index cbac67dd8..23400a64e 100644
---- a/Source/WebKit2/Shared/API/c/WKString.cpp
-+++ b/Source/WebKit2/Shared/API/c/WKString.cpp
-@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
- size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
- {
- COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
-- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
-+ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
- }
-
- size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
---
-2.11.0
-
diff --git a/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch b/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch
deleted file mode 100644
index 9c2205dd94..0000000000
--- a/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
-Date: Tue, 15 Aug 2017 18:28:49 -0400
-Subject: [PATCH] Detect 32-bits armv8-a architecture
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Adds WTF platform support for the 32-bits armv8-a architectures.
-
-Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version)
-and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits).
-
-This commit catches this new architecture (armv8a) within a #ifdef/#endif
-inside the if statement dedicated for 32-bits ARM detection.
-
-Fixes:
-
- In file included from ./config.h:30:0,
- from ...
- ./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture"
- # error "Not supported ARM architecture"
- ^~~~~
-
-Upstream-Status: Backport [with adaptations]
-Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
----
- Source/WTF/wtf/Platform.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index 562840cf7..9cf656845 100644
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -243,6 +243,10 @@
- || defined(__ARM_ARCH_7S__)
- #define WTF_ARM_ARCH_VERSION 7
-
-+#elif defined(__ARM_ARCH_8__) \
-+ || defined(__ARM_ARCH_8A__)
-+#define WTF_ARM_ARCH_VERSION 8
-+
- /* MSVC sets _M_ARM */
- #elif defined(_M_ARM)
- #define WTF_ARM_ARCH_VERSION _M_ARM
---
-2.16.1
-
diff --git a/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
deleted file mode 100644
index 669c7e6aa2..0000000000
--- a/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001
-From: Trevor Woerner <trevor.woerner@linaro.org>
-Date: Fri, 7 Feb 2014 04:07:17 +0100
-Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
-
-Building qtwebkit causes a QA issue such that QtWebPluginProcess and
-QtWebProcess contain bad RPATHs which point into the build location. This fix
-adds a patch to not include the rpath.prf which causes this problem.
-
-Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-Downloaded from:
-https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/
-0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
-
-Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
----
- Tools/qmake/mkspecs/features/unix/default_post.prf | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
-index fd66af6..ef754c3 100644
---- a/Tools/qmake/mkspecs/features/unix/default_post.prf
-+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
-@@ -61,7 +61,6 @@ linux-*g++* {
- }
- }
-
--contains(TEMPLATE, app): CONFIG += rpath
-
- CONFIG(debug, debug|release)|force_debug_info {
- # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
---
-2.7.0
-
diff --git a/package/qt5/qt5webkit/qt5webkit.hash b/package/qt5/qt5webkit/qt5webkit.hash
index 57ff2ac1b7..3068ad920d 100644
--- a/package/qt5/qt5webkit/qt5webkit.hash
+++ b/package/qt5/qt5webkit/qt5webkit.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 098c6bb25798fbf1b619b540621287787064efc9b586d76ac0ce7e39b87a3896 qtwebkit-opensource-src-5.6.3.tar.xz
-
# hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist
sha256 28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz
diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk
index 25c5495482..c6441b5bdd 100644
--- a/package/qt5/qt5webkit/qt5webkit.mk
+++ b/package/qt5/qt5webkit/qt5webkit.mk
@@ -4,15 +4,8 @@
#
################################################################################
-# no 5.9.2 package available, fall back to 5.9.1 version
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WEBKIT_VERSION = 5.9.1
QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules
-else
-QT5WEBKIT_VERSION = $(QT5_VERSION)
-QT5WEBKIT_SITE = https://download.qt.io/community_releases/5.6/$(QT5_VERSION)
-endif
-
QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
QT5WEBKIT_DEPENDENCIES = \
host-bison host-flex host-gperf host-python host-ruby \
diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash
index 3bb6297f3e..230aab232c 100644
--- a/package/qt5/qt5websockets/qt5websockets.hash
+++ b/package/qt5/qt5websockets/qt5websockets.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebsockets-everywhere-src-5.12.7.tar.xz.sha256
sha256 6fd13c2558f532a32f20d977b44c0146107a0e93861df84978e4fd72af283b17 qtwebsockets-everywhere-src-5.12.7.tar.xz
@@ -9,7 +6,3 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 79949ee74297883df6e4e7c4bfe1e75a6e7695376b4a87ffc013e27bda509cb2 LGPL_EXCEPTION.txt
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/package/qt5/qt5websockets/qt5websockets.mk b/package/qt5/qt5websockets/qt5websockets.mk
index 6e734a3bf3..bd4d49940a 100644
--- a/package/qt5/qt5websockets/qt5websockets.mk
+++ b/package/qt5/qt5websockets/qt5websockets.mk
@@ -9,14 +9,9 @@ QT5WEBSOCKETS_SITE = $(QT5_SITE)
QT5WEBSOCKETS_SOURCE = qtwebsockets-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5WEBSOCKETS_VERSION).tar.xz
QT5WEBSOCKETS_DEPENDENCIES = qt5base
QT5WEBSOCKETS_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools)
QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3
-else
-QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0
-QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
-endif
+
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5WEBSOCKETS_LICENSE += , BSD-3-Clause (examples)
endif
diff --git a/package/qt5/qt5webview/qt5webview.hash b/package/qt5/qt5webview/qt5webview.hash
index d9d340479b..7bbb23556b 100644
--- a/package/qt5/qt5webview/qt5webview.hash
+++ b/package/qt5/qt5webview/qt5webview.hash
@@ -1,6 +1,3 @@
-# Hash from: https://download.qt.io/archive/qt/5.6/5.6.3/submodules/qtwebview-opensource-src-5.6.3.tar.xz.sha256
-sha256 768a456e89f0fd7cbf39ac6b282e078a098e7426651c0b3d453b10c5c44bd81c qtwebview-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtwebview-everywhere-src-5.12.7.tar.xz.sha256
sha256 d3f82d2ceab59dc4dee3b6f54f4b70869c199d63f4534b299d900cdacc9b7be7 qtwebview-everywhere-src-5.12.7.tar.xz
diff --git a/package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash b/package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash
deleted file mode 100644
index b34c059983..0000000000
--- a/package/qt5/qt5x11extras/5.6.3/qt5x11extras.hash
+++ /dev/null
@@ -1,10 +0,0 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtx11extras-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 1e7a8e96e0629f2b2b78de684b156b357210cf5df6b42f30789423f2cb07677f qtx11extras-opensource-src-5.6.3.tar.xz
-
-# Hashes for license files:
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
-sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/package/qt5/qt5x11extras/5.12.7/qt5x11extras.hash b/package/qt5/qt5x11extras/qt5x11extras.hash
index 06cdb9c87b..06cdb9c87b 100644
--- a/package/qt5/qt5x11extras/5.12.7/qt5x11extras.hash
+++ b/package/qt5/qt5x11extras/qt5x11extras.hash
diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
index 6acc9462c1..5d6e564c05 100644
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -9,14 +9,8 @@ QT5X11EXTRAS_SITE = $(QT5_SITE)
QT5X11EXTRAS_SOURCE = qtx11extras-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5X11EXTRAS_VERSION).tar.xz
QT5X11EXTRAS_DEPENDENCIES = qt5base
QT5X11EXTRAS_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
define QT5X11EXTRAS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
index 0366baa0b9..5e61928ea7 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
@@ -1,16 +1,9 @@
-# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist
-sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz
-
# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.7/submodules/qtxmlpatterns-everywhere-src-5.12.7.tar.xz.sha256
sha256 9002014129a1f2a44700df333a7776e23bdfd689e7a619c3540fd9f6819b417b qtxmlpatterns-everywhere-src-5.12.7.tar.xz
# Hashes for license files:
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 6ed247fd59..42338afa07 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -9,14 +9,9 @@ QT5XMLPATTERNS_SITE = $(QT5_SITE)
QT5XMLPATTERNS_SOURCE = qtxmlpatterns-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5XMLPATTERNS_VERSION).tar.xz
QT5XMLPATTERNS_DEPENDENCIES = qt5base
QT5XMLPATTERNS_INSTALL_STAGING = YES
-
-ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
-else
-QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
-QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
-endif
+
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5XMLPATTERNS_LICENSE += , BSD-3-Clause (examples)
endif
diff --git a/package/scrypt/scrypt.hash b/package/scrypt/scrypt.hash
index 8a20d42bee..c73ff515bc 100644
--- a/package/scrypt/scrypt.hash
+++ b/package/scrypt/scrypt.hash
@@ -1,4 +1,4 @@
-# From http://www.tarsnap.com/scrypt/scrypt-sigs-1.2.0.asc
-sha256 1754bc89405277c8ac14220377a4c240ddc34b1ce70882aa92cd01bfdc8569d4 scrypt-1.2.0.tgz
+# From http://www.tarsnap.com/scrypt/scrypt-sigs-1.3.0.asc
+sha256 263034edd4d1e117d4051d9a9260c74dedb0efaf4491c5152b738978b3f32748 scrypt-1.3.0.tgz
# Locally computed
-sha256 e9d3ce691acc974c05d54bdea919fa03018fcdb5abd82eab5cdb78f07c451e0a main.c
+sha256 adc1942c42da6e3370223a27ff4a6835924d2b41e509f9bee58a5e6ca1bbddae COPYRIGHT
diff --git a/package/scrypt/scrypt.mk b/package/scrypt/scrypt.mk
index ae5a64e71f..820664f6c1 100644
--- a/package/scrypt/scrypt.mk
+++ b/package/scrypt/scrypt.mk
@@ -4,11 +4,11 @@
#
################################################################################
-SCRYPT_VERSION = 1.2.0
+SCRYPT_VERSION = 1.3.0
SCRYPT_SOURCE = scrypt-$(SCRYPT_VERSION).tgz
SCRYPT_SITE = http://www.tarsnap.com/scrypt
SCRYPT_LICENSE = BSD-2-Clause
-SCRYPT_LICENSE_FILES = main.c
+SCRYPT_LICENSE_FILES = COPYRIGHT
SCRYPT_DEPENDENCIES = openssl
SCRYPT_INSTALL_STAGING = YES
diff --git a/package/sed/sed.hash b/package/sed/sed.hash
index cc3bebafe1..bb48128526 100644
--- a/package/sed/sed.hash
+++ b/package/sed/sed.hash
@@ -1,6 +1,6 @@
# Locally calculated after checking pgp signature
-# https://ftp.gnu.org/gnu/sed/sed-4.7.tar.xz.sig
+# https://ftp.gnu.org/gnu/sed/sed-4.8.tar.xz.sig
# with the key 155D3FC500C834486D1EEA677FD9FCCB000BEEEE
-sha256 2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a sed-4.7.tar.xz
+sha256 f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633 sed-4.8.tar.xz
# Locally calculated
-sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING
+sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index 6fee598f66..6bb3220553 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SED_VERSION = 4.7
+SED_VERSION = 4.8
SED_SOURCE = sed-$(SED_VERSION).tar.xz
SED_SITE = $(BR2_GNU_MIRROR)/sed
SED_LICENSE = GPL-3.0
diff --git a/package/ser2net/ser2net.hash b/package/ser2net/ser2net.hash
index 5bd927d7d1..9a61564b0e 100644
--- a/package/ser2net/ser2net.hash
+++ b/package/ser2net/ser2net.hash
@@ -1,6 +1,6 @@
# From https://sourceforge.net/projects/ser2net/files/ser2net/
-md5 44a69f573677d9f2bde87b3611db5817 ser2net-4.1.1.tar.gz
-sha1 502e11c3bee429de6550db459d83c9a0991cfc5c ser2net-4.1.1.tar.gz
+md5 1a42e9605342fd3d6fa41b48be7f564a ser2net-4.1.2.tar.gz
+sha1 2a40a94e37d89ca795b3a8f692583c78259383c1 ser2net-4.1.2.tar.gz
# Locally computed:
-sha256 ad6c8fb34d01be177570323899d840a44c8774399d594595393708162fc61e22 ser2net-4.1.1.tar.gz
+sha256 9bdc33476834bbbdcbfbb77ff8f1b1952fe2e7e19dde7e6f7932cea0cec958c7 ser2net-4.1.2.tar.gz
sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING
diff --git a/package/ser2net/ser2net.mk b/package/ser2net/ser2net.mk
index 94035b2184..08f1fe0c8b 100644
--- a/package/ser2net/ser2net.mk
+++ b/package/ser2net/ser2net.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SER2NET_VERSION = 4.1.1
+SER2NET_VERSION = 4.1.2
SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
SER2NET_LICENSE = GPL-2.0+
SER2NET_LICENSE_FILES = COPYING
diff --git a/package/sispmctl/sispmctl.hash b/package/sispmctl/sispmctl.hash
index f1090c4b8a..941eb3dfda 100644
--- a/package/sispmctl/sispmctl.hash
+++ b/package/sispmctl/sispmctl.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 bf5177e085cb0168e18e4cfb69645c3095da149ed46f5659d6e757bde3548e40 sispmctl-4.1.tar.gz
+sha256 300adc32ab35a4f9260705f8f57ccd83c3c6601fc493dbe7d259335938819aaf sispmctl-4.2.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/sispmctl/sispmctl.mk b/package/sispmctl/sispmctl.mk
index 93e7de7694..ed0c8c2958 100644
--- a/package/sispmctl/sispmctl.mk
+++ b/package/sispmctl/sispmctl.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SISPMCTL_VERSION = 4.1
+SISPMCTL_VERSION = 4.2
SISPMCTL_SITE = http://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION)
SISPMCTL_LICENSE = GPL-2.0+
SISPMCTL_LICENSE_FILES = COPYING
diff --git a/package/smartmontools/0001-configure.ac-fix-stack-protector-detection.patch b/package/smartmontools/0001-configure.ac-fix-stack-protector-detection.patch
new file mode 100644
index 0000000000..63f51fc9bc
--- /dev/null
+++ b/package/smartmontools/0001-configure.ac-fix-stack-protector-detection.patch
@@ -0,0 +1,38 @@
+From 6bd18b0b7b4d916e474ba84707eb784a643b3e71 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 23 Feb 2020 16:23:20 +0100
+Subject: [PATCH] configure.ac: fix stack-protector detection
+
+Use AC_LINK_IFELSE instead of AC_COMPILE_IFELSE to check for
+stack-protector availability as some compilers could missed the needed
+library (-lssp or -lssp_nonshared) at linking step:
+
+/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/x86_64-linux-g++ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -Wall -W -Wformat=2 -fstack-protector-strong -o smartctl smartctl.o atacmdnames.o atacmds.o ataidentify.o ataprint.o dev_ata_cmd_set.o dev_intelliprop.o dev_interface.o dev_jmb39x_raid.o json.o knowndrives.o nvmecmds.o nvmeprint.o scsicmds.o scsiata.o scsinvme.o scsiprint.o utility.o os_linux.o cciss.o dev_areca.o -lselinux
+/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared
+/home/giuliobenetti/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/8.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp
+
+Fixes:
+ - http://autobuild.buildroot.org/results/0de9f2a69fa2a39164211299f8a429d2fec6935a
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://www.smartmontools.org/ticket/1302]
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 87470d8a..ccb457e1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -770,7 +770,7 @@ if test "$GXX" = "yes"; then
+ AC_MSG_CHECKING([whether $CXX supports $option])
+ save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$CXXFLAGS $option"
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [res=yes], [res=no; CXXFLAGS=$save_CXXFLAGS])
++ AC_LINK_IFELSE([AC_LANG_PROGRAM()], [res=yes], [res=no; CXXFLAGS=$save_CXXFLAGS])
+ AC_MSG_RESULT([$res])
+ done
+ else
+--
+2.25.0
+
diff --git a/package/smartmontools/smartmontools.hash b/package/smartmontools/smartmontools.hash
index ffa1e8f97e..bec007aabd 100644
--- a/package/smartmontools/smartmontools.hash
+++ b/package/smartmontools/smartmontools.hash
@@ -1,5 +1,7 @@
-# From http://sourceforge.net/projects/smartmontools/files/smartmontools/6.5/
-md5 093aeec3f8f39fa9a37593c4012d3156 smartmontools-6.5.tar.gz
-sha1 7e788b429534a4ae627858fbcc826b93402cee7e smartmontools-6.5.tar.gz
+# From http://sourceforge.net/projects/smartmontools/files/smartmontools/7.1/
+md5 430cd5f64caa4524018b536e5ecd9c29 smartmontools-7.1.tar.gz
+sha1 207dc2b50cab1c6fba7bc248665fbbe3189374e1 smartmontools-7.1.tar.gz
+
# Locally computed
+sha256 3f734d2c99deb1e4af62b25d944c6252de70ca64d766c4c7294545a2e659b846 smartmontools-7.1.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk
index bad7da2d16..9dc2f789cc 100644
--- a/package/smartmontools/smartmontools.mk
+++ b/package/smartmontools/smartmontools.mk
@@ -4,10 +4,12 @@
#
################################################################################
-SMARTMONTOOLS_VERSION = 6.5
+SMARTMONTOOLS_VERSION = 7.1
SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
SMARTMONTOOLS_LICENSE = GPL-2.0+
SMARTMONTOOLS_LICENSE_FILES = COPYING
+# We're patching configure.ac
+SMARTMONTOOLS_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)
SMARTMONTOOLS_CONF_OPTS += --with-libcap-ng
@@ -23,4 +25,11 @@ else
SMARTMONTOOLS_CONF_OPTS += --without-selinux
endif
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+SMARTMONTOOLS_CONF_OPTS += --with-libsystemd
+SMARTMONTOOLS_DEPENDENCIES += systemd
+else
+SMARTMONTOOLS_CONF_OPTS += --without-libsystemd
+endif
+
$(eval $(autotools-package))
diff --git a/package/syslog-ng/syslog-ng.conf b/package/syslog-ng/syslog-ng.conf
index e8b9f1fba4..a04a4770b1 100644
--- a/package/syslog-ng/syslog-ng.conf
+++ b/package/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.24
+@version: 3.25
source s_sys {
file("/proc/kmsg" program_override("kernel"));
diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash
index 62bc48a7af..962c354b4c 100644
--- a/package/syslog-ng/syslog-ng.hash
+++ b/package/syslog-ng/syslog-ng.hash
@@ -1,5 +1,5 @@
# Locally computed
-sha256 d4d0a0357b452be96b69d6f741129275530d8f0451e35adc408ad5635059fa3d syslog-ng-3.24.1.tar.gz
+sha256 34cb9673bcde58d543890e6c1189f466f938e199f227c524a6fa2f47f4db6817 syslog-ng-3.25.1.tar.gz
sha256 835219c8ca76156e6337236d1bcb8e617c0b1c2783b4a8bc478e18a86743d607 COPYING
sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt
diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk
index 68260172a2..9b7e9a1317 100644
--- a/package/syslog-ng/syslog-ng.mk
+++ b/package/syslog-ng/syslog-ng.mk
@@ -6,7 +6,7 @@
# When updating the version, please check at runtime if the version in
# syslog-ng.conf header needs to be updated
-SYSLOG_NG_VERSION = 3.24.1
+SYSLOG_NG_VERSION = 3.25.1
SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION)
SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
SYSLOG_NG_LICENSE_FILES = COPYING GPL.txt LGPL.txt
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index c727082a1a..bd638477a0 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -318,6 +318,16 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED
http://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html
+config BR2_PACKAGE_SYSTEMD_REPART
+ bool "enable repart support"
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_UTIL_LINUX_LIBFDISK
+ help
+ systemd-repart grows and adds partitions to a partition table,
+ based on the configuration files described in repart.d.
+
+ https://www.freedesktop.org/software/systemd/man/systemd-repart.html
+
config BR2_PACKAGE_SYSTEMD_RESOLVED
bool "enable resolve daemon"
default y
@@ -393,6 +403,18 @@ config BR2_PACKAGE_SYSTEMD_TMPFILES
http://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.html
+config BR2_PACKAGE_SYSTEMD_USERDB
+ bool "enable userdb daemon"
+ help
+ systemd-userdbd is a system service that multiplexes
+ user/group lookups to all local services that provide JSON
+ user/group record definitions to the system. In addition it
+ synthesizes JSON user/group records from classic UNIX/glibc
+ NSS user/group records in order to provide full backwards
+ compatibility.
+
+ https://www.freedesktop.org/software/systemd/man/systemd-userdbd.service.html
+
config BR2_PACKAGE_SYSTEMD_VCONSOLE
bool "enable vconsole tool"
default y
diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash
index 4ab514d673..4a398ef6bb 100644
--- a/package/systemd/systemd.hash
+++ b/package/systemd/systemd.hash
@@ -1,5 +1,5 @@
# sha256 locally computed
-sha256 e6b463733da5eb37075352a64112d030b8612935a54e5b3468279a4f15a4cec4 systemd-244.3.tar.gz
+sha256 6dc956a857c889d6f3cf7d768d4836db48a39e5bef5dd930fbed697ab2421a61 systemd-245.tar.gz
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1
sha256 f7299f5f5e8bdffd347dce1bed888b1cea6ddaf27de521c307265098bcbeae92 README
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index ca2174e5fb..56459947c4 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SYSTEMD_VERSION = 244.3
+SYSTEMD_VERSION = 245
SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION))
SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos)
SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE
@@ -41,6 +41,7 @@ SYSTEMD_CONF_OPTS += \
-Dumount-path=/usr/bin/umount \
-Dnobody-group=nogroup \
-Didn=true \
+ -Dhomed=false \
-Dnss-systemd=true
ifeq ($(BR2_PACKAGE_ACL),y)
@@ -302,6 +303,19 @@ else
SYSTEMD_CONF_OPTS += -Dlocaled=false
endif
+ifeq ($(BR2_PACKAGE_SYSTEMD_REPART),y)
+SYSTEMD_CONF_OPTS += -Drepart=true
+SYSTEMD_DEPENDENCIES += openssl
+else
+SYSTEMD_CONF_OPTS += -Drepart=false
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD_USERDB),y)
+SYSTEMD_CONF_OPTS += -Duserdb=true
+else
+SYSTEMD_CONF_OPTS += -Duserdb=false
+endif
+
ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y)
SYSTEMD_CONF_OPTS += -Dcoredump=true
SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper
@@ -348,6 +362,16 @@ else
SYSTEMD_CONF_OPTS += -Dresolve=false
endif
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+SYSTEMD_CONF_OPTS += -Ddns-over-tls=gnutls -Ddefault-dns-over-tls=opportunistic
+SYSTEMD_DEPENDENCIES += gnutls
+else ifeq ($(BR2_PACKAGE_OPENSSL),y)
+SYSTEMD_CONF_OPTS += -Ddns-over-tls=openssl -Ddefault-dns-over-tls=opportunistic
+SYSTEMD_DEPENDENCIES += openssl
+else
+SYSTEMD_CONF_OPTS += -Ddns-over-tls=false -Ddefault-dns-over-tls=no
+endif
+
ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y)
SYSTEMD_CONF_OPTS += -Dtimesyncd=true
SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization
@@ -511,6 +535,7 @@ HOST_SYSTEMD_CONF_OPTS = \
-Dtpm=false \
-Denvironment-d=false \
-Dbinfmt=false \
+ -Drepart=false \
-Dcoredump=false \
-Dpstore=false \
-Dlogind=false \
@@ -518,6 +543,8 @@ HOST_SYSTEMD_CONF_OPTS = \
-Dlocaled=false \
-Dmachined=false \
-Dportabled=false \
+ -Duserdb=false \
+ -Dhomed=false \
-Dnetworkd=false \
-Dtimedated=false \
-Dtimesyncd=false \
diff --git a/package/uacme/uacme.hash b/package/uacme/uacme.hash
index b8d631d50b..5c68680b54 100644
--- a/package/uacme/uacme.hash
+++ b/package/uacme/uacme.hash
@@ -1,3 +1,3 @@
# Locally computed:
-sha256 c80bbee3c2ac3a64f70abe23be3b7768039785863170ac062625407a0b61e635 uacme-1.0.21.tar.gz
+sha256 08070779232c9711a227189ee2d3cb55042f6be2ea0aa59525cb7b554c4688b0 uacme-1.0.22.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk
index 5813399c56..c5931e2682 100644
--- a/package/uacme/uacme.mk
+++ b/package/uacme/uacme.mk
@@ -4,7 +4,7 @@
#
################################################################################
-UACME_VERSION = 1.0.21
+UACME_VERSION = 1.0.22
# Released versions are on branch upstream/latest, tagged as
# upstream/X.Y.Z Do not use vX.Y.Z tags from master, as they do not
# include .tarball-version
diff --git a/package/udev-gentoo-scripts/Config.in b/package/udev-gentoo-scripts/Config.in
new file mode 100644
index 0000000000..9d6944354d
--- /dev/null
+++ b/package/udev-gentoo-scripts/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_UDEV_GENTOO_SCRIPTS
+ bool
+ depends on BR2_PACKAGE_EUDEV
+ depends on BR2_INIT_OPENRC
+ help
+ Init scripts for eudev.
diff --git a/package/udev-gentoo-scripts/udev-gentoo-scripts.hash b/package/udev-gentoo-scripts/udev-gentoo-scripts.hash
new file mode 100644
index 0000000000..60563baae0
--- /dev/null
+++ b/package/udev-gentoo-scripts/udev-gentoo-scripts.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 b206f72c93cd2e51ed59061931918a9c23c3c1f7e6caffacc9d4f8915a42c30a udev-gentoo-scripts-33.tar.bz2
+sha256 329f95829088b95650b9012ae688f09baa1637985425a7964d33683363f48702 init.d/udev-settle
diff --git a/package/udev-gentoo-scripts/udev-gentoo-scripts.mk b/package/udev-gentoo-scripts/udev-gentoo-scripts.mk
new file mode 100644
index 0000000000..a0598bcad8
--- /dev/null
+++ b/package/udev-gentoo-scripts/udev-gentoo-scripts.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# udev-gentoo-scripts
+#
+################################################################################
+
+UDEV_GENTOO_SCRIPTS_VERSION = 33
+UDEV_GENTOO_SCRIPTS_SOURCE = udev-gentoo-scripts-$(UDEV_GENTOO_SCRIPTS_VERSION).tar.bz2
+UDEV_GENTOO_SCRIPTS_SITE = https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/snapshot
+UDEV_GENTOO_SCRIPTS_LICENSE = GPL-2.0
+UDEV_GENTOO_SCRIPTS_LICENSE_FILES = init.d/udev-settle
+
+# We don't need to symlink /etc/init.d/udev to /etc/runlevels/sysinit, since
+# it's in the udev-settle and udev-trigger "need" lists.
+define UDEV_GENTOO_SCRIPTS_INSTALL_INIT_OPENRC
+ $(MAKE1) -C $(@D) install DESTDIR=$(TARGET_DIR)
+ $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/runlevels/sysinit
+ ln -s -f /etc/init.d/udev-settle /etc/init.d/udev-trigger \
+ $(TARGET_DIR)/etc/runlevels/sysinit
+endef
+
+$(eval $(generic-package))
diff --git a/package/upmpdcli/upmpdcli.hash b/package/upmpdcli/upmpdcli.hash
index 33003a406e..fe1d82202d 100644
--- a/package/upmpdcli/upmpdcli.hash
+++ b/package/upmpdcli/upmpdcli.hash
@@ -1,5 +1,5 @@
-# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.5.tar.gz.sha256:
-sha256 af0c13b6ab8720d98451307010c33462e9a3f50178bae82c593fd2dd12e31b0e upmpdcli-1.4.5.tar.gz
+# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.6.tar.gz.sha256:
+sha256 80ed85a323a1721a9e2ceb64923cedbf69c45f22fb9bc6853c9c11b46dc83a1d upmpdcli-1.4.6.tar.gz
# Hash for license file:
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
diff --git a/package/upmpdcli/upmpdcli.mk b/package/upmpdcli/upmpdcli.mk
index 290cdcb1f2..67d805f0cc 100644
--- a/package/upmpdcli/upmpdcli.mk
+++ b/package/upmpdcli/upmpdcli.mk
@@ -4,7 +4,7 @@
#
################################################################################
-UPMPDCLI_VERSION = 1.4.5
+UPMPDCLI_VERSION = 1.4.6
UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
UPMPDCLI_LICENSE = LGPL-2.1+
UPMPDCLI_LICENSE_FILES = COPYING
diff --git a/package/vala/vala.hash b/package/vala/vala.hash
index 7b3f0c9f76..319c7ef2f4 100644
--- a/package/vala/vala.hash
+++ b/package/vala/vala.hash
@@ -1,4 +1,4 @@
-# From https://download.gnome.org/sources/vala/0.34/vala-0.34.7.sha256sum
-sha256 1b2cb14f377d4c41fa3a86d3d01b93017015ce91b6714a85f27346073b4034fa vala-0.34.7.tar.xz
+# From https://download.gnome.org/sources/vala/0.46/vala-0.46.6.sha256sum
+sha256 ef31649932872f094971d46453b21c60a41661670f98afa334062425b4aec47a vala-0.46.6.tar.xz
# Locally computed
sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING
diff --git a/package/vala/vala.mk b/package/vala/vala.mk
index ad0a5650f7..b8a69f8c5e 100644
--- a/package/vala/vala.mk
+++ b/package/vala/vala.mk
@@ -4,8 +4,8 @@
#
################################################################################
-VALA_VERSION_MAJOR = 0.34
-VALA_VERSION = $(VALA_VERSION_MAJOR).7
+VALA_VERSION_MAJOR = 0.46
+VALA_VERSION = $(VALA_VERSION_MAJOR).6
VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
VALA_LICENSE = LGPL-2.1+
@@ -15,6 +15,7 @@ HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2
# Yes, the autoconf script understands ':' as "xsltproc is not
# available".
HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=:
+HOST_VALA_CONF_OPTS += --disable-valadoc
# We wrap vala & valac to point to the proper gir and vapi data dirs
# Otherwise we'll get host directory data which isn't enough
diff --git a/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch b/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch
index ffc1b5b8b1..126aa93300 100644
--- a/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch
+++ b/package/waffle/0002-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch
@@ -4,12 +4,12 @@ Date: Sun, 24 Dec 2017 00:11:45 +0100
Subject: [PATCH] cmake: forward cflags from *.pc files to waffle cflags
When building mesa egl without x11 and gles2 the headers need a
-MESA_EGL_NO_X11_HEADERS define to avoid including X11 headers.
+EGL_NO_X11 define to avoid including X11 headers.
-This define MESA_EGL_NO_X11_HEADERS is lost while building waffle
-since CGLAGS defined by pc files are not used.
+This define EGL_NO_X11 is lost while building waffle
+since CFLAGS defined by pc files are not used.
-MESA_EGL_NO_X11_HEADERS is defined in CFLAGS from egl.pc.
+EGL_NO_X11 is defined in CFLAGS from egl.pc.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
diff --git a/package/wayland-protocols/wayland-protocols.hash b/package/wayland-protocols/wayland-protocols.hash
index a27ff9e52c..321fc62de5 100644
--- a/package/wayland-protocols/wayland-protocols.hash
+++ b/package/wayland-protocols/wayland-protocols.hash
@@ -1,5 +1,5 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2019-July/040756.html
-md5 af38f22d8e233c2f2e00ddc8dcc94694 wayland-protocols-1.18.tar.xz
-sha1 aa2f132c082f3c790bd046283b3ef7ce3fb11370 wayland-protocols-1.18.tar.xz
-sha256 3d73b7e7661763dc09d7d9107678400101ecff2b5b1e531674abfa81e04874b3 wayland-protocols-1.18.tar.xz
-sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING
+# From https://lists.freedesktop.org/archives/wayland-devel/2020-February/041269.html
+md5 b0836533a3f2dc6585b1dae00341157f wayland-protocols-1.20.tar.xz
+sha1 e78c739a3a85477ed524b81e8bb75efe7f8bf4df wayland-protocols-1.20.tar.xz
+sha256 9782b7a1a863d82d7c92478497d13c758f52e7da4f197aa16443f73de77e4de7 wayland-protocols-1.20.tar.xz
+sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 COPYING
diff --git a/package/wayland-protocols/wayland-protocols.mk b/package/wayland-protocols/wayland-protocols.mk
index fbfa99558d..ed60d1c995 100644
--- a/package/wayland-protocols/wayland-protocols.mk
+++ b/package/wayland-protocols/wayland-protocols.mk
@@ -4,7 +4,7 @@
#
################################################################################
-WAYLAND_PROTOCOLS_VERSION = 1.18
+WAYLAND_PROTOCOLS_VERSION = 1.20
WAYLAND_PROTOCOLS_SITE = http://wayland.freedesktop.org/releases
WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz
WAYLAND_PROTOCOLS_LICENSE = MIT
diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index 8a67e509e1..9cfb43928b 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -30,10 +30,14 @@ import certifi
import distutils.version
import time
import gzip
+import sys
from urllib3 import HTTPSConnectionPool
from urllib3.exceptions import HTTPError
from multiprocessing import Pool
+sys.path.append('utils/')
+from getdeveloperlib import parse_developers
+
NVD_START_YEAR = 2002
NVD_JSON_VERSION = "1.0"
NVD_BASE_URL = "https://nvd.nist.gov/feeds/json/cve/" + NVD_JSON_VERSION
@@ -50,28 +54,63 @@ RM_API_STATUS_NOT_FOUND = 4
# because it's used by sub-processes.
http_pool = None
+class Defconfig:
+ def __init__(self, name, path):
+ self.name = name
+ self.path = path
+ self.developers = None
+
+ def set_developers(self, developers):
+ """
+ Fills in the .developers field
+ """
+ self.developers = [
+ developer.name
+ for developer in developers
+ if developer.hasfile(self.path)
+ ]
+
+
+def get_defconfig_list():
+ """
+ Builds the list of Buildroot defconfigs, returning a list of Defconfig
+ objects.
+ """
+ return [
+ Defconfig(name[:-len('_defconfig')], os.path.join('configs', name))
+ for name in os.listdir('configs')
+ if name.endswith('_defconfig')
+ ]
+
class Package:
- all_licenses = list()
+ all_licenses = dict()
all_license_files = list()
all_versions = dict()
all_ignored_cves = dict()
+ # This is the list of all possible checks. Add new checks to this list so
+ # a tool that post-processeds the json output knows the checks before
+ # iterating over the packages.
+ status_checks = ['cve', 'developers', 'hash', 'license',
+ 'license-files', 'patches', 'pkg-check', 'url', 'version']
def __init__(self, name, path):
self.name = name
self.path = path
+ self.pkg_path = os.path.dirname(path)
self.infras = None
+ self.license = None
self.has_license = False
self.has_license_files = False
self.has_hash = False
- self.patch_count = 0
+ self.patch_files = []
self.warnings = 0
self.current_version = None
self.url = None
- self.url_status = None
self.url_worker = None
self.cves = list()
- self.latest_version = (RM_API_STATUS_ERROR, None, None)
+ self.latest_version = {'status': RM_API_STATUS_ERROR, 'version': None, 'id': None}
+ self.status = {}
def pkgvar(self):
return self.name.upper().replace("-", "_")
@@ -80,19 +119,32 @@ class Package:
"""
Fills in the .url field
"""
- self.url_status = "No Config.in"
+ self.status['url'] = ("warning", "no Config.in")
for filename in os.listdir(os.path.dirname(self.path)):
if fnmatch.fnmatch(filename, 'Config.*'):
fp = open(os.path.join(os.path.dirname(self.path), filename), "r")
for config_line in fp:
if URL_RE.match(config_line):
self.url = config_line.strip()
- self.url_status = "Found"
+ self.status['url'] = ("ok", "found")
fp.close()
return
- self.url_status = "Missing"
+ self.status['url'] = ("error", "missing")
fp.close()
+ @property
+ def patch_count(self):
+ return len(self.patch_files)
+
+ @property
+ def has_valid_infra(self):
+ try:
+ if self.infras[0][1] == 'virtual':
+ return False
+ except IndexError:
+ return False
+ return True
+
def set_infra(self):
"""
Fills in the .infras field
@@ -112,29 +164,55 @@ class Package:
def set_license(self):
"""
- Fills in the .has_license and .has_license_files fields
+ Fills in the .status['license'] and .status['license-files'] fields
"""
+ if not self.has_valid_infra:
+ self.status['license'] = ("na", "no valid package infra")
+ self.status['license-files'] = ("na", "no valid package infra")
+ return
+
var = self.pkgvar()
+ self.status['license'] = ("error", "missing")
+ self.status['license-files'] = ("error", "missing")
if var in self.all_licenses:
- self.has_license = True
+ self.license = self.all_licenses[var]
+ self.status['license'] = ("ok", "found")
if var in self.all_license_files:
- self.has_license_files = True
+ self.status['license-files'] = ("ok", "found")
def set_hash_info(self):
"""
- Fills in the .has_hash field
+ Fills in the .status['hash'] field
"""
+ if not self.has_valid_infra:
+ self.status['hash'] = ("na", "no valid package infra")
+ self.status['hash-license'] = ("na", "no valid package infra")
+ return
+
hashpath = self.path.replace(".mk", ".hash")
- self.has_hash = os.path.exists(hashpath)
+ if os.path.exists(hashpath):
+ self.status['hash'] = ("ok", "found")
+ else:
+ self.status['hash'] = ("error", "missing")
def set_patch_count(self):
"""
- Fills in the .patch_count field
+ Fills in the .patch_count, .patch_files and .status['patches'] fields
"""
- self.patch_count = 0
+ if not self.has_valid_infra:
+ self.status['patches'] = ("na", "no valid package infra")
+ return
+
pkgdir = os.path.dirname(self.path)
for subdir, _, _ in os.walk(pkgdir):
- self.patch_count += len(fnmatch.filter(os.listdir(subdir), '*.patch'))
+ self.patch_files = fnmatch.filter(os.listdir(subdir), '*.patch')
+
+ if self.patch_count == 0:
+ self.status['patches'] = ("ok", "no patches")
+ elif self.patch_count < 5:
+ self.status['patches'] = ("warning", "some patches")
+ else:
+ self.status['patches'] = ("error", "lots of patches")
def set_current_version(self):
"""
@@ -146,10 +224,11 @@ class Package:
def set_check_package_warnings(self):
"""
- Fills in the .warnings field
+ Fills in the .warnings and .status['pkg-check'] fields
"""
cmd = ["./utils/check-package"]
pkgdir = os.path.dirname(self.path)
+ self.status['pkg-check'] = ("error", "Missing")
for root, dirs, files in os.walk(pkgdir):
for f in files:
if f.endswith(".mk") or f.endswith(".hash") or f == "Config.in" or f == "Config.in.host":
@@ -160,6 +239,10 @@ class Package:
m = re.match("^([0-9]*) warnings generated", line.decode())
if m:
self.warnings = int(m.group(1))
+ if self.warnings == 0:
+ self.status['pkg-check'] = ("ok", "no warnings")
+ else:
+ self.status['pkg-check'] = ("error", "{} warnings".format(self.warnings))
return
def is_cve_ignored(self, cve):
@@ -168,6 +251,24 @@ class Package:
"""
return cve in self.all_ignored_cves.get(self.pkgvar(), [])
+ def set_developers(self, developers):
+ """
+ Fills in the .developers and .status['developers'] field
+ """
+ self.developers = [
+ dev.name
+ for dev in developers
+ if dev.hasfile(self.path)
+ ]
+
+ if self.developers:
+ self.status['developers'] = ("ok", "{} developers".format(len(self.developers)))
+ else:
+ self.status['developers'] = ("warning", "no developers")
+
+ def is_status_ok(self, name):
+ return self.status[name][0] == 'ok'
+
def __eq__(self, other):
return self.path == other.path
@@ -176,7 +277,7 @@ class Package:
def __str__(self):
return "%s (path='%s', license='%s', license_files='%s', hash='%s', patches=%d)" % \
- (self.name, self.path, self.has_license, self.has_license_files, self.has_hash, self.patch_count)
+ (self.name, self.path, self.is_status_ok('license'), self.is_status_ok('license-files'), self.status['hash'], self.patch_count)
class CVE:
@@ -370,7 +471,7 @@ def package_init_make_info():
if value == "unknown":
continue
pkgvar = pkgvar[:-8]
- Package.all_licenses.append(pkgvar)
+ Package.all_licenses[pkgvar] = value
elif pkgvar.endswith("_LICENSE_FILES"):
if pkgvar.endswith("_MANIFEST_LICENSE_FILES"):
@@ -390,23 +491,23 @@ def package_init_make_info():
def check_url_status_worker(url, url_status):
- if url_status != "Missing" and url_status != "No Config.in":
+ if url_status[0] == 'ok':
try:
url_status_code = requests.head(url, timeout=30).status_code
if url_status_code >= 400:
- return "Invalid(%s)" % str(url_status_code)
+ return ("error", "invalid {}".format(url_status_code))
except requests.exceptions.RequestException:
- return "Invalid(Err)"
- return "Ok"
+ return ("error", "invalid (err)")
+ return ("ok", "valid")
return url_status
def check_package_urls(packages):
pool = Pool(processes=64)
for pkg in packages:
- pkg.url_worker = pool.apply_async(check_url_status_worker, (pkg.url, pkg.url_status))
+ pkg.url_worker = pool.apply_async(check_url_status_worker, (pkg.url, pkg.status['url']))
for pkg in packages:
- pkg.url_status = pkg.url_worker.get(timeout=3600)
+ pkg.status['url'] = pkg.url_worker.get(timeout=3600)
del pkg.url_worker
pool.terminate()
@@ -462,9 +563,8 @@ def check_package_latest_version(packages):
"""
Fills in the .latest_version field of all Package objects
- This field has a special format:
- (status, version, id)
- with:
+ This field is a dict and has the following keys:
+
- status: one of RM_API_STATUS_ERROR,
RM_API_STATUS_FOUND_BY_DISTRO, RM_API_STATUS_FOUND_BY_PATTERN,
RM_API_STATUS_NOT_FOUND
@@ -480,7 +580,24 @@ def check_package_latest_version(packages):
worker_pool = Pool(processes=64)
results = worker_pool.map(check_package_latest_version_worker, (pkg.name for pkg in packages))
for pkg, r in zip(packages, results):
- pkg.latest_version = r
+ pkg.latest_version = dict(zip(['status', 'version', 'id'], r))
+
+ if not pkg.has_valid_infra:
+ pkg.status['version'] = ("na", "no valid package infra")
+ continue
+
+ if pkg.latest_version['status'] == RM_API_STATUS_ERROR:
+ pkg.status['version'] = ('warning', "Release Monitoring API error")
+ elif pkg.latest_version['status'] == RM_API_STATUS_NOT_FOUND:
+ pkg.status['version'] = ('warning', "Package not found on Release Monitoring")
+
+ if pkg.latest_version['version'] is None:
+ pkg.status['version'] = ('warning', "No upstream version available on Release Monitoring")
+ elif pkg.latest_version['version'] != pkg.current_version:
+ pkg.status['version'] = ('error', "The newer version {} is available upstream".format(pkg.latest_version['version']))
+ else:
+ pkg.status['version'] = ('ok', 'up-to-date')
+
worker_pool.terminate()
del http_pool
@@ -497,6 +614,7 @@ def check_package_cves(nvd_path, packages):
def calculate_stats(packages):
stats = defaultdict(int)
+ stats['packages'] = len(packages)
for pkg in packages:
# If packages have multiple infra, take the first one. For the
# vast majority of packages, the target and host infra are the
@@ -507,25 +625,25 @@ def calculate_stats(packages):
stats["infra-%s" % infra] += 1
else:
stats["infra-unknown"] += 1
- if pkg.has_license:
+ if pkg.is_status_ok('license'):
stats["license"] += 1
else:
stats["no-license"] += 1
- if pkg.has_license_files:
+ if pkg.is_status_ok('license-files'):
stats["license-files"] += 1
else:
stats["no-license-files"] += 1
- if pkg.has_hash:
+ if pkg.is_status_ok('hash'):
stats["hash"] += 1
else:
stats["no-hash"] += 1
- if pkg.latest_version[0] == RM_API_STATUS_FOUND_BY_DISTRO:
+ if pkg.latest_version['status'] == RM_API_STATUS_FOUND_BY_DISTRO:
stats["rmo-mapping"] += 1
else:
stats["rmo-no-mapping"] += 1
- if not pkg.latest_version[1]:
+ if not pkg.latest_version['version']:
stats["version-unknown"] += 1
- elif pkg.latest_version[1] == pkg.current_version:
+ elif pkg.latest_version['version'] == pkg.current_version:
stats["version-uptodate"] += 1
else:
stats["version-not-uptodate"] += 1
@@ -658,30 +776,30 @@ def dump_html_pkg(f, pkg):
# License
td_class = ["centered"]
- if pkg.has_license:
+ if pkg.is_status_ok('license'):
td_class.append("correct")
else:
td_class.append("wrong")
f.write(" <td class=\"%s\">%s</td>\n" %
- (" ".join(td_class), boolean_str(pkg.has_license)))
+ (" ".join(td_class), boolean_str(pkg.is_status_ok('license'))))
# License files
td_class = ["centered"]
- if pkg.has_license_files:
+ if pkg.is_status_ok('license-files'):
td_class.append("correct")
else:
td_class.append("wrong")
f.write(" <td class=\"%s\">%s</td>\n" %
- (" ".join(td_class), boolean_str(pkg.has_license_files)))
+ (" ".join(td_class), boolean_str(pkg.is_status_ok('license-files'))))
# Hash
td_class = ["centered"]
- if pkg.has_hash:
+ if pkg.is_status_ok('hash'):
td_class.append("correct")
else:
td_class.append("wrong")
f.write(" <td class=\"%s\">%s</td>\n" %
- (" ".join(td_class), boolean_str(pkg.has_hash)))
+ (" ".join(td_class), boolean_str(pkg.is_status_ok('hash'))))
# Current version
if len(pkg.current_version) > 20:
@@ -691,29 +809,29 @@ def dump_html_pkg(f, pkg):
f.write(" <td class=\"centered\">%s</td>\n" % current_version)
# Latest version
- if pkg.latest_version[0] == RM_API_STATUS_ERROR:
+ if pkg.latest_version['status'] == RM_API_STATUS_ERROR:
td_class.append("version-error")
- if pkg.latest_version[1] is None:
+ if pkg.latest_version['version'] is None:
td_class.append("version-unknown")
- elif pkg.latest_version[1] != pkg.current_version:
+ elif pkg.latest_version['version'] != pkg.current_version:
td_class.append("version-needs-update")
else:
td_class.append("version-good")
- if pkg.latest_version[0] == RM_API_STATUS_ERROR:
+ if pkg.latest_version['status'] == RM_API_STATUS_ERROR:
latest_version_text = "<b>Error</b>"
- elif pkg.latest_version[0] == RM_API_STATUS_NOT_FOUND:
+ elif pkg.latest_version['status'] == RM_API_STATUS_NOT_FOUND:
latest_version_text = "<b>Not found</b>"
else:
- if pkg.latest_version[1] is None:
+ if pkg.latest_version['version'] is None:
latest_version_text = "<b>Found, but no version</b>"
else:
latest_version_text = "<a href=\"https://release-monitoring.org/project/%s\"><b>%s</b></a>" % \
- (pkg.latest_version[2], str(pkg.latest_version[1]))
+ (pkg.latest_version['id'], str(pkg.latest_version['version']))
latest_version_text += "<br/>"
- if pkg.latest_version[0] == RM_API_STATUS_FOUND_BY_DISTRO:
+ if pkg.latest_version['status'] == RM_API_STATUS_FOUND_BY_DISTRO:
latest_version_text += "found by <a href=\"https://release-monitoring.org/distro/Buildroot/\">distro</a>"
else:
latest_version_text += "found by guess"
@@ -732,12 +850,12 @@ def dump_html_pkg(f, pkg):
# URL status
td_class = ["centered"]
- url_str = pkg.url_status
- if pkg.url_status == "Missing" or pkg.url_status == "No Config.in":
+ url_str = pkg.status['url'][1]
+ if pkg.status['url'][0] in ("error", "warning"):
td_class.append("missing_url")
- elif pkg.url_status.startswith("Invalid"):
+ if pkg.status['url'][0] == "error":
td_class.append("invalid_url")
- url_str = "<a href=%s>%s</a>" % (pkg.url, pkg.url_status)
+ url_str = "<a href=%s>%s</a>" % (pkg.url, pkg.status['url'][1])
else:
td_class.append("good_url")
url_str = "<a href=%s>Link</a>" % pkg.url
@@ -832,7 +950,7 @@ def dump_html(packages, stats, date, commit, output):
f.write(html_footer)
-def dump_json(packages, stats, date, commit, output):
+def dump_json(packages, defconfigs, stats, date, commit, output):
# Format packages as a dictionnary instead of a list
# Exclude local field that does not contains real date
excluded_fields = ['url_worker', 'name']
@@ -843,6 +961,12 @@ def dump_json(packages, stats, date, commit, output):
if k not in excluded_fields
} for pkg in packages
}
+ defconfigs = {
+ d.name: {
+ k: v
+ for k, v in d.__dict__.items()
+ } for d in defconfigs
+ }
# Aggregate infrastructures into a single dict entry
statistics = {
k: v
@@ -853,6 +977,8 @@ def dump_json(packages, stats, date, commit, output):
# The actual structure to dump, add commit and date to it
final = {'packages': pkgs,
'stats': statistics,
+ 'defconfigs': defconfigs,
+ 'package_status_checks': Package.status_checks,
'commit': commit,
'date': str(date)}
@@ -892,6 +1018,12 @@ def __main__():
'HEAD']).splitlines()[0].decode()
print("Build package list ...")
packages = get_pkglist(args.npackages, package_list)
+ print("Getting developers ...")
+ developers = parse_developers()
+ print("Build defconfig list ...")
+ defconfigs = get_defconfig_list()
+ for d in defconfigs:
+ d.set_developers(developers)
print("Getting package make info ...")
package_init_make_info()
print("Getting package details ...")
@@ -903,6 +1035,7 @@ def __main__():
pkg.set_check_package_warnings()
pkg.set_current_version()
pkg.set_url()
+ pkg.set_developers(developers)
print("Checking URL status")
check_package_urls(packages)
print("Getting latest versions ...")
@@ -917,7 +1050,7 @@ def __main__():
dump_html(packages, stats, date, commit, args.html)
if args.json:
print("Write JSON")
- dump_json(packages, stats, date, commit, args.json)
+ dump_json(packages, defconfigs, stats, date, commit, args.json)
__main__()
diff --git a/utils/scanpypi b/utils/scanpypi
index 387755bbb8..212dbea85e 100755
--- a/utils/scanpypi
+++ b/utils/scanpypi
@@ -568,12 +568,12 @@ class BuildrootPackage():
hash_header = '# md5, sha256 from {url}\n'.format(
url=self.metadata_url)
lines.append(hash_header)
- hash_line = '{method}\t{digest} {filename}\n'.format(
+ hash_line = '{method} {digest} {filename}\n'.format(
method='md5',
digest=self.used_url['digests']['md5'],
filename=self.filename)
lines.append(hash_line)
- hash_line = '{method}\t{digest} {filename}\n'.format(
+ hash_line = '{method} {digest} {filename}\n'.format(
method='sha256',
digest=self.used_url['digests']['sha256'],
filename=self.filename)
@@ -589,7 +589,7 @@ class BuildrootPackage():
if not data:
break
sha256.update(data)
- hash_line = '{method}\t{digest} {filename}\n'.format(
+ hash_line = '{method} {digest} {filename}\n'.format(
method='sha256',
digest=sha256.hexdigest(),
filename=license_file.replace(self.tmp_extract, '')[1:])