Merge branch 'master' of ssh://g.hz.netease.com:22222/IoT/PV2/SmartAudioPV2

This commit is contained in:
wangzijiao 2019-01-04 09:32:05 +08:00
commit a09a2a63ba
4 changed files with 113 additions and 22 deletions

Binary file not shown.

View File

@ -10,13 +10,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=qt5
PKG_VERSION:=5.10.1
PKG_VERSION:=5.11.3
PKG_RELEASE:=1
IS_PREBUILT:=yes
ifeq ($(IS_PREBUILT),yes)
PKG_MD5SUM:=7b478dd1e5fbb05b3a6b63bf1169b1da
PKG_MD5SUM:=21fd82cc3aa2aee2d03bc166b92aca28
PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION)-prebuilt.tar.bz2
PKG_BUILD_DIR=$(COMPILE_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION)-prebuilt
else ifeq ($(IS_PREBUILT),64yes)
@ -78,7 +78,7 @@ endef
define Package/qt5-qml
$(call Package/qt5/Default)
TITLE+=qml
DEPENDS+=+qt5-core +qt5-network +qt5-gui +qt5-remoteobjects
DEPENDS+=+qt5-core +qt5-network +qt5-gui +qt5-remoteobjects +qt5-widgets
endef
define Package/qt5-remoteobjects
@ -105,6 +105,12 @@ define Package/qt5-quick-controls
DEPENDS+=+qt5-gui +qt5-network +qt5-qml +qt5-quick +qt5-widgets
endef
define Package/qt5-quick-controls-2
$(call Package/qt5/Default)
TITLE+=quick-controls-2
DEPENDS+=+qt5-gui +qt5-network +qt5-qml +qt5-quick +qt5-widgets +qt5-quick-2
endef
define Package/qt5-quick-dialogs
$(call Package/qt5/Default)
TITLE+=quick-dialogs
@ -153,6 +159,12 @@ define Package/qt5-quick-window
DEPENDS+=+qt5-gui +qt5-network +qt5-qml +qt5-quick
endef
define Package/qt5-virtual-keyboard
$(call Package/qt5/Default)
TITLE+=virtual-keyboard
DEPENDS+=+qt5-gui +qt5-qml +qt5-quick +qt5-widgets +qt5-svg
endef
define Package/qt5-quick-xmllistmodel
$(call Package/qt5/Default)
TITLE+=quick-xmllistmodel
@ -788,6 +800,16 @@ define Package/qt5-quick-controls/install
$(1)/usr/lib/qt5/qml/QtQuick/
endef
define Package/qt5-quick-controls-2/install
$(INSTALL_DIR) $(1)/usr/lib/qt5/qml/QtQuick
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/qt5/qml/QtQuick/Templates.2 \
$(1)/usr/lib/qt5/qml/QtQuick/
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/qt5/qml/QtQuick/Controls.2 \
$(1)/usr/lib/qt5/qml/QtQuick/
endef
define Package/qt5-quick-dialogs/install
$(INSTALL_DIR) $(1)/usr/lib/qt5/qml/QtQuick
$(CP) \
@ -851,6 +873,17 @@ define Package/qt5-quick-xmllistmodel/install
$(1)/usr/lib/qt5/qml/QtQuick/
endef
define Package/qt5-virtual-keyboard/install
$(INSTALL_DIR) $(1)/usr/lib/qt5/qml/QtQuick
$(INSTALL_DIR) $(1)/usr/lib/qt5/plugins/platforminputcontexts
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/qt5/qml/QtQuick/VirtualKeyboard \
$(1)/usr/lib/qt5/qml/QtQuick/
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/qt5/plugins/platforminputcontexts \
$(1)/usr/lib/qt5/plugins/
endef
define Package/qt5-sql/install
$(INSTALL_DIR) $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/qt5/plugins/sqldrivers/
@ -1331,6 +1364,7 @@ $(eval $(call BuildPackage,qt5-remoteobjects))
$(eval $(call BuildPackage,qt5-quick))
$(eval $(call BuildPackage,qt5-quick-2))
$(eval $(call BuildPackage,qt5-quick-controls))
$(eval $(call BuildPackage,qt5-quick-controls-2))
$(eval $(call BuildPackage,qt5-quick-dialogs))
$(eval $(call BuildPackage,qt5-quick-extras))
$(eval $(call BuildPackage,qt5-quick-layouts))
@ -1340,6 +1374,7 @@ $(eval $(call BuildPackage,qt5-quick-privatewidgets))
$(eval $(call BuildPackage,qt5-quick-scene3d))
$(eval $(call BuildPackage,qt5-quick-window))
$(eval $(call BuildPackage,qt5-quick-xmllistmodel))
$(eval $(call BuildPackage,qt5-virtual-keyboard))
$(eval $(call BuildPackage,qt5-sql))
$(eval $(call BuildPackage,qt5-test))
$(eval $(call BuildPackage,qt5-enginio))

View File

@ -81,7 +81,7 @@ endef
define Package/qt5-qml
$(call Package/qt5/Default)
TITLE+=qml
DEPENDS+=+qt5-core +qt5-network +qt5-gui +qt5-remoteobjects
DEPENDS+=+qt5-core +qt5-network +qt5-gui +qt5-remoteobjects +qt5-widgets +qt5-quick +qt5-quick-2
endef
define Package/qt5-remoteobjects
@ -108,6 +108,12 @@ define Package/qt5-quick-controls
DEPENDS+=+qt5-gui +qt5-network +qt5-qml +qt5-quick +qt5-widgets
endef
define Package/qt5-quick-controls-2
$(call Package/qt5/Default)
TITLE+=quick-controls-2
DEPENDS+=+qt5-gui +qt5-network +qt5-qml +qt5-quick +qt5-widgets +qt5-quick-2
endef
define Package/qt5-quick-dialogs
$(call Package/qt5/Default)
TITLE+=quick-dialogs
@ -156,6 +162,12 @@ define Package/qt5-quick-window
DEPENDS+=+qt5-gui +qt5-network +qt5-qml +qt5-quick
endef
define Package/qt5-virtual-keyboard
$(call Package/qt5/Default)
TITLE+=virtual-keyboard
DEPENDS+=+qt5-gui +qt5-qml +qt5-quick +qt5-widgets +qt5-svg
endef
define Package/qt5-quick-xmllistmodel
$(call Package/qt5/Default)
TITLE+=quick-xmllistmodel
@ -389,7 +401,7 @@ endef
define Package/qt5-wayland
$(call Package/qt5/Default)
TITLE+=wayland
DEPENDS+=+qt5-core +qt5-gui +qt5-dbus +qt5-network +qt5-qml +qt5-quick +weston +wayland
DEPENDS+=+qt5-core +qt5-gui +qt5-dbus +qt5-network +qt5-qml +qt5-quick +qt5-wayland:weston +qt5-wayland:wayland
endef
define Package/qt5-gamepad
@ -791,6 +803,15 @@ define Package/qt5-quick-controls/install
$(1)/usr/lib/qt5/qml/QtQuick/
endef
define Package/qt5-quick-controls-2/install
$(INSTALL_DIR) $(1)/usr/lib/qt5/qml/QtQuick
$(CP) \
$(PKG_INSTALL_DIR)/$(QT_R311_PREBUILD)/usr/lib/qt5/qml/QtQuick/Templates.2 \
$(1)/usr/lib/qt5/qml/QtQuick/
$(CP) \
$(PKG_INSTALL_DIR)/$(QT_R311_PREBUILD)/usr/lib/qt5/qml/QtQuick/Controls.2 \
$(1)/usr/lib/qt5/qml/QtQuick/
endef
define Package/qt5-quick-dialogs/install
$(INSTALL_DIR) $(1)/usr/lib/qt5/qml/QtQuick
$(CP) \
@ -854,6 +875,17 @@ define Package/qt5-quick-xmllistmodel/install
$(1)/usr/lib/qt5/qml/QtQuick/
endef
define Package/qt5-virtual-keyboard/install
$(INSTALL_DIR) $(1)/usr/lib/qt5/qml/QtQuick
$(INSTALL_DIR) $(1)/usr/lib/qt5/plugins/platforminputcontexts
$(CP) \
$(PKG_INSTALL_DIR)/$(QT_R311_PREBUILD)/usr/lib/qt5/qml/QtQuick/VirtualKeyboard \
$(1)/usr/lib/qt5/qml/QtQuick/
$(CP) \
$(PKG_INSTALL_DIR)/$(QT_R311_PREBUILD)/usr/lib/qt5/plugins/platforminputcontexts \
$(1)/usr/lib/qt5/plugins/
endef
define Package/qt5-sql/install
$(INSTALL_DIR) $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/qt5/plugins/sqldrivers/
@ -1334,6 +1366,7 @@ $(eval $(call BuildPackage,qt5-remoteobjects))
$(eval $(call BuildPackage,qt5-quick))
$(eval $(call BuildPackage,qt5-quick-2))
$(eval $(call BuildPackage,qt5-quick-controls))
$(eval $(call BuildPackage,qt5-quick-controls-2))
$(eval $(call BuildPackage,qt5-quick-dialogs))
$(eval $(call BuildPackage,qt5-quick-extras))
$(eval $(call BuildPackage,qt5-quick-layouts))
@ -1343,6 +1376,7 @@ $(eval $(call BuildPackage,qt5-quick-privatewidgets))
$(eval $(call BuildPackage,qt5-quick-scene3d))
$(eval $(call BuildPackage,qt5-quick-window))
$(eval $(call BuildPackage,qt5-quick-xmllistmodel))
$(eval $(call BuildPackage,qt5-virtual-keyboard))
$(eval $(call BuildPackage,qt5-sql))
$(eval $(call BuildPackage,qt5-test))
$(eval $(call BuildPackage,qt5-enginio))

View File

@ -1279,7 +1279,21 @@ CONFIG_PACKAGE_dropbear=y
CONFIG_DROPBEAR_CURVE25519=y
# CONFIG_DROPBEAR_ECC is not set
# CONFIG_PACKAGE_ead is not set
# CONFIG_PACKAGE_eudev is not set
CONFIG_PACKAGE_eudev=y
#
# Configuration
#
CONFIG_EUDEV_EXTRA_ata_id=y
CONFIG_EUDEV_EXTRA_blkid=y
CONFIG_EUDEV_EXTRA_cdrom_id=y
# CONFIG_EUDEV_EXTRA_collect is not set
CONFIG_EUDEV_EXTRA_input_id=y
# CONFIG_EUDEV_EXTRA_kmod is not set
CONFIG_EUDEV_EXTRA_mtd_probe=y
# CONFIG_EUDEV_EXTRA_rule_generator is not set
CONFIG_EUDEV_EXTRA_scsi_id=y
CONFIG_EUDEV_EXTRA_v4l_id=y
# CONFIG_PACKAGE_firewall is not set
CONFIG_PACKAGE_fstools=y
CONFIG_PACKAGE_jsonfilter=y
@ -1955,7 +1969,7 @@ CONFIG_PACKAGE_kmod-usb-core=y
# CONFIG_PACKAGE_kmod-fb-cfb-imgblt is not set
# CONFIG_PACKAGE_kmod-fb-sys-fops is not set
# CONFIG_PACKAGE_kmod-fbcon is not set
# CONFIG_PACKAGE_kmod-mali-utgard-km is not set
CONFIG_PACKAGE_kmod-mali-utgard-km=y
CONFIG_PACKAGE_kmod-sunxi-disp=y
# CONFIG_PACKAGE_kmod-sunxi-hdmi is not set
# CONFIG_PACKAGE_kmod-sunxi-tv is not set
@ -2179,7 +2193,7 @@ CONFIG_PACKAGE_kmod-net-broadcom=y
#
# Compression
#
# CONFIG_PACKAGE_libbz2 is not set
CONFIG_PACKAGE_libbz2=y
# CONFIG_PACKAGE_liblzma is not set
#
@ -2209,7 +2223,7 @@ CONFIG_PACKAGE_libxtables=y
#
# GPU Libraries
#
# CONFIG_PACKAGE_mali400-um is not set
CONFIG_PACKAGE_mali400-um=y
#
# IoT
@ -2357,7 +2371,14 @@ CONFIG_PACKAGE_libopenssl=y
#
# cairo
#
# CONFIG_PACKAGE_libcairo is not set
CONFIG_PACKAGE_libcairo=y
# CONFIG_CAIRO_PS is not set
CONFIG_CAIRO_PDF=y
CONFIG_CAIRO_PNG=y
# CONFIG_CAIRO_SCRIPT is not set
# CONFIG_CAIRO_SVG is not set
# CONFIG_CAIRO_TEE is not set
# CONFIG_CAIRO_XML is not set
#
# data
@ -2374,7 +2395,7 @@ CONFIG_PACKAGE_libsqlite3=y
# gnome
#
# CONFIG_PACKAGE_glib-networking is not set
# CONFIG_PACKAGE_glib2 is not set
CONFIG_PACKAGE_glib2=y
# CONFIG_PACKAGE_gmime is not set
# CONFIG_PACKAGE_libsoup is not set
# CONFIG_PACKAGE_totem-pl-parser is not set
@ -2413,7 +2434,7 @@ CONFIG_PACKAGE_libavahi-dbus-support=y
# CONFIG_PACKAGE_libavahi-nodbus-support is not set
# CONFIG_PACKAGE_libb64 is not set
# CONFIG_PACKAGE_libbfd is not set
# CONFIG_PACKAGE_libblkid is not set
CONFIG_PACKAGE_libblkid=y
CONFIG_PACKAGE_libblobmsg-json=y
# CONFIG_PACKAGE_libcap is not set
# CONFIG_PACKAGE_libcares is not set
@ -2476,7 +2497,7 @@ CONFIG_PACKAGE_libdbus=y
# CONFIG_PACKAGE_libdevmapper is not set
# CONFIG_PACKAGE_libepoxy is not set
# CONFIG_PACKAGE_libev is not set
# CONFIG_PACKAGE_libevdev is not set
CONFIG_PACKAGE_libevdev=y
# CONFIG_PACKAGE_libevent2 is not set
# CONFIG_PACKAGE_libevent2-core is not set
# CONFIG_PACKAGE_libevent2-extra is not set
@ -2489,7 +2510,7 @@ CONFIG_PACKAGE_libexpat=y
CONFIG_PACKAGE_libffi=y
# CONFIG_PACKAGE_libflac is not set
# CONFIG_PACKAGE_libfmae is not set
# CONFIG_PACKAGE_libfreetype is not set
CONFIG_PACKAGE_libfreetype=y
# CONFIG_PACKAGE_libfribidi is not set
# CONFIG_PACKAGE_libgcrypt is not set
# CONFIG_PACKAGE_libgd is not set
@ -2503,13 +2524,13 @@ CONFIG_PACKAGE_libffi=y
# CONFIG_PACKAGE_libiconv is not set
CONFIG_PACKAGE_libiconv-full=y
# CONFIG_PACKAGE_libid3tag is not set
# CONFIG_PACKAGE_libinput is not set
CONFIG_PACKAGE_libinput=y
# CONFIG_PACKAGE_libintl is not set
# CONFIG_PACKAGE_libintl-full is not set
# CONFIG_PACKAGE_libiw is not set
# CONFIG_PACKAGE_libiwinfo is not set
CONFIG_PACKAGE_libjansson=y
# CONFIG_PACKAGE_libjpeg is not set
CONFIG_PACKAGE_libjpeg=y
CONFIG_PACKAGE_libjson-c=y
# CONFIG_PACKAGE_libkmod is not set
# CONFIG_PACKAGE_libltdl is not set
@ -2556,10 +2577,10 @@ CONFIG_PACKAGE_libnl-tiny=y
# CONFIG_PACKAGE_libopus is not set
# CONFIG_PACKAGE_libpam is not set
# CONFIG_PACKAGE_libpcap is not set
# CONFIG_PACKAGE_libpcre is not set
CONFIG_PACKAGE_libpcre=y
# CONFIG_PACKAGE_libpcre16 is not set
# CONFIG_PACKAGE_libpcrecpp is not set
# CONFIG_PACKAGE_libpixman is not set
CONFIG_PACKAGE_libpixman=y
CONFIG_PACKAGE_libpng=y
# CONFIG_PACKAGE_libpopt is not set
# CONFIG_PACKAGE_libprotobuf-c is not set
@ -2601,7 +2622,7 @@ CONFIG_PACKAGE_libuci=y
# CONFIG_PACKAGE_libuci-lua is not set
CONFIG_PACKAGE_libuclient=y
# CONFIG_PACKAGE_libugpio is not set
# CONFIG_PACKAGE_libump is not set
CONFIG_PACKAGE_libump=y
# CONFIG_PACKAGE_libunwind is not set
# CONFIG_PACKAGE_libusb-1.0 is not set
# CONFIG_PACKAGE_libusb-compat is not set
@ -2625,7 +2646,7 @@ CONFIG_PACKAGE_libxml2=y
# CONFIG_PACKAGE_libzmq-curve is not set
# CONFIG_PACKAGE_libzmq-nc is not set
# CONFIG_PACKAGE_linux-atm is not set
# CONFIG_PACKAGE_mtdev is not set
CONFIG_PACKAGE_mtdev=y
# CONFIG_PACKAGE_musl-fts is not set
# CONFIG_PACKAGE_opencv is not set
# CONFIG_PACKAGE_p11-kit is not set
@ -2635,7 +2656,7 @@ CONFIG_PACKAGE_libxml2=y
# CONFIG_PACKAGE_sbc is not set
CONFIG_PACKAGE_terminfo=y
# CONFIG_PACKAGE_tinyalsa-lib is not set
# CONFIG_PACKAGE_tslib is not set
CONFIG_PACKAGE_tslib=y
# CONFIG_PACKAGE_uclibcxx is not set
# CONFIG_PACKAGE_uriparser is not set
CONFIG_PACKAGE_uthash=y
@ -3578,7 +3599,7 @@ CONFIG_PACKAGE_dmesg=y
# CONFIG_PACKAGE_fbtest is not set
# CONFIG_PACKAGE_fbviewer is not set
# CONFIG_PACKAGE_flock is not set
# CONFIG_PACKAGE_fontconfig is not set
CONFIG_PACKAGE_fontconfig=y
# CONFIG_PACKAGE_getevent is not set
# CONFIG_PACKAGE_getopt is not set
# CONFIG_PACKAGE_gpioctl-sysfs is not set
@ -3651,6 +3672,7 @@ CONFIG_PACKAGE_mtd-utils-mkfs.jffs2=y
# CONFIG_PACKAGE_mtd-utils-ubiupdatevol is not set
# CONFIG_PACKAGE_namei is not set
# CONFIG_PACKAGE_ocf-crypto-headers is not set
# CONFIG_PACKAGE_opengles_demo is not set
# CONFIG_PACKAGE_openldap-utils is not set
# CONFIG_PACKAGE_openmp-test is not set
# CONFIG_PACKAGE_openssl-util is not set