Add colourdepth support to Qtopia config

This commit is contained in:
Ulf Samuelsson 2007-07-28 17:26:18 +00:00
parent e806708e3f
commit 8e1d0f34f7
2 changed files with 68 additions and 20 deletions

View File

@ -16,10 +16,38 @@ config BR2_PACKAGE_QTOPIA4_DEBUG
depends BR2_PACKAGE_QTOPIA4
help
choice
prompt "Qtopia 4 Core license type"
default BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
depends BR2_PACKAGE_QTOPIA4
help
Selects the type of license you which to use for Qtopia 4 Core.
config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
bool "GPL license"
config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
bool "Commercial license"
endchoice
config BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED
bool "Approve Qtopia Core 4 GPL licence"
default n
depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
help
Select this if you approve the GNU GENERAL PUBLIC LICENSE Version 2
on the Qtopia Core 4 library. By doing this you will not be asked
while the library is compiled. Please read and understand the GPL
licence before approving this.
For full GPL version 2 see http://www.gnu.org/licenses/gpl.txt
config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME
string "Qtopia Core 4 Commercial License Username"
default ""
depends BR2_PACKAGE_QTOPIA4
depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
help
Commercial users can download their source directly by providing a username.
@ -27,7 +55,7 @@ config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME
config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
string "Qtopia Core 4 Commercial License Password"
default ""
depends BR2_PACKAGE_QTOPIA4
depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
help
Commercial users can download their source directly by providing a password.
@ -38,6 +66,14 @@ config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
help
Turns on support for older Qt3.
config BR2_PACKAGE_QTOPIA4_DEPTHS
string "color depths to support"
default "-depths 8"
depends BR2_PACKAGE_QTOPIA4
help
Which color depths to support for the library. Default is "-depths
8". Is specified by a comma separated list, i.e. -depths 24,16,8.
config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
string "The embedded platform we are making Qtopia4 for"
default "arm" if BR2_arm

View File

@ -40,6 +40,10 @@ QTOPIA4_SOURCE:=qtopia-core-opensource-src-$(QTOPIA4_VERSION).tar.gz
QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-opensource-src-$(QTOPIA4_VERSION)
QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-opensource-src-$(QTOPIA4_VERSION)
ifeq ($(BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED),y)
QTOPIA4_APPROVE_GPL_LICENSE:=-confirm-license
endif
endif
# If you want extra tweaking you can copy
@ -81,6 +85,12 @@ QTOPIA4_ENDIAN=-little-endian
else
QTOPIA4_ENDIAN=-big-endian
endif
ifeq ($(BR2_PACKAGE_QTOPIA4_DEPTHS),"")
QTOPIA4_DEPTHS=-depths 8
else
QTOPIA4_DEPTHS:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_DEPTHS)))
#"))
endif
QTOPIA4_DEBUG:=$(strip $(subst ",, $(QTOPIA4_DEBUG)))
#"))
@ -105,6 +115,8 @@ qtopia4-source: $(DL_DIR)/$(QTOPIA4_SOURCE)
$(QTOPIA4_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QTOPIA4_SOURCE)
$(QTOPIA4_CAT) $(DL_DIR)/$(QTOPIA4_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(QTOPIA4_TARGET_DIR) package/qtopia4/ \
qtopia-$(QTOPIA4_VERSION)-\*.patch\*
touch $(QTOPIA4_TARGET_DIR)/.unpacked
# This configure is very tailored towards my needs.
@ -133,7 +145,7 @@ endif
-xplatform qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++ \
$(QTOPIA4_QCONFIG_COMMAND) \
$(QTOPIA4_DEBUG) \
-depths 8 \
$(QTOPIA4_DEPTHS) \
-no-cups \
-no-nis \
-no-freetype \
@ -151,12 +163,11 @@ endif
-no-sql-tds \
-prefix /usr \
-prefix-install \
-L $(STAGING_DIR)/usr/lib \
-I $(STAGING_DIR)/usr/include \
$(QTOPIA4_QT3SUPPORT) \
$(QTOPIA4_TSLIB) \
$(QTOPIA4_LARGEFILE) \
$(QTOPIA4_ENDIAN) \
$(QTOPIA4_APPROVE_GPL_LICENSE) \
);
touch $(QTOPIA4_TARGET_DIR)/.configured
@ -192,6 +203,8 @@ $(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION): $(STAGING_DIR)/usr/lib/li
$(QTOPIA4_HOST_DIR)/.unpacked: $(DL_DIR)/$(QTOPIA4_SOURCE)
$(QTOPIA4_CAT) $(DL_DIR)/$(QTOPIA4_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(QTOPIA4_HOST_DIR) package/qtopia4/ \
qtopia-$(QTOPIA4_VERSION)-\*.patch\*
touch $(QTOPIA4_HOST_DIR)/.unpacked
# This configure is very tailored towards my needs.
@ -220,7 +233,7 @@ endif
-xplatform qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++ \
$(QTOPIA4_QCONFIG_COMMAND) \
$(QTOPIA4_DEBUG) \
-depths 8 \
$(QTOPIA4_DEPTHS) \
-no-cups \
-no-nis \
-no-freetype \
@ -236,12 +249,11 @@ endif
-no-sql-tds \
-prefix $(QTOPIA4_STAGING_DIR) \
-prefix-install \
-L $(STAGING_DIR)/usr/lib \
-I $(STAGING_DIR)/usr/include \
$(QTOPIA4_QT3SUPPORT) \
$(QTOPIA4_TSLIB) \
$(QTOPIA4_LARGEFILE) \
$(QTOPIA4_ENDIAN) \
$(QTOPIA4_APPROVE_GPL_LICENSE) \
);
touch $(QTOPIA4_HOST_DIR)/.configured