qt4: Disable mitshm

[openwrt/svn-archive/archive.git] / Xorg / lib / qt4 / Makefile

diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile
index 62f95b1afbfb64a84624ea90723ea644c144c8ba..93565129f4e337cb0104db500191bf4f33a5627b 100644 (file)
--- a/Xorg/lib/qt4/Makefile
+++ b/Xorg/lib/qt4/Makefile
@@ -12,8 +12,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qt4
-PKG_VERSION:=4.7.0-beta2
+PKG_VERSION:=4.7.0
 PKG_RELEASE:=1
+PKG_MD5SUM:=3a2f25b9b115037277f4fb759194a7a5
 
 PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.qt.nokia.com/qt/source
@@ -34,6 +35,7 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_PACKAGE_qt4-mysql
 
 include $(INCLUDE_DIR)/package.mk
+-include $(if $(DUMP),,./files/qmake.mk)
 
 # this should be moved to a more generic place later, as other packages are configured different as well depending on available nptl support
 ifeq ($(CONFIG_USE_GLIBC),y)
@@ -61,12 +63,15 @@ endef
 
 define Package/qt4
   $(call Package/qt4/Default)
-  DEPENDS:=@FEATURE_drawing-backend_DirectFB||@FEATURE_drawing-backend_libX11 +zlib +libstdcpp +libsqlite3
+  DEPENDS:=+zlib +libstdcpp +libsqlite3
 endef
 
 define Package/qt4-gui
   $(call Package/qt4/Default)
-  DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network
+  DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network \
+       +FEATURE_drawing-backend_DirectFB:directfb \
+       +FEATURE_drawing-backend_libX11:libX11 \
+       +FEATURE_drawing-backend_libX11:libXext
   TITLE+=(gui)
 endef
 
@@ -212,6 +217,7 @@ endef
 define Package/qt4-drivers-mouse-tslibmousedriver
   $(call Package/qt4-drivers-mouse/Default)
   TITLE+=tslibmousedriver
+  DEPENDS:=+tslib
 endef
 
 ###
@@ -256,6 +262,11 @@ endif
 ifeq ($(CONFIG_QT4_WS_X11),y)
   FILEPFX:=x11-
 endif
+ifeq ($(CONFIG_PACKAGE_qt4-gui),)
+  # If GUI is disabled, we use the X11 prefix. That's good enough, for now.
+  # The X11 files also work for non-GUI.
+  FILEPFX:=x11-
+endif
 
 define Build/Configure
        # NOTES:
@@ -298,8 +309,7 @@ define Build/Configure
                        -nomake translations \
                        -xplatform $(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++ \
                        -platform linux-g++ \
-                       $(if $(CONFIG_QT4_WS_QWS),-embedded) \
-                       $(if $(CONFIG_QT4_WS_X11),-x11) \
+                       $(if $(CONFIG_QT4_WS_X11),-x11,-embedded) \
                        -release \
                        -confirm-license \
                        -opensource \
@@ -347,7 +357,7 @@ define Build/Configure
                        -no-xfixes \
                        -no-xrandr \
                        -no-xrender \
-                       $(if $(CONFIG_QT4_WS_X11),-no-mitshm,-mitshm) \
+                       -no-mitshm \
                        $(if $(CONFIG_QT4_WS_X11),-no-fontconfig,-fontconfig) \
                        $(if $(CONFIG_QT4_WS_X11),-no-xinput,-xinput) \
                        $(if $(CONFIG_QT4_WS_X11),-no-xkb,-xkb) \