[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-03-05 15:35:37 +0000 (Thu, 05 Mar 2009)
New Revision: 25549

Log:
qtopia4: remove invalid PTHREADS_NATIVE dependency

Modified:
   trunk/buildroot/package/qtopia4/Config.in


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2009-03-05 15:30:57 UTC (rev 25548)
+++ trunk/buildroot/package/qtopia4/Config.in	2009-03-05 15:35:37 UTC (rev 25549)
@@ -1,14 +1,13 @@
 config BR2_PACKAGE_QTOPIA4
 	bool "qtopia4"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_PTHREADS_NATIVE
 	help
 	  Qtopia core 4.
 
 	  http://www.trolltech.com/
 
-comment "qtopia4 requires a toolchain with C++ and NPTL support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PTHREADS_NATIVE
+comment "qtopia4 requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
 
 if BR2_PACKAGE_QTOPIA4
 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[jacmet at uclibc.org]

Author: jacmet
Date: 2009-01-25 20:19:06 +0000 (Sun, 25 Jan 2009)
New Revision: 25017

Log:
qtopia4: fix and improve color/pixel depths config

Also fix whitespace and use an existing variable for qmake.conf, which
was forgotten in r23828, though it's only commented out.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>

Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2009-01-25 20:19:01 UTC (rev 25016)
+++ trunk/buildroot/package/qtopia4/Config.in	2009-01-25 20:19:06 UTC (rev 25017)
@@ -86,13 +86,47 @@
 	  library with proxy code and increase the space required on target.
 	  If unsure say n.
 
-config BR2_PACKAGE_QTOPIA4_DEPTHS
-	string "color depths to support"
-	default "-depths 24,16,8"
-	help
-	  Which color depths to support for the library. Default is "-depths
-	  24,16,8". Different depths are specified by a comma separated list.
+menu "Pixel depths"
+comment "Deselecting each option leads to Qt's default (8,16,32)"
 
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL
+	bool "All supported depths"
+
+if !BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1
+	bool "1 bpp, black/white"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4
+	bool "4 bpp, grayscale"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8
+	bool "8 bpp, paletted"
+	default y
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12
+	bool "12 bpp, rgb 4-4-4"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15
+	bool "15 bpp, rgb 5-5-5"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16
+	bool "16 bpp, rgb 5-6-5"
+	default y
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18
+	bool "18 bpp, rgb 6-6-6"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24
+	bool "24 bpp, rgb 8-8-8"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32
+	bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8"
+	default y
+
+endif
+endmenu
+
 config BR2_PACKAGE_QTOPIA4_GIF
 	bool "Enable GIF support"
 	help

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2009-01-25 20:19:01 UTC (rev 25016)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2009-01-25 20:19:06 UTC (rev 25017)
@@ -66,6 +66,42 @@
 endif
 
 
+### Pixel depths
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL),y)
+QTOPIA4_PIXEL_DEPTHS = all
+else
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1),y)
+QTOPIA4_PIXEL_DEPTHS += 1
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4),y)
+QTOPIA4_PIXEL_DEPTHS += 4
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8),y)
+QTOPIA4_PIXEL_DEPTHS += 8
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12),y)
+QTOPIA4_PIXEL_DEPTHS += 12
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15),y)
+QTOPIA4_PIXEL_DEPTHS += 15
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16),y)
+QTOPIA4_PIXEL_DEPTHS += 16
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18),y)
+QTOPIA4_PIXEL_DEPTHS += 18
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24),y)
+QTOPIA4_PIXEL_DEPTHS += 24
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32),y)
+QTOPIA4_PIXEL_DEPTHS += 32
+endif
+endif
+ifneq ($(QTOPIA4_PIXEL_DEPTHS),)
+QTOPIA4_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QTOPIA4_PIXEL_DEPTHS)))
+endif
+
 ### Display drivers
 ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_LINUXFB),y)
 QTOPIA4_CONFIGURE += -qt-gfx-linuxfb
@@ -310,8 +346,8 @@
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
 endif
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
-	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-        # Fix compiler path
+	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_QMAKE_CONF)
+	# Fix compiler path
 	$(SED) '\,QMAKE_CC[ 	]*=, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_QMAKE_CONF)
 	$(SED) '\,QMAKE_CXX[ 	]*=, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)
 	$(SED) '\,QMAKE_LINK[ 	]*=, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[egtvedt at uclibc.org]

Author: egtvedt
Date: 2008-12-08 10:00:54 -0800 (Mon, 08 Dec 2008)
New Revision: 24332

Log:
qtopia4: add kconfig option to enable Phonon

This patch adds a kconfig option to enable Phonon when configuring Qt.

Phonon is the multimedia API from KDE 4 which has been integrated into
Qt 4.4. For playback under Linux the GStreamer multimedia framework is
used.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>



Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2008-12-08 17:57:26 UTC (rev 24331)
+++ trunk/buildroot/package/qtopia4/Config.in	2008-12-08 18:00:54 UTC (rev 24332)
@@ -228,6 +228,15 @@
 source "package/qtopia4/Config.gfx.in"
 source "package/qtopia4/Config.mouse.in"
 
+config BR2_PACKAGE_QTOPIA4_PHONON
+	bool "Phonon Module"
+	select BR2_PACKAGE_GSTREAMER
+	select BR2_PACKAGE_GST_PLUGINS_BASE
+	help
+	  Build the Phonon module. Support for different audio/video
+	  formats can be configured at the GStreamer package.
+	  If unsure, say n.
+
 config BR2_PACKAGE_QTOPIA4_XMLPATTERNS
 	bool "XML Patterns Module"
 	help

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-12-08 17:57:26 UTC (rev 24331)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-12-08 18:00:54 UTC (rev 24332)
@@ -262,6 +262,13 @@
 QTOPIA4_CONFIGURE+= -no-xmlpatterns
 endif
 
+ifeq ($(BR2_PACKAGE_QTOPIA4_PHONON),y)
+QTOPIA4_CONFIGURE+= -phonon
+QTOPIA4_DEP_LIBS+=gstreamer gst-plugins-base
+else
+QTOPIA4_CONFIGURE+= -no-phonon
+endif
+
 ifeq ($(BR2_PACKAGE_QTOPIA4_SVG),y)
 QTOPIA4_CONFIGURE+= -svg
 else
@@ -361,13 +368,22 @@
 ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
+ifeq ($(BR2_PACKAGE_QTOPIA4_PHONON),y)
+	cp -dpf $(STAGING_DIR)/usr/lib/libphonon.so.* $(TARGET_DIR)/usr/lib/
+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libphonon.so.*
 endif
+endif
 	# Install image plugins if they are built
 	if [ -d $(STAGING_DIR)/usr/plugins/imageformats ]; then \
 		mkdir -p $(TARGET_DIR)/usr/plugins; \
 		cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
 		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/imageformats/*; \
 	fi
+ifeq ($(BR2_PACKAGE_QTOPIA4_PHONON),y)
+	mkdir -p $(TARGET_DIR)/usr/plugins
+	cp -dpfr $(STAGING_DIR)/usr/plugins/phonon_backend $(TARGET_DIR)/usr/plugins/
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/phonon_backend/*
+endif
 ifneq ($(BR2_PACKAGE_QTOPIA4_SQL_MODULE),y)
 	# Remove Sql libraries, not needed
 	-rm $(TARGET_DIR)/usr/lib/libQtSql*

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[egtvedt at uclibc.org]

Author: egtvedt
Date: 2008-12-04 08:50:05 -0800 (Thu, 04 Dec 2008)
New Revision: 24276

Log:
qtopia4: make build verbose or silent depending on user input

This will make Qt compile silent unless the user specifies V=1 or VERBOSE=1
when running make.



Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-12-04 16:49:06 UTC (rev 24275)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-12-04 16:50:05 UTC (rev 24276)
@@ -326,7 +326,7 @@
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
 		PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
 		./configure \
-		-verbose \
+		$(if $(VERBOSE),-verbose,-silent) \
 		-force-pkg-config \
 		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
 		$(QTOPIA4_QCONFIG_COMMAND) \

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Hans-Christian Egtvedt]

On Mon, 1 Dec 2008 14:39:57 +0100
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> Le Mon, 1 Dec 2008 14:25:58 +0100,
> Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> a ?crit :
> 
> > They probably will if the external toolchain is for cross compiling.
> > What architecture was your external toolchain for? Was it configured
> > very similar to the host toolchain?
> 
> My host machine is x86, my external toolchain compiles binaries for
> arm (toolchain generated by crosstool-ng, it uses uClibc).
> 

Then you were probably lucky getting it to compile the first time.

> > I think I'll leave it until we have some proper data on who uses
> > what kinds of toolchains. Could it be that your external toolchain
> > just needs a massage?
> 
> What do you mean ?
> 
> It just seems logical to me that when using an external toolchain, one
> needs to tell the toolchain where the headers and libraries are, when
> they are not in the sysroot directory of the toolchain as specified
> during the generation of the toolchain.
> 

Adding -I and -L as a general rule to both cross compiling and host
compiling is wrong. You must probably change the CFLAGS, CXXFLAGS,
LDFLAGS, etc. in qmake.conf.

-- 
Best regards,
Hans-Christian Egtvedt

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Thomas Petazzoni]

Le Mon, 1 Dec 2008 14:25:58 +0100,
Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> a ?crit :

> They probably will if the external toolchain is for cross compiling.
> What architecture was your external toolchain for? Was it configured
> very similar to the host toolchain?

My host machine is x86, my external toolchain compiles binaries for arm
(toolchain generated by crosstool-ng, it uses uClibc).

> I think I'll leave it until we have some proper data on who uses what
> kinds of toolchains. Could it be that your external toolchain just
> needs a massage?

What do you mean ?

It just seems logical to me that when using an external toolchain, one
needs to tell the toolchain where the headers and libraries are, when
they are not in the sysroot directory of the toolchain as specified
during the generation of the toolchain.

Sincerly,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Hans-Christian Egtvedt]

On Mon, 1 Dec 2008 14:19:58 +0100
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> Le Mon, 1 Dec 2008 14:12:01 +0100,
> Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> a ?crit :
> 
> > Okay, then we'll enable them only if we have an external toolchain.
> 
> Yes, probably. But then, if you encountered some breakage with them
> and an internal toolchain, maybe the same breakage occurs with an
> external toolchain ?
> 

They probably will if the external toolchain is for cross compiling.
What architecture was your external toolchain for? Was it configured
very similar to the host toolchain?

> (I tested my patch by building Qtopia with an external toolchain, and
> it worked. But maybe I didn't build exactly the same thing as you
> did).
> 

The problem I triggered was that stdio.h in uClibc is not equal to
stdio.h in glibc on my build machine, so the host compiler got utterly
confused.

I think I'll leave it until we have some proper data on who uses what
kinds of toolchains. Could it be that your external toolchain just
needs a massage?

-- 
Best regards,
Hans-Christian Egtvedt

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Thomas Petazzoni]

Le Mon, 1 Dec 2008 14:12:01 +0100,
Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> a ?crit :

> Okay, then we'll enable them only if we have an external toolchain.

Yes, probably. But then, if you encountered some breakage with them and
an internal toolchain, maybe the same breakage occurs with an external
toolchain ?

(I tested my patch by building Qtopia with an external toolchain, and
it worked. But maybe I didn't build exactly the same thing as you did).

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Hans-Christian Egtvedt]

On Mon, 1 Dec 2008 14:08:54 +0100
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> Le Mon,  1 Dec 2008 05:06:02 -0800 (PST),
> egtvedt at uclibc.org a ?crit :
> 
> > UTC (rev 24212) @@ -342,8 +342,6 @@ -no-rpath \
> >  		-nomake examples \
> >  		-nomake demos \
> > -		-I $(STAGING_DIR)/usr/include \
> > -		-L $(STAGING_DIR)/usr/lib \
> 
> These lines have been added by me in revision 24001. They are
> necessary to allow compilation with an external toolchain.
> 

Okay, then we'll enable them only if we have an external toolchain.
I'll redo some more in mplayer.mk.

-- 
Best regards,
Hans-Christian Egtvedt

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Thomas Petazzoni]

Le Mon,  1 Dec 2008 05:06:02 -0800 (PST),
egtvedt at uclibc.org a ?crit :

> UTC (rev 24212) @@ -342,8 +342,6 @@ -no-rpath \
>  		-nomake examples \
>  		-nomake demos \
> -		-I $(STAGING_DIR)/usr/include \
> -		-L $(STAGING_DIR)/usr/lib \

These lines have been added by me in revision 24001. They are necessary
to allow compilation with an external toolchain.

Sincerly,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[egtvedt at uclibc.org]

Author: egtvedt
Date: 2008-12-01 05:06:02 -0800 (Mon, 01 Dec 2008)
New Revision: 24212

Log:
qtopia4: remove explisit include and library directories from configure call

This patch removes -I and -L from ./configure since it breaks cross-compiling.
The inclusion of -I and -L will confuse the host compiler when compiling the
host tools.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>



Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-12-01 13:02:22 UTC (rev 24211)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-12-01 13:06:02 UTC (rev 24212)
@@ -342,8 +342,6 @@
 		-no-rpath \
 		-nomake examples \
 		-nomake demos \
-		-I $(STAGING_DIR)/usr/include \
-		-L $(STAGING_DIR)/usr/lib \
 	)
 	touch $@
 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[tpetazzoni at uclibc.org]

Author: tpetazzoni
Date: 2008-11-11 10:35:43 -0800 (Tue, 11 Nov 2008)
New Revision: 24001

Log:
Fix Qtopia build issues

This patch fixes two Qtopia build issues, encountered while trying to
use system implementation of zlib, freetype, jpeg and libpng :

 * The build process doesn't look in $(STAGING_DIR)/usr/include for
   includes and $(STAGING_DIR)/usr/lib. Same problem as the patch
   currently floating around adding LDFLAGS to TARGET_CONFIGURE_OPTS,
   but as Qtopia doesn't use TARGET_CONFIGURE_OPTS, we need a specific
   fix here. So we use the -I and -L options of Qtopia's configure
   script.

 * The build process doesn't use pkg-config to get the header path for
   Freetype headers (located in $(STAGING_DIR)/usr/include/freetype2
   and not directly in $(STAGING_DIR)/usr/include/). There was already
   a fix for this, consisting in adding $(FREETYPE_DIR)/include to the
   -I path of Qtopia's configure. This patch modifies this fix to use
   $(STAGING_DIR)/usr/include/freetype2 instead, which looks more
   coherent with how all the packages are built (using $(STAGING_DIR)
   as the reference to get headers and libraries).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-11-11 18:32:31 UTC (rev 24000)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-11-11 18:35:43 UTC (rev 24001)
@@ -212,7 +212,7 @@
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE),y)
 QTOPIA4_CONFIGURE+= -system-freetype
-QTOPIA4_CONFIGURE+= -I $(FREETYPE_DIR)/include
+QTOPIA4_CONFIGURE+= -I $(STAGING_DIR)/usr/include/freetype2/
 QTOPIA4_DEP_LIBS+=freetype
 else
 QTOPIA4_CONFIGURE+= -no-freetype
@@ -342,6 +342,8 @@
 		-no-rpath \
 		-nomake examples \
 		-nomake demos \
+		-I $(STAGING_DIR)/usr/include \
+		-L $(STAGING_DIR)/usr/lib \
 	)
 	touch $@
 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Peter Korsgaard]

>>>>> "Markus" == Markus Heidelberg <markus.heidelberg@web.de> writes:

Hi,

 >> trunk/buildroot/package/qtopia4/Config.gfx.in
 >> trunk/buildroot/package/qtopia4/Config.in
 >> trunk/buildroot/package/qtopia4/Config.mouse.in
 >> trunk/buildroot/package/qtopia4/Config.sql.in
 >> trunk/buildroot/package/qtopia4/qtopia4.mk

 Markus> Thanks, but it would be nice to include the log messages from
 Markus> my patches, this one is quite meaningless. And if the
 Markus> separate patches are squashed into one, I don't have to do
 Markus> the work with splitting the change up into a patch set. I
 Markus> don't think these four patches were split too much, are they?

I agree.

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Peter Korsgaard]

>>>>> "Arnar" == Arnar Mar Sigur?sson <antab@valka.is> writes:

Hi,

 >>> +    default n
 >> is not necessary in all the options

 Arnar> Is "default n" the default? Was not sure because i have seen
 Arnar> other packages use "default n".

There shouldn't be any after r22874 - If there are, then that's an
error.

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Markus Heidelberg]

antab at uclibc.org, 02.11.2008:
> Author: antab
> Date: 2008-11-01 19:16:53 -0700 (Sat, 01 Nov 2008)
> New Revision: 23900
> 
> Log:
> Fixes for Qt from Markus Heidelberg
> 
> 
> Modified:
>    trunk/buildroot/package/qtopia4/Config.gfx.in
>    trunk/buildroot/package/qtopia4/Config.in
>    trunk/buildroot/package/qtopia4/Config.mouse.in
>    trunk/buildroot/package/qtopia4/Config.sql.in
>    trunk/buildroot/package/qtopia4/qtopia4.mk

Thanks, but it would be nice to include the log messages from my patches, this
one is quite meaningless. And if the separate patches are squashed into one, I
don't have to do the work with splitting the change up into a patch set. I
don't think these four patches were split too much, are they?

Markus

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[antab at uclibc.org]

Author: antab
Date: 2008-11-01 19:16:53 -0700 (Sat, 01 Nov 2008)
New Revision: 23900

Log:
Fixes for Qt from Markus Heidelberg


Modified:
   trunk/buildroot/package/qtopia4/Config.gfx.in
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/Config.mouse.in
   trunk/buildroot/package/qtopia4/Config.sql.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.gfx.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.gfx.in	2008-11-02 00:55:41 UTC (rev 23899)
+++ trunk/buildroot/package/qtopia4/Config.gfx.in	2008-11-02 02:16:53 UTC (rev 23900)
@@ -6,18 +6,14 @@
 
 config BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED
 	bool "Transformed"
-	default n
 
 config BR2_PACKAGE_QTOPIA4_GFX_QVFB
 	bool "Qt Virtual Framebuffer"
-	default n
 
 config BR2_PACKAGE_QTOPIA4_GFX_VNC
 	bool "VNC"
-	default n
 
 config BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN
 	bool "multiscreen"
-	default y
 
 endmenu

Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2008-11-02 00:55:41 UTC (rev 23899)
+++ trunk/buildroot/package/qtopia4/Config.in	2008-11-02 02:16:53 UTC (rev 23900)
@@ -185,7 +185,7 @@
 	  Select freetype2 support.
 
 config BR2_PACKAGE_QTOPIA4_NOFREETYPE
-        bool "no freetype2 support"
+	bool "no freetype2 support"
 	help
 	  Do not compile in Freetype2 support.
 

Modified: trunk/buildroot/package/qtopia4/Config.mouse.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.mouse.in	2008-11-02 00:55:41 UTC (rev 23899)
+++ trunk/buildroot/package/qtopia4/Config.mouse.in	2008-11-02 02:16:53 UTC (rev 23900)
@@ -2,30 +2,23 @@
 
 config BR2_PACKAGE_QTOPIA4_MOUSE_PC
 	bool "pc"
-	default n
 
 config BR2_PACKAGE_QTOPIA4_MOUSE_BUS
 	bool "bus"
-	default n
 
 config BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP
 	bool "linuxtp"
-	default n
 
 config BR2_PACKAGE_QTOPIA4_MOUSE_YOPY
 	bool "yopy"
-	default n
 
 config BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX
-	bool "vxr41xx"
-	default n
+	bool "vr41xx"
 
 config BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB
 	bool "tslib"
-	default n
 
 config BR2_PACKAGE_QTOPIA4_MOUSE_QVFB
 	bool "qvfb"
-	default n
 
 endmenu

Modified: trunk/buildroot/package/qtopia4/Config.sql.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.sql.in	2008-11-02 00:55:41 UTC (rev 23899)
+++ trunk/buildroot/package/qtopia4/Config.sql.in	2008-11-02 02:16:53 UTC (rev 23900)
@@ -1,7 +1,7 @@
 menuconfig BR2_PACKAGE_QTOPIA4_SQL_MODULE
-    bool "SQL Module"
-    help
-      Compile Qtopia SQL Module
+	bool "SQL Module"
+	help
+	  Compile Qtopia SQL Module
 
 if BR2_PACKAGE_QTOPIA4_SQL_MODULE
 config BR2_PACKAGE_QTOPIA4_MYSQL

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-11-02 00:55:41 UTC (rev 23899)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-11-02 02:16:53 UTC (rev 23900)
@@ -95,32 +95,32 @@
 
 ### Mouse drivers
 ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_PC),y)
-QTOPIA4_CONFIGURE += qt-mouse-pc
+QTOPIA4_CONFIGURE += -qt-mouse-pc
 else
 QTOPIA4_CONFIGURE += -no-mouse-pc
 endif
 ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_BUS),y)
-QTOPIA4_CONFIGURE += qt-mouse-bus
+QTOPIA4_CONFIGURE += -qt-mouse-bus
 else
 QTOPIA4_CONFIGURE += -no-mouse-bus
 endif
 ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP),y)
-QTOPIA4_CONFIGURE += qt-mouse-linuxtp
+QTOPIA4_CONFIGURE += -qt-mouse-linuxtp
 else
 QTOPIA4_CONFIGURE += -no-mouse-linuxtp
 endif
 ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_YOPY),y)
-QTOPIA4_CONFIGURE += qt-mouse-yopy
+QTOPIA4_CONFIGURE += -qt-mouse-yopy
 else
 QTOPIA4_CONFIGURE += -no-mouse-yopy
 endif
 ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX),y)
-QTOPIA4_CONFIGURE += qt-mouse-vr41xx
+QTOPIA4_CONFIGURE += -qt-mouse-vr41xx
 else
 QTOPIA4_CONFIGURE += -no-mouse-vr41xx
 endif
 ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB),y)
-QTOPIA4_CONFIGURE += qt-mouse-tslib
+QTOPIA4_CONFIGURE += -qt-mouse-tslib
 QTOPIA4_DEP_LIBS+=tslib
 QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
 QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB)))
@@ -128,6 +128,11 @@
 else
 QTOPIA4_CONFIGURE += -no-mouse-tslib
 endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_QVFB),y)
+QTOPIA4_CONFIGURE += -qt-mouse-qvfb
+else
+QTOPIA4_CONFIGURE += -no-mouse-qvfb
+endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y)
 QTOPIA4_CONFIGURE+= "-debug $(QTOPIA4_TSLIB_DEB)"

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Markus Heidelberg]

Arnar Mar Sigur?sson, 01.11.2008:
> >> +	default n
> > is not necessary in all the options
> Is "default n" the default? Was not sure because i have seen other packages
> use "default n".

Yes, it is.
find package -name Config.* -exec grep "default n" {} \;
only shows 7 lines. Look at revision 22874 from 2008-07-17 where all the
"default n" lines were removed.

Markus

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Thiago A. Corrêa]

>> I don't know what the multiscreen driver is about, sounds like multiple
>> physical screens. Is this a common setup that you default to y here?
>
> Multiscreen is for using more then one output driver yes, so you can use
> linuxfb and VNC at the same time (what i'm doing). Probably should have it
> default no.

Hi Arnar,

    Just out of curiosity, did you try the new directfb driver? It's
new to 4.4 series I think. Since directfb was supposed to have the
AVR32 accelarated instructions, so you would effectively have an
accelarated gfx driver.

    I've been meaning to test it out myself but my hardware with LCD
isn't ready yet :(

Kind Regards,
    Thiago A. Correa

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Arnar Mar Sigurðsson]

-----Original Message-----
From: buildroot-bounces@uclibc.org on behalf of Markus Heidelberg
Sent: Sat 11/1/2008 11:47 AM
To: buildroot at uclibc.org
Cc: antab at uclibc.org
Subject: Re: [Buildroot] svn commit: trunk/buildroot/package/qtopia4
 
> Just some comments:

>> +config BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN
>> +	bool "multiscreen"
>> +	default y

> I don't know what the multiscreen driver is about, sounds like multiple
> physical screens. Is this a common setup that you default to y here?

Multiscreen is for using more then one output driver yes, so you can use linuxfb and VNC at the same time (what i'm doing). Probably should have it default no.

>> +config BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX
>> +	bool "vxr41xx"

> vr41xx
Ah, damn typos;)

>> +	default n
> is not necessary in all the options
Is "default n" the default? Was not sure because i have seen other packages use "default n".

>> Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
>> +### Mouse drivers

> MOUSE_QVFB is missing here.
Good catch, i added all the drivers listed in configure -help, but not using all of them so i cant test all. Still need to add the kbd driver list, will do that later on.


> I could also make a patch, but I wanted to clarify the multiscreen thing
> first.
Patches are welcome

> Markus

Arnar Mar Sig
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20081101/78254894/attachment.htm 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Markus Heidelberg]

antab at uclibc.org, 31.10.2008:
> Author: antab
> Date: 2008-10-31 10:17:23 -0700 (Fri, 31 Oct 2008)
> New Revision: 23886
> 
> Log:
> Add options to select what gfx and mouse drivers are compiled in.
> Note to tslib users: You now have to select the tslib mouse driver to build it.
> 
> 
> Added:
>    trunk/buildroot/package/qtopia4/Config.gfx.in
>    trunk/buildroot/package/qtopia4/Config.mouse.in
> 
> Modified:
>    trunk/buildroot/package/qtopia4/Config.in
>    trunk/buildroot/package/qtopia4/Config.sql.in
>    trunk/buildroot/package/qtopia4/qtopia4.mk

Just some comments:

> +config BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN
> +	bool "multiscreen"
> +	default y

I don't know what the multiscreen driver is about, sounds like multiple
physical screens. Is this a common setup that you default to y here?

> +config BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX
> +	bool "vxr41xx"

vr41xx

> +	default n

is not necessary in all the options

> Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
> +### Mouse drivers

MOUSE_QVFB is missing here.


I could also make a patch, but I wanted to clarify the multiscreen thing
first.

Markus

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[antab at uclibc.org]

Author: antab
Date: 2008-10-31 10:17:23 -0700 (Fri, 31 Oct 2008)
New Revision: 23886

Log:
Add options to select what gfx and mouse drivers are compiled in.
Note to tslib users: You now have to select the tslib mouse driver to build it.


Added:
   trunk/buildroot/package/qtopia4/Config.gfx.in
   trunk/buildroot/package/qtopia4/Config.mouse.in

Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/Config.sql.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Added: trunk/buildroot/package/qtopia4/Config.gfx.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.gfx.in	                        (rev 0)
+++ trunk/buildroot/package/qtopia4/Config.gfx.in	2008-10-31 17:17:23 UTC (rev 23886)
@@ -0,0 +1,23 @@
+menu "Graphics drivers"
+
+config BR2_PACKAGE_QTOPIA4_GFX_LINUXFB
+	bool "Linux Framebuffer"
+	default y
+
+config BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED
+	bool "Transformed"
+	default n
+
+config BR2_PACKAGE_QTOPIA4_GFX_QVFB
+	bool "Qt Virtual Framebuffer"
+	default n
+
+config BR2_PACKAGE_QTOPIA4_GFX_VNC
+	bool "VNC"
+	default n
+
+config BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN
+	bool "multiscreen"
+	default y
+
+endmenu

Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2008-10-31 16:37:01 UTC (rev 23885)
+++ trunk/buildroot/package/qtopia4/Config.in	2008-10-31 17:17:23 UTC (rev 23886)
@@ -224,13 +224,9 @@
 	help
 	  The target platform.
 
-menuconfig BR2_PACKAGE_QTOPIA4_SQL_MODULE
-	bool "SQL Module"
-	help
-	  Compile Qtopia SQL Module
-if BR2_PACKAGE_QTOPIA4_SQL_MODULE
 source "package/qtopia4/Config.sql.in"
-endif
+source "package/qtopia4/Config.gfx.in"
+source "package/qtopia4/Config.mouse.in"
 
 config BR2_PACKAGE_QTOPIA4_XMLPATTERNS
 	bool "XML Patterns Module"

Added: trunk/buildroot/package/qtopia4/Config.mouse.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.mouse.in	                        (rev 0)
+++ trunk/buildroot/package/qtopia4/Config.mouse.in	2008-10-31 17:17:23 UTC (rev 23886)
@@ -0,0 +1,31 @@
+menu "Mouse drivers"
+
+config BR2_PACKAGE_QTOPIA4_MOUSE_PC
+	bool "pc"
+	default n
+
+config BR2_PACKAGE_QTOPIA4_MOUSE_BUS
+	bool "bus"
+	default n
+
+config BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP
+	bool "linuxtp"
+	default n
+
+config BR2_PACKAGE_QTOPIA4_MOUSE_YOPY
+	bool "yopy"
+	default n
+
+config BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX
+	bool "vxr41xx"
+	default n
+
+config BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB
+	bool "tslib"
+	default n
+
+config BR2_PACKAGE_QTOPIA4_MOUSE_QVFB
+	bool "qvfb"
+	default n
+
+endmenu

Modified: trunk/buildroot/package/qtopia4/Config.sql.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.sql.in	2008-10-31 16:37:01 UTC (rev 23885)
+++ trunk/buildroot/package/qtopia4/Config.sql.in	2008-10-31 17:17:23 UTC (rev 23886)
@@ -1,3 +1,9 @@
+menuconfig BR2_PACKAGE_QTOPIA4_SQL_MODULE
+    bool "SQL Module"
+    help
+      Compile Qtopia SQL Module
+
+if BR2_PACKAGE_QTOPIA4_SQL_MODULE
 config BR2_PACKAGE_QTOPIA4_MYSQL
 	bool "MySQL Driver"
 	help
@@ -33,4 +39,4 @@
 	help
 	  Build SQLite 2 driver
 	  If unsure, say n.
-
+endif

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-31 16:37:01 UTC (rev 23885)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-31 17:17:23 UTC (rev 23886)
@@ -65,12 +65,68 @@
 QTOPIA4_CONFIGURE+= -no-qt3support
 endif
 
-ifeq ($(BR2_PACKAGE_TSLIB),y)
-QTOPIA4_CONFIGURE+= -qt-mouse-tslib
+
+### Display drivers
+ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_LINUXFB),y)
+QTOPIA4_CONFIGURE += -qt-gfx-linuxfb
+else
+QTOPIA4_CONFIGURE += -no-gfx-linuxfb
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED),y)
+QTOPIA4_CONFIGURE += -qt-gfx-transformed
+else
+QTOPIA4_CONFIGURE += -no-gfx-transformed
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_QVFB),y)
+QTOPIA4_CONFIGURE += -qt-gfx-qvfb
+else
+QTOPIA4_CONFIGURE += -no-gfx-qvfb
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_VNC),y)
+QTOPIA4_CONFIGURE += -qt-gfx-vnc
+else
+QTOPIA4_CONFIGURE += -no-gfx-vnc
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN),y)
+QTOPIA4_CONFIGURE += -qt-gfx-multiscreen
+else
+QTOPIA4_CONFIGURE += -no-gfx-multiscreen
+endif
+
+### Mouse drivers
+ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_PC),y)
+QTOPIA4_CONFIGURE += qt-mouse-pc
+else
+QTOPIA4_CONFIGURE += -no-mouse-pc
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_BUS),y)
+QTOPIA4_CONFIGURE += qt-mouse-bus
+else
+QTOPIA4_CONFIGURE += -no-mouse-bus
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP),y)
+QTOPIA4_CONFIGURE += qt-mouse-linuxtp
+else
+QTOPIA4_CONFIGURE += -no-mouse-linuxtp
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_YOPY),y)
+QTOPIA4_CONFIGURE += qt-mouse-yopy
+else
+QTOPIA4_CONFIGURE += -no-mouse-yopy
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX),y)
+QTOPIA4_CONFIGURE += qt-mouse-vr41xx
+else
+QTOPIA4_CONFIGURE += -no-mouse-vr41xx
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB),y)
+QTOPIA4_CONFIGURE += qt-mouse-tslib
 QTOPIA4_DEP_LIBS+=tslib
 QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
 QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB)))
 #"))
+else
+QTOPIA4_CONFIGURE += -no-mouse-tslib
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y)

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[correa at uclibc.org]

Author: correa
Date: 2008-10-30 19:17:30 -0700 (Thu, 30 Oct 2008)
New Revision: 23872

Log:
fix wrong variable name for SQL. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-31 02:04:28 UTC (rev 23871)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-31 02:17:30 UTC (rev 23872)
@@ -307,7 +307,7 @@
 		cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
 		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/imageformats/*; \
 	fi
-ifneq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
+ifneq ($(BR2_PACKAGE_QTOPIA4_SQL_MODULE),y)
 	# Remove Sql libraries, not needed
 	-rm $(TARGET_DIR)/usr/lib/libQtSql*
 endif

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-10-29 13:40:51 -0700 (Wed, 29 Oct 2008)
New Revision: 23855

Log:
qtopia4: fix wrong compilation of qmake

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-29 19:40:21 UTC (rev 23854)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-29 20:40:51 UTC (rev 23855)
@@ -257,8 +257,12 @@
 # Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'.
 # PKG_CONFIG_SYSROOT is only used to avoid a warning from Qt's configure system
 # when cross compiling, Qt 4.4.3 is wrong here.
+# Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
+# instead of the host then.
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
+		PATH=$(TARGET_PATH) \
+		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
+		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
 		PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
 		./configure \
 		-verbose \

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Markus Heidelberg]

Peter Korsgaard, 29.10.2008:
> >>>>> "Arnar" == Arnar Mar Sigur?sson <antab@valka.is> writes:
> 
> Hi,
> 
>  Arnar> This breaks building Qt for AVR32. It will force qmake to be
>  Arnar> build for the target so its unusable later on.
> 
> Ok, I don't do Qt nor AVR32 - Markus, Thomas?

Sorry for this. I'm a bit ashamed, as I use AVR32 myself. I used it at the
office on the AVR32, but after the PKG_CONFIG cleanup the day before I decided
to introduce TARGET_CONFIGURE_OPTS at home and only tested it for i386.

Please try the patch I just sent, Arnar. It fixes it for me on AVR32 and
should fix it for you, too.

Markus

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Arnar Mar Sigurðsson]

r23828 - the sed changes are good (i remember being hit by this some timeago and had to edit that file by hand)
r23827 - the pkg config changes on the other hand break it. After reverting that i'm able to build 4.4.3 and 4.5.0-tp1.

Greets
  Arnar Mar Sig

-----Original Message-----
From: Thiago A. Corr?a [mailto:thiago.correa at gmail.com]
Sent: Wed 10/29/2008 4:01 PM
To: Peter Korsgaard
Cc: Arnar Mar Sigur?sson; buildroot at uclibc.org; markus.heidelberg at web.de
Subject: Re: [Buildroot] svn commit: trunk/buildroot/package/qtopia4
 
On Wed, Oct 29, 2008 at 1:21 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Arnar" == Arnar Mar Sigur?sson <antab@valka.is> writes:
>
> Hi,
>
>  Arnar> This breaks building Qt for AVR32. It will force qmake to be
>  Arnar> build for the target so its unusable later on.
>
> Ok, I don't do Qt nor AVR32 - Markus, Thomas?
>

I didn't try it either myself yet as I'm kind busy working on some
other stuff, but the patch seams ok to me.
I do quite a bit of AVR32 and Qt. The sed just edits the qmake.conf
that qmake uses to generate the makefiles for qt and applications that
use it. qmake itself is usually built using a simpler Makefile to go
around the chicken egg issue.

The PKG_CONFIG_SYSROOT part is that I'm not quite sure. Is that the
part that breaks it Amar?

Kind Regards,
    Thiago A. Correa


-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20081029/5e9ab0b7/attachment.htm 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Thiago A. Corrêa]

On Wed, Oct 29, 2008 at 1:21 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Arnar" == Arnar Mar Sigur?sson <antab@valka.is> writes:
>
> Hi,
>
>  Arnar> This breaks building Qt for AVR32. It will force qmake to be
>  Arnar> build for the target so its unusable later on.
>
> Ok, I don't do Qt nor AVR32 - Markus, Thomas?
>

I didn't try it either myself yet as I'm kind busy working on some
other stuff, but the patch seams ok to me.
I do quite a bit of AVR32 and Qt. The sed just edits the qmake.conf
that qmake uses to generate the makefiles for qt and applications that
use it. qmake itself is usually built using a simpler Makefile to go
around the chicken egg issue.

The PKG_CONFIG_SYSROOT part is that I'm not quite sure. Is that the
part that breaks it Amar?

Kind Regards,
    Thiago A. Correa

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Peter Korsgaard]

>>>>> "Arnar" == Arnar Mar Sigur?sson <antab@valka.is> writes:

Hi,

 Arnar> This breaks building Qt for AVR32. It will force qmake to be
 Arnar> build for the target so its unusable later on.

Ok, I don't do Qt nor AVR32 - Markus, Thomas?

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Arnar Mar Sigurðsson]

This breaks building Qt for AVR32. It will force qmake to be build for the target so its unusable later on.


-----Original Message-----
From: buildroot-bounces@uclibc.org on behalf of jacmet at uclibc.org
Sent: Tue 10/28/2008 9:40 AM
To: buildroot at uclibc.org
Subject: [Buildroot] svn commit: trunk/buildroot/package/qtopia4
 
Author: jacmet
Date: 2008-10-28 02:40:25 -0700 (Tue, 28 Oct 2008)
New Revision: 23827

Log:
qtopia4: fix use of pkg-config

When cross compiling, Qt sets PKG_CONFIG in its own configure script to
an empty string. That leads to not using pkg-config. To avoid that, use
the configure option -force-pkg-config. Also set environment variables
for pkg-config defined in TARGET_CONFIGURE_OPTS.

Patch by Markus Heidelberg.

See http://buildroot.uclibc.org/lists/buildroot/2008-October/011324.html
for more details.

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-28 06:48:06 UTC (rev 23826)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-28 09:40:25 UTC (rev 23827)
@@ -253,10 +253,15 @@
 	
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+# Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'.
+# PKG_CONFIG_SYSROOT is only used to avoid a warning from Qt's configure system
+# when cross compiling, Qt 4.4.3 is wrong here.
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
-		PATH=$(TARGET_PATH) \
+		$(TARGET_CONFIGURE_OPTS) \
+		PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
 		./configure \
 		-verbose \
+		-force-pkg-config \
 		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
 		$(QTOPIA4_QCONFIG_COMMAND) \
 		$(QTOPIA4_CONFIGURE) \

_______________________________________________
buildroot mailing list
buildroot at uclibc.org
http://busybox.net/mailman/listinfo/buildroot




-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/ms-tnef
Size: 3596 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20081029/8bed3fde/attachment.bin 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-10-28 02:40:28 -0700 (Tue, 28 Oct 2008)
New Revision: 23828

Log:
qtopia4: fix adjustment of qmake.conf

Extend the regexp to match spaces and also tabs to replace the qmake
variables with the proper buildroot values. Also use TARGET_AR and
TARGET_STRIP instead of using TARGET_CROSS and set a variable for
qmake.conf to shorten the command line.

Patch by Markus Heidelberg

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-28 09:40:25 UTC (rev 23827)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-28 09:40:28 UTC (rev 23828)
@@ -218,6 +218,7 @@
 BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
 #"))
 
+QTOPIA4_QMAKE_CONF:=$(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
 
 # Variable for other Qt applications to use
 QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++
@@ -243,14 +244,14 @@
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
 	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
         # Fix compiler path
-	$(SED) '\,QMAKE_CC *=, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_CXX *=, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_LINK *=, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_LINK_SHLIB *=, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_AR *=, c\QMAKE_AR = $(TARGET_CROSS)ar cqs' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_RANLIB *=, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_STRIP *=, c\QMAKE_STRIP = $(TARGET_CROSS)strip' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	
+	$(SED) '\,QMAKE_CC[ 	]*=, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_QMAKE_CONF)
+	$(SED) '\,QMAKE_CXX[ 	]*=, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)
+	$(SED) '\,QMAKE_LINK[ 	]*=, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)
+	$(SED) '\,QMAKE_LINK_SHLIB[ 	]*=, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)
+	$(SED) '\,QMAKE_AR[ 	]*=, c\QMAKE_AR = $(TARGET_AR) cqs' $(QTOPIA4_QMAKE_CONF)
+	$(SED) '\,QMAKE_RANLIB[ 	]*=, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_QMAKE_CONF)
+	$(SED) '\,QMAKE_STRIP[ 	]*=, c\QMAKE_STRIP = $(TARGET_STRIP)' $(QTOPIA4_QMAKE_CONF)
+
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 # Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'.

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-10-28 02:40:25 -0700 (Tue, 28 Oct 2008)
New Revision: 23827

Log:
qtopia4: fix use of pkg-config

When cross compiling, Qt sets PKG_CONFIG in its own configure script to
an empty string. That leads to not using pkg-config. To avoid that, use
the configure option -force-pkg-config. Also set environment variables
for pkg-config defined in TARGET_CONFIGURE_OPTS.

Patch by Markus Heidelberg.

See http://buildroot.uclibc.org/lists/buildroot/2008-October/011324.html
for more details.

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-28 06:48:06 UTC (rev 23826)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-10-28 09:40:25 UTC (rev 23827)
@@ -253,10 +253,15 @@
 	
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+# Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'.
+# PKG_CONFIG_SYSROOT is only used to avoid a warning from Qt's configure system
+# when cross compiling, Qt 4.4.3 is wrong here.
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
-		PATH=$(TARGET_PATH) \
+		$(TARGET_CONFIGURE_OPTS) \
+		PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
 		./configure \
 		-verbose \
+		-force-pkg-config \
 		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
 		$(QTOPIA4_QCONFIG_COMMAND) \
 		$(QTOPIA4_CONFIGURE) \

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-10-25 23:03:23 -0700 (Sat, 25 Oct 2008)
New Revision: 23793

Log:
qtopia4: reduce the use of BR2_PACKAGE_QTOPIA4

Use one conditional if statement instead of several single "depends on".

Patch by Markus Heidelberg.

Cleaned up trailing white space while we're at it.

Modified:
   trunk/buildroot/package/qtopia4/Config.in


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2008-10-26 00:24:38 UTC (rev 23792)
+++ trunk/buildroot/package/qtopia4/Config.in	2008-10-26 06:03:23 UTC (rev 23793)
@@ -7,16 +7,16 @@
 
 	  http://www.trolltech.com/
 
+if BR2_PACKAGE_QTOPIA4
+
 config BR2_PACKAGE_QTOPIA4_DEBUG
 	bool "Compile with debug support"
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  If unsure, say N.
 
 choice
 	prompt "Library type"
 	default BR2_PACKAGE_QTOPIA4_SHARED
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Selects the library type: Shared or Static
 
@@ -40,7 +40,6 @@
 choice
 	prompt "Qtopia 4 Core license type"
 	default BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Selects the type of license you which to use for Qtopia 4 Core.
 
@@ -54,7 +53,7 @@
 
 config BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED
 	bool "Approve Qtopia Core 4 GPL licence"
-	depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
+	depends on 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
@@ -67,7 +66,7 @@
 config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME
 	string "Qtopia Core 4 Commercial License Username"
 	default ""
-	depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
+	depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
 	  Commercial users can download their source directly by
 	  providing a username.
@@ -75,14 +74,13 @@
 config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
 	string "Qtopia Core 4 Commercial License Password"
 	default ""
-	depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
+	depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
 	  Commercial users can download their source directly by
 	  providing a password.
 
 config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
 	bool "Compatibility with Qt3"
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Turns on support for older Qt3. This will create an additional
 	  library with proxy code and increase the space required on target.
@@ -91,26 +89,22 @@
 config BR2_PACKAGE_QTOPIA4_DEPTHS
 	string "color depths to support"
 	default "-depths 24,16,8"
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Which color depths to support for the library. Default is "-depths
 	  24,16,8". Different depths are specified by a comma separated list.
 
 config BR2_PACKAGE_QTOPIA4_GIF
 	bool "Enable GIF support"
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  This compiles and installs the plugin for GIF reading support.
 
 config BR2_PACKAGE_QTOPIA4_LIBMNG
 	bool "Enable libmng support"
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  This compiles and installs the plugin for MNG support.
 
 choice
 	prompt "JPEG support"
-	depends on BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOJPEG
 	help
 	  Select libjpeg support.
@@ -134,7 +128,6 @@
 
 choice
 	prompt "PNG support"
-	depends on BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOPNG
 	help
 	  Select which library to use if PNG support should be enabled.
@@ -152,7 +145,6 @@
 
 choice
 	prompt "TIFF support"
-	depends on BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOTIFF
 	help
 	  Select which library to use if TIFF support should be enabled.
@@ -170,7 +162,6 @@
 
 choice
 	prompt "zlib support"
-	depends on BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_QTZLIB
 	help
 	  Select zlib support.
@@ -179,17 +170,16 @@
 	bool "Qt zlib"
 	help
 	  Use the zlib bundled with Qt.
-	
+
 config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB
 	bool "System zlib"
 	select BR2_PACKAGE_ZLIB
 	help
 	  Use the shared zlib from the system.
 endchoice
-								
+
 choice
 	prompt "freetype2 support"
-	depends on BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOFREETYPE
 	help
 	  Select freetype2 support.
@@ -204,7 +194,7 @@
 	bool "Qt freetype2"
 	help
 	  Use the libfreetype bundled with Qt.
-	
+
 config BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE
 	bool "System freetype2"
 	select BR2_PACKAGE_FREETYPE
@@ -212,7 +202,7 @@
 	  Use shared libfreetype from the target system.
 	  See http://www.freetype.org/
 endchoice
-	
+
 config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
 	string "The embedded platform we are making Qtopia4 for"
 	default "arm"	if BR2_arm
@@ -231,13 +221,11 @@
 	default "generic"	if BR2_sh
 	default "generic"	if BR2_sh64
 	default "generic"	if BR2_sparc
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  The target platform.
 
 menuconfig BR2_PACKAGE_QTOPIA4_SQL_MODULE
 	bool "SQL Module"
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Compile Qtopia SQL Module
 if BR2_PACKAGE_QTOPIA4_SQL_MODULE
@@ -246,28 +234,24 @@
 
 config BR2_PACKAGE_QTOPIA4_XMLPATTERNS
 	bool "XML Patterns Module"
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Build QtXmlPatterns module.
 	  If unsure, say n
 
 config BR2_PACKAGE_QTOPIA4_SVG
 	bool "SVG Module"
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Build the SVG module.
 	  If unsure, say n
 
 config BR2_PACKAGE_QTOPIA4_WEBKIT
 	bool "WebKit Module"
-	depends on BR2_PACKAGE_QTOPIA4
 	help
 	  Build the WebKit module.
 	  If unsure, say n.
 
 config BR2_PACKAGE_QTOPIA4_OPENSSL
 	bool "Enable OpenSSL support"
-	depends on BR2_PACKAGE_QTOPIA4
 	select BR2_PACKAGE_OPENSSL
 	help
 	  Enable support for the OpenSSL encryption library. If you use
@@ -275,3 +259,4 @@
 	  target.
 	  If unsure, say n.
 
+endif # BR2_PACKAGE_QTOPIA4

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[egtvedt at uclibc.org]

Author: egtvedt
Date: 2008-09-29 09:27:48 -0700 (Mon, 29 Sep 2008)
New Revision: 23558

Log:
qtopia4: bump version to 4.4.3

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>



Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-09-29 14:34:40 UTC (rev 23557)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-09-29 16:27:48 UTC (rev 23558)
@@ -16,7 +16,7 @@
 # (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
 # to fix
 
-QTOPIA4_VERSION:=4.4.1
+QTOPIA4_VERSION:=4.4.3
 QTOPIA4_CAT:=$(BZCAT)
 
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[correa at uclibc.org]

Author: correa
Date: 2008-09-02 20:44:31 -0700 (Tue, 02 Sep 2008)
New Revision: 23308

Log:
Bump version

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-09-03 01:09:29 UTC (rev 23307)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-09-03 03:44:31 UTC (rev 23308)
@@ -16,7 +16,7 @@
 # (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
 # to fix
 
-QTOPIA4_VERSION:=4.4.0
+QTOPIA4_VERSION:=4.4.1
 QTOPIA4_CAT:=$(BZCAT)
 
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[correa at uclibc.org]

Author: correa
Date: 2008-09-02 18:09:29 -0700 (Tue, 02 Sep 2008)
New Revision: 23307

Log:
Qtopia: don't build sqlite driver when SQL module is disabled.

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-09-02 13:54:58 UTC (rev 23306)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-09-03 01:09:29 UTC (rev 23307)
@@ -182,11 +182,17 @@
 endif
 ifeq ($(BR2_PACKAGE_QTOPIA4_SQLITE),y)
 QTOPIA4_CONFIGURE+= -qt-sql-sqlite
+else
+QTOPIA4_CONFIGURE+= -no-sql-sqlite
 endif
 ifeq ($(BR2_PACKAGE_QTOPIA4_SQLITE2),y)
 QTOPIA4_CONFIGURE+= -qt-sql-sqlite2
 endif
+else
 # By default, no SQL driver is turned on by configure.
+# but it seams sqlite isn't disabled despite what says
+# configure --help
+QTOPIA4_CONFIGURE+= -no-sql-sqlite
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_XMLPATTERNS),y)

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-08-27 13:19:09 -0700 (Wed, 27 Aug 2008)
New Revision: 23256

Log:
qtopia: fix long help text lines

Modified:
   trunk/buildroot/package/qtopia4/Config.in


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2008-08-27 20:19:04 UTC (rev 23255)
+++ trunk/buildroot/package/qtopia4/Config.in	2008-08-27 20:19:09 UTC (rev 23256)
@@ -69,15 +69,16 @@
 	default ""
 	depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
-	  Commercial users can download their source directly by providing a username.
+	  Commercial users can download their source directly by
+	  providing a username.
 
-
 config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
 	string "Qtopia Core 4 Commercial License Password"
 	default ""
 	depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
-	  Commercial users can download their source directly by providing a password.
+	  Commercial users can download their source directly by
+	  providing a password.
 
 config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
 	bool "Compatibility with Qt3"

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[correa at uclibc.org]

Author: correa
Date: 2008-06-27 20:55:12 -0700 (Fri, 27 Jun 2008)
New Revision: 22545

Log:
Greatly improve Qtopia/Qt Embedded for Linux build. Fix build, reduce the number of variables, add OpenSSL, XmlPatterns, Webkit and individual sql drivers to build. Improve help strings. Sorry for the large commit

Added:
   trunk/buildroot/package/qtopia4/Config.sql.in

Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2008-06-28 03:22:35 UTC (rev 22544)
+++ trunk/buildroot/package/qtopia4/Config.in	2008-06-28 03:55:12 UTC (rev 22545)
@@ -12,6 +12,8 @@
 	bool "Compile with debug support"
 	default n
 	depends on BR2_PACKAGE_QTOPIA4
+	help
+	  If unsure, say N.
 
 choice
 	prompt "Library type"
@@ -22,8 +24,19 @@
 
 config BR2_PACKAGE_QTOPIA4_SHARED
 	bool "Shared library"
+	help
+	  Create and use shared Qt libraries.
+	  If you have multiple programs that depend on Qt or intend to use
+	  plugins, say Y.
+
 config BR2_PACKAGE_QTOPIA4_STATIC
 	bool "Static Library"
+	help
+	  Create and use static Qt libraries.
+	  If you don't have multiple programs on the target that depends on
+	  Qt, then this will save you quite some of storage space.
+	  If unsure, say Y.
+
 endchoice
 
 choice
@@ -71,11 +84,21 @@
 
 config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
 	bool "Compatibility with Qt3"
-	default y
+	default n
 	depends on BR2_PACKAGE_QTOPIA4
 	help
-	  Turns on support for older Qt3.
+	  Turns on support for older Qt3. This will create an additional 
+	  library with proxy code and increase the space required on target.
+	  If unsure say n.
 
+config BR2_PACKAGE_QTOPIA4_DEPTHS
+	string "color depths to support"
+	default "-depths 24,16,8"
+	depends on BR2_PACKAGE_QTOPIA4
+	help
+	  Which color depths to support for the library. Default is "-depths
+	  24,16,8". Different depths are specified by a comma separated list.
+
 config BR2_PACKAGE_QTOPIA4_GIF
 	bool "Enable GIF support"
 	default n
@@ -99,14 +122,19 @@
 
 config BR2_PACKAGE_QTOPIA4_NOJPEG
 	bool "No jpeg support"
+	help
+	  Disable JPEG support
 
 config BR2_PACKAGE_QTOPIA4_SYSTEMJPEG
-	bool "Use system libjpeg"
 	select BR2_PACKAGE_JPEG
+	bool "System libjpeg"
+	help
+	  Link against system libjpeg
 
 config BR2_PACKAGE_QTOPIA4_QTJPEG
-	bool "Use Qt libjpeg"
-
+	bool "Use Qt bundled libjpeg"
+	help
+	  Link against libjpeg proveded with Qt
 endchoice
 
 choice
@@ -120,12 +148,11 @@
 	bool "No PNG support"
 
 config BR2_PACKAGE_QTOPIA4_SYSTEMPNG
-	bool "Use system libpng"
+	bool "System libpng"
 	select BR2_PACKAGE_LIBPNG
 
 config BR2_PACKAGE_QTOPIA4_QTPNG
 	bool "Use Qt bundled libpng"
-
 endchoice
 
 choice
@@ -139,32 +166,13 @@
 	bool "No TIFF support"
 
 config BR2_PACKAGE_QTOPIA4_SYSTEMTIFF
-	bool "Use system libtiff"
+	bool "System libtiff"
 	select BR2_PACKAGE_TIFF
 
 config BR2_PACKAGE_QTOPIA4_QTTIFF
 	bool "Use Qt bundled libtiff"
-
 endchoice
 
-config BR2_PACKAGE_QTOPIA4_SVG
-	bool "Enable SVG support"
-	depends on BR2_PACKAGE_QTOPIA4
-	help
-	  Enable the QtSvg library.
-
-config BR2_PACKAGE_QTOPIA4_SQL
-	bool "Enable SQL support"
-	depends on BR2_PACKAGE_QTOPIA4
-	help
-	  Enable all the SQL drivers it QtSql library.
-
-config BR2_PACKAGE_QTOPIA4_OPENSSL
-	bool "Enable OpenSSL support"
-	depends on BR2_PACKAGE_QTOPIA4
-	help
-	  Enable support for the OpenSSL encryption library.
-
 choice
 	prompt "zlib support"
 	depends on BR2_PACKAGE_QTOPIA4
@@ -172,27 +180,44 @@
 	help
 	  Select zlib support.
 
-config BR2_PACKAGE_QTOPIA4_NOZLIB
-        bool
-	prompt "no zlib"
-	help
-	  Use the zlib bundled with Qt.
-
-
 config BR2_PACKAGE_QTOPIA4_QTZLIB
-	bool
-	prompt "Qt zlib"
+	bool "Qt zlib"
 	help
 	  Use the zlib bundled with Qt.
-
+	
 config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB
-	bool
+	bool "System zlib"
 	select BR2_PACKAGE_ZLIB
-	prompt "System zlib"
 	help
 	  Use the shared zlib from the system.
 endchoice
+								    
+choice
+	prompt "freetype2 support"
+	depends on BR2_PACKAGE_QTOPIA4
+	default BR2_PACKAGE_QTOPIA4_NOFREETYPE
+	help
+	  Select freetype2 support.
 
+config BR2_PACKAGE_QTOPIA4_NOFREETYPE
+        bool "no freetype2 support"
+	help
+	  Do not compile in Freetype2 support.
+
+
+config BR2_PACKAGE_QTOPIA4_QTFREETYPE
+	bool "Qt freetype2"
+	help
+	  Use the libfreetype bundled with Qt.
+	
+config BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE
+	bool "System freetype2"
+	select BR2_PACKAGE_FREETYPE
+	help
+	  Use shared libfreetype from the target system.
+	  See http://www.freetype.org/
+endchoice
+	
 config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
 	string "The embedded platform we are making Qtopia4 for"
 	default "arm"	if BR2_arm
@@ -213,4 +238,50 @@
 	default "generic"	if BR2_sparc
 	depends on BR2_PACKAGE_QTOPIA4
 	help
-	  The platform.
+	  The target platform.
+
+menuconfig BR2_PACKAGE_QTOPIA4_SQL_MODULE
+	bool "SQL Module"
+	default n
+	depends on BR2_PACKAGE_QTOPIA4
+	help
+	  Compile Qtopia SQL Module
+if BR2_PACKAGE_QTOPIA4_SQL_MODULE
+source "package/qtopia4/Config.sql.in"
+endif
+
+config BR2_PACKAGE_QTOPIA4_XMLPATTERNS
+	bool "XML Patterns Module"
+	default n
+	depends on BR2_PACKAGE_QTOPIA4
+	help
+	  Build QtXmlPatterns module.
+	  If unsure, say n
+
+config BR2_PACKAGE_QTOPIA4_SVG
+	bool "SVG Module"
+	default n
+	depends on BR2_PACKAGE_QTOPIA4
+	help
+	  Build the SVG module.
+	  If unsure, say n
+
+config BR2_PACKAGE_QTOPIA4_WEBKIT
+	bool "WebKit Module"
+	default n
+	depends on BR2_PACKAGE_QTOPIA4
+	help
+	  Build the WebKit module.
+	  If unsure, say n.
+
+config BR2_PACKAGE_QTOPIA4_OPENSSL
+	bool "Enable OpenSSL support"
+	depends on BR2_PACKAGE_QTOPIA4
+	select BR2_PACKAGE_OPENSSL
+	default n
+	help
+	  Enable support for the OpenSSL encryption library. If you use
+	  QSslSocket say y here, otherwise, say no to save space on the
+	  target.
+	  If unsure, say n.
+

Added: trunk/buildroot/package/qtopia4/Config.sql.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.sql.in	                        (rev 0)
+++ trunk/buildroot/package/qtopia4/Config.sql.in	2008-06-28 03:55:12 UTC (rev 22545)
@@ -0,0 +1,42 @@
+config BR2_PACKAGE_QTOPIA4_MYSQL
+	bool "MySQL Driver"
+	default n
+	help
+	  Build MySQL driver
+	  If unsure, say n.
+
+config BR2_PACKAGE_QTOPIA4_IBASE
+	bool "iBase Driver"
+	default n
+	help
+	  Build iBase driver
+	  If unsure, say n.
+
+config BR2_PACKAGE_QTOPIA4_ODBC
+	bool "ODBC Driver"
+	default n
+	help
+	  Build ODBC driver
+	  If unsure, say n.
+
+config BR2_PACKAGE_QTOPIA4_PSQL
+	bool "PostgreSQL Driver"
+	default n
+	help
+	  Build PostgreSQL driver
+	  If unsure, say n.
+
+config BR2_PACKAGE_QTOPIA4_SQLITE
+	bool "SQLite 3 Driver"
+	default n
+	help
+	  Build SQLite driver
+	  If unsure, say n.
+
+config BR2_PACKAGE_QTOPIA4_SQLITE2
+	bool "SQLite 2 Driver"
+	default n
+	help
+	  Build SQLite 2 driver
+	  If unsure, say n.
+

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-06-28 03:22:35 UTC (rev 22544)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-06-28 03:55:12 UTC (rev 22545)
@@ -24,20 +24,20 @@
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD)))
 #"))
 
+QTOPIA4_CONFIGURE:=#empty
+
 # What to download, free or commercial version.
 ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),)
 QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)
 QTOPIA4_SOURCE:=qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION).tar.bz2
 QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION)
-QTOPIA4_NO_SQL_OCI:=-no-sql-oci
-QTOPIA4_NO_SQL_TDS:=-no-sql-tds
-QTOPIA4_NO_SQL_DB2:=-no-sql-db2
+QTOPIA4_CONFIGURE+= -no-sql-oci -no-sql-tds -no-sql-db2
 else # Good, good, we are free:
 QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/source
 QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.bz2
 QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION)
 ifeq ($(BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED),y)
-QTOPIA4_APPROVE_GPL_LICENSE:=-confirm-license
+QTOPIA4_CONFIGURE+= -confirm-license
 endif
 endif
 
@@ -54,19 +54,19 @@
 QTOPIA4_QCONFIG_FILE_LOCATION:=/src/corelib/global/
 
 ifeq ($(BR2_LARGEFILE),y)
-QTOPIA4_LARGEFILE=-largefile
+QTOPIA4_CONFIGURE+= -largefile
 else
-QTOPIA4_LARGEFILE=-no-largefile
+QTOPIA4_CONFIGURE+= -no-largefile
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QT3SUPPORT),y)
-QTOPIA4_QT3SUPPORT=-qt3support
+QTOPIA4_CONFIGURE+= -qt3support
 else
-QTOPIA4_QT3SUPPORT=-no-qt3support
+QTOPIA4_CONFIGURE+= -no-qt3support
 endif
 
 ifeq ($(BR2_PACKAGE_TSLIB),y)
-QTOPIA4_TSLIB=-qt-mouse-tslib
+QTOPIA4_CONFIGURE+= -qt-mouse-tslib
 QTOPIA4_DEP_LIBS+=tslib
 QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
 QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB)))
@@ -74,116 +74,147 @@
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y)
-QTOPIA4_DEBUG="-debug $(QTOPIA4_TSLIB_DEB)"
+QTOPIA4_CONFIGURE+= "-debug $(QTOPIA4_TSLIB_DEB)"
 else
-QTOPIA4_DEBUG=-release
+QTOPIA4_CONFIGURE+= -release
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
-QTOPIA4_SHARED=-shared
+QTOPIA4_CONFIGURE+= -shared
 else
-QTOPIA4_SHARED=-static
+QTOPIA4_CONFIGURE+= -static
 endif
 
 ifeq ($(BR2_ENDIAN),"LITTLE")
-QTOPIA4_ENDIAN=-little-endian
+QTOPIA4_CONFIGURE+= -little-endian
 else
-QTOPIA4_ENDIAN=-big-endian
+QTOPIA4_CONFIGURE+= -big-endian
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_GIF),y)
-QTOPIA4_GIF=-qt-gif
+QTOPIA4_CONFIGURE+= -qt-gif
 else
-QTOPIA4_GIF=-no-gif
+QTOPIA4_CONFIGURE+= -no-gif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_LIBMNG),y)
-QTOPIA4_MNG=-qt-libmng
+QTOPIA4_CONFIGURE+= -qt-libmng
 else
-QTOPIA4_MNG=-no-libmng
+QTOPIA4_CONFIGURE+= -no-libmng
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTZLIB),y)
-QTOPIA4_ZLIB=-qt-zlib
+QTOPIA4_CONFIGURE+= -qt-zlib
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMZLIB),y)
-QTOPIA4_ZLIB=-system-zlib
+QTOPIA4_CONFIGURE+= -system-zlib
 QTOPIA4_DEP_LIBS+=zlib
-else
-QTOPIA4_ZLIB=-no-zlib
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTJPEG),y)
-QTOPIA4_JPEG=-qt-libjpeg
+QTOPIA4_CONFIGURE+= -qt-libjpeg
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMJPEG),y)
-QTOPIA4_JPEG=-system-libjpeg
+QTOPIA4_CONFIGURE+= -system-libjpeg
 QTOPIA4_DEP_LIBS+=jpeg
 else
-QTOPIA4_JPEG=-no-libjpeg
+QTOPIA4_CONFIGURE+= -no-libjpeg
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTPNG),y)
-QTOPIA4_PNG=-qt-libpng
+QTOPIA4_CONFIGURE+= -qt-libpng
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMPNG),y)
-QTOPIA4_PNG=-system-libpng
+QTOPIA4_CONFIGURE+= -system-libpng
 QTOPIA4_DEP_LIBS+=libpng
 else
-QTOPIA4_PNG=-no-libpng
+QTOPIA4_CONFIGURE+= -no-libpng
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTTIFF),y)
-QTOPIA4_TIFF=-qt-libtiff
+QTOPIA4_CONFIGURE+= -qt-libtiff
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMTIFF),y)
-QTOPIA4_TIFF=-system-libtiff
+QTOPIA4_CONFIGURE+= -system-libtiff
 QTOPIA4_DEP_LIBS+=tiff
 else
-QTOPIA4_TIFF=-no-libtiff
+QTOPIA4_CONFIGURE+= -no-libtiff
 endif
 endif
 
+
+ifeq ($(BR2_PACKAGE_QTOPIA4_QTFREETYPE),y)
+QTOPIA4_CONFIGURE+= -qt-freetype
+else
+ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE),y)
+QTOPIA4_CONFIGURE+= -system-freetype
+QTOPIA4_CONFIGURE+= -I $(FREETYPE_DIR)/include
+QTOPIA4_DEP_LIBS+=freetype
+else
+QTOPIA4_CONFIGURE+= -no-freetype
+endif
+endif
+
+
 ifeq ($(BR2_PACKAGE_QTOPIA4_OPENSSL),y)
-QTOPIA4_OPENSSL=-openssl
+QTOPIA4_CONFIGURE+= -openssl
 QTOPIA4_DEP_LIBS+=openssl
 else
-QTOPIA4_OPENSSL=-no-openssl
+QTOPIA4_CONFIGURE+= -no-openssl
 endif
 
+# Qt SQL Drivers
+ifeq ($(BR2_PACKAGE_QTOPIA4_SQL_MODULE),y)
+ifeq ($(BR2_PACKAGE_QTOPIA4_IBASE),y)
+QTOPIA4_CONFIGURE+= -qt-sql-ibase
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_MYSQL),y)
+QTOPIA4_CONFIGURE+= -qt-sql-mysql
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_ODBC),y)
+QTOPIA4_CONFIGURE+= -qt-sql-odbc
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PSQL),y)
+QTOPIA4_CONFIGURE+= -qt-sql-psql
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_SQLITE),y)
+QTOPIA4_CONFIGURE+= -qt-sql-sqlite
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_SQLITE2),y)
+QTOPIA4_CONFIGURE+= -qt-sql-sqlite2
+endif
+# By default, no SQL driver is turned on by configure.
+endif
+
+ifeq ($(BR2_PACKAGE_QTOPIA4_XMLPATTERNS),y)
+QTOPIA4_CONFIGURE+= -xmlpatterns
+else
+QTOPIA4_CONFIGURE+= -no-xmlpatterns
+endif
+
 ifeq ($(BR2_PACKAGE_QTOPIA4_SVG),y)
-QTOPIA4_SVG=-svg
+QTOPIA4_CONFIGURE+= -svg
 else
-QTOPIA4_SVG=-no-svg
+QTOPIA4_CONFIGURE+= -no-svg
 endif
 
-ifeq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
-QTOPIA4_SQL_IBASE=-qt-sql-ibase
-QTOPIA4_SQL_MYSQL=-qt-sql-mysql
-QTOPIA4_SQL_ODBC=-qt-sql-odbc
-QTOPIA4_SQL_PSQL=-qt-sql-psql
-QTOPIA4_SQL_SQLITE=-qt-sql-sqlite
-QTOPIA4_SQL_SQLITE2=-qt-sql-sqlite2
+ifeq ($(BR2_PACKAGE_QTOPIA4_WEBKIT),y)
+QTOPIA4_CONFIGURE+= -webkit
 else
-QTOPIA4_SQL_IBASE=-no-sql-ibase
-QTOPIA4_SQL_MYSQL=-no-sql-mysql
-QTOPIA4_SQL_ODBC=-no-sql-odbc
-QTOPIA4_SQL_PSQL=-no-sql-psql
-QTOPIA4_SQL_SQLITE=-no-sql-sqlite
-QTOPIA4_SQL_SQLITE2=-no-sql-sqlite2
+QTOPIA4_CONFIGURE+= -no-webkit
 endif
 
-QTOPIA4_DEBUG:=$(strip $(subst ",, $(QTOPIA4_DEBUG)))
+QTOPIA4_CONFIGURE:=$(strip $(subst ",, $(QTOPIA4_CONFIGURE)))
 #"))
 BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
 #"))
 
 
 # Variable for other Qt applications to use
-QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake
+QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++
 
 $(DL_DIR)/$(QTOPIA4_SOURCE):
 	$(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
@@ -204,7 +235,16 @@
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
 endif
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
-	$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+        # Fix compiler path
+	$(SED) '\,QMAKE_CC *=, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_CXX *=, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_LINK *=, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_LINK_SHLIB *=, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_AR *=, c\QMAKE_AR = $(TARGET_CROSS)ar cqs' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_RANLIB *=, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_STRIP *=, c\QMAKE_STRIP = $(TARGET_CROSS)strip' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
@@ -213,30 +253,11 @@
 		-verbose \
 		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
 		$(QTOPIA4_QCONFIG_COMMAND) \
-		$(QTOPIA4_DEBUG) \
-		$(QTOPIA4_SHARED) \
+		$(QTOPIA4_CONFIGURE) \
 		-no-stl \
 		-no-cups \
 		-no-nis \
-		-no-freetype \
 		-no-accessibility \
-		$(QTOPIA4_MNG) \
-		$(QTOPIA4_GIF) \
-		$(QTOPIA4_JPEG) \
-		$(QTOPIA4_PNG) \
-		$(QTOPIA4_TIFF) \
-		$(QTOPIA4_ZLIB) \
-		$(QTOPIA4_SVG) \
-		$(QTOPIA4_SQL_IBASE) \
-		$(QTOPIA4_SQL_MYSQL) \
-		$(QTOPIA4_SQL_ODBC) \
-		$(QTOPIA4_SQL_PSQL) \
-		$(QTOPIA4_SQL_SQLITE) \
-		$(QTOPIA4_SQL_SQLITE2) \
-		$(QTOPIA4_NO_SQL_DB2) \
-		$(QTOPIA4_NO_SQL_OCI) \
-		$(QTOPIA4_NO_SQL_TDS) \
-		-no-webkit \
 		-no-separate-debug-info \
 		-prefix /usr \
 		-hostprefix $(STAGING_DIR)/usr \
@@ -244,11 +265,6 @@
 		-no-rpath \
 		-nomake examples \
 		-nomake demos \
-		$(QTOPIA4_QT3SUPPORT) \
-		$(QTOPIA4_TSLIB) \
-		$(QTOPIA4_LARGEFILE) \
-		$(QTOPIA4_ENDIAN) \
-		$(QTOPIA4_APPROVE_GPL_LICENSE) \
 	)
 	touch $@
 
@@ -292,6 +308,11 @@
 qtopia4-dirclean:
 	rm -rf $(QTOPIA4_TARGET_DIR)
 
+qtopia4-status:
+	@echo "QTOPIA4_QMAKE:               " $(QTOPIA4_QMAKE)
+	@echo "QTOPIA4_DEP_LIBS:            " $(QTOPIA4_DEP_LIBS)
+	@echo "FREETYPE_DIR:		    " $(FREETYPE_DIR)
+
 #############################################################
 #
 # Toplevel Makefile options

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[correa at uclibc.org]

Author: correa
Date: 2008-06-27 20:22:35 -0700 (Fri, 27 Jun 2008)
New Revision: 22544

Log:
Remove unused patches

Removed:
   trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-arch.patch.avr32
   trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-qatomic-header-to-header-list.patch.avr32
   trunk/buildroot/package/qtopia4/qtopia-4.3.1-add-avr32-arch.patch.avr32
   trunk/buildroot/package/qtopia4/qtopia-4.3.1-add-avr32-qatomic-header-to-header-list.patch.avr32
   trunk/buildroot/package/qtopia4/qtopia-4.3.2-add-avr32-arch.patch.avr32


Changeset:

Sorry, the patch is too large to include (18509 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=22544

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ulf at uclibc.org]

Author: ulf
Date: 2008-05-20 22:52:12 -0700 (Tue, 20 May 2008)
New Revision: 22032

Log:
add SVG selection to Qtopia 4 and fix strip command

Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2008-05-21 05:48:38 UTC (rev 22031)
+++ trunk/buildroot/package/qtopia4/Config.in	2008-05-21 05:52:12 UTC (rev 22032)
@@ -147,6 +147,12 @@
 
 endchoice
 
+config BR2_PACKAGE_QTOPIA4_SVG
+	bool "Enable SVG support"
+	depends BR2_PACKAGE_QTOPIA4
+	help
+	  Enable the QtSvg library.
+
 config BR2_PACKAGE_QTOPIA4_SQL
 	bool "Enable SQL support"
 	depends BR2_PACKAGE_QTOPIA4

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-05-21 05:48:38 UTC (rev 22031)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-05-21 05:52:12 UTC (rev 22032)
@@ -154,6 +154,12 @@
 QTOPIA4_OPENSSL=-no-openssl
 endif
 
+ifeq ($(BR2_PACKAGE_QTOPIA4_SVG),y)
+QTOPIA4_SVG=-svg
+else
+QTOPIA4_SVG=-no-svg
+endif
+
 ifeq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
 QTOPIA4_SQL_IBASE=-qt-sql-ibase
 QTOPIA4_SQL_MYSQL=-qt-sql-mysql
@@ -220,6 +226,7 @@
 		$(QTOPIA4_PNG) \
 		$(QTOPIA4_TIFF) \
 		$(QTOPIA4_ZLIB) \
+		$(QTOPIA4_SVG) \
 		$(QTOPIA4_SQL_IBASE) \
 		$(QTOPIA4_SQL_MYSQL) \
 		$(QTOPIA4_SQL_ODBC) \
@@ -260,20 +267,22 @@
 	cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
 ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.*
+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
 endif
 	# Install image plugins if they are built
 	if [ -d $(STAGING_DIR)/usr/plugins/imageformats ]; then \
 		mkdir -p $(TARGET_DIR)/usr/plugins; \
 		cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
-		$(STRIPCMD) --strip-unneeded $(TARGET_DIR)/usr/plugins/imageformats/*; \
+		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/imageformats/*; \
 	fi
 ifneq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
 	# Remove Sql libraries, not needed
 	-rm $(TARGET_DIR)/usr/lib/libQtSql*
 endif
+ifneq ($(BR2_PACKAGE_QTOPIA4_SVG),y)
 	# Remove Svg libraries, not needed
 	-rm $(TARGET_DIR)/usr/lib/libQtSvg*
+endif
 
 qtopia4: uclibc zlib $(QTOPIA4_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4
 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ulf at uclibc.org]

Author: ulf
Date: 2008-05-20 22:48:38 -0700 (Tue, 20 May 2008)
New Revision: 22031

Log:
Bump qtopia version

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-05-20 21:35:55 UTC (rev 22030)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-05-21 05:48:38 UTC (rev 22031)
@@ -16,10 +16,8 @@
 # (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
 # to fix
 
-QTOPIA4_VERSION:=4.4.0-snapshot-20080325
-# QTOPIA4_VERSION:=4.4.1-snapshot-20080511
-# QTOPIA4_VERSION:=4.5.0-snapshot-20080511
-QTOPIA4_CAT:=$(ZCAT)
+QTOPIA4_VERSION:=4.4.0
+QTOPIA4_CAT:=$(BZCAT)
 
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
 #"))
@@ -29,14 +27,14 @@
 # What to download, free or commercial version.
 ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),)
 QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)
-QTOPIA4_SOURCE:=qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION).tar.gz
+QTOPIA4_SOURCE:=qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION).tar.bz2
 QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION)
 QTOPIA4_NO_SQL_OCI:=-no-sql-oci
 QTOPIA4_NO_SQL_TDS:=-no-sql-tds
 QTOPIA4_NO_SQL_DB2:=-no-sql-db2
 else # Good, good, we are free:
-QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/snapshots
-QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.gz
+QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/source
+QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.bz2
 QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION)
 ifeq ($(BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED),y)
 QTOPIA4_APPROVE_GPL_LICENSE:=-confirm-license

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ulf at uclibc.org]

Author: ulf
Date: 2008-05-10 23:45:47 -0700 (Sat, 10 May 2008)
New Revision: 21968

Log:
Bump qtopia version

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-05-11 06:45:17 UTC (rev 21967)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-05-11 06:45:47 UTC (rev 21968)
@@ -16,7 +16,9 @@
 # (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
 # to fix
 
-QTOPIA4_VERSION:=4.4.0-snapshot-20080312
+QTOPIA4_VERSION:=4.4.0-snapshot-20080325
+# QTOPIA4_VERSION:=4.4.1-snapshot-20080511
+# QTOPIA4_VERSION:=4.5.0-snapshot-20080511
 QTOPIA4_CAT:=$(ZCAT)
 
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Peter Korsgaard]

>>>>> "Thiago" == Thiago A Corr?a <thiago.correa@gmail.com> writes:

Hi,

 Thiago> $(STRIP) doesn't exist, and now that the patch was reverted, it
 Thiago> doesn't work, as opposed to working. So, it seams fixing whitespace
 Thiago> damage is more important than producing a working binary.

Ofcause not, but random unneeded changes aren't particular welcome
either. Your changelog didn't mention anything about STRIP though.

Anyway, several of the recent commits are broken in this regard. I
have fixed qtopia4, oprofile, dummy and webif in r21859.

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Thiago A. Corrêa]

>  >  QTOPIA4_SOURCE:=qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION).tar.gz
>  >  QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION)
>  > -QTOPIA4_NO_SQL_OCI:=-no-sql-oci
>  > -QTOPIA4_NO_SQL_TDS:=-no-sql-tds
>  > -QTOPIA4_NO_SQL_DB2:=-no-sql-db2
>  > +QTOPIA4_CONFIGURE+= -no-sql-oci -no-sql-tds -no-sql-db2
>
>  The SQL selection stuff should be kept.

Actually, according to configure --help, all sql drivers are disabled
by default, so this is not needed.

>
>  >
>  > -QTOPIA4_DEBUG:=$(strip $(subst ",, $(QTOPIA4_DEBUG)))
>  > +QTOPIA4_CONFIGURE:=$(strip $(subst ",, $(QTOPIA4_CONFIGURE)))
>  >  #"))
>  >  BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
>  >  #"))
>  >
>  >
>  >  # Variable for other Qt applications to use
>  > -QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake
>  > +QTOPIA4_QMAKE:=$(TARGET_CONFIGURE_OPTS) $(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++
>  >
>
>  Is this really needed? qmake works fine for me by just specifying the
>  Buildroot PATH to STAGING_DIR/bin.

Actually that's what you suggested, that prepend calling qmake with
$(TARGET_CONFIGURE_OPTS) , but that makes no difference, so this one
isn't.

>
>  >  $(DL_DIR)/$(QTOPIA4_SOURCE):
>  >       $(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
>  > @@ -198,7 +198,16 @@
>  >       $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
>  >  endif
>  >       $(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
>  > -     $(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
>  > +     #$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
>  > +        # Fix compiler path
>  > +     $(SED) '\,QMAKE_CC, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
>  > +     $(SED) '\,QMAKE_CXX, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
>  > +     $(SED) '\,QMAKE_LINK, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
>  > +     $(SED) '\,QMAKE_LINK_SHLIB, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
>  > +     $(SED) '\,QMAKE_AR, c\QMAKE_AR = $(TARGET_CROSS)ar cqs' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
>  > +     $(SED) '\,QMAKE_RANLIB, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
>  > +     $(SED) '\,QMAKE_STRIP, c\QMAKE_STRIP = $(TARGET_CROSS)strip' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
>  > +
>
>  Again, if people use the BUildroot environment, this is not needed.
>

Again, it simply doesn't work.
The issue is not qmake, but the generated makefile. This is the only
way I found it to work.


>  > -     -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.*
>  > +     -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*

$(STRIP) doesn't exist, and now that the patch was reverted, it
doesn't work, as opposed to working. So, it seams fixing whitespace
damage is more important than producing a working binary.

>  >       # Install image plugins if they are built
>  >       if [ -d $(STAGING_DIR)/usr/plugins/imageformats ]; then \
>  >               mkdir -p $(TARGET_DIR)/usr/plugins; \
>  >               cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
>  > -             $(STRIP) --strip-unneeded $(TARGET_DIR)/usr/plugins/imageformats/*; \
>  > +             $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/imageformats/*; \

Same here.

>  >
>  > +qtopia4-status:
>  > +     @echo "QTOPIA4_QMAKE:               " $(QTOPIA4_QMAKE)
>  > +     @echo "QTOPIA4_DEP_LIBS:            " $(QTOPIA4_DEP_LIBS)
>  > +
>
>  Do we really need this?
>

We have one to debug linux kernel makefile, and other packages as
well, so why not? Does it really bother people?

Kind Regards,
    Thiago A. Correa

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ninevoltz at uclibc.org]

Author: ninevoltz
Date: 2008-04-25 04:45:28 -0700 (Fri, 25 Apr 2008)
New Revision: 21857

Log:
reverting r21851

Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2008-04-25 08:43:01 UTC (rev 21856)
+++ trunk/buildroot/package/qtopia4/Config.in	2008-04-25 11:45:28 UTC (rev 21857)
@@ -12,7 +12,6 @@
 	bool "Compile with debug support"
 	default n
 	depends BR2_PACKAGE_QTOPIA4
-	help
 
 choice
 	prompt "Library type"
@@ -60,7 +59,7 @@
 	default ""
 	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
-	    Commercial users can download their source directly by providing a username.
+	  Commercial users can download their source directly by providing a username.
 
 
 config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
@@ -68,23 +67,15 @@
 	default ""
 	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
-	    Commercial users can download their source directly by providing a password.
+	  Commercial users can download their source directly by providing a password.
 
 config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
 	bool "Compatibility with Qt3"
 	default y
 	depends BR2_PACKAGE_QTOPIA4
 	help
-	    Turns on support for older Qt3.
+	  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_GIF
 	bool "Enable GIF support"
 	default n
@@ -95,39 +86,80 @@
 config BR2_PACKAGE_QTOPIA4_LIBMNG
 	bool "Enable libmng support"
 	default n
-	select BR2_PACKAGE_LIBPNG
 	depends BR2_PACKAGE_QTOPIA4
 	help
 	  This compiles and installs the plugin for MNG support.
 
 choice
-	prompt "libjpeg support"
+	prompt "JPEG support"
 	depends BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOJPEG
 	help
 	  Select libjpeg support.
 
 config BR2_PACKAGE_QTOPIA4_NOJPEG
-	bool
-	prompt "No jpeg support"
-	help
-	  Disable JPEG support
+	bool "No jpeg support"
 
 config BR2_PACKAGE_QTOPIA4_SYSTEMJPEG
-	bool
+	bool "Use system libjpeg"
 	select BR2_PACKAGE_JPEG
-	prompt "use system libjpeg"
-	help
-	  Link against system libjpeg
 
 config BR2_PACKAGE_QTOPIA4_QTJPEG
-	bool
-	prompt "use qt libjpeg"
+	bool "Use Qt libjpeg"
+
+endchoice
+
+choice
+	prompt "PNG support"
+	depends BR2_PACKAGE_QTOPIA4
+	default BR2_PACKAGE_QTOPIA4_NOPNG
 	help
-	  Link against libjpeg proveded with Qt
+	  Select which library to use if PNG support should be enabled.
+
+config BR2_PACKAGE_QTOPIA4_NOPNG
+	bool "No PNG support"
+
+config BR2_PACKAGE_QTOPIA4_SYSTEMPNG
+	bool "Use system libpng"
+	select BR2_PACKAGE_LIBPNG
+
+config BR2_PACKAGE_QTOPIA4_QTPNG
+	bool "Use Qt bundled libpng"
+
 endchoice
 
 choice
+	prompt "TIFF support"
+	depends BR2_PACKAGE_QTOPIA4
+	default BR2_PACKAGE_QTOPIA4_NOTIFF
+	help
+	  Select which library to use if TIFF support should be enabled.
+
+config BR2_PACKAGE_QTOPIA4_NOTIFF
+	bool "No TIFF support"
+
+config BR2_PACKAGE_QTOPIA4_SYSTEMTIFF
+	bool "Use system libtiff"
+	select BR2_PACKAGE_TIFF
+
+config BR2_PACKAGE_QTOPIA4_QTTIFF
+	bool "Use Qt bundled libtiff"
+
+endchoice
+
+config BR2_PACKAGE_QTOPIA4_SQL
+	bool "Enable SQL support"
+	depends BR2_PACKAGE_QTOPIA4
+	help
+	  Enable all the SQL drivers it QtSql library.
+
+config BR2_PACKAGE_QTOPIA4_OPENSSL
+	bool "Enable OpenSSL support"
+	depends BR2_PACKAGE_QTOPIA4
+	help
+	  Enable support for the OpenSSL encryption library.
+
+choice
 	prompt "zlib support"
 	depends BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_QTZLIB
@@ -146,7 +178,7 @@
 	prompt "Qt zlib"
 	help
 	  Use the zlib bundled with Qt.
-	
+
 config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB
 	bool
 	select BR2_PACKAGE_ZLIB
@@ -154,7 +186,6 @@
 	help
 	  Use the shared zlib from the system.
 endchoice
-								    
 
 config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
 	string "The embedded platform we are making Qtopia4 for"
@@ -176,4 +207,4 @@
 	default "generic"	if BR2_sparc
 	depends BR2_PACKAGE_QTOPIA4
 	help
-	    The platform.
+	  The platform.

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-04-25 08:43:01 UTC (rev 21856)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-04-25 11:45:28 UTC (rev 21857)
@@ -16,7 +16,7 @@
 # (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
 # to fix
 
-QTOPIA4_VERSION:=4.4.0-snapshot-20080325
+QTOPIA4_VERSION:=4.4.0-snapshot-20080312
 QTOPIA4_CAT:=$(ZCAT)
 
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
@@ -24,20 +24,20 @@
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD)))
 #"))
 
-QTOPIA4_CONFIGURE:=#empty
-
 # What to download, free or commercial version.
 ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),)
 QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)
 QTOPIA4_SOURCE:=qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION).tar.gz
 QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION)
-QTOPIA4_CONFIGURE+= -no-sql-oci -no-sql-tds -no-sql-db2
+QTOPIA4_NO_SQL_OCI:=-no-sql-oci
+QTOPIA4_NO_SQL_TDS:=-no-sql-tds
+QTOPIA4_NO_SQL_DB2:=-no-sql-db2
 else # Good, good, we are free:
 QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/snapshots
 QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.gz
 QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION)
 ifeq ($(BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED),y)
-QTOPIA4_CONFIGURE+= -confirm-license
+QTOPIA4_APPROVE_GPL_LICENSE:=-confirm-license
 endif
 endif
 
@@ -54,15 +54,15 @@
 QTOPIA4_QCONFIG_FILE_LOCATION:=/src/corelib/global/
 
 ifeq ($(BR2_LARGEFILE),y)
-QTOPIA4_CONFIGURE+= -largefile
+QTOPIA4_LARGEFILE=-largefile
 else
-QTOPIA4_CONFIGURE+= -no-largefile
+QTOPIA4_LARGEFILE=-no-largefile
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QT3SUPPORT),y)
-QTOPIA4_CONFIGURE+= -qt3support
+QTOPIA4_QT3SUPPORT=-qt3support
 else
-QTOPIA4_CONFIGURE+= -no-qt3support
+QTOPIA4_QT3SUPPORT=-no-qt3support
 endif
 
 ifeq ($(BR2_PACKAGE_TSLIB),y)
@@ -74,110 +74,110 @@
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y)
-QTOPIA4_CONFIGURE+= "-debug $(QTOPIA4_TSLIB_DEB)"
+QTOPIA4_DEBUG="-debug $(QTOPIA4_TSLIB_DEB)"
 else
-QTOPIA4_CONFIGURE+= -release
+QTOPIA4_DEBUG=-release
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
-QTOPIA4_CONFIGURE+= -shared
+QTOPIA4_SHARED=-shared
 else
-QTOPIA4_CONFIGURE+= -static
+QTOPIA4_SHARED=-static
 endif
 
 ifeq ($(BR2_ENDIAN),"LITTLE")
-QTOPIA4_CONFIGURE+= -little-endian
+QTOPIA4_ENDIAN=-little-endian
 else
-QTOPIA4_CONFIGURE+= -big-endian
+QTOPIA4_ENDIAN=-big-endian
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_GIF),y)
-QTOPIA4_CONFIGURE+= -qt-gif
+QTOPIA4_GIF=-qt-gif
 else
-QTOPIA4_CONFIGURE+= -no-gif
+QTOPIA4_GIF=-no-gif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_LIBMNG),y)
-QTOPIA4_CONFIGURE+= -qt-libmng
+QTOPIA4_MNG=-qt-libmng
 else
-QTOPIA4_CONFIGURE+= -no-libmng
+QTOPIA4_MNG=-no-libmng
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTZLIB),y)
-QTOPIA4_CONFIGURE+= -qt-zlib
+QTOPIA4_ZLIB=-qt-zlib
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMZLIB),y)
-QTOPIA4_CONFIGURE+= -system-zlib
+QTOPIA4_ZLIB=-system-zlib
 QTOPIA4_DEP_LIBS+=zlib
 else
-QTOPIA4_CONFIGURE+= -no-zlib
+QTOPIA4_ZLIB=-no-zlib
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTJPEG),y)
-QTOPIA4_CONFIGURE+= -qt-libjpeg
+QTOPIA4_JPEG=-qt-libjpeg
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMJPEG),y)
-QTOPIA4_CONFIGURE+= -system-libjpeg
+QTOPIA4_JPEG=-system-libjpeg
 QTOPIA4_DEP_LIBS+=jpeg
 else
-QTOPIA4_CONFIGURE+= -no-libjpeg
+QTOPIA4_JPEG=-no-libjpeg
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTPNG),y)
-QTOPIA4_CONFIGURE+= -qt-libpng
+QTOPIA4_PNG=-qt-libpng
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMPNG),y)
-QTOPIA4_CONFIGURE+= -system-libpng
+QTOPIA4_PNG=-system-libpng
 QTOPIA4_DEP_LIBS+=libpng
 else
-QTOPIA4_CONFIGURE+= -no-libpng
+QTOPIA4_PNG=-no-libpng
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTTIFF),y)
-QTOPIA4_CONFIGURE+= -qt-libtiff
+QTOPIA4_TIFF=-qt-libtiff
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMTIFF),y)
-QTOPIA4_CONFIGURE+= -system-libtiff
+QTOPIA4_TIFF=-system-libtiff
 QTOPIA4_DEP_LIBS+=tiff
 else
-QTOPIA4_CONFIGURE+= -no-libtiff
+QTOPIA4_TIFF=-no-libtiff
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_OPENSSL),y)
-QTOPIA4_CONFIGURE+= -openssl
+QTOPIA4_OPENSSL=-openssl
 QTOPIA4_DEP_LIBS+=openssl
 else
-QTOPIA4_CONFIGURE+= -no-openssl
+QTOPIA4_OPENSSL=-no-openssl
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
-QTOPIA4_CONFIGURE+= -qt-sql-ibase
-QTOPIA4_CONFIGURE+= -qt-sql-mysql
-QTOPIA4_CONFIGURE+= -qt-sql-odbc
-QTOPIA4_CONFIGURE+= -qt-sql-psql
-QTOPIA4_CONFIGURE+= -qt-sql-sqlite
-QTOPIA4_CONFIGURE+= -qt-sql-sqlite2
+QTOPIA4_SQL_IBASE=-qt-sql-ibase
+QTOPIA4_SQL_MYSQL=-qt-sql-mysql
+QTOPIA4_SQL_ODBC=-qt-sql-odbc
+QTOPIA4_SQL_PSQL=-qt-sql-psql
+QTOPIA4_SQL_SQLITE=-qt-sql-sqlite
+QTOPIA4_SQL_SQLITE2=-qt-sql-sqlite2
 else
-QTOPIA4_CONFIGURE+= -no-sql-ibase
-QTOPIA4_CONFIGURE+= -no-sql-mysql
-QTOPIA4_CONFIGURE+= -no-sql-odbc
-QTOPIA4_CONFIGURE+= -no-sql-psql
-QTOPIA4_CONFIGURE+= -no-sql-sqlite
-QTOPIA4_CONFIGURE+= -no-sql-sqlite2
+QTOPIA4_SQL_IBASE=-no-sql-ibase
+QTOPIA4_SQL_MYSQL=-no-sql-mysql
+QTOPIA4_SQL_ODBC=-no-sql-odbc
+QTOPIA4_SQL_PSQL=-no-sql-psql
+QTOPIA4_SQL_SQLITE=-no-sql-sqlite
+QTOPIA4_SQL_SQLITE2=-no-sql-sqlite2
 endif
 
-QTOPIA4_CONFIGURE:=$(strip $(subst ",, $(QTOPIA4_CONFIGURE)))
+QTOPIA4_DEBUG:=$(strip $(subst ",, $(QTOPIA4_DEBUG)))
 #"))
 BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
 #"))
 
 
 # Variable for other Qt applications to use
-QTOPIA4_QMAKE:=$(TARGET_CONFIGURE_OPTS) $(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++
+QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake
 
 $(DL_DIR)/$(QTOPIA4_SOURCE):
 	$(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
@@ -198,16 +198,7 @@
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
 endif
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
-	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-        # Fix compiler path
-	$(SED) '\,QMAKE_CC, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_CXX, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_LINK, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_LINK_SHLIB, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_AR, c\QMAKE_AR = $(TARGET_CROSS)ar cqs' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_RANLIB, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_STRIP, c\QMAKE_STRIP = $(TARGET_CROSS)strip' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	
+	$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
@@ -216,12 +207,28 @@
 		-verbose \
 		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
 		$(QTOPIA4_QCONFIG_COMMAND) \
-		$(QTOPIA4_CONFIGURE) \
+		$(QTOPIA4_DEBUG) \
+		$(QTOPIA4_SHARED) \
 		-no-stl \
 		-no-cups \
 		-no-nis \
 		-no-freetype \
 		-no-accessibility \
+		$(QTOPIA4_MNG) \
+		$(QTOPIA4_GIF) \
+		$(QTOPIA4_JPEG) \
+		$(QTOPIA4_PNG) \
+		$(QTOPIA4_TIFF) \
+		$(QTOPIA4_ZLIB) \
+		$(QTOPIA4_SQL_IBASE) \
+		$(QTOPIA4_SQL_MYSQL) \
+		$(QTOPIA4_SQL_ODBC) \
+		$(QTOPIA4_SQL_PSQL) \
+		$(QTOPIA4_SQL_SQLITE) \
+		$(QTOPIA4_SQL_SQLITE2) \
+		$(QTOPIA4_NO_SQL_DB2) \
+		$(QTOPIA4_NO_SQL_OCI) \
+		$(QTOPIA4_NO_SQL_TDS) \
 		-no-webkit \
 		-no-separate-debug-info \
 		-prefix /usr \
@@ -230,6 +237,11 @@
 		-no-rpath \
 		-nomake examples \
 		-nomake demos \
+		$(QTOPIA4_QT3SUPPORT) \
+		$(QTOPIA4_TSLIB) \
+		$(QTOPIA4_LARGEFILE) \
+		$(QTOPIA4_ENDIAN) \
+		$(QTOPIA4_APPROVE_GPL_LICENSE) \
 	)
 	touch $@
 
@@ -248,13 +260,13 @@
 	cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
 ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
+	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.*
 endif
 	# Install image plugins if they are built
 	if [ -d $(STAGING_DIR)/usr/plugins/imageformats ]; then \
 		mkdir -p $(TARGET_DIR)/usr/plugins; \
 		cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
-		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/imageformats/*; \
+		$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/plugins/imageformats/*; \
 	fi
 ifneq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
 	# Remove Sql libraries, not needed
@@ -271,10 +283,6 @@
 qtopia4-dirclean:
 	rm -rf $(QTOPIA4_TARGET_DIR)
 
-qtopia4-status:
-	@echo "QTOPIA4_QMAKE:               " $(QTOPIA4_QMAKE)
-	@echo "QTOPIA4_DEP_LIBS:            " $(QTOPIA4_DEP_LIBS)
-
 #############################################################
 #
 # Toplevel Makefile options

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Hans-Christian Egtvedt]

On Thu, 2008-04-24 at 11:44 -0700, ninevoltz at uclibc.org wrote:
> Author: ninevoltz
> Date: 2008-04-24 11:44:30 -0700 (Thu, 24 Apr 2008)
> New Revision: 21851
> 
> Log:
> update qtopia snapshot version and fix problem with qmake generated makefiles being unable to find the toolchain
> 
> Modified:
>    trunk/buildroot/package/qtopia4/Config.in
>    trunk/buildroot/package/qtopia4/qtopia4.mk
> 

This is broken, please revert.

> Changeset:
> Modified: trunk/buildroot/package/qtopia4/Config.in
> ===================================================================
> --- trunk/buildroot/package/qtopia4/Config.in	2008-04-24 18:35:44 UTC (rev 21850)
> +++ trunk/buildroot/package/qtopia4/Config.in	2008-04-24 18:44:30 UTC (rev 21851)
> @@ -12,6 +12,7 @@
>  	bool "Compile with debug support"
>  	default n
>  	depends BR2_PACKAGE_QTOPIA4
> +	help
>

Remove this

>  choice
>  	prompt "Library type"
> @@ -59,7 +60,7 @@
>  	default ""
>  	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
>  	help
> -	  Commercial users can download their source directly by providing a username.
> +	    Commercial users can download their source directly by providing a username.
>  

Whitespace damage

>  config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
> @@ -67,15 +68,23 @@
>  	default ""
>  	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
>  	help
> -	  Commercial users can download their source directly by providing a password.
> +	    Commercial users can download their source directly by providing a password.
>

Whitespace damage
 
>  config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
>  	bool "Compatibility with Qt3"
>  	default y
>  	depends BR2_PACKAGE_QTOPIA4
>  	help
> -	  Turns on support for older Qt3.
> +	    Turns on support for older Qt3.
>  

Whitespace damage

> +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.
> +

Default should be nothing, i.e. enabling all colour depths.

>  config BR2_PACKAGE_QTOPIA4_GIF
>  	bool "Enable GIF support"
>  	default n
> @@ -86,80 +95,39 @@
>  config BR2_PACKAGE_QTOPIA4_LIBMNG
>  	bool "Enable libmng support"
>  	default n
> +	select BR2_PACKAGE_LIBPNG

Huh? Does PNG support MNG? AFAIK this is to enable the internal MNG
library in Qt embedded.

>  	depends BR2_PACKAGE_QTOPIA4
>  	help
>  	  This compiles and installs the plugin for MNG support.
>  
>  choice
> -	prompt "JPEG support"
> +	prompt "libjpeg support"
>  	depends BR2_PACKAGE_QTOPIA4
>  	default BR2_PACKAGE_QTOPIA4_NOJPEG
>  	help
>  	  Select libjpeg support.
>  
>  config BR2_PACKAGE_QTOPIA4_NOJPEG
> -	bool "No jpeg support"
> +	bool
> +	prompt "No jpeg support"
> +	help
> +	  Disable JPEG support
>  

Broken, Use the bool "<name>" stuff.

>  config BR2_PACKAGE_QTOPIA4_SYSTEMJPEG
> -	bool "Use system libjpeg"
> +	bool
>  	select BR2_PACKAGE_JPEG
> +	prompt "use system libjpeg"
> +	help
> +	  Link against system libjpeg
>  

?Broken, Use the bool "<name>" stuff.

>  config BR2_PACKAGE_QTOPIA4_QTJPEG
> -	bool "Use Qt libjpeg"
> -
> -endchoice
> -
> -choice
> -	prompt "PNG support"
> -	depends BR2_PACKAGE_QTOPIA4
> -	default BR2_PACKAGE_QTOPIA4_NOPNG
> +	bool
> +	prompt "use qt libjpeg"
>  	help
> -	  Select which library to use if PNG support should be enabled.
> -
> -config BR2_PACKAGE_QTOPIA4_NOPNG
> -	bool "No PNG support"
> -
> -config BR2_PACKAGE_QTOPIA4_SYSTEMPNG
> -	bool "Use system libpng"
> -	select BR2_PACKAGE_LIBPNG
> -
> -config BR2_PACKAGE_QTOPIA4_QTPNG
> -	bool "Use Qt bundled libpng"
> -

Why are you removing PNG choice?

> +	  Link against libjpeg proveded with Qt
>  endchoice
>  
>  choice
> -	prompt "TIFF support"
> -	depends BR2_PACKAGE_QTOPIA4
> -	default BR2_PACKAGE_QTOPIA4_NOTIFF
> -	help
> -	  Select which library to use if TIFF support should be enabled.
> -
> -config BR2_PACKAGE_QTOPIA4_NOTIFF
> -	bool "No TIFF support"
> -
> -config BR2_PACKAGE_QTOPIA4_SYSTEMTIFF
> -	bool "Use system libtiff"
> -	select BR2_PACKAGE_TIFF
> -
> -config BR2_PACKAGE_QTOPIA4_QTTIFF
> -	bool "Use Qt bundled libtiff"
> -
> -endchoice
> -

Why remove TIFF support?

> -config BR2_PACKAGE_QTOPIA4_SQL
> -	bool "Enable SQL support"
> -	depends BR2_PACKAGE_QTOPIA4
> -	help
> -	  Enable all the SQL drivers it QtSql library.
> -

Why remove SQL support?

> -config BR2_PACKAGE_QTOPIA4_OPENSSL
> -	bool "Enable OpenSSL support"
> -	depends BR2_PACKAGE_QTOPIA4
> -	help
> -	  Enable support for the OpenSSL encryption library.
> -

Why remove SSL support?

> -choice
>  	prompt "zlib support"
>  	depends BR2_PACKAGE_QTOPIA4
>  	default BR2_PACKAGE_QTOPIA4_QTZLIB
> @@ -178,7 +146,7 @@
>  	prompt "Qt zlib"
>  	help
>  	  Use the zlib bundled with Qt.
> -
> +	

Whitespace damage

>  config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB
>  	bool
>  	select BR2_PACKAGE_ZLIB
> @@ -186,6 +154,7 @@
>  	help
>  	  Use the shared zlib from the system.
>  endchoice
> +								    
>  

Let zlib be user selectable.

>  config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
>  	string "The embedded platform we are making Qtopia4 for"
> @@ -207,4 +176,4 @@
>  	default "generic"	if BR2_sparc
>  	depends BR2_PACKAGE_QTOPIA4
>  	help
> -	  The platform.
> +	    The platform.
> 

Whitespace damage

> Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
> ===================================================================
> --- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-04-24 18:35:44 UTC (rev 21850)
> +++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-04-24 18:44:30 UTC (rev 21851)
> @@ -16,7 +16,7 @@
>  # (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
>  # to fix
>  
> -QTOPIA4_VERSION:=4.4.0-snapshot-20080312
> +QTOPIA4_VERSION:=4.4.0-snapshot-20080325

We should bump to version 4.4.1.-snapshot-20080425.

>  QTOPIA4_CAT:=$(ZCAT)
>  
>  BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
> @@ -24,20 +24,20 @@
>  BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD)))
>  #"))
>  
> +QTOPIA4_CONFIGURE:=#empty
> +
>  # What to download, free or commercial version.
>  ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),)
>  QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)
>  QTOPIA4_SOURCE:=qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION).tar.gz
>  QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION)
> -QTOPIA4_NO_SQL_OCI:=-no-sql-oci
> -QTOPIA4_NO_SQL_TDS:=-no-sql-tds
> -QTOPIA4_NO_SQL_DB2:=-no-sql-db2
> +QTOPIA4_CONFIGURE+= -no-sql-oci -no-sql-tds -no-sql-db2

The SQL selection stuff should be kept.

>  else # Good, good, we are free:
>  QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/snapshots
>  QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.gz
>  QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION)
>  ifeq ($(BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED),y)
> -QTOPIA4_APPROVE_GPL_LICENSE:=-confirm-license
> +QTOPIA4_CONFIGURE+= -confirm-license
>  endif
>  endif
>  
> @@ -54,15 +54,15 @@
>  QTOPIA4_QCONFIG_FILE_LOCATION:=/src/corelib/global/
>  
>  ifeq ($(BR2_LARGEFILE),y)
> -QTOPIA4_LARGEFILE=-largefile
> +QTOPIA4_CONFIGURE+= -largefile
>  else
> -QTOPIA4_LARGEFILE=-no-largefile
> +QTOPIA4_CONFIGURE+= -no-largefile
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_QT3SUPPORT),y)
> -QTOPIA4_QT3SUPPORT=-qt3support
> +QTOPIA4_CONFIGURE+= -qt3support
>  else
> -QTOPIA4_QT3SUPPORT=-no-qt3support
> +QTOPIA4_CONFIGURE+= -no-qt3support
>  endif
>  
>  ifeq ($(BR2_PACKAGE_TSLIB),y)
> @@ -74,110 +74,110 @@
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y)
> -QTOPIA4_DEBUG="-debug $(QTOPIA4_TSLIB_DEB)"
> +QTOPIA4_CONFIGURE+= "-debug $(QTOPIA4_TSLIB_DEB)"
>  else
> -QTOPIA4_DEBUG=-release
> +QTOPIA4_CONFIGURE+= -release
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
> -QTOPIA4_SHARED=-shared
> +QTOPIA4_CONFIGURE+= -shared
>  else
> -QTOPIA4_SHARED=-static
> +QTOPIA4_CONFIGURE+= -static
>  endif
>  
>  ifeq ($(BR2_ENDIAN),"LITTLE")
> -QTOPIA4_ENDIAN=-little-endian
> +QTOPIA4_CONFIGURE+= -little-endian
>  else
> -QTOPIA4_ENDIAN=-big-endian
> +QTOPIA4_CONFIGURE+= -big-endian
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_GIF),y)
> -QTOPIA4_GIF=-qt-gif
> +QTOPIA4_CONFIGURE+= -qt-gif
>  else
> -QTOPIA4_GIF=-no-gif
> +QTOPIA4_CONFIGURE+= -no-gif
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_LIBMNG),y)
> -QTOPIA4_MNG=-qt-libmng
> +QTOPIA4_CONFIGURE+= -qt-libmng
>  else
> -QTOPIA4_MNG=-no-libmng
> +QTOPIA4_CONFIGURE+= -no-libmng
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_QTZLIB),y)
> -QTOPIA4_ZLIB=-qt-zlib
> +QTOPIA4_CONFIGURE+= -qt-zlib
>  else
>  ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMZLIB),y)
> -QTOPIA4_ZLIB=-system-zlib
> +QTOPIA4_CONFIGURE+= -system-zlib
>  QTOPIA4_DEP_LIBS+=zlib
>  else
> -QTOPIA4_ZLIB=-no-zlib
> +QTOPIA4_CONFIGURE+= -no-zlib
>  endif
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_QTJPEG),y)
> -QTOPIA4_JPEG=-qt-libjpeg
> +QTOPIA4_CONFIGURE+= -qt-libjpeg
>  else
>  ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMJPEG),y)
> -QTOPIA4_JPEG=-system-libjpeg
> +QTOPIA4_CONFIGURE+= -system-libjpeg
>  QTOPIA4_DEP_LIBS+=jpeg
>  else
> -QTOPIA4_JPEG=-no-libjpeg
> +QTOPIA4_CONFIGURE+= -no-libjpeg
>  endif
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_QTPNG),y)
> -QTOPIA4_PNG=-qt-libpng
> +QTOPIA4_CONFIGURE+= -qt-libpng
>  else
>  ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMPNG),y)
> -QTOPIA4_PNG=-system-libpng
> +QTOPIA4_CONFIGURE+= -system-libpng
>  QTOPIA4_DEP_LIBS+=libpng
>  else
> -QTOPIA4_PNG=-no-libpng
> +QTOPIA4_CONFIGURE+= -no-libpng
>  endif
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_QTTIFF),y)
> -QTOPIA4_TIFF=-qt-libtiff
> +QTOPIA4_CONFIGURE+= -qt-libtiff
>  else
>  ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMTIFF),y)
> -QTOPIA4_TIFF=-system-libtiff
> +QTOPIA4_CONFIGURE+= -system-libtiff
>  QTOPIA4_DEP_LIBS+=tiff
>  else
> -QTOPIA4_TIFF=-no-libtiff
> +QTOPIA4_CONFIGURE+= -no-libtiff

You removed TIFF support in kconfig, but kept it in Makefile...

>  endif
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_OPENSSL),y)
> -QTOPIA4_OPENSSL=-openssl
> +QTOPIA4_CONFIGURE+= -openssl
>  QTOPIA4_DEP_LIBS+=openssl
>  else
> -QTOPIA4_OPENSSL=-no-openssl
> +QTOPIA4_CONFIGURE+= -no-openssl
>  endif
>  
>  ifeq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
> -QTOPIA4_SQL_IBASE=-qt-sql-ibase
> -QTOPIA4_SQL_MYSQL=-qt-sql-mysql
> -QTOPIA4_SQL_ODBC=-qt-sql-odbc
> -QTOPIA4_SQL_PSQL=-qt-sql-psql
> -QTOPIA4_SQL_SQLITE=-qt-sql-sqlite
> -QTOPIA4_SQL_SQLITE2=-qt-sql-sqlite2
> +QTOPIA4_CONFIGURE+= -qt-sql-ibase
> +QTOPIA4_CONFIGURE+= -qt-sql-mysql
> +QTOPIA4_CONFIGURE+= -qt-sql-odbc
> +QTOPIA4_CONFIGURE+= -qt-sql-psql
> +QTOPIA4_CONFIGURE+= -qt-sql-sqlite
> +QTOPIA4_CONFIGURE+= -qt-sql-sqlite2
>  else
> -QTOPIA4_SQL_IBASE=-no-sql-ibase
> -QTOPIA4_SQL_MYSQL=-no-sql-mysql
> -QTOPIA4_SQL_ODBC=-no-sql-odbc
> -QTOPIA4_SQL_PSQL=-no-sql-psql
> -QTOPIA4_SQL_SQLITE=-no-sql-sqlite
> -QTOPIA4_SQL_SQLITE2=-no-sql-sqlite2
> +QTOPIA4_CONFIGURE+= -no-sql-ibase
> +QTOPIA4_CONFIGURE+= -no-sql-mysql
> +QTOPIA4_CONFIGURE+= -no-sql-odbc
> +QTOPIA4_CONFIGURE+= -no-sql-psql
> +QTOPIA4_CONFIGURE+= -no-sql-sqlite
> +QTOPIA4_CONFIGURE+= -no-sql-sqlite2
>  endif

Same about SQL.

>  
> -QTOPIA4_DEBUG:=$(strip $(subst ",, $(QTOPIA4_DEBUG)))
> +QTOPIA4_CONFIGURE:=$(strip $(subst ",, $(QTOPIA4_CONFIGURE)))
>  #"))
>  BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
>  #"))
>  
> 
>  # Variable for other Qt applications to use
> -QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake
> +QTOPIA4_QMAKE:=$(TARGET_CONFIGURE_OPTS) $(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++
>  

Is this really needed? qmake works fine for me by just specifying the
Buildroot PATH to STAGING_DIR/bin.

>  $(DL_DIR)/$(QTOPIA4_SOURCE):
>  	$(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
> @@ -198,7 +198,16 @@
>  	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
>  endif
>  	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
> -	$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
> +	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
> +        # Fix compiler path
> +	$(SED) '\,QMAKE_CC, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
> +	$(SED) '\,QMAKE_CXX, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
> +	$(SED) '\,QMAKE_LINK, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
> +	$(SED) '\,QMAKE_LINK_SHLIB, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
> +	$(SED) '\,QMAKE_AR, c\QMAKE_AR = $(TARGET_CROSS)ar cqs' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
> +	$(SED) '\,QMAKE_RANLIB, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
> +	$(SED) '\,QMAKE_STRIP, c\QMAKE_STRIP = $(TARGET_CROSS)strip' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
> +

Again, if people use the BUildroot environment, this is not needed.

>  	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
>  		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
>  	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
> @@ -207,28 +216,12 @@
>  		-verbose \
>  		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
>  		$(QTOPIA4_QCONFIG_COMMAND) \
> -		$(QTOPIA4_DEBUG) \
> -		$(QTOPIA4_SHARED) \
> +		$(QTOPIA4_CONFIGURE) \
>  		-no-stl \
>  		-no-cups \
>  		-no-nis \
>  		-no-freetype \
>  		-no-accessibility \
> -		$(QTOPIA4_MNG) \
> -		$(QTOPIA4_GIF) \
> -		$(QTOPIA4_JPEG) \
> -		$(QTOPIA4_PNG) \
> -		$(QTOPIA4_TIFF) \
> -		$(QTOPIA4_ZLIB) \
> -		$(QTOPIA4_SQL_IBASE) \
> -		$(QTOPIA4_SQL_MYSQL) \
> -		$(QTOPIA4_SQL_ODBC) \
> -		$(QTOPIA4_SQL_PSQL) \
> -		$(QTOPIA4_SQL_SQLITE) \
> -		$(QTOPIA4_SQL_SQLITE2) \
> -		$(QTOPIA4_NO_SQL_DB2) \
> -		$(QTOPIA4_NO_SQL_OCI) \
> -		$(QTOPIA4_NO_SQL_TDS) \
>  		-no-webkit \
>  		-no-separate-debug-info \
>  		-prefix /usr \
> @@ -237,11 +230,6 @@
>  		-no-rpath \
>  		-nomake examples \
>  		-nomake demos \
> -		$(QTOPIA4_QT3SUPPORT) \
> -		$(QTOPIA4_TSLIB) \
> -		$(QTOPIA4_LARGEFILE) \
> -		$(QTOPIA4_ENDIAN) \
> -		$(QTOPIA4_APPROVE_GPL_LICENSE) \
>  	)
>  	touch $@
>  
> @@ -260,13 +248,13 @@
>  	cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
>  ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
>  	cp -dpf $(STAGING_DIR)/usr/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
> -	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.*
> +	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
>  endif
>  	# Install image plugins if they are built
>  	if [ -d $(STAGING_DIR)/usr/plugins/imageformats ]; then \
>  		mkdir -p $(TARGET_DIR)/usr/plugins; \
>  		cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
> -		$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/plugins/imageformats/*; \
> +		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/imageformats/*; \
>  	fi
>  ifneq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
>  	# Remove Sql libraries, not needed
> @@ -283,6 +271,10 @@
>  qtopia4-dirclean:
>  	rm -rf $(QTOPIA4_TARGET_DIR)
>  
> +qtopia4-status:
> +	@echo "QTOPIA4_QMAKE:               " $(QTOPIA4_QMAKE)
> +	@echo "QTOPIA4_DEP_LIBS:            " $(QTOPIA4_DEP_LIBS)
> +

Do we really need this?

>  #############################################################
>  #
>  # Toplevel Makefile options

-- 
With kind regards,
Hans-Christian Egtvedt, Applications Engineer

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Thiago A. Corrêa]

Sorry, I was actually going to wait a little bit to send a patch....
then would have caught this on the diff. But that's quite a small
change anyway. The only thing that makes me uncomfortable is the QMAKE
variable, it could go without the CONFIGURE_OPTS thing.

Anyway, given that it now actually works as opposed to not, that's
quite a minor annoyance.

Btw, it seams to be missing the new Config.in.sql

On Thu, Apr 24, 2008 at 4:47 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "John" == John Voltz <john.voltz@gmail.com> writes:
>
>   John> I would assume it was due to changes in the build from the
>   John> different snapshot versions of qtopia. The commit log goes like
>   John> this:
>
>  That still doesn't explain the white space changes. Please cleanup
>  stuff before checking in to buildroot instead of simply mirroring what
>  you have in the other repo.
>
>  Or alternatively, send the indivual changes as patches and give us
>  some days to comment before checking in.
>
>  --
>
>
> Bye, Peter Korsgaard
>  _______________________________________________
>  buildroot mailing list
>  buildroot at uclibc.org
>  http://busybox.net/mailman/listinfo/buildroot
>

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Peter Korsgaard]

>>>>> "John" == John Voltz <john.voltz@gmail.com> writes:

 John> I would assume it was due to changes in the build from the
 John> different snapshot versions of qtopia. The commit log goes like
 John> this:

That still doesn't explain the white space changes. Please cleanup
stuff before checking in to buildroot instead of simply mirroring what
you have in the other repo.

Or alternatively, send the indivual changes as patches and give us
some days to comment before checking in.

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[John Voltz]

I would assume it was due to changes in the build from the different
snapshot versions of qtopia. The commit log goes like this:
------------------------------------------------------------------------
r382 | thiago.correa | 2008-04-07 16:00:23 -0400 (Mon, 07 Apr 2008) | 1 line

Fix problem with qmake generaged makefiles unable to find the toolchain
------------------------------------------------------------------------
r366 | john.voltz | 2008-04-04 13:57:27 -0400 (Fri, 04 Apr 2008) | 1 line

update qtopia 4 file version
------------------------------------------------------------------------
r319 | thiago.correa | 2008-03-27 14:34:10 -0400 (Thu, 27 Mar 2008) | 1 line

Sync upstream -r 21517 (buildroot.uclibc.org)
------------------------------------------------------------------------


On Thu, Apr 24, 2008 at 3:04 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:

> >>>>> "ninevoltz" == ninevoltz  <ninevoltz@uclibc.org> writes:
>
>  ninevoltz> Author: ninevoltz
>  ninevoltz> Date: 2008-04-24 11:44:30 -0700 (Thu, 24 Apr 2008)
>  ninevoltz> New Revision: 21851
>
>  ninevoltz> Log:
>  ninevoltz> update qtopia snapshot version and fix problem with qmake
>  ninevoltz> generated makefiles being unable to find the toolchain
>
> What about all the config changes? Why don't you comment on them? Why
> are you changing it?
>
>  ninevoltz> Modified:
>  ninevoltz>    trunk/buildroot/package/qtopia4/Config.in
>  ninevoltz>    trunk/buildroot/package/qtopia4/qtopia4.mk
>
>
>  ninevoltz> Changeset:
>  ninevoltz> Modified: trunk/buildroot/package/qtopia4/Config.in
>  ninevoltz>
> ===================================================================
>  ninevoltz> --- trunk/buildroot/package/qtopia4/Config.in       2008-04-24
> 18:35:44 UTC (rev 21850)
>  ninevoltz> +++ trunk/buildroot/package/qtopia4/Config.in       2008-04-24
> 18:44:30 UTC (rev 21851)
>  ninevoltz> @@ -12,6 +12,7 @@
>  ninevoltz>     bool "Compile with debug support"
>  ninevoltz>     default n
>  ninevoltz>     depends BR2_PACKAGE_QTOPIA4
>  ninevoltz> +   help
>
> Why?
>
>  ninevoltz> +qtopia4-status:
>  ninevoltz> +   @echo "QTOPIA4_QMAKE:               " $(QTOPIA4_QMAKE)
>  ninevoltz> +   @echo "QTOPIA4_DEP_LIBS:            " $(QTOPIA4_DEP_LIBS)
>
> What is that for?
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20080424/c7c3493e/attachment-0001.htm 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Peter Korsgaard]

>>>>> "ninevoltz" == ninevoltz  <ninevoltz@uclibc.org> writes:

 ninevoltz> Author: ninevoltz
 ninevoltz> Date: 2008-04-24 11:44:30 -0700 (Thu, 24 Apr 2008)
 ninevoltz> New Revision: 21851

 ninevoltz> Log:
 ninevoltz> update qtopia snapshot version and fix problem with qmake
 ninevoltz> generated makefiles being unable to find the toolchain

What about all the config changes? Why don't you comment on them? Why
are you changing it?

 ninevoltz> Modified:
 ninevoltz>    trunk/buildroot/package/qtopia4/Config.in
 ninevoltz>    trunk/buildroot/package/qtopia4/qtopia4.mk


 ninevoltz> Changeset:
 ninevoltz> Modified: trunk/buildroot/package/qtopia4/Config.in
 ninevoltz> ===================================================================
 ninevoltz> --- trunk/buildroot/package/qtopia4/Config.in	2008-04-24 18:35:44 UTC (rev 21850)
 ninevoltz> +++ trunk/buildroot/package/qtopia4/Config.in	2008-04-24 18:44:30 UTC (rev 21851)
 ninevoltz> @@ -12,6 +12,7 @@
 ninevoltz>  	bool "Compile with debug support"
 ninevoltz>  	default n
 ninevoltz>  	depends BR2_PACKAGE_QTOPIA4
 ninevoltz> +	help

Why?

 ninevoltz> +qtopia4-status:
 ninevoltz> +	@echo "QTOPIA4_QMAKE:               " $(QTOPIA4_QMAKE)
 ninevoltz> +	@echo "QTOPIA4_DEP_LIBS:            " $(QTOPIA4_DEP_LIBS)

What is that for?

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ninevoltz at uclibc.org]

Author: ninevoltz
Date: 2008-04-24 11:44:30 -0700 (Thu, 24 Apr 2008)
New Revision: 21851

Log:
update qtopia snapshot version and fix problem with qmake generated makefiles being unable to find the toolchain

Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2008-04-24 18:35:44 UTC (rev 21850)
+++ trunk/buildroot/package/qtopia4/Config.in	2008-04-24 18:44:30 UTC (rev 21851)
@@ -12,6 +12,7 @@
 	bool "Compile with debug support"
 	default n
 	depends BR2_PACKAGE_QTOPIA4
+	help
 
 choice
 	prompt "Library type"
@@ -59,7 +60,7 @@
 	default ""
 	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
-	  Commercial users can download their source directly by providing a username.
+	    Commercial users can download their source directly by providing a username.
 
 
 config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
@@ -67,15 +68,23 @@
 	default ""
 	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
-	  Commercial users can download their source directly by providing a password.
+	    Commercial users can download their source directly by providing a password.
 
 config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
 	bool "Compatibility with Qt3"
 	default y
 	depends BR2_PACKAGE_QTOPIA4
 	help
-	  Turns on support for older Qt3.
+	    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_GIF
 	bool "Enable GIF support"
 	default n
@@ -86,80 +95,39 @@
 config BR2_PACKAGE_QTOPIA4_LIBMNG
 	bool "Enable libmng support"
 	default n
+	select BR2_PACKAGE_LIBPNG
 	depends BR2_PACKAGE_QTOPIA4
 	help
 	  This compiles and installs the plugin for MNG support.
 
 choice
-	prompt "JPEG support"
+	prompt "libjpeg support"
 	depends BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOJPEG
 	help
 	  Select libjpeg support.
 
 config BR2_PACKAGE_QTOPIA4_NOJPEG
-	bool "No jpeg support"
+	bool
+	prompt "No jpeg support"
+	help
+	  Disable JPEG support
 
 config BR2_PACKAGE_QTOPIA4_SYSTEMJPEG
-	bool "Use system libjpeg"
+	bool
 	select BR2_PACKAGE_JPEG
+	prompt "use system libjpeg"
+	help
+	  Link against system libjpeg
 
 config BR2_PACKAGE_QTOPIA4_QTJPEG
-	bool "Use Qt libjpeg"
-
-endchoice
-
-choice
-	prompt "PNG support"
-	depends BR2_PACKAGE_QTOPIA4
-	default BR2_PACKAGE_QTOPIA4_NOPNG
+	bool
+	prompt "use qt libjpeg"
 	help
-	  Select which library to use if PNG support should be enabled.
-
-config BR2_PACKAGE_QTOPIA4_NOPNG
-	bool "No PNG support"
-
-config BR2_PACKAGE_QTOPIA4_SYSTEMPNG
-	bool "Use system libpng"
-	select BR2_PACKAGE_LIBPNG
-
-config BR2_PACKAGE_QTOPIA4_QTPNG
-	bool "Use Qt bundled libpng"
-
+	  Link against libjpeg proveded with Qt
 endchoice
 
 choice
-	prompt "TIFF support"
-	depends BR2_PACKAGE_QTOPIA4
-	default BR2_PACKAGE_QTOPIA4_NOTIFF
-	help
-	  Select which library to use if TIFF support should be enabled.
-
-config BR2_PACKAGE_QTOPIA4_NOTIFF
-	bool "No TIFF support"
-
-config BR2_PACKAGE_QTOPIA4_SYSTEMTIFF
-	bool "Use system libtiff"
-	select BR2_PACKAGE_TIFF
-
-config BR2_PACKAGE_QTOPIA4_QTTIFF
-	bool "Use Qt bundled libtiff"
-
-endchoice
-
-config BR2_PACKAGE_QTOPIA4_SQL
-	bool "Enable SQL support"
-	depends BR2_PACKAGE_QTOPIA4
-	help
-	  Enable all the SQL drivers it QtSql library.
-
-config BR2_PACKAGE_QTOPIA4_OPENSSL
-	bool "Enable OpenSSL support"
-	depends BR2_PACKAGE_QTOPIA4
-	help
-	  Enable support for the OpenSSL encryption library.
-
-choice
 	prompt "zlib support"
 	depends BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_QTZLIB
@@ -178,7 +146,7 @@
 	prompt "Qt zlib"
 	help
 	  Use the zlib bundled with Qt.
-
+	
 config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB
 	bool
 	select BR2_PACKAGE_ZLIB
@@ -186,6 +154,7 @@
 	help
 	  Use the shared zlib from the system.
 endchoice
+								    
 
 config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
 	string "The embedded platform we are making Qtopia4 for"
@@ -207,4 +176,4 @@
 	default "generic"	if BR2_sparc
 	depends BR2_PACKAGE_QTOPIA4
 	help
-	  The platform.
+	    The platform.

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-04-24 18:35:44 UTC (rev 21850)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-04-24 18:44:30 UTC (rev 21851)
@@ -16,7 +16,7 @@
 # (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
 # to fix
 
-QTOPIA4_VERSION:=4.4.0-snapshot-20080312
+QTOPIA4_VERSION:=4.4.0-snapshot-20080325
 QTOPIA4_CAT:=$(ZCAT)
 
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
@@ -24,20 +24,20 @@
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD)))
 #"))
 
+QTOPIA4_CONFIGURE:=#empty
+
 # What to download, free or commercial version.
 ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),)
 QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)
 QTOPIA4_SOURCE:=qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION).tar.gz
 QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION)
-QTOPIA4_NO_SQL_OCI:=-no-sql-oci
-QTOPIA4_NO_SQL_TDS:=-no-sql-tds
-QTOPIA4_NO_SQL_DB2:=-no-sql-db2
+QTOPIA4_CONFIGURE+= -no-sql-oci -no-sql-tds -no-sql-db2
 else # Good, good, we are free:
 QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/snapshots
 QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.gz
 QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION)
 ifeq ($(BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED),y)
-QTOPIA4_APPROVE_GPL_LICENSE:=-confirm-license
+QTOPIA4_CONFIGURE+= -confirm-license
 endif
 endif
 
@@ -54,15 +54,15 @@
 QTOPIA4_QCONFIG_FILE_LOCATION:=/src/corelib/global/
 
 ifeq ($(BR2_LARGEFILE),y)
-QTOPIA4_LARGEFILE=-largefile
+QTOPIA4_CONFIGURE+= -largefile
 else
-QTOPIA4_LARGEFILE=-no-largefile
+QTOPIA4_CONFIGURE+= -no-largefile
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QT3SUPPORT),y)
-QTOPIA4_QT3SUPPORT=-qt3support
+QTOPIA4_CONFIGURE+= -qt3support
 else
-QTOPIA4_QT3SUPPORT=-no-qt3support
+QTOPIA4_CONFIGURE+= -no-qt3support
 endif
 
 ifeq ($(BR2_PACKAGE_TSLIB),y)
@@ -74,110 +74,110 @@
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y)
-QTOPIA4_DEBUG="-debug $(QTOPIA4_TSLIB_DEB)"
+QTOPIA4_CONFIGURE+= "-debug $(QTOPIA4_TSLIB_DEB)"
 else
-QTOPIA4_DEBUG=-release
+QTOPIA4_CONFIGURE+= -release
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
-QTOPIA4_SHARED=-shared
+QTOPIA4_CONFIGURE+= -shared
 else
-QTOPIA4_SHARED=-static
+QTOPIA4_CONFIGURE+= -static
 endif
 
 ifeq ($(BR2_ENDIAN),"LITTLE")
-QTOPIA4_ENDIAN=-little-endian
+QTOPIA4_CONFIGURE+= -little-endian
 else
-QTOPIA4_ENDIAN=-big-endian
+QTOPIA4_CONFIGURE+= -big-endian
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_GIF),y)
-QTOPIA4_GIF=-qt-gif
+QTOPIA4_CONFIGURE+= -qt-gif
 else
-QTOPIA4_GIF=-no-gif
+QTOPIA4_CONFIGURE+= -no-gif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_LIBMNG),y)
-QTOPIA4_MNG=-qt-libmng
+QTOPIA4_CONFIGURE+= -qt-libmng
 else
-QTOPIA4_MNG=-no-libmng
+QTOPIA4_CONFIGURE+= -no-libmng
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTZLIB),y)
-QTOPIA4_ZLIB=-qt-zlib
+QTOPIA4_CONFIGURE+= -qt-zlib
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMZLIB),y)
-QTOPIA4_ZLIB=-system-zlib
+QTOPIA4_CONFIGURE+= -system-zlib
 QTOPIA4_DEP_LIBS+=zlib
 else
-QTOPIA4_ZLIB=-no-zlib
+QTOPIA4_CONFIGURE+= -no-zlib
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTJPEG),y)
-QTOPIA4_JPEG=-qt-libjpeg
+QTOPIA4_CONFIGURE+= -qt-libjpeg
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMJPEG),y)
-QTOPIA4_JPEG=-system-libjpeg
+QTOPIA4_CONFIGURE+= -system-libjpeg
 QTOPIA4_DEP_LIBS+=jpeg
 else
-QTOPIA4_JPEG=-no-libjpeg
+QTOPIA4_CONFIGURE+= -no-libjpeg
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTPNG),y)
-QTOPIA4_PNG=-qt-libpng
+QTOPIA4_CONFIGURE+= -qt-libpng
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMPNG),y)
-QTOPIA4_PNG=-system-libpng
+QTOPIA4_CONFIGURE+= -system-libpng
 QTOPIA4_DEP_LIBS+=libpng
 else
-QTOPIA4_PNG=-no-libpng
+QTOPIA4_CONFIGURE+= -no-libpng
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTTIFF),y)
-QTOPIA4_TIFF=-qt-libtiff
+QTOPIA4_CONFIGURE+= -qt-libtiff
 else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMTIFF),y)
-QTOPIA4_TIFF=-system-libtiff
+QTOPIA4_CONFIGURE+= -system-libtiff
 QTOPIA4_DEP_LIBS+=tiff
 else
-QTOPIA4_TIFF=-no-libtiff
+QTOPIA4_CONFIGURE+= -no-libtiff
 endif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_OPENSSL),y)
-QTOPIA4_OPENSSL=-openssl
+QTOPIA4_CONFIGURE+= -openssl
 QTOPIA4_DEP_LIBS+=openssl
 else
-QTOPIA4_OPENSSL=-no-openssl
+QTOPIA4_CONFIGURE+= -no-openssl
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
-QTOPIA4_SQL_IBASE=-qt-sql-ibase
-QTOPIA4_SQL_MYSQL=-qt-sql-mysql
-QTOPIA4_SQL_ODBC=-qt-sql-odbc
-QTOPIA4_SQL_PSQL=-qt-sql-psql
-QTOPIA4_SQL_SQLITE=-qt-sql-sqlite
-QTOPIA4_SQL_SQLITE2=-qt-sql-sqlite2
+QTOPIA4_CONFIGURE+= -qt-sql-ibase
+QTOPIA4_CONFIGURE+= -qt-sql-mysql
+QTOPIA4_CONFIGURE+= -qt-sql-odbc
+QTOPIA4_CONFIGURE+= -qt-sql-psql
+QTOPIA4_CONFIGURE+= -qt-sql-sqlite
+QTOPIA4_CONFIGURE+= -qt-sql-sqlite2
 else
-QTOPIA4_SQL_IBASE=-no-sql-ibase
-QTOPIA4_SQL_MYSQL=-no-sql-mysql
-QTOPIA4_SQL_ODBC=-no-sql-odbc
-QTOPIA4_SQL_PSQL=-no-sql-psql
-QTOPIA4_SQL_SQLITE=-no-sql-sqlite
-QTOPIA4_SQL_SQLITE2=-no-sql-sqlite2
+QTOPIA4_CONFIGURE+= -no-sql-ibase
+QTOPIA4_CONFIGURE+= -no-sql-mysql
+QTOPIA4_CONFIGURE+= -no-sql-odbc
+QTOPIA4_CONFIGURE+= -no-sql-psql
+QTOPIA4_CONFIGURE+= -no-sql-sqlite
+QTOPIA4_CONFIGURE+= -no-sql-sqlite2
 endif
 
-QTOPIA4_DEBUG:=$(strip $(subst ",, $(QTOPIA4_DEBUG)))
+QTOPIA4_CONFIGURE:=$(strip $(subst ",, $(QTOPIA4_CONFIGURE)))
 #"))
 BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
 #"))
 
 
 # Variable for other Qt applications to use
-QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake
+QTOPIA4_QMAKE:=$(TARGET_CONFIGURE_OPTS) $(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++
 
 $(DL_DIR)/$(QTOPIA4_SOURCE):
 	$(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
@@ -198,7 +198,16 @@
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
 endif
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
-	$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+        # Fix compiler path
+	$(SED) '\,QMAKE_CC, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_CXX, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_LINK, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_LINK_SHLIB, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_AR, c\QMAKE_AR = $(TARGET_CROSS)ar cqs' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_RANLIB, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_STRIP, c\QMAKE_STRIP = $(TARGET_CROSS)strip' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
@@ -207,28 +216,12 @@
 		-verbose \
 		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
 		$(QTOPIA4_QCONFIG_COMMAND) \
-		$(QTOPIA4_DEBUG) \
-		$(QTOPIA4_SHARED) \
+		$(QTOPIA4_CONFIGURE) \
 		-no-stl \
 		-no-cups \
 		-no-nis \
 		-no-freetype \
 		-no-accessibility \
-		$(QTOPIA4_MNG) \
-		$(QTOPIA4_GIF) \
-		$(QTOPIA4_JPEG) \
-		$(QTOPIA4_PNG) \
-		$(QTOPIA4_TIFF) \
-		$(QTOPIA4_ZLIB) \
-		$(QTOPIA4_SQL_IBASE) \
-		$(QTOPIA4_SQL_MYSQL) \
-		$(QTOPIA4_SQL_ODBC) \
-		$(QTOPIA4_SQL_PSQL) \
-		$(QTOPIA4_SQL_SQLITE) \
-		$(QTOPIA4_SQL_SQLITE2) \
-		$(QTOPIA4_NO_SQL_DB2) \
-		$(QTOPIA4_NO_SQL_OCI) \
-		$(QTOPIA4_NO_SQL_TDS) \
 		-no-webkit \
 		-no-separate-debug-info \
 		-prefix /usr \
@@ -237,11 +230,6 @@
 		-no-rpath \
 		-nomake examples \
 		-nomake demos \
-		$(QTOPIA4_QT3SUPPORT) \
-		$(QTOPIA4_TSLIB) \
-		$(QTOPIA4_LARGEFILE) \
-		$(QTOPIA4_ENDIAN) \
-		$(QTOPIA4_APPROVE_GPL_LICENSE) \
 	)
 	touch $@
 
@@ -260,13 +248,13 @@
 	cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
 ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
-	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.*
+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
 endif
 	# Install image plugins if they are built
 	if [ -d $(STAGING_DIR)/usr/plugins/imageformats ]; then \
 		mkdir -p $(TARGET_DIR)/usr/plugins; \
 		cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
-		$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/plugins/imageformats/*; \
+		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/imageformats/*; \
 	fi
 ifneq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
 	# Remove Sql libraries, not needed
@@ -283,6 +271,10 @@
 qtopia4-dirclean:
 	rm -rf $(QTOPIA4_TARGET_DIR)
 
+qtopia4-status:
+	@echo "QTOPIA4_QMAKE:               " $(QTOPIA4_QMAKE)
+	@echo "QTOPIA4_DEP_LIBS:            " $(QTOPIA4_DEP_LIBS)
+
 #############################################################
 #
 # Toplevel Makefile options

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[jacmet at uclibc.org]

Author: jacmet
Date: 2008-04-23 08:27:15 -0700 (Wed, 23 Apr 2008)
New Revision: 21812

Log:
qtopia4: use .patch.$ARCH naming convention


Added:
   trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-arch.patch.avr32
   trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-qatomic-header-to-header-list.patch.avr32
   trunk/buildroot/package/qtopia4/qtopia-4.3.1-add-avr32-arch.patch.avr32
   trunk/buildroot/package/qtopia4/qtopia-4.3.1-add-avr32-qatomic-header-to-header-list.patch.avr32
   trunk/buildroot/package/qtopia4/qtopia-4.3.2-add-avr32-arch.patch.avr32

Removed:
   trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-arch.patch
   trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-qatomic-header-to-header-list.patch
   trunk/buildroot/package/qtopia4/qtopia-4.3.1-add-avr32-arch.patch
   trunk/buildroot/package/qtopia4/qtopia-4.3.1-add-avr32-qatomic-header-to-header-list.patch
   trunk/buildroot/package/qtopia4/qtopia-4.3.2-add-avr32-arch.patch

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:

Sorry, the patch is too large to include (37034 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=21812

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Will Wagner]

> 
>  ~ > du -sk usr/lib/libQt*so.4.4.0 | sort -n
> 48      usr/lib/libQtTest.so.4.4.0
> 160     usr/lib/libQtXml.so.4.4.0
> 196     usr/lib/libQtSvg.so.4.4.0
> 396     usr/lib/libQtNetwork.so.4.4.0
> 492     usr/lib/libQtScript.so.4.4.0
> 1792    usr/lib/libQtCore.so.4.4.0
> 5436    usr/lib/libQtGui.so.4.4.0
> 
> These are stripped binaries.
> 
> That is roughly 8 MB of shared libraries, give or take a few kB's will
> also depend a lot on your compiler.

Yes but I'm using static linking, only core and gui and I have removed 
all the unneeded features for my target, the footprint for me is much 
smaller.

> 

-- 
------------------------------------------------------------------------
Will Wagner                                     will_wagner at carallon.com
Senior Project Engineer                  Office Tel: +44 (0)20 7371 2032
Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA
------------------------------------------------------------------------

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Hans-Christian Egtvedt]

On Thu, 2008-03-13 at 10:38 +0000, Will Wagner wrote:
> Hans-Christian Egtvedt wrote:
> > On Wed, 2008-03-12 at 18:44 +0000, Will Wagner wrote:
> >> ninevoltz at uclibc.org wrote:
> > 
> > <snipp>
> > 
> >>> -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.
> >>> -
> >> Why have you removed the option to configure supported colour depths?
> >>
> > 
> > Why do you need it? It would only reduce the footprint by some kB anyway
> > to specify a specific color depth.
> 
> I want it exactly because it does save a few kB. Perhaps we should add 
> it back in but change the default to all?
> 

 ~ > du -sk usr/lib/libQt*so.4.4.0 | sort -n
48      usr/lib/libQtTest.so.4.4.0
160     usr/lib/libQtXml.so.4.4.0
196     usr/lib/libQtSvg.so.4.4.0
396     usr/lib/libQtNetwork.so.4.4.0
492     usr/lib/libQtScript.so.4.4.0
1792    usr/lib/libQtCore.so.4.4.0
5436    usr/lib/libQtGui.so.4.4.0

These are stripped binaries.

That is roughly 8 MB of shared libraries, give or take a few kB's will
also depend a lot on your compiler.

-- 
With kind regards,
Hans-Christian Egtvedt, Applications Engineer

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Will Wagner]

Hans-Christian Egtvedt wrote:
> On Wed, 2008-03-12 at 18:44 +0000, Will Wagner wrote:
>> ninevoltz at uclibc.org wrote:
> 
> <snipp>
> 
>>> -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.
>>> -
>> Why have you removed the option to configure supported colour depths?
>>
> 
> Why do you need it? It would only reduce the footprint by some kB anyway
> to specify a specific color depth.

I want it exactly because it does save a few kB. Perhaps we should add 
it back in but change the default to all?

> 
> Not specifying -depths will give you all depths supported by Qt
> Embedded.
> 

-- 
------------------------------------------------------------------------
Will Wagner                                     will_wagner at carallon.com
Senior Project Engineer                  Office Tel: +44 (0)20 7371 2032
Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA
------------------------------------------------------------------------

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Hans-Christian Egtvedt]

On Wed, 2008-03-12 at 18:44 +0000, Will Wagner wrote:
> ninevoltz at uclibc.org wrote:

<snipp>

> > -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.
> > -
> 
> Why have you removed the option to configure supported colour depths?
> 

Why do you need it? It would only reduce the footprint by some kB anyway
to specify a specific color depth.

Not specifying -depths will give you all depths supported by Qt
Embedded.

-- 
With kind regards,
Hans-Christian Egtvedt, Applications Engineer

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Hans-Christian Egtvedt]

On Wed, 2008-03-12 at 18:26 +0000, Will Wagner wrote:
> ninevoltz at uclibc.org wrote:
> > Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
> > ===================================================================
> > --- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-03-12 13:11:29 UTC (rev 21314)
> > +++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-03-12 13:53:02 UTC (rev 21315)
> 
> snip
> 
> >  
> > -$(QTOPIA4_TARGET_DIR)/.installed: $(QTOPIA4_TARGET_DIR)/.built
> > +$(STAGING_DIR)/usr/lib/libQtCore.la: $(QTOPIA4_TARGET_DIR)/.compiled
> > +	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_TARGET_DIR) install
> 
> Doing a make install seems rather over the top. I don't need all the 
> docs copied into the staging dir for a start. Why do the install at all, 
> qtopia4 worked fine before when just copying the needed parts to the 
> TARGET_DIR
> 

Using copy instead of a proper install is waiting for issues to happen,
unless of course you have full knowledge about what Trolltech does with
their Qt library and how they install it.

> A possible improvement might be to do install_subtargets instead.
> 

That might be an idea, but then again, somebody will need to track any
changes done in Qt Embedded.

> > +
> > +$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la
> >  	mkdir -p $(TARGET_DIR)/usr/lib/fonts
> >  	touch $(TARGET_DIR)/usr/lib/fonts/fontdir
> > -	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
> > -	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
> > -	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
> > +	cp -dpf $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
> > +	cp -dpf $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
> > +	cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
> >  ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
> > -	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
> > -	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.$(QTOPIA4_VERSION)
> > +	cp -dpf $(STAGING_DIR)/usr/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
> > +	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.*
> 
> Why did you change this from $(STRIPCMD) $(STRIP_STRIP_UNNEEDED)?
> 
> $(STRIP) --strip-unneeded fails on my target (arm) as STRIP not defined.
> 

Probably because I am a bit out of sync with upstream, but it should
have been catched in review process before being commited. Easy fix
though.

-- 
With kind regards,
Hans-Christian Egtvedt, Applications Engineer

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[John Voltz]

I didn't add the patch originator's name to the commit message, it was
Hans-Christian Egtvedt from Atmel Norway. I will CC this message to him.

John Voltz


On Wed, Mar 12, 2008 at 2:44 PM, Will Wagner <will_wagner@carallon.com>
wrote:

> ninevoltz at uclibc.org wrote:
> > Author: ninevoltz
> > Date: 2008-03-12 06:53:02 -0700 (Wed, 12 Mar 2008)
> > New Revision: 21315
> >
> > Log:
> > Fix Qtopia Core 4 compile and installation and bump to version 4.4.0
> >
> > Modified:
> >    trunk/buildroot/package/qtopia4/Config.in
> >    trunk/buildroot/package/qtopia4/qtopia4.mk
> >
> >
> > Changeset:
> > Modified: trunk/buildroot/package/qtopia4/Config.in
> > ===================================================================
> > --- trunk/buildroot/package/qtopia4/Config.in 2008-03-12 13:11:29 UTC
> (rev 21314)
> > +++ trunk/buildroot/package/qtopia4/Config.in 2008-03-12 13:53:02 UTC
> (rev 21315)
>
> snip
>
> >
> > -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.
> > -
>
> Why have you removed the option to configure supported colour depths?
>
> --
> ------------------------------------------------------------------------
> Will Wagner                                     will_wagner at carallon.com
> Senior Project Engineer                  Office Tel: +44 (0)20 7371 2032
> Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA
> ------------------------------------------------------------------------
>
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20080312/1d5bca07/attachment-0001.htm 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Will Wagner]

ninevoltz at uclibc.org wrote:
> Author: ninevoltz
> Date: 2008-03-12 06:53:02 -0700 (Wed, 12 Mar 2008)
> New Revision: 21315
> 
> Log:
> Fix Qtopia Core 4 compile and installation and bump to version 4.4.0
> 
> Modified:
>    trunk/buildroot/package/qtopia4/Config.in
>    trunk/buildroot/package/qtopia4/qtopia4.mk
> 
> 
> Changeset:
> Modified: trunk/buildroot/package/qtopia4/Config.in
> ===================================================================
> --- trunk/buildroot/package/qtopia4/Config.in	2008-03-12 13:11:29 UTC (rev 21314)
> +++ trunk/buildroot/package/qtopia4/Config.in	2008-03-12 13:53:02 UTC (rev 21315)

snip

>  
> -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.
> -

Why have you removed the option to configure supported colour depths?

-- 
------------------------------------------------------------------------
Will Wagner                                     will_wagner at carallon.com
Senior Project Engineer                  Office Tel: +44 (0)20 7371 2032
Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA
------------------------------------------------------------------------

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Will Wagner]

ninevoltz at uclibc.org wrote:
> Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
> ===================================================================
> --- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-03-12 13:11:29 UTC (rev 21314)
> +++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-03-12 13:53:02 UTC (rev 21315)

snip

>  
> -$(QTOPIA4_TARGET_DIR)/.installed: $(QTOPIA4_TARGET_DIR)/.built
> +$(STAGING_DIR)/usr/lib/libQtCore.la: $(QTOPIA4_TARGET_DIR)/.compiled
> +	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_TARGET_DIR) install

Doing a make install seems rather over the top. I don't need all the 
docs copied into the staging dir for a start. Why do the install at all, 
qtopia4 worked fine before when just copying the needed parts to the 
TARGET_DIR

A possible improvement might be to do install_subtargets instead.

> +
> +$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la
>  	mkdir -p $(TARGET_DIR)/usr/lib/fonts
>  	touch $(TARGET_DIR)/usr/lib/fonts/fontdir
> -	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
> -	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
> -	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
> +	cp -dpf $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
> +	cp -dpf $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
> +	cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
>  ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
> -	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
> -	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.$(QTOPIA4_VERSION)
> +	cp -dpf $(STAGING_DIR)/usr/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
> +	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.*

Why did you change this from $(STRIPCMD) $(STRIP_STRIP_UNNEEDED)?

$(STRIP) --strip-unneeded fails on my target (arm) as STRIP not defined.

>  endif
>  	# Install image plugins if they are built
> -	if [ -d $(QTOPIA4_TARGET_DIR)/plugins/imageformats ]; then \
> -		mkdir -p $(TARGET_DIR)/usr/lib/qt4/plugins; \
> -		cp -dpfr $(QTOPIA4_TARGET_DIR)/plugins/imageformats $(TARGET_DIR)/usr/lib/qt4/plugins; \
> -		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/qt4/plugins/imageformats/*; \
> +	if [ -d $(STAGING_DIR)/usr/plugins/imageformats ]; then \
> +		mkdir -p $(TARGET_DIR)/usr/plugins; \
> +		cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
> +		$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/plugins/imageformats/*; \
>  	fi
> +ifneq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
>  	# Remove Sql libraries, not needed
>  	-rm $(TARGET_DIR)/usr/lib/libQtSql*
> +endif
>  	# Remove Svg libraries, not needed
>  	-rm $(TARGET_DIR)/usr/lib/libQtSvg*
> -	touch $@
>  
> +qtopia4: uclibc zlib $(QTOPIA4_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4
>  
> -qtopia4: uclibc zlib $(QTOPIA4_DEP_LIBS) $(QTOPIA4_TARGET_DIR)/.installed
> -
>  qtopia4-clean:
>  	-$(MAKE) -C $(QTOPIA4_TARGET_DIR) clean
>  
> 
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot

-- 
------------------------------------------------------------------------
Will Wagner                                     will_wagner at carallon.com
Senior Project Engineer                  Office Tel: +44 (0)20 7371 2032
Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA
------------------------------------------------------------------------

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Thomas Petazzoni]

Le Wed, 12 Mar 2008 15:20:50 +0100,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :

> Please note in the commit message who the patch was from.

Yes, that would be very nice. I was a bit surprised when I saw my
fakeroot-related patch committed with no attribution. Of course, it was
a very tiny and trivial patch, but attribution is an important aspect
of free software contribution, even for tiny contributions.

Thanks,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Free Embedded Linux Training Materials
on http://free-electrons.com/training
(More than 1500 pages!)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20080312/a1171971/attachment.pgp 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Peter Korsgaard]

>>>>> "ninevoltz" == ninevoltz  <ninevoltz@uclibc.org> writes:

 ninevoltz> Author: ninevoltz
 ninevoltz> Date: 2008-03-12 06:53:02 -0700 (Wed, 12 Mar 2008)
 ninevoltz> New Revision: 21315

 ninevoltz> Log:
 ninevoltz> Fix Qtopia Core 4 compile and installation and bump to
 ninevoltz> version 4.4.0

Please note in the commit message who the patch was from.

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ninevoltz at uclibc.org]

Author: ninevoltz
Date: 2008-03-12 06:53:02 -0700 (Wed, 12 Mar 2008)
New Revision: 21315

Log:
Fix Qtopia Core 4 compile and installation and bump to version 4.4.0

Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2008-03-12 13:11:29 UTC (rev 21314)
+++ trunk/buildroot/package/qtopia4/Config.in	2008-03-12 13:53:02 UTC (rev 21315)
@@ -12,7 +12,6 @@
 	bool "Compile with debug support"
 	default n
 	depends BR2_PACKAGE_QTOPIA4
-	help
 
 choice
 	prompt "Library type"
@@ -60,7 +59,7 @@
 	default ""
 	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
-	    Commercial users can download their source directly by providing a username.
+	  Commercial users can download their source directly by providing a username.
 
 
 config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
@@ -68,23 +67,15 @@
 	default ""
 	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
-	    Commercial users can download their source directly by providing a password.
+	  Commercial users can download their source directly by providing a password.
 
 config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
 	bool "Compatibility with Qt3"
 	default y
 	depends BR2_PACKAGE_QTOPIA4
 	help
-	    Turns on support for older Qt3.
+	  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_GIF
 	bool "Enable GIF support"
 	default n
@@ -95,39 +86,80 @@
 config BR2_PACKAGE_QTOPIA4_LIBMNG
 	bool "Enable libmng support"
 	default n
-	select BR2_PACKAGE_LIBPNG
 	depends BR2_PACKAGE_QTOPIA4
 	help
 	  This compiles and installs the plugin for MNG support.
 
 choice
-	prompt "libjpeg support"
+	prompt "JPEG support"
 	depends BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOJPEG
 	help
 	  Select libjpeg support.
 
 config BR2_PACKAGE_QTOPIA4_NOJPEG
-	bool
-	prompt "No jpeg support"
-	help
-	  Disable JPEG support
+	bool "No jpeg support"
 
 config BR2_PACKAGE_QTOPIA4_SYSTEMJPEG
-	bool
+	bool "Use system libjpeg"
 	select BR2_PACKAGE_JPEG
-	prompt "use system libjpeg"
-	help
-	  Link against system libjpeg
 
 config BR2_PACKAGE_QTOPIA4_QTJPEG
-	bool
-	prompt "use qt libjpeg"
+	bool "Use Qt libjpeg"
+
+endchoice
+
+choice
+	prompt "PNG support"
+	depends BR2_PACKAGE_QTOPIA4
+	default BR2_PACKAGE_QTOPIA4_NOPNG
 	help
-	  Link against libjpeg proveded with Qt
+	  Select which library to use if PNG support should be enabled.
+
+config BR2_PACKAGE_QTOPIA4_NOPNG
+	bool "No PNG support"
+
+config BR2_PACKAGE_QTOPIA4_SYSTEMPNG
+	bool "Use system libpng"
+	select BR2_PACKAGE_LIBPNG
+
+config BR2_PACKAGE_QTOPIA4_QTPNG
+	bool "Use Qt bundled libpng"
+
 endchoice
 
 choice
+	prompt "TIFF support"
+	depends BR2_PACKAGE_QTOPIA4
+	default BR2_PACKAGE_QTOPIA4_NOTIFF
+	help
+	  Select which library to use if TIFF support should be enabled.
+
+config BR2_PACKAGE_QTOPIA4_NOTIFF
+	bool "No TIFF support"
+
+config BR2_PACKAGE_QTOPIA4_SYSTEMTIFF
+	bool "Use system libtiff"
+	select BR2_PACKAGE_TIFF
+
+config BR2_PACKAGE_QTOPIA4_QTTIFF
+	bool "Use Qt bundled libtiff"
+
+endchoice
+
+config BR2_PACKAGE_QTOPIA4_SQL
+	bool "Enable SQL support"
+	depends BR2_PACKAGE_QTOPIA4
+	help
+	  Enable all the SQL drivers it QtSql library.
+
+config BR2_PACKAGE_QTOPIA4_OPENSSL
+	bool "Enable OpenSSL support"
+	depends BR2_PACKAGE_QTOPIA4
+	help
+	  Enable support for the OpenSSL encryption library.
+
+choice
 	prompt "zlib support"
 	depends BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_QTZLIB
@@ -146,7 +178,7 @@
 	prompt "Qt zlib"
 	help
 	  Use the zlib bundled with Qt.
-	
+
 config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB
 	bool
 	select BR2_PACKAGE_ZLIB
@@ -154,7 +186,6 @@
 	help
 	  Use the shared zlib from the system.
 endchoice
-								    
 
 config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
 	string "The embedded platform we are making Qtopia4 for"
@@ -176,4 +207,4 @@
 	default "generic"	if BR2_sparc
 	depends BR2_PACKAGE_QTOPIA4
 	help
-	    The platform.
+	  The platform.

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-03-12 13:11:29 UTC (rev 21314)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-03-12 13:53:02 UTC (rev 21315)
@@ -13,10 +13,10 @@
 
 # BUG: In "OpenSuSE 10.2", dbus.h is at dbus-1.0/dbus/dbus.h
 # instead of at "dbus/dbus.h"
-# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus) 
+# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
 # to fix
 
-QTOPIA4_VERSION:=4.3.2
+QTOPIA4_VERSION:=4.4.0-snapshot-20080312
 QTOPIA4_CAT:=$(ZCAT)
 
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
@@ -26,28 +26,19 @@
 
 # What to download, free or commercial version.
 ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),)
-
 QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)
-QTOPIA4_SOURCE:=qtopia-core-commercial-src-$(QTOPIA4_VERSION).tar.gz
-QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VERSION)
-QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VERSION)
+QTOPIA4_SOURCE:=qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION).tar.gz
+QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION)
 QTOPIA4_NO_SQL_OCI:=-no-sql-oci
 QTOPIA4_NO_SQL_TDS:=-no-sql-tds
 QTOPIA4_NO_SQL_DB2:=-no-sql-db2
-
-else
-
-# Good, good, we are free:
-
-QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/source/
-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)
-
+else # Good, good, we are free:
+QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/snapshots
+QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.gz
+QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-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
@@ -74,16 +65,7 @@
 QTOPIA4_QT3SUPPORT=-no-qt3support
 endif
 
-QTOPIA4_DEP_LIBS:=
-ifeq ($(BR2_PACKAGE_JPEG),y)
-QTOPIA4_DEP_LIBS+=jpeg
-endif
-ifeq ($(BR2_PACKAGE_LIBPNG),y)
-QTOPIA4_DEP_LIBS+=libpng
-endif
-
 ifeq ($(BR2_PACKAGE_TSLIB),y)
-#BUG: Qtopia refuse to recognize -qt-mouse-tslib
 QTOPIA4_TSLIB=-qt-mouse-tslib
 QTOPIA4_DEP_LIBS+=tslib
 QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
@@ -109,44 +91,85 @@
 QTOPIA4_ENDIAN=-big-endian
 endif
 
-ifeq ($(BR2_PACKAGE_QTOPIA4_DEPTHS),"")
-QTOPIA4_DEPTHS=-depths 8
-else
-QTOPIA4_DEPTHS:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_DEPTHS)))
-#"))
-endif
-
 ifeq ($(BR2_PACKAGE_QTOPIA4_GIF),y)
-QTOPIA4_GIF_LIB=-qt-gif
+QTOPIA4_GIF=-qt-gif
 else
-QTOPIA4_GIF_LIB=-no-gif
+QTOPIA4_GIF=-no-gif
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_LIBMNG),y)
-QTOPIA4_MNG_LIB=-qt-libmng
+QTOPIA4_MNG=-qt-libmng
 else
-QTOPIA4_MNG_LIB=-no-libmng
+QTOPIA4_MNG=-no-libmng
 endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTZLIB),y)
 QTOPIA4_ZLIB=-qt-zlib
-endif
+else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMZLIB),y)
 QTOPIA4_ZLIB=-system-zlib
+QTOPIA4_DEP_LIBS+=zlib
 else
 QTOPIA4_ZLIB=-no-zlib
 endif
+endif
 
 ifeq ($(BR2_PACKAGE_QTOPIA4_QTJPEG),y)
 QTOPIA4_JPEG=-qt-libjpeg
-endif
+else
 ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMJPEG),y)
 QTOPIA4_JPEG=-system-libjpeg
+QTOPIA4_DEP_LIBS+=jpeg
 else
 QTOPIA4_JPEG=-no-libjpeg
 endif
+endif
 
+ifeq ($(BR2_PACKAGE_QTOPIA4_QTPNG),y)
+QTOPIA4_PNG=-qt-libpng
+else
+ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMPNG),y)
+QTOPIA4_PNG=-system-libpng
+QTOPIA4_DEP_LIBS+=libpng
+else
+QTOPIA4_PNG=-no-libpng
+endif
+endif
 
+ifeq ($(BR2_PACKAGE_QTOPIA4_QTTIFF),y)
+QTOPIA4_TIFF=-qt-libtiff
+else
+ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMTIFF),y)
+QTOPIA4_TIFF=-system-libtiff
+QTOPIA4_DEP_LIBS+=tiff
+else
+QTOPIA4_TIFF=-no-libtiff
+endif
+endif
+
+ifeq ($(BR2_PACKAGE_QTOPIA4_OPENSSL),y)
+QTOPIA4_OPENSSL=-openssl
+QTOPIA4_DEP_LIBS+=openssl
+else
+QTOPIA4_OPENSSL=-no-openssl
+endif
+
+ifeq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
+QTOPIA4_SQL_IBASE=-qt-sql-ibase
+QTOPIA4_SQL_MYSQL=-qt-sql-mysql
+QTOPIA4_SQL_ODBC=-qt-sql-odbc
+QTOPIA4_SQL_PSQL=-qt-sql-psql
+QTOPIA4_SQL_SQLITE=-qt-sql-sqlite
+QTOPIA4_SQL_SQLITE2=-qt-sql-sqlite2
+else
+QTOPIA4_SQL_IBASE=-no-sql-ibase
+QTOPIA4_SQL_MYSQL=-no-sql-mysql
+QTOPIA4_SQL_ODBC=-no-sql-odbc
+QTOPIA4_SQL_PSQL=-no-sql-psql
+QTOPIA4_SQL_SQLITE=-no-sql-sqlite
+QTOPIA4_SQL_SQLITE2=-no-sql-sqlite2
+endif
+
 QTOPIA4_DEBUG:=$(strip $(subst ",, $(QTOPIA4_DEBUG)))
 #"))
 BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
@@ -154,10 +177,10 @@
 
 
 # Variable for other Qt applications to use
-QTOPIA4_QMAKE:=$(QTOPIA4_TARGET_DIR)/bin/qmake
+QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake
 
 $(DL_DIR)/$(QTOPIA4_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
+	$(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
 
 qtopia4-source: $(DL_DIR)/$(QTOPIA4_SOURCE)
 
@@ -168,110 +191,91 @@
 		qtopia-$(QTOPIA4_VERSION)-\*.patch\*
 	touch $@
 
-# This configure is very tailored towards a specific need.
 $(QTOPIA4_TARGET_DIR)/.configured: $(QTOPIA4_TARGET_DIR)/.unpacked
-	# Patching configure to get rid of some features I don't want.
-	# (I don't want SQL either but there is no option for that at all,
-	# the SQL library will be built even without the plugins/drivers).
 ifneq ($(BR2_INET_IPV6),y)
 	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_TARGET_DIR)/configure
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
 endif
-
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
 	$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	
-	# Fix compiler path
-	$(SED) '\,QMAKE_CC, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_CXX, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_LINK, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_LINK_SHLIB, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_AR, c\QMAKE_AR = $(TARGET_CROSS)ar cqs' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_RANLIB, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_STRIP, c\QMAKE_STRIP = $(TARGET_CROSS)strip' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
 		PATH=$(TARGET_PATH) \
-		QPEHOME=/usr \
-		QPEDIR=/usr \
 		./configure \
-		-v \
-		-platform linux-g++ \
+		-verbose \
 		-embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
-		-xplatform qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++ \
 		$(QTOPIA4_QCONFIG_COMMAND) \
 		$(QTOPIA4_DEBUG) \
 		$(QTOPIA4_SHARED) \
-		$(QTOPIA4_DEPTHS) \
 		-no-stl \
 		-no-cups \
 		-no-nis \
 		-no-freetype \
 		-no-accessibility \
-		$(QTOPIA4_MNG_LIB) \
-		$(QTOPIA4_GIF_LIB) \
+		$(QTOPIA4_MNG) \
+		$(QTOPIA4_GIF) \
 		$(QTOPIA4_JPEG) \
+		$(QTOPIA4_PNG) \
+		$(QTOPIA4_TIFF) \
 		$(QTOPIA4_ZLIB) \
-		-no-sql-ibase \
-		-no-sql-mysql \
-		-no-sql-odbc \
-		-no-sql-psql \
-		-no-sql-sqlite \
-		-no-sql-sqlite2 \
+		$(QTOPIA4_SQL_IBASE) \
+		$(QTOPIA4_SQL_MYSQL) \
+		$(QTOPIA4_SQL_ODBC) \
+		$(QTOPIA4_SQL_PSQL) \
+		$(QTOPIA4_SQL_SQLITE) \
+		$(QTOPIA4_SQL_SQLITE2) \
 		$(QTOPIA4_NO_SQL_DB2) \
 		$(QTOPIA4_NO_SQL_OCI) \
 		$(QTOPIA4_NO_SQL_TDS) \
-		-prefix $(QTOPIA4_TARGET_DIR) \
-		-docdir $(QTOPIA4_TARGET_DIR)/doc \
-		-headerdir $(QTOPIA4_TARGET_DIR)/include \
-		-datadir $(QTOPIA4_TARGET_DIR) \
-		-plugindir $(QTOPIA4_TARGET_DIR)/plugins \
-		-translationdir $(QTOPIA4_TARGET_DIR)/translations \
-		-sysconfdir $(QTOPIA4_TARGET_DIR) \
-		-examplesdir $(QTOPIA4_TARGET_DIR)/examples \
-		-demosdir $(QTOPIA4_TARGET_DIR)/demos \
+		-no-webkit \
+		-no-separate-debug-info \
+		-prefix /usr \
+		-hostprefix $(STAGING_DIR)/usr \
 		-fast \
+		-no-rpath \
 		-nomake examples \
-		-no-rpath \
-		-no-fatal_error \
+		-nomake demos \
 		$(QTOPIA4_QT3SUPPORT) \
 		$(QTOPIA4_TSLIB) \
 		$(QTOPIA4_LARGEFILE) \
 		$(QTOPIA4_ENDIAN) \
 		$(QTOPIA4_APPROVE_GPL_LICENSE) \
-	);
+	)
 	touch $@
 
-$(QTOPIA4_TARGET_DIR)/.built: $(QTOPIA4_TARGET_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_TARGET_DIR) sub-src
+$(QTOPIA4_TARGET_DIR)/.compiled: $(QTOPIA4_TARGET_DIR)/.configured
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_TARGET_DIR)
 	touch $@
 
-$(QTOPIA4_TARGET_DIR)/.installed: $(QTOPIA4_TARGET_DIR)/.built
+$(STAGING_DIR)/usr/lib/libQtCore.la: $(QTOPIA4_TARGET_DIR)/.compiled
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_TARGET_DIR) install
+
+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la
 	mkdir -p $(TARGET_DIR)/usr/lib/fonts
 	touch $(TARGET_DIR)/usr/lib/fonts/fontdir
-	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
-	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
-	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -dpf $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -dpf $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
 ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
-	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.$(QTOPIA4_VERSION)
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
+	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.*
 endif
 	# Install image plugins if they are built
-	if [ -d $(QTOPIA4_TARGET_DIR)/plugins/imageformats ]; then \
-		mkdir -p $(TARGET_DIR)/usr/lib/qt4/plugins; \
-		cp -dpfr $(QTOPIA4_TARGET_DIR)/plugins/imageformats $(TARGET_DIR)/usr/lib/qt4/plugins; \
-		$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/qt4/plugins/imageformats/*; \
+	if [ -d $(STAGING_DIR)/usr/plugins/imageformats ]; then \
+		mkdir -p $(TARGET_DIR)/usr/plugins; \
+		cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
+		$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/plugins/imageformats/*; \
 	fi
+ifneq ($(BR2_PACKAGE_QTOPIA4_SQL),y)
 	# Remove Sql libraries, not needed
 	-rm $(TARGET_DIR)/usr/lib/libQtSql*
+endif
 	# Remove Svg libraries, not needed
 	-rm $(TARGET_DIR)/usr/lib/libQtSvg*
-	touch $@
 
+qtopia4: uclibc zlib $(QTOPIA4_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4
 
-qtopia4: uclibc zlib $(QTOPIA4_DEP_LIBS) $(QTOPIA4_TARGET_DIR)/.installed
-
 qtopia4-clean:
 	-$(MAKE) -C $(QTOPIA4_TARGET_DIR) clean
 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ninevoltz at uclibc.org]

Author: ninevoltz
Date: 2008-03-06 10:22:10 -0800 (Thu, 06 Mar 2008)
New Revision: 21221

Log:
reordered path fixes

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-03-06 18:21:33 UTC (rev 21220)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-03-06 18:22:10 UTC (rev 21221)
@@ -177,8 +177,18 @@
 	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_TARGET_DIR)/configure
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
 endif
+
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
 	$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	
+	# Fix compiler path
+	$(SED) '\,QMAKE_CC, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_CXX, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_LINK, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_LINK_SHLIB, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_AR, c\QMAKE_AR = $(TARGET_CROSS)ar cqs' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_RANLIB, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) '\,QMAKE_STRIP, c\QMAKE_STRIP = $(TARGET_CROSS)strip' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
@@ -224,6 +234,7 @@
 		-fast \
 		-nomake examples \
 		-no-rpath \
+		-no-fatal_error \
 		$(QTOPIA4_QT3SUPPORT) \
 		$(QTOPIA4_TSLIB) \
 		$(QTOPIA4_LARGEFILE) \
@@ -256,14 +267,6 @@
 	-rm $(TARGET_DIR)/usr/lib/libQtSql*
 	# Remove Svg libraries, not needed
 	-rm $(TARGET_DIR)/usr/lib/libQtSvg*
-	# Fix compiler path
-	$(SED) '\,QMAKE_CC, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_CXX, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_LINK, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_LINK_SHLIB, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_AR, c\QMAKE_AR = $(TARGET_CROSS)ar cqs' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_RANLIB, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-	$(SED) '\,QMAKE_STRIP, c\QMAKE_STRIP = $(TARGET_CROSS)strip' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
 	touch $@
 
 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[thomasez at uclibc.org]

Author: thomasez
Date: 2008-01-25 02:20:11 -0800 (Fri, 25 Jan 2008)
New Revision: 20900

Log:
Fix by Fredy Yanardi


Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2008-01-25 10:02:32 UTC (rev 20899)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2008-01-25 10:20:11 UTC (rev 20900)
@@ -31,6 +31,9 @@
 QTOPIA4_SOURCE:=qtopia-core-commercial-src-$(QTOPIA4_VERSION).tar.gz
 QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VERSION)
 QTOPIA4_HOST_DIR:=$(TOOL_BUILD_DIR)/qtopia-core-commercial-src-$(QTOPIA4_VERSION)
+QTOPIA4_NO_SQL_OCI:=-no-sql-oci
+QTOPIA4_NO_SQL_TDS:=-no-sql-tds
+QTOPIA4_NO_SQL_DB2:=-no-sql-db2
 
 else
 
@@ -81,7 +84,7 @@
 
 ifeq ($(BR2_PACKAGE_TSLIB),y)
 #BUG: Qtopia refuse to recognize -qt-mouse-tslib
-#QTOPIA4_TSLIB=-qt-mouse-tslib
+QTOPIA4_TSLIB=-qt-mouse-tslib
 QTOPIA4_DEP_LIBS+=tslib
 QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
 QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB)))
@@ -200,15 +203,15 @@
 		$(QTOPIA4_GIF_LIB) \
 		$(QTOPIA4_JPEG) \
 		$(QTOPIA4_ZLIB) \
-		-no-sql-db2 \
 		-no-sql-ibase \
 		-no-sql-mysql \
-		-no-sql-oci \
 		-no-sql-odbc \
 		-no-sql-psql \
 		-no-sql-sqlite \
 		-no-sql-sqlite2 \
-		-no-sql-tds \
+		$(QTOPIA4_NO_SQL_DB2) \
+		$(QTOPIA4_NO_SQL_OCI) \
+		$(QTOPIA4_NO_SQL_TDS) \
 		-prefix $(QTOPIA4_TARGET_DIR) \
 		-docdir $(QTOPIA4_TARGET_DIR)/doc \
 		-headerdir $(QTOPIA4_TARGET_DIR)/include \

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[vanokuten at uclibc.org]

Author: vanokuten
Date: 2007-12-18 07:12:15 -0800 (Tue, 18 Dec 2007)
New Revision: 20658

Log:
qtopia-4.3.2 update

Added:
   trunk/buildroot/package/qtopia4/qtopia-4.3.2-add-avr32-arch.patch

Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/qtopia-4.3.1-add-avr32-arch.patch
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:

Sorry, the patch is too large to include (6618 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=20658

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[rafael2k]

hi ulf,
is touchscreen working ok w/ this patch?

bye,
rafael diniz

Em Qua 26 Set 2007, ulf at uclibc.org escreveu:
> Author: ulf
> Date: 2007-09-26 03:23:31 -0700 (Wed, 26 Sep 2007)
> New Revision: 20036
>
> Log:
> Document bugs in qtopia build, remove qt-mouse-tslib which breaks the build
>
> Modified:
>    trunk/buildroot/package/qtopia4/qtopia4.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
> ===================================================================
> --- trunk/buildroot/package/qtopia4/qtopia4.mk	2007-09-26 10:21:18 UTC (rev
> 20035) +++ trunk/buildroot/package/qtopia4/qtopia4.mk	2007-09-26 10:23:31
> UTC (rev 20036) @@ -15,6 +15,11 @@
>  #
>  ######################################################################
>
> +# BUG: In "OpenSuSE 10.2", dbus.h is at dbus-1.0/dbus/dbus.h
> +# instead of at "dbus/dbus.h"
> +# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
> +# to fix
> +
>  QTOPIA4_VERSION:=4.3.1
>  QTOPIA4_CAT:=$(ZCAT)
>
> @@ -79,7 +84,8 @@
>  endif
>
>  ifeq ($(BR2_PACKAGE_TSLIB),y)
> -QTOPIA4_TSLIB=-qt-mouse-tslib
> +#BUG: Qtopia refuse to recognize -qt-mouse-tslib
> +#QTOPIA4_TSLIB=-qt-mouse-tslib
>  QTOPIA4_DEP_LIBS+=tslib
>  QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
>  QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB)))
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot



-- 
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
Ci?ncia da Computa??o @  Unicamp
R?dio Muda, radiolivre.org, TV Piolho, tvlivre.org, www.midiaindependente.org
Chave PGP: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x2FF86098
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
Url : http://busybox.net/lists/buildroot/attachments/20070926/ac3722db/attachment.pgp 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Peter Korsgaard]

>>>>> "Ulf" == Ulf Samuelsson <ulf@atmel.com> writes:

 >> Huh, on the build host? Why would qtopia mess around with that?

 Ulf> It includes <dbus/dbus.h>
 Ulf> Which on OpenSuSE 10.2 is at <dbus-1.0/dbus/dbus.h>

But it's compiled with the cross compiler right? Or is this some kind
of host build tool?

/me is confused.

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Ulf Samuelsson]

ons 2007-09-26 klockan 13:07 +0200 skrev Peter Korsgaard:
> >>>>> "ulf" == ulf  <ulf@uclibc.org> writes:
> 
> Hi,
> 
>  ulf> +# BUG: In "OpenSuSE 10.2", dbus.h is at dbus-1.0/dbus/dbus.h
>  ulf> +# instead of at "dbus/dbus.h"
>  ulf> +# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus) 
> 
> Huh, on the build host? Why would qtopia mess around with that?

It includes <dbus/dbus.h>
Which on OpenSuSE 10.2 is at <dbus-1.0/dbus/dbus.h>

I assume this is a problem with OpenSuSE instead of qtopia.
It is there as a help for people with problem
but it does not fix it.
Have to do that manually.

BR
Ulf Samuelsson

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[Peter Korsgaard]

>>>>> "ulf" == ulf  <ulf@uclibc.org> writes:

Hi,

 ulf> +# BUG: In "OpenSuSE 10.2", dbus.h is at dbus-1.0/dbus/dbus.h
 ulf> +# instead of at "dbus/dbus.h"
 ulf> +# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus) 

Huh, on the build host? Why would qtopia mess around with that?

-- 
Bye, Peter Korsgaard

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ulf at uclibc.org]

Author: ulf
Date: 2007-09-26 03:23:31 -0700 (Wed, 26 Sep 2007)
New Revision: 20036

Log:
Document bugs in qtopia build, remove qt-mouse-tslib which breaks the build

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2007-09-26 10:21:18 UTC (rev 20035)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2007-09-26 10:23:31 UTC (rev 20036)
@@ -15,6 +15,11 @@
 #
 ######################################################################
 
+# BUG: In "OpenSuSE 10.2", dbus.h is at dbus-1.0/dbus/dbus.h
+# instead of at "dbus/dbus.h"
+# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus) 
+# to fix
+
 QTOPIA4_VERSION:=4.3.1
 QTOPIA4_CAT:=$(ZCAT)
 
@@ -79,7 +84,8 @@
 endif
 
 ifeq ($(BR2_PACKAGE_TSLIB),y)
-QTOPIA4_TSLIB=-qt-mouse-tslib
+#BUG: Qtopia refuse to recognize -qt-mouse-tslib
+#QTOPIA4_TSLIB=-qt-mouse-tslib
 QTOPIA4_DEP_LIBS+=tslib
 QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
 QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB)))

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ulf at uclibc.org]

Author: ulf
Date: 2007-09-23 09:29:10 -0700 (Sun, 23 Sep 2007)
New Revision: 19976

Log:
Update qtopia4 AVR32 patch to 4.3.1 (makes ARM work as well)

Added:
   trunk/buildroot/package/qtopia4/qtopia-4.3.1-add-avr32-arch.patch
   trunk/buildroot/package/qtopia4/qtopia-4.3.1-add-avr32-qatomic-header-to-header-list.patch


Changeset:

Sorry, the patch is too large to include (6157 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=19976

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ulf at uclibc.org]

Author: ulf
Date: 2007-08-28 16:06:33 -0700 (Tue, 28 Aug 2007)
New Revision: 19729

Log:
Fix some qtopia quirks, bump version

Added:
   trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-qatomic-header-to-header-list.patch

Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Added: trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-qatomic-header-to-header-list.patch
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-qatomic-header-to-header-list.patch	                        (rev 0)
+++ trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-qatomic-header-to-header-list.patch	2007-08-28 23:06:33 UTC (rev 19729)
@@ -0,0 +1,6 @@
+--- a/include/QtCore/headers.pri	2007-08-02 15:03:31.000000000 +0200
++++ b/include/QtCore/headers.pri	2007-08-02 15:03:44.000000000 +0200
+@@ -1,2 +1,2 @@
+-SYNCQT.HEADER_FILES = ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qtextstream.h ../corelib/io/qtemporaryfile.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qbuffer.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qdir.h ../corelib/io/qurl.h ../corelib/io/qabstractfileengine.h ../corelib/io/qfileinfo.h ../corelib/io/qsettings.h ../corelib/io/qfile.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_x86_64.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_boundschecker.h ../corelib/arch/qatomic_generic.h ../corelib/tools/qcache.h ../corelib/tools/qline.h ../corelib/tools/qlist.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qrect.h ../corelib/tools/qsize.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qbitarray.h ../corelib/tools/qvector.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qqueue.h ../corelib/tools/qbytearray.h ../corelib/tools/qalgorithms.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qshareddata.h ../corelib/tools/qiterator.h ../corelib/tools/qlocale.h ../corelib/tools/qstack.h ../corelib/tools/qmap.h ../corelib/tools/qset.h ../corelib/tools/qdatetime.h ../corelib/tools/qstring.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qregexp.h ../corelib/tools/qchar.h ../corelib/tools/qhash.h ../corelib/tools/qtimeline.h ../corelib/codecs/qtextcodecplugin.h ../corelib/codecs/qtextcodec.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-small.h ../corelib/global/qlibraryinfo.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qconfig-minimal.h ../corelib/global/qnamespace.h ../corelib/global/qconfig-medium.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qobject.h ../corelib/kernel/qtimer.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qpointer.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qobjectdefs.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qfactoryinterface.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/thread/qthread.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qatomic.h ../../include/QtCore/QtCore 
++SYNCQT.HEADER_FILES = ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qtextstream.h ../corelib/io/qtemporaryfile.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qbuffer.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qdir.h ../corelib/io/qurl.h ../corelib/io/qabstractfileengine.h ../corelib/io/qfileinfo.h ../corelib/io/qsettings.h ../corelib/io/qfile.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_x86_64.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_boundschecker.h ../corelib/arch/qatomic_generic.h ../corelib/tools/qcache.h ../corelib/tools/qline.h ../corelib/tools/qlist.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qrect.h ../corelib/tools/qsize.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qbitarray.h ../corelib/tools/qvector.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qqueue.h ../corelib/tools/qbytearray.h ../corelib/tools/qalgorithms.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qshareddata.h ../corelib/tools/qiterator.h ../corelib/tools/qlocale.h ../corelib/tools/qstack.h ../corelib/tools/qmap.h ../corelib/tools/qset.h ../corelib/tools/qdatetime.h ../corelib/tools/qstring.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qregexp.h ../corelib/tools/qchar.h ../corelib/tools/qhash.h ../corelib/tools/qtimeline.h ../corelib/codecs/qtextcodecplugin.h ../corelib/codecs/qtextcodec.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-small.h ../corelib/global/qlibraryinfo.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qconfig-minimal.h ../corelib/global/qnamespace.h ../corelib/global/qconfig-medium.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qobject.h ../corelib/kernel/qtimer.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qpointer.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qobjectdefs.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qfactoryinterface.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/thread/qthread.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qatomic.h ../../include/QtCore/QtCore 
+ SYNCQT.HEADER_CLASSES = ../../include/QtCore/QDataStream ../../include/QtCore/QtDebug ../../include/QtCore/QDebug ../../include/QtCore/QNoDebug ../../include/QtCore/QTextStream ../../include/QtCore/QTextStreamFunction ../../include/QtCore/QTextStreamManipulator ../../include/QtCore/QTS ../../include/QtCore/QTextIStream ../../include/QtCore/QTextOStream ../../include/QtCore/QTemporaryFile ../../include/QtCore/QFSFileEngine ../../include/QtCore/QIODevice ../../include/QtCore/Q_PID ../../include/QtCore/QProcess ../../include/QtCore/QResource ../../include/QtCore/QBuffer ../../include/QtCore/QFileSystemWatcher ../../include/QtCore/QDir ../../include/QtCore/QUrl ../../include/QtCore/QAbstractFileEngine ../../include/QtCore/QAbstractFileEngineHandler ../../include/QtCore/QFileInfo ../../include/QtCore/QFileInfoList ../../include/QtCore/QFileInfoListIterator ../../include/QtCore/QSettings ../../include/QtCore/QFile ../../include/QtCore/QBasicAtomic ../../include/QtCore/QBasicAtomicPointer ../../include/QtCore/QCache ../../include/QtCore/QLine ../../include/QtCore/QLineF ../../include/QtCore/QListData ../../include/QtCore/QList ../../include/QtCore/QListIterator ../../include/QtCore/QMutableListIterator ../../include/QtCore/QPair ../../include/QtCore/QPoint ../../include/QtCore/QPointF ../../include/QtCore/QRect ../../include/QtCore/QRectF ../../include/QtCore/QSize ../../include/QtCore/QSizeF ../../include/QtCore/QStringListIterator ../../include/QtCore/QMutableStringListIterator ../../include/QtCore/QStringList ../../include/QtCore/QStringMatcher ../../include/QtCore/QLinkedListData ../../include/QtCore/QLinkedListNode ../../include/QtCore/QLinkedList ../../include/QtCore/QLinkedListIterator ../../include/QtCore/QMutableLinkedListIterator ../../include/QtCore/QBitArray ../../include/QtCore/QBitRef ../../include/QtCore/QVectorData ../../include/QtCore/QVectorTypedData ../../include/QtCore/QVector ../../include/QtCore/QVectorIterator ../../include/QtCore/QMutableVectorIterator ../../include/QtCore/QByteArrayMatcher ../../include/QtCore/QQueue ../../include/QtCore/QByteArray ../../include/QtCore/QByteRef ../../include/QtCore/QtAlgorithms ../../include/QtCore/QVarLengthArray ../../include/QtCore/QSharedData ../../include/QtCore/QSharedDataPointer ../../include/QtCore/QLocale ../../include/QtCore/QSystemLocale ../../include/QtCore/QStack ../../include/QtCore/QMapData ../../include/QtCore/QMap ../../include/QtCore/QMultiMap ../../include/QtCore/QMapIterator ../../include/QtCore/QMutableMapIterator ../../include/QtCore/QSet ../../include/QtCore/QSetIterator ../../include/QtCore/QMutableSetIterator ../../include/QtCore/QDate ../../include/QtCore/QTime ../../include/QtCore/QDateTime ../../include/QtCore/QStdWString ../../include/QtCore/QString ../../include/QtCore/QLatin1String ../../include/QtCore/QCharRef ../../include/QtCore/QConstString ../../include/QtCore/QtContainerFwd ../../include/QtCore/QRegExp ../../include/QtCore/QLatin1Char ../../include/QtCore/QChar ../../include/QtCore/QHashData ../../include/QtCore/QHashDummyValue ../../include/QtCore/QHashDummyNode ../../include/QtCore/QHashNode ../../include/QtCore/QHash ../../include/QtCore/QMultiHash ../../include/QtCore/QHashIterator ../../include/QtCore/QMutableHashIterator ../../include/QtCore/QTimeLine ../../include/QtCore/QTextCodecFactoryInterface ../../include/QtCore/QTextCodecPlugin ../../include/QtCore/QTextCodec ../../include/QtCore/QTextEncoder ../../include/QtCore/QTextDecoder ../../include/QtCore/QLibraryInfo ../../include/QtCore/QtEndian ../../include/QtCore/QtGlobal ../../include/QtCore/QUintForSize ../../include/QtCore/QUintForType ../../include/QtCore/QIntForSize ../../include/QtCore/QIntForType ../../include/QtCore/QNoImplicitBoolCast ../../include/QtCore/Q_INT8 ../../include/QtCore/Q_UINT8 ../../include/QtCore/Q_INT16 ../../include/QtCore/Q_UINT16 ../../include/QtCore/Q_INT32 ../../include/QtCore/Q_UINT32 ../../include/QtCore/Q_INT64 ../../include/QtCore/Q_UINT64 ../../include/QtCore/Q_LLONG ../../include/QtCore/Q_ULLONG ../../include/QtCore/Q_LONG ../../include/QtCore/Q_ULONG ../../include/QtCore/QSysInfo ../../include/QtCore/QtMsgHandler ../../include/QtCore/QGlobalStatic ../../include/QtCore/QBool ../../include/QtCore/QTypeInfo ../../include/QtCore/QFlag ../../include/QtCore/QFlags ../../include/QtCore/QForeachContainer ../../include/QtCore/QForeachContainerBase ../../include/QtCore/Qt ../../include/QtCore/QInternal ../../include/QtCore/QCOORD ../../include/QtCore/QTranslator ../../include/QtCore/QVariant ../../include/QtCore/QVariantList ../../include/QtCore/QVariantMap ../../include/QtCore/QVariantComparisonHelper ../../include/QtCore/QMimeData ../../include/QtCore/QEventLoop ../../include/QtCore/QCoreApplication ../../include/QtCore/QtCleanUpFunction ../../include/QtCore/QModelIndex ../../include/QtCore/QPersistentModelIndex ../../include/QtCore/QModelIndexList ../../include/QtCore/QAbstractItemModel ../../include/QtCore/QAbstractTableModel ../../include/QtCore/QAbstractListModel ../../include/QtCore/QSignalMapper ../../include/QtCore/QObjectCleanupHandler ../../include/QtCore/QBasicTimer ../../include/QtCore/QSocketNotifier ../../include/QtCore/QObjectList ../../include/QtCore/QObjectData ../../include/QtCore/QObject ../../include/QtCore/QObjectUserData ../../include/QtCore/QTimer ../../include/QtCore/QMetaType ../../include/QtCore/QMetaTypeId ../../include/QtCore/QMetaTypeId2 ../../include/QtCore/QAbstractEventDispatcher ../../include/QtCore/QPointer ../../include/QtCore/QMetaMethod ../../include/QtCore/QMetaEnum ../../include/QtCore/QMetaProperty ../../include/QtCore/QMetaClassInfo ../../include/QtCore/QEvent ../../include/QtCore/QTimerEvent ../../include/QtCore/QChildEvent ../../include/QtCore/QCustomEvent ../../include/QtCore/QDynamicPropertyChangeEvent ../../include/QtCore/QGenericArgument ../../include/QtCore/QGenericReturnArgument ../../include/QtCore/QArgument ../../include/QtCore/QReturnArgument ../../include/QtCore/QMetaObject ../../include/QtCore/QPluginLoader ../../include/QtCore/QUuid ../../include/QtCore/QLibrary ../../include/QtCore/QtPlugin ../../include/QtCore/QtPluginInstanceFunction ../../include/QtCore/QFactoryInterface ../../include/QtCore/QSemaphore ../../include/QtCore/QThreadStorageData ../../include/QtCore/QThreadStorage ../../include/QtCore/QWaitCondition ../../include/QtCore/QThread ../../include/QtCore/QMutex ../../include/QtCore/QMutexLocker ../../include/QtCore/QReadWriteLock ../../include/QtCore/QReadLocker ../../include/QtCore/QWriteLocker ../../include/QtCore/QAtomic ../../include/QtCore/QAtomicPointer 

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2007-08-28 23:05:10 UTC (rev 19728)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2007-08-28 23:06:33 UTC (rev 19729)
@@ -15,7 +15,7 @@
 #
 ######################################################################
 
-QTOPIA4_VERSION:=4.2.2
+QTOPIA4_VERSION:=4.3.1
 QTOPIA4_CAT:=$(ZCAT)
 
 BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
@@ -169,8 +169,6 @@
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
 		PATH=$(TARGET_PATH) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CXXFLAGS)" \
 		QPEHOME=/usr \
 		QPEDIR=/usr \
 		./configure \
@@ -181,6 +179,7 @@
 		$(QTOPIA4_QCONFIG_COMMAND) \
 		$(QTOPIA4_DEBUG) \
 		$(QTOPIA4_DEPTHS) \
+		-no-stl \
 		-no-cups \
 		-no-nis \
 		-no-freetype \
@@ -205,8 +204,8 @@
 		-sysconfdir /etc/qt4 \
 		-examplesdir /usr/share/qt4/examples \
 		-demosdir /usr/share/qt4/demos \
+		-fast \
 		-nomake examples \
-		-fast \
 		-no-rpath \
 		$(QTOPIA4_QT3SUPPORT) \
 		$(QTOPIA4_TSLIB) \
@@ -230,13 +229,13 @@
 	if [ -d $(QTOPIA4_TARGET_DIR)/plugins/imageformats ]; then \
 		mkdir -p $(TARGET_DIR)/usr/lib/qt4/plugins; \
 		cp -dpfr $(QTOPIA4_TARGET_DIR)/plugins/imageformats $(TARGET_DIR)/usr/lib/qt4/plugins; \
-		$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/qt4/plugins/imageformats/*; \
+		$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/qt4/plugins/imageformats/*; \
 	fi
 	# Remove Sql libraries, not needed
 	-rm $(TARGET_DIR)/usr/lib/libQtSql*
 	# Remove Svg libraries, not needed
 	-rm $(TARGET_DIR)/usr/lib/libQtSvg*
-	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.$(QTOPIA4_VERSION)
+	-$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.$(QTOPIA4_VERSION)
 
 #################################
 #
@@ -265,8 +264,6 @@
 		$(QTOPIA4_HOST_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_HOST_DIR); rm -rf config.cache; \
 		PATH=$(TARGET_PATH) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CXXFLAGS="$(TARGET_CXXFLAGS)" \
 		QPEHOME=/usr \
 		QPEDIR=/usr \
 		./configure \
@@ -277,6 +274,7 @@
 		$(QTOPIA4_QCONFIG_COMMAND) \
 		$(QTOPIA4_DEBUG) \
 		$(QTOPIA4_DEPTHS) \
+		-no-stl \
 		-no-cups \
 		-no-nis \
 		-no-freetype \
@@ -301,8 +299,8 @@
 		-sysconfdir $(STAGING_DIR)/etc/qt4 \
 		-examplesdir $(STAGING_DIR)/usr/share/qt4/examples \
 		-demosdir $(STAGING_DIR)/usr/share/qt4/demos \
+		-fast \
 		-nomake examples \
-		-fast \
 		-no-rpath \
 		$(QTOPIA4_QT3SUPPORT) \
 		$(QTOPIA4_TSLIB) \
@@ -317,6 +315,9 @@
 
 $(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION)
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_HOST_DIR) install
+	# For some reason make install misses copying this file.
+	# cp -dpf $(QTOPIA4_HOST_DIR)/src/corelib/arch/qatomic_avr32.h $(STAGING_DIR)/include/qt4/QtCore/
+	# Try other patch first.
 
 qtopia4: uclibc zlib $(QTOPIA4_DEP_LIBS) \
 		$(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION) \

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[aldot at uclibc.org]

Author: aldot
Date: 2007-08-22 12:31:43 -0700 (Wed, 22 Aug 2007)
New Revision: 19660

Log:
- add GIF and MMG support, fix comments a little bit, small cleanups, and avoid building Qtopia examples.
  Thanks to Hans-Christian Egtvedt and Thiago A. Correa (for the last item).


Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2007-08-22 18:14:44 UTC (rev 19659)
+++ trunk/buildroot/package/qtopia4/Config.in	2007-08-22 19:31:43 UTC (rev 19660)
@@ -74,10 +74,25 @@
 	    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_GIF
+	bool "Enable GIF support"
+	default n
+	depends BR2_PACKAGE_QTOPIA4
+	help
+	  This compiles and installs the plugin for GIF reading support.
+
+config BR2_PACKAGE_QTOPIA4_LIBMNG
+	bool "Enable libmng support"
+	default n
+	depends BR2_PACKAGE_QTOPIA4
+	help
+	  This compiles and installs the plugin for MNG support.
+
 config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
 	string "The embedded platform we are making Qtopia4 for"
 	default "arm"	if BR2_arm
 	default "arm"	if BR2_armeb
+	default "avr32"	if BR2_avr32
 	default "x86"	if BR2_i386
 	default "x86_64"	if BR2_x86_64
 	default "mips"	if BR2_mips

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2007-08-22 18:14:44 UTC (rev 19659)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2007-08-22 19:31:43 UTC (rev 19660)
@@ -63,28 +63,41 @@
 else
 QTOPIA4_LARGEFILE=-no-largefile
 endif
+
 ifeq ($(BR2_PACKAGE_QTOPIA4_QT3SUPPORT),y)
 QTOPIA4_QT3SUPPORT=-qt3support
 else
 QTOPIA4_QT3SUPPORT=-no-qt3support
 endif
+
+QTOPIA4_DEP_LIBS:=
+ifeq ($(BR2_PACKAGE_JPEG),y)
+QTOPIA4_DEP_LIBS+=jpeg
+endif
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+QTOPIA4_DEP_LIBS+=libpng
+endif
+
 ifeq ($(BR2_PACKAGE_TSLIB),y)
 QTOPIA4_TSLIB=-qt-mouse-tslib
-QTOPIA4_TSLIB_DEP=tslib
+QTOPIA4_DEP_LIBS+=tslib
 QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
 QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB)))
 #"))
 endif
+
 ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y)
 QTOPIA4_DEBUG="-debug $(QTOPIA4_TSLIB_DEB)"
 else
 QTOPIA4_DEBUG=-release
 endif
+
 ifeq ($(BR2_ENDIAN),"LITTLE")
 QTOPIA4_ENDIAN=-little-endian
 else
 QTOPIA4_ENDIAN=-big-endian
 endif
+
 ifeq ($(BR2_PACKAGE_QTOPIA4_DEPTHS),"")
 QTOPIA4_DEPTHS=-depths 8
 else
@@ -92,21 +105,43 @@
 #"))
 endif
 
+ifeq ($(BR2_PACKAGE_QTOPIA4_GIF),y)
+QTOPIA4_GIF_LIB=-qt-gif
+else
+QTOPIA4_GIF_LIB=-no-gif
+endif
+
+ifeq ($(BR2_PACKAGE_QTOPIA4_LIBMNG),y)
+QTOPIA4_MNG_LIB=-qt-libmng
+else
+QTOPIA4_MNG_LIB=-no-libmng
+endif
+
 QTOPIA4_DEBUG:=$(strip $(subst ",, $(QTOPIA4_DEBUG)))
 #"))
 BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
 #"))
 
 
-# This is for staging.
-QTOPIA4_STAGING_DIR:=$(STAGING_DIR)/usr/Trolltech
-QTOPIA4_QMAKE=$(QTOPIA4_STAGING_DIR)/bin/qmake
+# Variable for other Qt applications to use
+QTOPIA4_QMAKE:=$(QTOPIA4_HOST_DIR)/bin/qmake
 
 $(DL_DIR)/$(QTOPIA4_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
 
 qtopia4-source: $(DL_DIR)/$(QTOPIA4_SOURCE)
 
+##############################################################################
+#
+# And now for the fun part, we have to do this in a two stage build because
+# Qt saves the library path inside the binary libraries. I.e.
+# libQtCore.so.<version> contains a hardcoded link to where the Qt libraries
+# are installed. Therefor we have to do one build for host/staging where
+# prefix is in our staging_dir, and a second build with prefix /usr for the
+# target.
+#
+##############################################################################
+
 #################################
 #
 # Target
@@ -117,13 +152,13 @@
 	$(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
+	touch $@
 
-# This configure is very tailored towards my needs.
+# This configure is very tailored towards a specific need.
 $(QTOPIA4_TARGET_DIR)/.configured: $(QTOPIA4_TARGET_DIR)/.unpacked
-	# Patching configure to get rid of some feature I dont want.
-	# (I don't want SQL either but there is no option for that at all.
-	# the SQL library will be built even without the plugins/drivers.
+	# Patching configure to get rid of some features I don't want.
+	# (I don't want SQL either but there is no option for that at all,
+	# the SQL library will be built even without the plugins/drivers).
 ifneq ($(BR2_INET_IPV6),y)
 	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_TARGET_DIR)/configure
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
@@ -150,8 +185,8 @@
 		-no-nis \
 		-no-freetype \
 		-no-accessibility \
-		-no-libmng \
-		-no-gif \
+		$(QTOPIA4_MNG_LIB) \
+		$(QTOPIA4_GIF_LIB) \
 		-no-sql-db2 \
 		-no-sql-ibase \
 		-no-sql-mysql \
@@ -162,38 +197,46 @@
 		-no-sql-sqlite2 \
 		-no-sql-tds \
 		-prefix /usr \
-		-prefix-install \
+		-docdir /usr/share/qt4/doc \
+		-headerdir /usr/include/qt4 \
+		-datadir /usr/share/qt4 \
+		-plugindir /usr/lib/qt4/plugins \
+		-translationdir /usr/share/qt4/translations \
+		-sysconfdir /etc/qt4 \
+		-examplesdir /usr/share/qt4/examples \
+		-demosdir /usr/share/qt4/demos \
+		-nomake examples \
+		-fast \
+		-no-rpath \
 		$(QTOPIA4_QT3SUPPORT) \
 		$(QTOPIA4_TSLIB) \
 		$(QTOPIA4_LARGEFILE) \
 		$(QTOPIA4_ENDIAN) \
 		$(QTOPIA4_APPROVE_GPL_LICENSE) \
-	)
-	touch $(QTOPIA4_TARGET_DIR)/.configured
+	);
+	touch $@
 
 $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_TARGET_DIR)/.configured
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		-C $(QTOPIA4_TARGET_DIR) sub-src
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_TARGET_DIR) sub-src
 
-$(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		INSTALL_ROOT=$(STAGING_DIR) \
-		-C $(QTOPIA4_TARGET_DIR) \
-		sub-src-install_subtargets-ordered \
-		install_qmake install_mkspecs
-
-$(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION): $(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION)
+$(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_TARGET_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION)
 	mkdir -p $(TARGET_DIR)/usr/lib/fonts
 	touch $(TARGET_DIR)/usr/lib/fonts/fontdir
-	cp -a $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
-	cp -a $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
-	cp -a $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
-	cp -a $(STAGING_DIR)/usr/lib/*.so.* $(TARGET_DIR)/usr/lib/
-	# We don't need no stinking Sql libraries:
-	-rm $(TARGET_DIR)/usr/lib/*Sql*
-	# Nor Svg
-	-rm $(TARGET_DIR)/usr/lib/*Svg*
-	-$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/*.so.$(QTOPIA4_VERSION)
+	cp -dpf $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -dpf $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
+	cp -dpf $(QTOPIA4_TARGET_DIR)/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
+	# Install image plugins if they are built
+	if [ -d $(QTOPIA4_TARGET_DIR)/plugins/imageformats ]; then \
+		mkdir -p $(TARGET_DIR)/usr/lib/qt4/plugins; \
+		cp -dpfr $(QTOPIA4_TARGET_DIR)/plugins/imageformats $(TARGET_DIR)/usr/lib/qt4/plugins; \
+		$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/qt4/plugins/imageformats/*; \
+	fi
+	# Remove Sql libraries, not needed
+	-rm $(TARGET_DIR)/usr/lib/libQtSql*
+	# Remove Svg libraries, not needed
+	-rm $(TARGET_DIR)/usr/lib/libQtSvg*
+	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libQt*.so.$(QTOPIA4_VERSION)
 
 #################################
 #
@@ -205,13 +248,13 @@
 	$(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
+	touch $@
 
-# This configure is very tailored towards my needs.
+# This configure is very tailored towards a specific need.
 $(QTOPIA4_HOST_DIR)/.configured: $(QTOPIA4_HOST_DIR)/.unpacked
 	# Patching configure to get rid of some feature I dont want.
-	# (I don't want SQL either but there is no option for that at all.
-	# the SQL library will be built even without the plugins/drivers.
+	# (I don't want SQL either but there is no option for that at all,
+	# the SQL library will be built even without the plugins/drivers).
 ifneq ($(BR2_INET_IPV6),y)
 	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_HOST_DIR)/configure
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_HOST_DIR)/configure
@@ -237,7 +280,9 @@
 		-no-cups \
 		-no-nis \
 		-no-freetype \
-		-no-libmng \
+		-no-accessibility \
+		$(QTOPIA4_MNG_LIB) \
+		$(QTOPIA4_GIF_LIB) \
 		-no-sql-db2 \
 		-no-sql-ibase \
 		-no-sql-mysql \
@@ -247,26 +292,34 @@
 		-no-sql-sqlite \
 		-no-sql-sqlite2 \
 		-no-sql-tds \
-		-prefix $(QTOPIA4_STAGING_DIR) \
-		-prefix-install \
+		-prefix $(STAGING_DIR)/usr \
+		-docdir $(STAGING_DIR)/usr/share/qt4/doc \
+		-headerdir $(STAGING_DIR)/usr/include/qt4 \
+		-datadir $(STAGING_DIR)/usr/share/qt4 \
+		-plugindir $(STAGING_DIR)/usr/lib/qt4/plugins \
+		-translationdir $(STAGING_DIR)/usr/share/qt4/translations \
+		-sysconfdir $(STAGING_DIR)/etc/qt4 \
+		-examplesdir $(STAGING_DIR)/usr/share/qt4/examples \
+		-demosdir $(STAGING_DIR)/usr/share/qt4/demos \
+		-nomake examples \
+		-fast \
+		-no-rpath \
 		$(QTOPIA4_QT3SUPPORT) \
 		$(QTOPIA4_TSLIB) \
 		$(QTOPIA4_LARGEFILE) \
 		$(QTOPIA4_ENDIAN) \
 		$(QTOPIA4_APPROVE_GPL_LICENSE) \
-	)
-	touch $(QTOPIA4_HOST_DIR)/.configured
+	);
+	touch $@
 
 $(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_HOST_DIR)/.configured
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) \
-		-C $(QTOPIA4_HOST_DIR)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_HOST_DIR)
 
-$(QTOPIA4_STAGING_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		-C $(QTOPIA4_HOST_DIR) install
+$(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION): $(QTOPIA4_HOST_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_HOST_DIR) install
 
-qtopia4: uclibc zlib $(QTOPIA4_TSLIB_DEP) \
-		$(QTOPIA4_STAGING_DIR)/lib/libQtCore.so.$(QTOPIA4_VERSION) \
+qtopia4: uclibc zlib $(QTOPIA4_DEP_LIBS) \
+		$(STAGING_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION) \
 		$(TARGET_DIR)/usr/lib/libQtCore.so.$(QTOPIA4_VERSION)
 
 qtopia4-clean:

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[aldot at uclibc.org]

Author: aldot
Date: 2007-08-21 01:31:19 -0700 (Tue, 21 Aug 2007)
New Revision: 19600

Log:
- fix patching in the correct target cflags (Thiago A. Corr^ea)


Modified:
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2007-08-21 08:05:40 UTC (rev 19599)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2007-08-21 08:31:19 UTC (rev 19600)
@@ -129,7 +129,7 @@
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
 endif
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
-	$(SED) 's/-O2/$(TARGET_CFLAGS)/' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
@@ -217,7 +217,7 @@
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_HOST_DIR)/configure
 endif
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_HOST_DIR)/configure
-	$(SED) 's/-O2/$(TARGET_CFLAGS)/' $(QTOPIA4_HOST_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+	$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_HOST_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
 		$(QTOPIA4_HOST_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_HOST_DIR); rm -rf config.cache; \

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ulf at uclibc.org]

Author: ulf
Date: 2007-07-28 10:26:18 -0700 (Sat, 28 Jul 2007)
New Revision: 19303

Log:
Add colourdepth support to Qtopia config

Modified:
   trunk/buildroot/package/qtopia4/Config.in
   trunk/buildroot/package/qtopia4/qtopia4.mk


Changeset:
Modified: trunk/buildroot/package/qtopia4/Config.in
===================================================================
--- trunk/buildroot/package/qtopia4/Config.in	2007-07-28 17:14:06 UTC (rev 19302)
+++ trunk/buildroot/package/qtopia4/Config.in	2007-07-28 17:26:18 UTC (rev 19303)
@@ -12,14 +12,42 @@
 
 config BR2_PACKAGE_QTOPIA4_DEBUG
         bool "Compile with debug support"
-        default y 
+        default y
 	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,17 +55,25 @@
 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.
 
 config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
         bool "Compatibility with Qt3"
-        default y 
+        default y
 	depends BR2_PACKAGE_QTOPIA4
         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

Modified: trunk/buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- trunk/buildroot/package/qtopia4/qtopia4.mk	2007-07-28 17:14:06 UTC (rev 19302)
+++ trunk/buildroot/package/qtopia4/qtopia4.mk	2007-07-28 17:26:18 UTC (rev 19303)
@@ -2,15 +2,15 @@
 #
 # qtopia4 (Qtopia Core 4)
 # http://www.trolltech.com/
-# 
+#
 # This makefile composed by Thomas Lundquist <thomasez@zelow.no>
 #
 # There is two versions built, one for the target and one for
 # staging. The target version is built in the staging_dir and the
 # staging version in the toolchain_dir.
 #
-# BTW, this uses alot of FPU calls and it's pretty slow if you use 
-# the kernels FPU emulation so it's better to choose soft float in the 
+# BTW, this uses alot of FPU calls and it's pretty slow if you use
+# the kernels FPU emulation so it's better to choose soft float in the
 # buildroot config (and uClibc.config of course, if you have your own.)
 #
 ######################################################################
@@ -40,15 +40,19 @@
 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
 
-# If you want extra tweaking you can copy 
+endif
+
+# If you want extra tweaking you can copy
 # $(QTOPIA4_TARGET_DIR)/src/corelib/global/qconfig-myfile.h
-# to the qtopia4 packages directory (where this .mk file is) and 
+# to the qtopia4 packages directory (where this .mk file is) and
 # remove the comment.
 # QTOPIA4_QCONFIG_COMMAND:=-qconfig myfile
 #
-# For the options you can set in this file, look at 
+# For the options you can set in this file, look at
 # $(QTOPIA4_TARGET_DIR)/src/corelib/global/qfeatures.txt
 #
 QTOPIA4_QCONFIG_FILE:=package/qtopia4/qconfig-myfile.h
@@ -81,6 +85,12 @@
 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,12 +115,14 @@
 
 $(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.
 $(QTOPIA4_TARGET_DIR)/.configured: $(QTOPIA4_TARGET_DIR)/.unpacked
 	# Patching configure to get rid of some feature I dont want.
-	# (I don't want SQL either but there is no option for that at all. 
+	# (I don't want SQL either but there is no option for that at all.
 	# the SQL library will be built even without the plugins/drivers.
 ifneq ($(BR2_INET_IPV6),y)
 	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_TARGET_DIR)/configure
@@ -119,7 +131,7 @@
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
 	$(SED) 's/-O2/$(TARGET_CFLAGS)/' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
-	 	$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+		$(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
 		PATH=$(TARGET_PATH) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -133,7 +145,7 @@
 		-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 @@
 		-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,12 +203,14 @@
 
 $(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.
 $(QTOPIA4_HOST_DIR)/.configured: $(QTOPIA4_HOST_DIR)/.unpacked
 	# Patching configure to get rid of some feature I dont want.
-	# (I don't want SQL either but there is no option for that at all. 
+	# (I don't want SQL either but there is no option for that at all.
 	# the SQL library will be built even without the plugins/drivers.
 ifneq ($(BR2_INET_IPV6),y)
 	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_HOST_DIR)/configure
@@ -206,7 +219,7 @@
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_HOST_DIR)/configure
 	$(SED) 's/-O2/$(TARGET_CFLAGS)/' $(QTOPIA4_HOST_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
 	-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
-	 	$(QTOPIA4_HOST_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+		$(QTOPIA4_HOST_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
 	(cd $(QTOPIA4_HOST_DIR); rm -rf config.cache; \
 		PATH=$(TARGET_PATH) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -220,7 +233,7 @@
 		-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 @@
 		-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
 

[Buildroot] svn commit: trunk/buildroot/package/qtopia4

[ulf at uclibc.org]

Author: ulf
Date: 2007-07-28 08:41:26 -0700 (Sat, 28 Jul 2007)
New Revision: 19292

Log:
Add AVR32 patch for Qtopia

Added:
   trunk/buildroot/package/qtopia4/qtopia-4.2.2-add-avr32-arch.patch


Changeset:

Sorry, the patch is too large to include (6144 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=19292