diff options
62 files changed, 395 insertions, 206 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90efd81e50..0ecff99ff3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,6 +119,7 @@ grinn_chiliboard_defconfig: *defconfig grinn_liteboard_defconfig: *defconfig imx23evk_defconfig: *defconfig imx6q-sabresd_defconfig: *defconfig +imx6q-sabresd_qt5_defconfig: *defconfig imx6ulpico_defconfig: *defconfig lego_ev3_defconfig: *defconfig linksprite_pcduino_defconfig: *defconfig diff --git a/DEVELOPERS b/DEVELOPERS index f3944e2748..9df289680e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -543,6 +543,7 @@ F: package/supertuxkart/ N: Fabio Estevam <festevam@gmail.com> F: board/warp7/ F: configs/freescale_imx* +F: configs/imx6q-sabresd* F: configs/imx6ulpico_defconfig F: configs/mx6cubox_defconfig F: configs/mx6sx_udoo_neo_defconfig @@ -947,6 +948,9 @@ F: package/libuio/ F: package/netsniff-ng/ F: package/rabbitmq-c/ +N: Joshua Henderson <joshua.henderson@microchip.com> +F: package/qt5/qt5wayland/ + N: Juha Rantanen <juha@codercoded.com> F: package/acsccid/ @@ -1425,6 +1429,9 @@ N: Rico Bachmann <bachmann@tofwerk.com> F: package/apr-util/ F: package/subversion/ +N: RJ Ascani <rj.ascani@gmail.com> +F: package/azmq/ + N: Rodrigo Rebello <rprebello@gmail.com> F: package/chocolate-doom/ F: package/irssi/ diff --git a/board/freescale/imx6q-sabresd/linux_qt5.fragment b/board/freescale/imx6q-sabresd/linux_qt5.fragment new file mode 100644 index 0000000000..5c0505e510 --- /dev/null +++ b/board/freescale/imx6q-sabresd/linux_qt5.fragment @@ -0,0 +1,4 @@ +# Currently kernel mainline exhibits issues when running cpufreq as ondemand +# governor on mx6. +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y diff --git a/board/freescale/imx6q-sabresd/readme.txt b/board/freescale/imx6q-sabresd/readme.txt index 10e973cf9f..b57c4fb0e1 100644 --- a/board/freescale/imx6q-sabresd/readme.txt +++ b/board/freescale/imx6q-sabresd/readme.txt @@ -54,4 +54,27 @@ To boot your newly created system: emulator at 115200 bps, 8n1; - power on the board. +Testing graphics on the i.MX6Q Sabre SD board +============================================= + +The imx6q-sabresd_qt5_defconfig allows to quickly test the graphics +capabilities of i.MX6 using the opensource Etnaviv graphics stack +and kernel mainline. + +In order to build it: + +make imx6q-sabresd_qt5_defconfig +make + +Then flash the SD card as explained above. + +Running kmscube application: + +# kmscube -D /dev/dri/card1 + +Running Qt5 Cinematic Demo: + +# export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json +# /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience + Enjoy! diff --git a/board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json b/board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json new file mode 100644 index 0000000000..9469dc12a5 --- /dev/null +++ b/board/freescale/imx6q-sabresd/rootfs_overlay/root/sabresd.json @@ -0,0 +1,15 @@ +{ + "device": "/dev/dri/card1", + "hwcursor": false, + "pbuffers": true, + "outputs": [ + { + "name": "HDMI-1", + "mode": "off" + }, + { + "name": "LVDS-1", + "mode": "1024x768" + } + ] +} diff --git a/configs/imx6q-sabresd_qt5_defconfig b/configs/imx6q-sabresd_qt5_defconfig new file mode 100644 index 0000000000..0b4e961080 --- /dev/null +++ b/configs/imx6q-sabresd_qt5_defconfig @@ -0,0 +1,76 @@ +BR2_arm=y +BR2_cortex_a9=y +BR2_ARM_ENABLE_NEON=y +BR2_ARM_ENABLE_VFP=y +BR2_ARM_FPU_VFPV3=y + +# Linux headers same as kernel, a 4.11 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y + +# Additional features needed for packages +BR2_TOOLCHAIN_BUILDROOT_WCHAR=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y + +# System +BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" + +# required tools to create the SD card image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_ROOTFS_OVERLAY="board/freescale/imx6q-sabresd/rootfs_overlay" + +# Bootloader +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05" +BR2_TARGET_UBOOT_FORMAT_IMX=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.6" +BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd" +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6q-sabresd/linux_qt5.fragment" + +# GL driver +BR2_PACKAGE_MESA3D=y +BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y +BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y +BR2_PACKAGE_MESA3D_OPENGL_ES=y + +# Fonts +BR2_PACKAGE_BITSTREAM_VERA=y +BR2_PACKAGE_CANTARELL=y +BR2_PACKAGE_DEJAVU=y +BR2_PACKAGE_FONT_AWESOME=y +BR2_PACKAGE_GHOSTSCRIPT_FONTS=y +BR2_PACKAGE_INCONSOLATA=y +BR2_PACKAGE_LIBERATION=y + +# GL demos +BR2_PACKAGE_GLMARK2=y +BR2_PACKAGE_KMSCUBE=y +BR2_PACKAGE_LIBV4L=y +BR2_PACKAGE_MESA3D_DEMOS=y + +# Qt5 +BR2_PACKAGE_QT5=y +BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y +BR2_PACKAGE_QT5BASE_OPENGL_LIB=y +BR2_PACKAGE_QT5BASE_LINUXFB=y +BR2_PACKAGE_QT5BASE_FONTCONFIG=y +BR2_PACKAGE_QT5BASE_GIF=y +BR2_PACKAGE_QT5BASE_JPEG=y +BR2_PACKAGE_QT5CINEX=y +BR2_PACKAGE_QT5CINEX_HD=y diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk index 342c7a8a37..7de7f51af1 100644 --- a/fs/squashfs/squashfs.mk +++ b/fs/squashfs/squashfs.mk @@ -6,6 +6,8 @@ ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs +ROOTFS_SQUASHFS_ARGS = -noappend -processors $(PARALLEL_JOBS) + ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y) ROOTFS_SQUASHFS_ARGS += -comp lz4 -Xhc else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y) @@ -19,8 +21,7 @@ ROOTFS_SQUASHFS_ARGS += -comp gzip endif define ROOTFS_SQUASHFS_CMD - $(HOST_DIR)/bin/mksquashfs $(TARGET_DIR) $@ -noappend \ - $(ROOTFS_SQUASHFS_ARGS) + $(HOST_DIR)/bin/mksquashfs $(TARGET_DIR) $@ $(ROOTFS_SQUASHFS_ARGS) endef $(eval $(call ROOTFS_TARGET,squashfs)) diff --git a/package/Config.in b/package/Config.in index b5170b044c..85416afdf4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1284,6 +1284,7 @@ menu "Networking" source "package/alljoyn-base/Config.in" source "package/alljoyn-tcl/Config.in" source "package/alljoyn-tcl-base/Config.in" + source "package/azmq/Config.in" source "package/azure-iot-sdk-c/Config.in" source "package/batman-adv/Config.in" source "package/c-ares/Config.in" diff --git a/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch b/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch new file mode 100644 index 0000000000..98975d27ed --- /dev/null +++ b/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch @@ -0,0 +1,43 @@ +From d960f93fb52e373f76cfedbee5f4fb0c5276856a Mon Sep 17 00:00:00 2001 +From: RJ Ascani <rj.ascani@gmail.com> +Date: Thu, 20 Jul 2017 15:53:40 -0700 +Subject: [PATCH] Conditionally disable test and doc builds + +Signed-off-by: RJ Ascani <rj.ascani@gmail.com> +--- + CMakeLists.txt | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5b5b9cc..97006a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,7 +49,9 @@ include_directories(${Boost_INCLUDE_DIRS} + ${ZeroMQ_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}) + +-enable_testing() ++if (BUILD_TESTING) ++ enable_testing() ++endif() + + macro(add_catch_test name) + if (TEST_REPORT_FORMAT) +@@ -59,8 +61,12 @@ macro(add_catch_test name) + endif() + endmacro() + +-add_subdirectory(test) +-add_subdirectory(doc) ++if (BUILD_TESTING) ++ add_subdirectory(test) ++endif() ++if (BUILD_DOC) ++ add_subdirectory(doc) ++endif() + + install(DIRECTORY ${PROJECT_SOURCE_DIR}/azmq + DESTINATION include) +-- +2.13.3 + diff --git a/package/azmq/Config.in b/package/azmq/Config.in new file mode 100644 index 0000000000..422a058832 --- /dev/null +++ b/package/azmq/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_AZMQ + bool "azmq" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_ATOMIC + depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_USE_WCHAR # boost + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + select BR2_PACKAGE_ZEROMQ + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_CHRONO + select BR2_PACKAGE_BOOST_DATE_TIME + select BR2_PACKAGE_BOOST_LOG + select BR2_PACKAGE_BOOST_RANDOM + select BR2_PACKAGE_BOOST_REGEX + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_BOOST_THREAD + help + This library provides Boost Asio style bindings for ZeroMQ. + + https://github.com/zeromq/azmq + +comment "azmq needs a toolchain w/ C++11, wchar and threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ + && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) + +comment "azmq needs exception_ptr" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/azmq/azmq.hash b/package/azmq/azmq.hash new file mode 100644 index 0000000000..d3993f4988 --- /dev/null +++ b/package/azmq/azmq.hash @@ -0,0 +1,3 @@ +# Locally calculated +# https://github.com/zeromq/azmq/archive/v1.0.tar.gz +sha256 c204c731bcb7810ca3a2c5515e88974ef2ff8d0589e60a897dc238b369180e7b azmq-v1.0.tar.gz diff --git a/package/azmq/azmq.mk b/package/azmq/azmq.mk new file mode 100644 index 0000000000..427ad0f5b4 --- /dev/null +++ b/package/azmq/azmq.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# azmq +# +################################################################################ + +AZMQ_VERSION = v1.0 +AZMQ_SITE = $(call github,zeromq,azmq,$(AZMQ_VERSION)) +AZMQ_DEPENDENCIES = boost zeromq +AZMQ_LICENSE = BSL-1.0 +AZMQ_LICENSE_FILES = LICENSE-BOOST_1_0 + +# AZMQ is a header only library, so it does not need to be installed on the +# target. +AZMQ_INSTALL_STAGING = YES +AZMQ_INSTALL_TARGET = NO + +$(eval $(cmake-package)) diff --git a/package/erlang-jiffy/erlang-jiffy.hash b/package/erlang-jiffy/erlang-jiffy.hash index 1f83e2789c..4a201fe5d6 100644 --- a/package/erlang-jiffy/erlang-jiffy.hash +++ b/package/erlang-jiffy/erlang-jiffy.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d erlang-jiffy-0.14.8.tar.gz +sha256 c555726f592b79894c253ca1dc3c3aec6a5697271d29364d57f8175f387b86f3 erlang-jiffy-0.14.11.tar.gz diff --git a/package/erlang-jiffy/erlang-jiffy.mk b/package/erlang-jiffy/erlang-jiffy.mk index 3139454546..9a688f7c9b 100644 --- a/package/erlang-jiffy/erlang-jiffy.mk +++ b/package/erlang-jiffy/erlang-jiffy.mk @@ -4,17 +4,11 @@ # ################################################################################ -ERLANG_JIFFY_VERSION = 0.14.8 +ERLANG_JIFFY_VERSION = 0.14.11 ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) ERLANG_JIFFY_LICENSE = MIT (core), \ BSD-3-Clause (Google double conversion library), \ BSD-3-Clause (tests) ERLANG_JIFFY_LICENSE_FILES = LICENSE -# Set version manually in jiffy.app.src otherwise "git describe" is used. -define ERLANG_JIFFY_SET_VERSION_HOOK - $(SED) 's/{vsn, git}/{vsn, "$(ERLANG_JIFFY_VERSION)"}/' $(@D)/src/jiffy.app.src -endef -ERLANG_JIFFY_POST_PATCH_HOOKS = ERLANG_JIFFY_SET_VERSION_HOOK - $(eval $(rebar-package)) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index f1e19193e9..ccf74d6212 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.2.2/ -md5 1ede9a41223c78528b8c5d23e69a2667 expat-2.2.2.tar.bz2 -sha1 891cee988b38d5d66953f62f94c3150b8810a70a expat-2.2.2.tar.bz2 +# From https://sourceforge.net/projects/expat/files/expat/2.2.3/ +md5 f053af63ef5f39bd9b78d01fbc203334 expat-2.2.3.tar.bz2 +sha1 e2be3a2aa8d12ce70184aab418d0d5d96ed86d0e expat-2.2.3.tar.bz2 # Calculated based on the hashes above -sha256 4376911fcf81a23ebd821bbabc26fd933f3ac74833f74924342c29aad2c86046 expat-2.2.2.tar.bz2 +sha256 b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f expat-2.2.3.tar.bz2 diff --git a/package/expat/expat.mk b/package/expat/expat.mk index a78d326d71..a6fa37323d 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.2.2 +EXPAT_VERSION = 2.2.3 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2 EXPAT_INSTALL_STAGING = YES @@ -15,14 +15,5 @@ HOST_EXPAT_DEPENDENCIES = host-pkgconf EXPAT_LICENSE = MIT EXPAT_LICENSE_FILES = COPYING -# Kernel versions older than 3.17 do not support getrandom() -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17),) -EXPAT_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DXML_POOR_ENTROPY" -endif - -# Make build succeed on host kernel older than 3.17. getrandom() will still -# be used on newer kernels. -HOST_EXPAT_CONF_ENV += CPPFLAGS="$(HOST_CPPFLAGS) -DXML_POOR_ENTROPY" - $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch b/package/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch deleted file mode 100644 index 80bf7a7b34..0000000000 --- a/package/fontconfig/0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1ab5258f7c2abfafcd63a760ca08bf93591912da Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 14 Dec 2016 16:11:05 -0800 -Subject: [PATCH] Avoid conflicts with integer width macros from TS - 18661-1:2014 - -glibc 2.25+ has now defined these macros in <limits.h> -https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a - -Create an alias for FC_CHAR_WIDTH for ABI compatibility - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> ---- -Patch status: upstream - - fontconfig/fontconfig.h | 3 ++- - src/fcobjs.h | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h -index 5c72b22..070a557 100644 ---- a/fontconfig/fontconfig.h -+++ b/fontconfig/fontconfig.h -@@ -128,7 +128,8 @@ typedef int FcBool; - #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION - - /* Adjust outline rasterizer */ --#define FC_CHAR_WIDTH "charwidth" /* Int */ -+#define FC_CHARWIDTH "charwidth" /* Int */ -+#define FC_CHAR_WIDTH FC_CHARWIDTH - #define FC_CHAR_HEIGHT "charheight"/* Int */ - #define FC_MATRIX "matrix" /* FcMatrix */ - -diff --git a/src/fcobjs.h b/src/fcobjs.h -index 1fc4f65..d27864b 100644 ---- a/src/fcobjs.h -+++ b/src/fcobjs.h -@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL) - FC_OBJECT (RGBA, FcTypeInteger, NULL) - FC_OBJECT (SCALE, FcTypeDouble, NULL) - FC_OBJECT (MINSPACE, FcTypeBool, NULL) --FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL) -+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL) - FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) - FC_OBJECT (MATRIX, FcTypeMatrix, NULL) - FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) --- -2.10.2 - diff --git a/package/fontconfig/fontconfig.hash b/package/fontconfig/fontconfig.hash index ad3582557b..e9963f6f3f 100644 --- a/package/fontconfig/fontconfig.hash +++ b/package/fontconfig/fontconfig.hash @@ -1,2 +1,2 @@ -# From https://lists.freedesktop.org/archives/fontconfig/2016-August/005794.html -sha256 b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 fontconfig-2.12.1.tar.bz2 +# From https://lists.freedesktop.org/archives/fontconfig/2017-July/005961.html +sha256 668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c fontconfig-2.12.4.tar.bz2 diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk index 8d395bccd2..d8a2f54918 100644 --- a/package/fontconfig/fontconfig.mk +++ b/package/fontconfig/fontconfig.mk @@ -4,16 +4,12 @@ # ################################################################################ -FONTCONFIG_VERSION = 2.12.1 +FONTCONFIG_VERSION = 2.12.4 FONTCONFIG_SITE = http://fontconfig.org/release FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2 FONTCONFIG_INSTALL_STAGING = YES - -# When -# 0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch is -# removed, the host-gperf dependency should be removed. -FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf -HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf host-gperf +FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf +HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf FONTCONFIG_LICENSE = fontconfig license FONTCONFIG_LICENSE_FILES = COPYING diff --git a/package/libatomic_ops/libatomic_ops.hash b/package/libatomic_ops/libatomic_ops.hash index 47a281ddf2..9e67624d91 100644 --- a/package/libatomic_ops/libatomic_ops.hash +++ b/package/libatomic_ops/libatomic_ops.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 ef8335676f18a111f885d48810ab090fb6bfad94e5a5dd76cdccd2a536828662 libatomic_ops-libatomic_ops-7_4_4.tar.gz +sha256 cf7e61f7f929651b65d6186a03446819805c867f4f75c7148c8f26321eb66260 libatomic_ops-v7.4.6.tar.gz diff --git a/package/libatomic_ops/libatomic_ops.mk b/package/libatomic_ops/libatomic_ops.mk index 52d2745213..483f118128 100644 --- a/package/libatomic_ops/libatomic_ops.mk +++ b/package/libatomic_ops/libatomic_ops.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBATOMIC_OPS_VERSION = libatomic_ops-7_4_4 +LIBATOMIC_OPS_VERSION = v7.4.6 LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,$(LIBATOMIC_OPS_VERSION)) LIBATOMIC_OPS_AUTORECONF = YES diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index c8289cda58..f9fe4fe30f 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 41ce914a88da21d3b07a76023beca57576ca5b376c6ac440c80bc581cbca1250 libuv-v1.12.0.tar.gz +sha256 6a4976887594ec9f4e8521c95598dbbc478c59733056a5cf46354e93a1bc8400 libuv-v1.13.1.tar.gz diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 891ac74509..06c5520086 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.12.0 +LIBUV_VERSION = v1.13.1 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES diff --git a/package/log4cpp/0001-Fix-musl-compile.patch b/package/log4cpp/0001-Fix-musl-compile.patch deleted file mode 100644 index f1a13a072c..0000000000 --- a/package/log4cpp/0001-Fix-musl-compile.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 17562259fb6684f351a70b98b4f3b438927ba1aa Mon Sep 17 00:00:00 2001 -From: Peter Seiderer <ps.report@gmx.net> -Date: Mon, 11 Jul 2016 22:58:31 +0200 -Subject: [PATCH] Fix musl compile. - -Include proper config.h (via log4cpp/Portability.hh) to fix the -evaluate of LOG4CPP_HAVE_STDINT_H in the file tests/Clock.hh - -Fixes: - - Clock.hh:17:13: error: 'int64_t' does not name a type - typedef int64_t usec_t; - -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - log4cpp/tests/Clock.hh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/log4cpp/tests/Clock.hh b/log4cpp/tests/Clock.hh -index 4bf0ca4..45c6467 100644 ---- a/log4cpp/tests/Clock.hh -+++ b/log4cpp/tests/Clock.hh -@@ -6,6 +6,8 @@ - #ifndef __CLOCK_H - #define __CLOCK_H - -+#include <log4cpp/Portability.hh> -+ - #ifdef LOG4CPP_HAVE_STDINT_H - #include <stdint.h> - #endif // LOG4CPP_HAVE_STDINT_H --- -2.8.1 - diff --git a/package/log4cpp/log4cpp.hash b/package/log4cpp/log4cpp.hash index 6467aabfd9..fd73988077 100644 --- a/package/log4cpp/log4cpp.hash +++ b/package/log4cpp/log4cpp.hash @@ -1,3 +1,5 @@ # From http://sourceforge.net/projects/log4cpp/files/log4cpp-1.1.x%20%28new%29/log4cpp-1.1/ -md5 1e173df8ee97205f412ff84aa93b8fbe log4cpp-1.1.1.tar.gz -sha1 23aa5bd7d6f79992c92bad3e1c6d64a34f8fcf68 log4cpp-1.1.1.tar.gz +md5 b9e2cee932da987212f2c74b767b4d8b log4cpp-1.1.3.tar.gz +sha1 74f0fea7931dc1bc4e5cd34a6318cd2a51322041 log4cpp-1.1.3.tar.gz +# Locally computed +sha256 2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d log4cpp-1.1.3.tar.gz diff --git a/package/log4cpp/log4cpp.mk b/package/log4cpp/log4cpp.mk index 1801cffffc..aab05f22f6 100644 --- a/package/log4cpp/log4cpp.mk +++ b/package/log4cpp/log4cpp.mk @@ -5,7 +5,7 @@ ################################################################################ LOG4CPP_VERSION_MAJOR = 1.1 -LOG4CPP_VERSION = $(LOG4CPP_VERSION_MAJOR).1 +LOG4CPP_VERSION = $(LOG4CPP_VERSION_MAJOR).3 LOG4CPP_SITE = http://downloads.sourceforge.net/project/log4cpp/log4cpp-1.1.x%20%28new%29/log4cpp-$(LOG4CPP_VERSION_MAJOR) LOG4CPP_SUBDIR = log4cpp # The "or later" is indicated in the HTML documentation diff --git a/package/logrotate/logrotate.hash b/package/logrotate/logrotate.hash index 4985a17a87..860263c436 100644 --- a/package/logrotate/logrotate.hash +++ b/package/logrotate/logrotate.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 62aa0229cfd34c7b6ea6a6736d569983bf4a3dd1f3c9e9c2efe2ffe2a0a55cf2 logrotate-3.11.0.tar.gz +sha256 683ccb7fff74082471aa6bd9e962ae7a3f4d55eea7df41fd97aa12ec6f55e657 logrotate-3.12.3.tar.gz diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index b11fc883d4..274b2b649d 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -4,7 +4,7 @@ # ################################################################################ -LOGROTATE_VERSION = 3.11.0 +LOGROTATE_VERSION = 3.12.3 LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION)) LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE_FILES = COPYING diff --git a/package/logsurfer/logsurfer.hash b/package/logsurfer/logsurfer.hash index 2c14078f76..539a41a3ce 100644 --- a/package/logsurfer/logsurfer.hash +++ b/package/logsurfer/logsurfer.hash @@ -1,2 +1,3 @@ -# Locally computed: -sha256 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af logsurfer-1.8.tar.gz +# From https://www.crypt.gen.nz/logsurfer/ +md5 4c26a74d813ccf766117c95c644aa601 logsurfer-1.8.tar.gz +sha256 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af logsurfer-1.8.tar.gz diff --git a/package/luv/luv.hash b/package/luv/luv.hash index 140fe96386..44f4048df3 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 2eab80360f8ab6793612bb59d067a56664ac9a5a14988e0a09a53d0bff20c131 luv-1.9.1-0.tar.gz +sha256 1051cfbdc361d5ea6d978fd71273b94c8a5007d76af498b456b297b18de9622c luv-1.9.1-1.tar.gz diff --git a/package/luv/luv.mk b/package/luv/luv.mk index 43cecf57fc..633bfe6890 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.9.1-0 +LUV_VERSION = 1.9.1-1 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash index 99fd69e798..7f7abdbf49 100644 --- a/package/luvi/luvi.hash +++ b/package/luvi/luvi.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b36a3b96ec5852398338bc38567c5bb589783487c65130e1d702ff98fac3a6b7 luvi-src-v2.7.5.tar.gz +sha256 65d3ded5007d5bb58fc3b76013913596fd42ed7326310d67c668ddf9a017a179 luvi-v2.7.6.tar.gz diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index 956c37ffab..7dd5e5a323 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -4,9 +4,8 @@ # ################################################################################ -LUVI_VERSION = v2.7.5 -LUVI_SOURCE = luvi-src-$(LUVI_VERSION).tar.gz -LUVI_SITE = https://github.com/luvit/luvi/releases/download/$(LUVI_VERSION) +LUVI_VERSION = v2.7.6 +LUVI_SITE = $(call github,luvit,luvi,$(LUVI_VERSION)) LUVI_LICENSE = Apache-2.0 LUVI_LICENSE_FILES = LICENSE.txt LUVI_DEPENDENCIES = libuv luajit luv host-luajit diff --git a/package/lvm2/lvm2.hash b/package/lvm2/lvm2.hash index 81d0e974e4..9f7a6c6f51 100644 --- a/package/lvm2/lvm2.hash +++ b/package/lvm2/lvm2.hash @@ -1,2 +1,2 @@ # From ftp://sources.redhat.com/pub/lvm2/releases/sha512.sum -sha512 801adcc2ae483f81edf6bfba73090b6b8f710370e48764f08a62da71d617157075bea01593c2535ad5ba71dcb5e0cfe83cec9a65180a6e8b9e0d214bdee79883 LVM2.2.02.171.tgz +sha512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e LVM2.2.02.173.tgz diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index f5cd0b530d..63ac109ca9 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LVM2_VERSION = 2.02.171 +LVM2_VERSION = 2.02.173 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES diff --git a/package/lzip/lzip.hash b/package/lzip/lzip.hash index 8855231fb3..e074c76005 100644 --- a/package/lzip/lzip.hash +++ b/package/lzip/lzip.hash @@ -1,4 +1,2 @@ -# From http://lists.nongnu.org/archive/html/lzip-bug/2016-06/msg00002.html -sha1 ef42f3209d02c3b3c217a61c8f127bcb8747b128 lzip-1.18.tar.gz -# Locally calculated after checking pgp signature -sha256 47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd lzip-1.18.tar.gz +# From http://lists.nongnu.org/archive/html/lzip-bug/2017-05/msg00000.html +sha256 ffadc4f56be1bc0d3ae155ec4527bd003133bdc703a753b2cc683f610e646ba9 lzip-1.19.tar.gz diff --git a/package/lzip/lzip.mk b/package/lzip/lzip.mk index cb8803737e..b7ba5dd21d 100644 --- a/package/lzip/lzip.mk +++ b/package/lzip/lzip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LZIP_VERSION = 1.18 +LZIP_VERSION = 1.19 LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE_FILES = COPYING diff --git a/package/lzo/lzo.hash b/package/lzo/lzo.hash index 415ed99dad..cf2734fc7f 100644 --- a/package/lzo/lzo.hash +++ b/package/lzo/lzo.hash @@ -1,2 +1,4 @@ # From http://www.oberhumer.com/opensource/lzo/ -sha1 e2a60aca818836181e7e6f8c4f2c323aca6ac057 lzo-2.09.tar.gz +sha1 4924676a9bae5db58ef129dc1cebce3baa3c4b5d lzo-2.10.tar.gz +# Locally computed +sha256 c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072 lzo-2.10.tar.gz diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 17d8d0fca7..5b8efdd54d 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -4,7 +4,7 @@ # ################################################################################ -LZO_VERSION = 2.09 +LZO_VERSION = 2.10 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download LZO_LICENSE = GPL-2.0+ LZO_LICENSE_FILES = COPYING diff --git a/package/mcelog/0001-memutil.h-add-missing-include-for-va_list.patch b/package/mcelog/0001-memutil.h-add-missing-include-for-va_list.patch deleted file mode 100644 index f9e08be18d..0000000000 --- a/package/mcelog/0001-memutil.h-add-missing-include-for-va_list.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 36aad32283eae5b47a05e3adfa3f5f6a7b1b55c0 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <bernd.kuhls@t-online.de> -Date: Sun, 11 Jun 2017 10:02:39 +0200 -Subject: [PATCH] memutil.h: add missing include for va_list - -Fixes compile error with uclibc-ng: - -In file included from mcelog.c:51:0: -memutil.h:4:48: error: unknown type name 'va_list' - int xvasprintf(char **ret, const char *format, va_list ap); - -Patch sent upstream: https://github.com/andikleen/mcelog/pull/54 - -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> ---- - memutil.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/memutil.h b/memutil.h -index 81028e9..dbed7fa 100644 ---- a/memutil.h -+++ b/memutil.h -@@ -1,4 +1,5 @@ - #include <stdlib.h> -+#include <stdarg.h> - - int xasprintf(char **strp, const char *fmt, ...); - int xvasprintf(char **ret, const char *format, va_list ap); --- -2.11.0 - diff --git a/package/mcelog/mcelog.hash b/package/mcelog/mcelog.hash index f1c0cd54c6..1a9dd602dc 100644 --- a/package/mcelog/mcelog.hash +++ b/package/mcelog/mcelog.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 825644a6cfd9b149e848d91d322724f2fb48f3a98441a25d9d38a5dbe02fe1ef mcelog-v152.tar.gz +sha256 d8f3dde21b2e0d76740f374385817c11b3fd69b095a186a6dd12c7b0ba0cca8f mcelog-v153.tar.gz diff --git a/package/mcelog/mcelog.mk b/package/mcelog/mcelog.mk index d12fc44f74..dca6a18c26 100644 --- a/package/mcelog/mcelog.mk +++ b/package/mcelog/mcelog.mk @@ -4,7 +4,7 @@ # ################################################################################ -MCELOG_VERSION = v152 +MCELOG_VERSION = v153 MCELOG_SITE = $(BR2_KERNEL_MIRROR)/scm/utils/cpu/mce/mcelog.git MCELOG_SITE_METHOD = git MCELOG_LICENSE = GPL-2.0 diff --git a/package/mdadm/mdadm.hash b/package/mdadm/mdadm.hash index 7f228d99dc..6132a6d8ca 100644 --- a/package/mdadm/mdadm.hash +++ b/package/mdadm/mdadm.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc -sha256 8ae5f45306b873190e91f410709b00e51997b633c072b33f8efd9f7df022ca68 mdadm-3.3.4.tar.xz +sha256 1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9 mdadm-4.0.tar.xz diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index c08e05774b..207b0be60d 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -4,14 +4,14 @@ # ################################################################################ -MDADM_VERSION = 3.3.4 +MDADM_VERSION = 4.0 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING MDADM_MAKE_OPTS = \ - CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm + CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm MDADM_INSTALL_TARGET_OPTS = \ DESTDIR=$(TARGET_DIR)/usr -C $(MDADM_DIR) install-mdadm diff --git a/package/memcached/memcached.hash b/package/memcached/memcached.hash index 1a88cc7283..204590d27c 100644 --- a/package/memcached/memcached.hash +++ b/package/memcached/memcached.hash @@ -1,4 +1,4 @@ -# From http://www.memcached.org/files/memcached-1.4.37.tar.gz.sha1 -sha1 6a6c2ab70e9470fef939afff1cb58b7602077611 memcached-1.4.37.tar.gz +# From http://www.memcached.org/files/memcached-1.5.0.tar.gz.sha1 +sha1 e12af93e63c05ab7e89398e4cfd0bfc7b7bff1c5 memcached-1.5.0.tar.gz # Calculated based on the hash above -sha256 2f335ab9110ce39036c5271ef39a582a852e424bc9659e421844073cfdf8606b memcached-1.4.37.tar.gz +sha256 c001f812024bb461b5e4d7d0506daab63dff9614eea26f46536c3b7e1e601c32 memcached-1.5.0.tar.gz diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk index 087be570a3..d0e3bc01d9 100644 --- a/package/memcached/memcached.mk +++ b/package/memcached/memcached.mk @@ -4,7 +4,7 @@ # ################################################################################ -MEMCACHED_VERSION = 1.4.37 +MEMCACHED_VERSION = 1.5.0 MEMCACHED_SITE = http://www.memcached.org/files MEMCACHED_DEPENDENCIES = libevent MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 1356c38ef3..7b9e4b42cf 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 = 17.1.5 +MESA3D_HEADERS_VERSION = 17.1.6 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index fb6427a555..f2dda20645 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2017-July/000342.html -md5 6cf936fbcaadd98924298a7009e8265d mesa-17.1.5.tar.xz -sha1 709a38eb9ecf54390c303071a016c23c1d4bd64b mesa-17.1.5.tar.xz -sha256 378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9 mesa-17.1.5.tar.xz -sha512 a12671afd812b304e1db690b123a9de16332608541f71cc3ee9128a3630c81416d46255e5bdbf19e14e85716b218f447987b555e3bc0081b8b6f392556fa21e2 mesa-17.1.5.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2017-August/000346.html +md5 54758bf842f9ea53c8b57cce4311b87e mesa-17.1.6.tar.xz +sha1 2acc201e24ea67c5231074d6746a42a747228ed6 mesa-17.1.6.tar.xz +sha256 0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50 mesa-17.1.6.tar.xz +sha512 cf57f29a21208f0a9bc84157f806bcaf6fd0583352449fcb986b05773eeefc99c4040dc41b242782dd5aa9ff7f9c5312b17a4db82d87f600acf165b6acdfc95a mesa-17.1.6.tar.xz diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 1654046f02..e62dfff148 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 = 17.1.5 +MESA3D_VERSION = 17.1.6 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos diff --git a/package/minizip/minizip.hash b/package/minizip/minizip.hash index 994ed60a5b..718026c1f6 100644 --- a/package/minizip/minizip.hash +++ b/package/minizip/minizip.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 ac361f40531d9fb7222d4befd10d160c647d5e85138f6bc9eda080ed8f937fb8 minizip-5f56dd81d94bd7028f7dc05d7d14112697c30241.tar.gz +sha256 5666b5ee3e85dfd2dd119970613c12e6267d31813f07d3ffa5d359fe272cb6d1 minizip-1.1.tar.gz diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 835dfb9121..bcd6cc928f 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIZIP_VERSION = 5f56dd81d94bd7028f7dc05d7d14112697c30241 +MINIZIP_VERSION = 1.1 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) MINIZIP_DEPENDENCIES = zlib MINIZIP_AUTORECONF = YES diff --git a/package/mksh/mksh.hash b/package/mksh/mksh.hash index e92acd93e5..411baa8624 100644 --- a/package/mksh/mksh.hash +++ b/package/mksh/mksh.hash @@ -1,4 +1,4 @@ # From http://www.mirbsd.org/mksh.htm#build -md5 be0a6fb93b4a5f927bcc1893bb6692f8 mksh-R54.tgz +md5 718c44251b52c48e7312903273e263f4 mksh-R55.tgz # Calculated based on the hash above -sha256 8bce3837c386684aa7780f085f1a4dbd5e3e26fb5c528ee0d41ae29af7f39013 mksh-R54.tgz +sha256 ced42cb4a181d97d52d98009eed753bd553f7c34e6991d404f9a8dcb45c35a57 mksh-R55.tgz diff --git a/package/mksh/mksh.mk b/package/mksh/mksh.mk index 4d91bfcf44..b5706dbe0f 100644 --- a/package/mksh/mksh.mk +++ b/package/mksh/mksh.mk @@ -4,7 +4,7 @@ # ################################################################################ -MKSH_VERSION = R54 +MKSH_VERSION = R55 MKSH_SOURCE = mksh-$(MKSH_VERSION).tgz MKSH_SITE = https://www.mirbsd.org/MirOS/dist/mir/mksh # For MirOS License see https://www.mirbsd.org/TaC-mksh.txt diff --git a/package/netatalk/netatalk.hash b/package/netatalk/netatalk.hash index 955ffd4018..1b974f5b6c 100644 --- a/package/netatalk/netatalk.hash +++ b/package/netatalk/netatalk.hash @@ -1,3 +1,3 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.8/ -md5 9cab934ca32b8979f389da52d44c69c2 netatalk-3.1.8.tar.bz2 -sha1 00518461a311e6c17c95738ac214c8f06f863b4b netatalk-3.1.8.tar.bz2 +# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.9/ +md5 d1d385ae6c3dc45eef4c923472f8fa5f netatalk-3.1.9.tar.bz2 +sha1 ac746efc00e8cfbe5042a7835b27480bb83505cd netatalk-3.1.9.tar.bz2 diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk index 8e661a04a8..e0085db74a 100644 --- a/package/netatalk/netatalk.mk +++ b/package/netatalk/netatalk.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETATALK_VERSION = 3.1.8 +NETATALK_VERSION = 3.1.9 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index ae03051987..cca94ba338 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -57,13 +57,21 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time # Hooks to collect statistics about installed files +define _step_pkg_size_get_file_list + (cd $(TARGET_DIR) ; \ + ( \ + find . -xtype f -print0 | xargs -0 md5sum ; \ + find . -xtype d -print0 | xargs -0 -I{} printf 'directory {}\n'; \ + ) \ + ) | sort > $1 +endef + # This hook will be called before the target installation of a # package. We store in a file named .br_filelist_before the list of # files currently installed in the target. Note that the MD5 is also # stored, in order to identify if the files are overwritten. define step_pkg_size_start - (cd $(TARGET_DIR) ; find . -type f -print0 | xargs -0 md5sum) | sort > \ - $($(PKG)_DIR)/.br_filelist_before + $(call _step_pkg_size_get_file_list,$($(PKG)_DIR)/.br_filelist_before) endef # This hook will be called after the target installation of a @@ -72,8 +80,7 @@ endef # a diff with the .br_filelist_before to compute the list of files # installed by this package. define step_pkg_size_end - (cd $(TARGET_DIR); find . -type f -print0 | xargs -0 md5sum) | sort > \ - $($(PKG)_DIR)/.br_filelist_after + $(call _step_pkg_size_get_file_list,$($(PKG)_DIR)/.br_filelist_after) comm -13 $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after | \ while read hash file ; do \ echo "$(1),$${file}" >> $(BUILD_DIR)/packages-file-list.txt ; \ diff --git a/package/qt5/Config.in b/package/qt5/Config.in index abaa584991..1802c86f85 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -77,6 +77,7 @@ source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5tools/Config.in" source "package/qt5/qt5virtualkeyboard/Config.in" +source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5websockets/Config.in" diff --git a/package/qt5/qt5wayland/Config.in b/package/qt5/qt5wayland/Config.in new file mode 100644 index 0000000000..82110ccefc --- /dev/null +++ b/package/qt5/qt5wayland/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_QT5WAYLAND + bool "qt5wayland" + depends on BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_WAYLAND + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5wayland module. + + http://qt.io + +comment "qt5wayland needs an OpenGL-capable backend" + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + +if BR2_PACKAGE_QT5WAYLAND + +config BR2_PACKAGE_QT5WAYLAND_COMPOSITOR + bool "Enable compositor (experimental)" + help + The compositor API is still experimental, and not built by + default. + +endif diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash new file mode 100644 index 0000000000..95b88241b3 --- /dev/null +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -0,0 +1,5 @@ +# hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwayland-opensource-src-5.6.2.tar.xz.mirrorlist +sha256 035c3199f4719627b64b7020f0f4574da2b4cb78c6981aba75f27b872d8e6c86 qtwayland-opensource-src-5.6.2.tar.xz + +# Hash from: http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz.mirrorlist +sha256 cf0cb1982a7b748bfec8c7834691f13072f104884c61809d0bbd1a01ebda3ffa qtwayland-opensource-src-5.9.1.tar.xz diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk new file mode 100644 index 0000000000..0a7bdb8cf9 --- /dev/null +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -0,0 +1,61 @@ +################################################################################ +# +# qt5wayland +# +################################################################################ + +QT5WAYLAND_VERSION = $(QT5_VERSION) +QT5WAYLAND_SITE = $(QT5_SITE) +QT5WAYLAND_SOURCE = qtwayland-opensource-src-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_DEPENDENCIES = qt5base qt5declarative wayland +QT5WAYLAND_INSTALL_STAGING = YES + +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 +endif + +define QT5WAYLAND_CONFIGURE_CMDS + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5WAYLAND_QMAKEFLAGS)) +endef + +define QT5WAYLAND_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5WAYLAND_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install + $(QT5_LA_PRL_FILES_FIXUP) +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 +endif + +define QT5WAYLAND_INSTALL_TARGET_CMDS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland* $(TARGET_DIR)/usr/lib/qt/plugins + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland* $(TARGET_DIR)/usr/lib/qt/plugins/platforms + $(QT5WAYLAND_INSTALL_COMPOSITOR) +endef + +$(eval $(generic-package)) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index d04abf36de..bed2aefb1e 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,4 +1,4 @@ # From http://www.sqlite.org/download.html -sha1 58f2cabffb3ff4761a3ac7f834d9db7b46307c1f sqlite-autoconf-3190300.tar.gz +sha1 2a451bcf42dc0865840463f7efc3f51cebeb4ea8 sqlite-autoconf-3200000.tar.gz # Calculated based on the hash above -sha256 06129c03dced9f87733a8cba408871bd60673b8f93b920ba8d815efab0a06301 sqlite-autoconf-3190300.tar.gz +sha256 3814c6f629ff93968b2b37a70497cfe98b366bf587a2261a56a5f750af6ae6a0 sqlite-autoconf-3200000.tar.gz diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index f6b249d941..1bfa6ca4ad 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLITE_VERSION = 3190300 +SQLITE_VERSION = 3200000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2017 SQLITE_LICENSE = Public domain |
