Merge pull request #4 from hauke/qt5base-fixes

Qt5base fixes

diff --git a/frameworks/qt5base/Makefile b/frameworks/qt5base/Makefile
index e2e8c729e0b99d0306fcb5b0d3522464057b85ae..810ae54800a9410cf87ed08ae060d0c0150dc8fa 100644 (file)
--- a/frameworks/qt5base/Makefile
+++ b/frameworks/qt5base/Makefile
@@ -25,11 +25,21 @@ PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_SYS_NAME)
 PKG_BUILD_PARALLEL:=1
 PKG_BUILD_DEPENDS:=librpc
 PKG_INSTALL:=1
+PKG_USE_MIPS16:=0
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 include ./files/qmake.mk
 
+PKG_CONFIG_DEPENDS:= \
+       CONFIG_PACKAGE_qt5base-plugin-sqldrivers-sqlite \
+       CONFIG_PACKAGE_qt5base-plugin-imageformats-jpeg \
+       CONFIG_PACKAGE_qt5base-network \
+       CONFIG_PACKAGE_qt5base-gui \
+       CONFIG_PACKAGE_qt5base-plugin-imageformats-gif \
+       CONFIG_PACKAGE_qt5base-plugin-platforms-linuxfb \
+       CONFIG_PACKAGE_qt5base-plugin-platforms-minimal
+
 define Package/qt5base/Default
   SECTION:=video-frameworks
   CATEGORY:=Video
@@ -55,7 +65,7 @@ endef
 define Package/qt5base-core
   $(call Package/qt5base/Default)
   TITLE+=core
-  DEPENDS+=+libpthread +zlib +libpcre16 +libstdcpp +icu +librt
+  DEPENDS+=+libpthread +zlib +libpcre16 +libstdcpp +librt
 endef
 
 define Package/qt5base-gui
@@ -249,8 +259,17 @@ define Build/Configure
                        -shared \
                        -largefile \
                        -accessibility \
-                       -system-sqlite \
+                       $(if $(CONFIG_PACKAGE_qt5base-plugin-sqldrivers-sqlite),-system-sqlite,-no-sql-sqlite2) \
+                       -no-sql-db2 \
+                       -no-sql-ibase \
+                       -no-sql-mysql \
+                       -no-sql-oci \
+                       -no-sql-odbc \
+                       -no-sql-psql \
+                       -no-sql-sqlite \
+                       -no-sql-tds \
                        -no-qml-debug \
+                       -no-nis \
                        -no-sse2 \
                        -no-sse3 \
                        -no-ssse3 \
@@ -258,17 +277,17 @@ define Build/Configure
                        -no-sse4.2 \
                        -no-avx \
                        -no-avx2 \
-                       -no-mips_dsp \
-                       -no-mips_dspr2 \
+                       $(if $(findstring -mdsp,$(TARGET_CFLAGS)),,-no-mips_dsp)\
+                       $(if $(findstring -mdspr2,$(TARGET_CFLAGS)),,-no-mips_dspr2)\
                        -force-pkg-config \
                        -system-zlib \
                        -mtdev \
                        -no-journald \
-                       -system-libpng \
-                       -system-libjpeg \
+                       $(if $(CONFIG_PACKAGE_qt5base-gui),-system-libpng,-no-libpng) \
+                       $(if $(CONFIG_PACKAGE_qt5base-plugin-imageformats-jpeg),-system-libjpeg,-no-libjpeg) \
                        -system-freetype \
                        -no-harfbuzz \
-                       -openssl-linked \
+                       $(if $(CONFIG_PACKAGE_qt5base-network),-openssl-linked,-no-openssl) \
                        -system-pcre \
                        -system-xcb \
                        -system-xkbcommon \
@@ -276,17 +295,18 @@ define Build/Configure
                        -no-xcb-xlib \
                        -no-glib \
                        -no-pulseaudio \
-                       -alsa \
+                       -no-alsa \
                        -no-gtkstyle \
                        -nomake tools \
                        -make examples \
-                       -gui \
+                       $(if $(CONFIG_PACKAGE_qt5base-gui),-gui,-no-gui) \
+                       $(if $(CONFIG_PACKAGE_qt5base-plugin-imageformats-gif),,-no-gif) \
                        -widgets \
                        -no-optimized-qmake \
                        -no-cups \
-                       -iconv \
+                       -no-iconv \
                        -evdev \
-                       -icu \
+                       -no-icu \
                        -fontconfig \
                        -no-strip \
                        -no-pch \
@@ -296,9 +316,9 @@ define Build/Configure
                        -no-xcb \
                        -no-eglfs \
                        -no-directfb \
-                       -linuxfb \
+                       $(if $(CONFIG_PACKAGE_qt5base-plugin-platforms-linuxfb),-linuxfb,-no-linuxfb) \
                        -no-kms \
-                       -qpa minimal \
+                       $(if $(CONFIG_PACKAGE_qt5base-plugin-platforms-minimal),,-qpa minimal) \
                        -xplatform linux-openwrt-g++ \
                        -no-opengl \
                        -no-system-proxies \

diff --git a/frameworks/qt5base/patches/002-musl.patch b/frameworks/qt5base/patches/002-musl.patch
new file mode 100644 (file)
index 0000000..2f5fe45
--- /dev/null
+++ b/frameworks/qt5base/patches/002-musl.patch
@@ -0,0 +1,30 @@
+From 8f09897de948cea8861ca95e182f442cf15a339e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 8 Jun 2015 13:59:25 -0700
+Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T
+
+This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
+only when its glibc < 2 and not also for the libraries which may define
+it as per standards but are not glibc, e.g. musl
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ mkspecs/linux-oe-g++/qplatformdefs.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/mkspecs/linux-g++/qplatformdefs.h
++++ b/mkspecs/linux-g++/qplatformdefs.h
+@@ -78,10 +78,10 @@
+ 
+ #undef QT_SOCKLEN_T
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+-#define QT_SOCKLEN_T            socklen_t
+-#else
++#if defined(__GLIBC__) && (__GLIBC__ < 2)
+ #define QT_SOCKLEN_T            int
++#else
++#define QT_SOCKLEN_T            socklen_t
+ #endif
+ 
+ #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)

diff --git a/frameworks/qt5base/patches/002-uclibc-execinfo.patch b/frameworks/qt5base/patches/002-uclibc-execinfo.patch
index ae263333102539e685917c6cd010b750d03439d0..6ad2624c2ca8ce61b4e3c5633e9ffb59bcbd1d5b 100644 (file)
--- a/frameworks/qt5base/patches/002-uclibc-execinfo.patch
+++ b/frameworks/qt5base/patches/002-uclibc-execinfo.patch
@@ -1,6 +1,6 @@
---- qtbase-opensource-src-5.4.1.orig/src/corelib/kernel/qcrashhandler.cpp      2015-05-27 21:29:18.327561992 +0200
-+++ qtbase-opensource-src-5.4.1/src/corelib/kernel/qcrashhandler.cpp   2015-05-27 21:34:18.543553856 +0200
-@@ -62,7 +62,7 @@
+--- a/src/corelib/kernel/qcrashhandler.cpp
++++ b/src/corelib/kernel/qcrashhandler.cpp
+@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
  
  QtCrashHandler QSegfaultHandler::callback = 0;