From fe11f5dac3c2bfef8251978ee90bb8141adccb3c Mon Sep 17 00:00:00 2001 From: wangzijiao Date: Fri, 18 Jan 2019 15:56:22 +0800 Subject: [PATCH] enable wayland config && fix compile error --- package/libs/libdirectfb/Makefile | 2 +- package/netease/submodules | 2 +- target/allwinner/mandolin-c1evb/config-4.9 | 7 ++++ target/allwinner/mandolin-c1evb/defconfig | 44 ++++++++++++++-------- 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/package/libs/libdirectfb/Makefile b/package/libs/libdirectfb/Makefile index 93b5f00dc..31526d482 100644 --- a/package/libs/libdirectfb/Makefile +++ b/package/libs/libdirectfb/Makefile @@ -28,7 +28,7 @@ define Package/directfb SECTION:=libs CATEGORY:=Libraries URL:=http://directfb.org - DEPENDS:=+libstdcpp +tslib +libpng +libjpeg +libpthread +libfreetype +libsysfs +flux + DEPENDS:=+libump +mali400-um +libstdcpp +tslib +libpng +libjpeg +libpthread +libfreetype +libsysfs +flux endef define Package/directfb/description diff --git a/package/netease/submodules b/package/netease/submodules index 8d682c33b..a2ebc69e6 160000 --- a/package/netease/submodules +++ b/package/netease/submodules @@ -1 +1 @@ -Subproject commit 8d682c33b55577fcbf96f413b3088654fbbb9591 +Subproject commit a2ebc69e64ca881b3b2c7dbd069766595ed67fe9 diff --git a/target/allwinner/mandolin-c1evb/config-4.9 b/target/allwinner/mandolin-c1evb/config-4.9 index 671460284..5e3258715 100644 --- a/target/allwinner/mandolin-c1evb/config-4.9 +++ b/target/allwinner/mandolin-c1evb/config-4.9 @@ -332,10 +332,17 @@ CONFIG_FHANDLE=y # CONFIG_FIQ_WATCHDOG is not set CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIX_EARLYCON_MEM=y +# CONFIG_FONTS is not set +CONFIG_FONT_8x16=y +CONFIG_FONT_8x8=y +CONFIG_FONT_SUPPORT=y # CONFIG_FPE_FASTFPE is not set # CONFIG_FPE_NWFPE is not set # CONFIG_FPGA_V4_PLATFORM is not set # CONFIG_FPGA_V7_PLATFORM is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set CONFIG_FRAME_VECTOR=y CONFIG_FRAME_WARN=2048 CONFIG_FREEZER=y diff --git a/target/allwinner/mandolin-c1evb/defconfig b/target/allwinner/mandolin-c1evb/defconfig index a52ff87e4..57674fa4c 100755 --- a/target/allwinner/mandolin-c1evb/defconfig +++ b/target/allwinner/mandolin-c1evb/defconfig @@ -2218,7 +2218,7 @@ CONFIG_PACKAGE_libbz2=y CONFIG_PACKAGE_libattr=y CONFIG_PACKAGE_libext2fs=y # CONFIG_PACKAGE_libfuse is not set -# CONFIG_PACKAGE_libsysfs is not set +CONFIG_PACKAGE_libsysfs=y # # Firewall @@ -2423,15 +2423,15 @@ CONFIG_PACKAGE_alsa-lib=y CONFIG_PACKAGE_bluez-libs=y # CONFIG_PACKAGE_boost is not set # CONFIG_PACKAGE_breakpad-libs is not set -# CONFIG_PACKAGE_bullet is not set +CONFIG_PACKAGE_bullet=y # CONFIG_PACKAGE_civetweb is not set -# CONFIG_PACKAGE_directfb is not set +CONFIG_PACKAGE_directfb=y # CONFIG_PACKAGE_enchant is not set # CONFIG_PACKAGE_gdk-pixbuf is not set CONFIG_PACKAGE_glog=y # CONFIG_PACKAGE_granite is not set -# CONFIG_PACKAGE_harfbuzz is not set -# CONFIG_PACKAGE_icu is not set +CONFIG_PACKAGE_harfbuzz=y +CONFIG_PACKAGE_icu=y # CONFIG_PACKAGE_lcms2 is not set # CONFIG_PACKAGE_libao is not set # CONFIG_PACKAGE_libapr is not set @@ -2498,7 +2498,9 @@ CONFIG_LIBCURL_PROXY=y # CONFIG_LIBCURL_LIBCURL_OPTION is not set # CONFIG_LIBCURL_VERBOSE is not set CONFIG_PACKAGE_libdaemon=y -# CONFIG_PACKAGE_libdrm is not set +CONFIG_PACKAGE_libdrm=y +# CONFIG_LIBDRM_TEST_PROGRAMS is not set +# CONFIG_LIBDRM_V4C is not set # CONFIG_PACKAGE_libelf1 is not set # CONFIG_PACKAGE_libdb47 is not set # CONFIG_PACKAGE_libdb47xx is not set @@ -2555,7 +2557,7 @@ CONFIG_PACKAGE_libmad=y # CONFIG_PACKAGE_libmosquitto is not set # CONFIG_PACKAGE_libmosquitto-nossl is not set # CONFIG_PACKAGE_libmosquittopp is not set -# CONFIG_PACKAGE_libmount is not set +CONFIG_PACKAGE_libmount=y # CONFIG_PACKAGE_libmraa is not set # CONFIG_PACKAGE_libmysqlclient is not set # CONFIG_PACKAGE_libmysqlclient-r is not set @@ -2646,10 +2648,10 @@ CONFIG_PACKAGE_libuws=y # CONFIG_PACKAGE_libvorbisidec is not set # CONFIG_PACKAGE_libvpx is not set # CONFIG_PACKAGE_libwayland-ivi-extension is not set -# CONFIG_PACKAGE_libwebp is not set +CONFIG_PACKAGE_libwebp=y # CONFIG_PACKAGE_libwebsockets-cyassl is not set # CONFIG_PACKAGE_libwebsockets-openssl is not set -# CONFIG_PACKAGE_libxkbcommon is not set +CONFIG_PACKAGE_libxkbcommon=y CONFIG_PACKAGE_libxml2=y # CONFIG_PACKAGE_libxslt is not set # CONFIG_PACKAGE_libzmq-curve is not set @@ -2659,7 +2661,7 @@ CONFIG_PACKAGE_mtdev=y # CONFIG_PACKAGE_musl-fts is not set # CONFIG_PACKAGE_opencv is not set # CONFIG_PACKAGE_p11-kit is not set -# CONFIG_PACKAGE_pango is not set +CONFIG_PACKAGE_pango=y # CONFIG_PACKAGE_portaudio is not set # CONFIG_PACKAGE_rapidjson is not set # CONFIG_PACKAGE_sbc is not set @@ -2671,7 +2673,7 @@ CONFIG_PACKAGE_tslib=y CONFIG_PACKAGE_uthash=y # CONFIG_PACKAGE_uvoice is not set # CONFIG_PACKAGE_x264 is not set -# CONFIG_PACKAGE_xkeyboard-config is not set +CONFIG_PACKAGE_xkeyboard-config=y CONFIG_PACKAGE_zlib=y # @@ -4544,7 +4546,7 @@ CONFIG_PACKAGE_brcm_patchram_plus=y # CONFIG_PACKAGE_cxdish is not set CONFIG_PACKAGE_dbus=y CONFIG_PACKAGE_dbus-utils=y -# CONFIG_PACKAGE_directfb-examples is not set +CONFIG_PACKAGE_directfb-examples=y CONFIG_PACKAGE_dmesg=y # CONFIG_PACKAGE_dropbearconvert is not set # CONFIG_PACKAGE_dump1090 is not set @@ -4675,7 +4677,17 @@ CONFIG_PACKAGE_whereis=y # # Wayland # -# CONFIG_PACKAGE_glmark2 is not set -# CONFIG_PACKAGE_wayland is not set -# CONFIG_PACKAGE_wayland-protocols is not set -# CONFIG_PACKAGE_weston is not set +CONFIG_PACKAGE_glmark2=y +CONFIG_GLMARK2_FBDEV=y +CONFIG_GLMARK2_WAYLAND=y +CONFIG_PACKAGE_wayland=y +CONFIG_PACKAGE_wayland-protocols=y +CONFIG_PACKAGE_weston=y +# CONFIG_WESTON_DBUS is not set +# CONFIG_WESTON_LAUNCH is not set +CONFIG_WESTON_OPENGL_ES=y +# CONFIG_WESTON_FBDEV is not set +CONFIG_WESTON_DRM=y +# CONFIG_WESTON_LCMS2 is not set +# CONFIG_WESTON_LIBXML2 is not set +CONFIG_WESTON_DEMO_CLIENTS=y