[ptxdist] [libnl] Problems with version 1.1, version bump
Hi, I am trying to port an PTXbase linux distribution for x86 to an Freescale i.MX53 QSB (Loco). I have upgraded our build server from Debian Lenny to Squeeze, the Toolchain from 1.99.3 to 2011.03.0 (including the changes of mkl/OSELAS.Toolchain.git) and PTXdist from 2011.01.0 to 2011.04.1. Since then libnl does not build anymore. I attached the build log, right now I fixed the problem by upgrading to libnl 3.0 (patch is attached). Regards Marius targetinstall_libnl.log Description: Binary data 0001-libnl-version-bump-1.1-3.0.patch Description: Binary data -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [libnl] Problems with version 1.1, version bump
Am 28.04.2011 11:29, schrieb Robert Schwebel: On Thu, Apr 28, 2011 at 11:11:35AM +0200, Michael Olbrich wrote: On Wed, Apr 27, 2011 at 03:43:11PM +0200, Marius Brehler wrote: I have upgraded our build server from Debian Lenny to Squeeze, the Toolchain from 1.99.3 to 2011.03.0 (including the changes of mkl/OSELAS.Toolchain.git) and PTXdist from 2011.01.0 to 2011.04.1. Since then libnl does not build anymore. I attached the build log, right now I fixed the problem by upgrading to libnl 3.0 (patch is attached). This breaks the option LIBNL_MONITOR as nl-monitor is not installed. I'm not sure how usefull this is. rsc: you introduced this option, what do you think? patch or don't install it? patch. I think nl-monitor is useful if you want to check what's going on on a system. I modified my patch, so the problem with the nl-monitor should be solved. Regards Marius >From 8c748e6b91c579418571c09d6f823cd23e6267c9 Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Thu, 28 Apr 2011 12:30:30 +0200 Subject: [PATCH] libnl: version bump: 1.1 -> 3.0 --- rules/libnl.make |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/libnl.make b/rules/libnl.make index a52a1cd..fa7f35b 100644 --- a/rules/libnl.make +++ b/rules/libnl.make @@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_LIBNL) += libnl # # Paths and names # -LIBNL_VERSION := 1.1 +LIBNL_VERSION := 3.0 LIBNL := libnl-$(LIBNL_VERSION) LIBNL_SUFFIX := tar.gz -LIBNL_URL := http://people.suug.ch/~tgr/libnl/files/$(LIBNL).$(LIBNL_SUFFIX) +LIBNL_URL := http://www.infradead.org/~tgr/libnl/files/$(LIBNL).$(LIBNL_SUFFIX) LIBNL_SOURCE := $(SRCDIR)/$(LIBNL).$(LIBNL_SUFFIX) LIBNL_DIR := $(BUILDDIR)/$(LIBNL) @@ -60,7 +60,7 @@ $(STATEDIR)/libnl.targetinstall: @$(call install_lib, libnl, 0, 0, 0644, libnl) ifdef PTXCONF_LIBNL_MONITOR - @$(call install_copy, libnl, 0, 0, 0755, -, /usr/sbin/nl-monitor) + @$(call install_copy, libnl, 0, 0, 0755, ${LIBNL_DIR}/src/nl-monitor, /usr/sbin/nl-monitor) endif # genl-ctrl-dump -- 1.7.2.5 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [libnl] Problems with version 1.1, version bump
Am 29.04.2011 11:16, schrieb Michael Olbrich: Hi, On Wed, Apr 27, 2011 at 03:43:11PM +0200, Marius Brehler wrote: I am trying to port an PTXbase linux distribution for x86 to an Freescale i.MX53 QSB (Loco). I have upgraded our build server from Debian Lenny to Squeeze, the Toolchain from 1.99.3 to 2011.03.0 (including the changes of mkl/OSELAS.Toolchain.git) and PTXdist from 2011.01.0 to 2011.04.1. Since then libnl does not build anymore. I attached the build log, right now I fixed the problem by upgrading to libnl 3.0 (patch is attached). unfortunately libnl 3.0 is not compatible to 1.1. This breaks other packages. Well libnl 3.0 seems to work fine for me, at least everything builds fine on our buildserver. But if it breaks other package, I think you should drop my patch. From what I can see in the logfile, gcc picks the wrong header files. Try this: $ ptxdist clean libnl $ ptxdist prepare libnl edit platform-/build-target/libnl-1.1/Makefile.rules and remove "@echo " CC $<"; \' so you can see parameters for gcc. $ ptxdist compile libnl I noticed that $ ptxdist clean $ ptxdist targetinstall libnl works and the build of libnl 1.1 is successful. But if I run $ ptxdist go libnl 1.1 fails to build. I followed your instructions and removed the line from the Makefile.rules file for boath cases. Except of the errors as in the build log I attached in my first mail, there are no differences between the two builds logs: http://linux.sungazer.de/log/libnl__clean_go.log http://linux.sungazer.de/log/libnl__clean_targetinstall.log Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [libnl] Problems with version 1.1, version bump
Am 29.04.2011 17:29, schrieb Michael Olbrich: On Fri, Apr 29, 2011 at 04:59:33PM +0200, Marius Brehler wrote: Am 29.04.2011 11:16, schrieb Michael Olbrich: On Wed, Apr 27, 2011 at 03:43:11PM +0200, Marius Brehler wrote: I am trying to port an PTXbase linux distribution for x86 to an Freescale i.MX53 QSB (Loco). I have upgraded our build server from Debian Lenny to Squeeze, the Toolchain >from 1.99.3 to 2011.03.0 (including the changes of mkl/OSELAS.Toolchain.git) and PTXdist from 2011.01.0 to 2011.04.1. Since then libnl does not build anymore. I attached the build log, right now I fixed the problem by upgrading to libnl 3.0 (patch is attached). unfortunately libnl 3.0 is not compatible to 1.1. This breaks other packages. Well libnl 3.0 seems to work fine for me, at least everything builds fine on our buildserver. But if it breaks other package, I think you should drop my patch. From what I can see in the logfile, gcc picks the wrong header files. Try this: $ ptxdist clean libnl $ ptxdist prepare libnl edit platform-/build-target/libnl-1.1/Makefile.rules and remove "@echo " CC $<"; \' so you can see parameters for gcc. $ ptxdist compile libnl I noticed that $ ptxdist clean $ ptxdist targetinstall libnl works and the build of libnl 1.1 is successful. But if I run $ ptxdist go libnl 1.1 fails to build. I followed your instructions and removed the line from the Makefile.rules file for boath cases. Except of the errors as in the build log I attached in my first mail, there are no differences between the two builds logs: http://linux.sungazer.de/log/libnl__clean_go.log http://linux.sungazer.de/log/libnl__clean_targetinstall.log Hmmm, did you modify libnl.make in some way? The "-I/home/autobuild/busch-linux/platform-arm/sysroot-target/kernel-headers/include" should not be there. No, it has not been modified. I just checked it and it is the original libml.make which is distributed with ptxdist-2011.04.1. Unfortunately we use a kernel with freescale patches for the i.MX53 QSB and I have written a ruleset for xorg-driver-video-imx where 'export CFLAGS=-I$(KERNEL_HEADERS_DIR)/include' is called. Actually the build of the video driver is disabled in the ptxconf at the moment. I'll check if it sticks together after the weekend. Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [libnl] Problems with version 1.1, version bump
Am 29.04.2011 18:18, schrieb Marius Brehler: Am 29.04.2011 17:29, schrieb Michael Olbrich: On Fri, Apr 29, 2011 at 04:59:33PM +0200, Marius Brehler wrote: Am 29.04.2011 11:16, schrieb Michael Olbrich: On Wed, Apr 27, 2011 at 03:43:11PM +0200, Marius Brehler wrote: I am trying to port an PTXbase linux distribution for x86 to an Freescale i.MX53 QSB (Loco). I have upgraded our build server from Debian Lenny to Squeeze, the Toolchain >from 1.99.3 to 2011.03.0 (including the changes of mkl/OSELAS.Toolchain.git) and PTXdist from 2011.01.0 to 2011.04.1. Since then libnl does not build anymore. I attached the build log, right now I fixed the problem by upgrading to libnl 3.0 (patch is attached). unfortunately libnl 3.0 is not compatible to 1.1. This breaks other packages. Well libnl 3.0 seems to work fine for me, at least everything builds fine on our buildserver. But if it breaks other package, I think you should drop my patch. From what I can see in the logfile, gcc picks the wrong header files. Try this: $ ptxdist clean libnl $ ptxdist prepare libnl edit platform-/build-target/libnl-1.1/Makefile.rules and remove "@echo " CC $<"; \' so you can see parameters for gcc. $ ptxdist compile libnl I noticed that $ ptxdist clean $ ptxdist targetinstall libnl works and the build of libnl 1.1 is successful. But if I run $ ptxdist go libnl 1.1 fails to build. I followed your instructions and removed the line from the Makefile.rules file for boath cases. Except of the errors as in the build log I attached in my first mail, there are no differences between the two builds logs: http://linux.sungazer.de/log/libnl__clean_go.log http://linux.sungazer.de/log/libnl__clean_targetinstall.log Hmmm, did you modify libnl.make in some way? The "-I/home/autobuild/busch-linux/platform-arm/sysroot-target/kernel-headers/include" should not be there. No, it has not been modified. I just checked it and it is the original libml.make which is distributed with ptxdist-2011.04.1. Unfortunately we use a kernel with freescale patches for the i.MX53 QSB and I have written a ruleset for xorg-driver-video-imx where 'export CFLAGS=-I$(KERNEL_HEADERS_DIR)/include' is called. Actually the build of the video driver is disabled in the ptxconf at the moment. I'll check if it sticks together after the weekend. Regards Hi, your hint was correct. The "-I/home/autobuild/busch-linux/platform-arm/sysroot-target/kernel-headers/include" should not be there. The call of 'export CFLAGS=-I$(KERNEL_HEADERS_DIR)/include' in my rules/xorg-driver-video-imx.make file caused this problem. I did not know that ptxdist parses all *.make files before building the project, even if a package is not choosen to build. The build of libnl with 'ptxdist clean; ptxdist targeinstall libnl' did work, because the kernel was not build before, so the 'sysroot-target/kernel-headers/include' dir was not existing. After removing my makefile everthing seems to be fine. I'll find a cleaner way for the CFLAGS in my makefile and won't copy from the freescale ltib makefiles next time ;) Thank you very much for your help. Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Generate images/root.ext3
Hello, at the moment ptxdist seems not to be able to generate an ext3 root image. It is possible to convert the ext2 image to an ext3 image. Therefor it is nessecary to run "tune2fs -j " to create the journal and "fsck.ext3 -yf" to set the filesystem revision level from 0 to 1. The only problem is that your normaly need to be root to use tune2fs and fsck.ext3. I'll have to write at least a small script for my own use, but it would be nicer to integrate it into ptxdist. If there is no problem with the need of root rights (sudo?) and you think it would be a nice feature for ptxdist, I will take a look on how to "adapt" the rules/post/image_ext2.make for ext3 image generation. Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] Qt 4.7
Hi, because we have to use Qt 4.7, I have ported most of the patches written for Qt 4.6.3 to work with Qt 4.7.2. I also added a menu entry to the qt4.in to give the user the choise which version of Qt to build (4.6 or 4.7) and I modified the makefile to recognize this choise. Is their any interest to adopt this changes to PTXdist? In this caise, I would clean up my patches a little bit and would send them afterwards to this mailinglist. Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] Offer choise between Qt 4.6 and Qt 4.7
From: Marius Brehler Date: Wed, 8 Jun 2011 12:30:25 +0200 Subject: [PATCH] Offer choice between Qt 4.6 and Qt 4.7. This patch adds the choise which Qt version should be build. Signed-off-by: Marius Brehler --- rules/qt4.in | 18 ++ rules/qt4.make |7 +++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/rules/qt4.in b/rules/qt4.in index b24cd7d..ca6c1cc 100644 --- a/rules/qt4.in +++ b/rules/qt4.in @@ -46,6 +46,24 @@ menuconfig QT4 if QT4 +choice + prompt "qt version " + default QT4_VERSION_46 + + config QT_VERSION_46 + bool + prompt "4.6" + help + Build Qt 4.6. + + config QT_VERSION_47 + bool + prompt "4.7" + help + Build Qt 4.7. + +endchoice + menu "build options " config QT4_SHARED diff --git a/rules/qt4.make b/rules/qt4.make index 2ac0e9c..885bddd 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -2,6 +2,7 @@ # # Copyright (C) 2008 by Juergen Beisert # 2009 Michael Olbrich +# 2011 Marius Brehler # # See CREDITS for details about who has contributed to this project. # @@ -17,8 +18,14 @@ PACKAGES-$(PTXCONF_QT4) += qt4 # # Paths and names # +ifdef PTXCONF_QT4_VERSION_47 +QT4_VERSION:= 4.7.2 +QT4_MD5:= 66b992f5c21145df08c99d21847f4fdb +else QT4_VERSION:= 4.6.3 QT4_MD5:= 5c69f16d452b0bb3d44bc3c10556c072 +endif + QT4:= qt-everywhere-opensource-src-$(QT4_VERSION) QT4_SUFFIX := tar.gz QT4_URL:= http://get.qt.nokia.com/qt/source/$(QT4).$(QT4_SUFFIX) -- 1.7.4.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/3] Qt 4.7.2
I adopted the patches which were written for Qt 4.6.3 to appliy Qt 4.7.3. The patch '0006-fix-zlib-handling-for-host-tools.patch' is not needed for Qt 4.7 any more and I did not ported the '0007-Hack-disable-Wl-gc-sections-on-ppc.patch' to work with Qt 4.7 yet. Only the patch 0002 and 0004 were adjusted, the others can be copied from Qt 4.6.3 patchset. --- From: Marius Brehler Date: Thu, 9 Jun 2011 09:12:49 +0200 Subject: [PATCH] Add series for Qt 4.7.2. --- patches/qt-everywhere-opensource-src-4.7.2/series |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) create mode 100644 patches/qt-everywhere-opensource-src-4.7.2/series diff --git a/patches/qt-everywhere-opensource-src-4.7.2/series b/patches/qt-everywhere-opensource-src-4.7.2/series new file mode 100644 index 000..d90c3ad --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.7.2/series @@ -0,0 +1,7 @@ +0001-mkspec-for-ptxdist.patch +0002-disable-ordered-compiling.patch +0003-Hack-hide-cursor-during-startup.patch +0004-add-missing-subdir.patch +0005-Fix-dnd-issue-on-QWS.patch +0008-qmake-make-sure-local-include-dirs-come-first.patch +0009-phonon-fix-colors-for-video-on-qgraphicsview.patch -- 1.7.4.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/3] Qt 4.7.2
From: Marius Brehler Date: Wed, 8 Jun 2011 11:18:43 +0200 Subject: [PATCH] disable ordered compiling. Modified Michael Olbrich's patch for Qt 4.6.3 to work with Qt 4.7.2: By default all modules are compiled in a predefined order. This breaks when building not all modules. This patch disables ordered building. As a result qmake generates the correct dependancies. --- projects.pro |1 - src/src.pro |6 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects.pro b/projects.pro index f94e1de..b34cc35 100644 --- a/projects.pro +++ b/projects.pro @@ -2,7 +2,6 @@ # Main projectfile # -CONFIG += ordered TEMPLATE = subdirs cross_compile: CONFIG += nostrip diff --git a/src/src.pro b/src/src.pro index 060f48b..b970149 100644 --- a/src/src.pro +++ b/src/src.pro @@ -105,12 +105,13 @@ src_webkit_declarative.target = sub-webkitdeclarative src_qt3support.depends = src_gui src_xml src_network src_sql src_tools_idc.depends = src_corelib # target defined in tools.pro src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro - src_phonon.depends = src_gui + src_phonon.depends = src_gui src_network src_multimedia.depends = src_gui contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl src_tools_activeqt.depends = src_tools_idc src_gui src_declarative.depends = src_gui src_script src_network - src_plugins.depends = src_gui src_sql src_svg + src_plugins.depends = src_gui src_sql src_declarative + contains(QT_CONFIG, svg):src_plugins.depends += src_svg contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS src_s60installs.depends -= src_s60installs @@ -134,6 +135,7 @@ src_webkit_declarative.target = sub-webkitdeclarative src_declarative.depends += src_opengl src_webkit.depends += src_opengl } + contains(QT_CONFIG, phonon):src_plugins.depends += src_phonon contains(QT_CONFIG, xmlpatterns) { src_declarative.depends += src_xmlpatterns src_webkit.depends += src_xmlpatterns -- 1.7.2.5 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 3/3] Qt 4.7.2
From: Marius Brehler Date: Fri, 20 May 2011 16:47:22 +0200 Subject: [PATCH] add missing subdir Modified Michael Olbrich's patch for Qt 4.6.3 to work with Qt 4.7.2: "widgets" is missing from SUBDIRS and wont be commpiled. This patch addes it. --- examples/tutorials/tutorials.pro |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro index 34723c2..2d00b9a 100644 --- a/examples/tutorials/tutorials.pro +++ b/examples/tutorials/tutorials.pro @@ -1,5 +1,6 @@ TEMPLATE = subdirs SUBDIRS = \ + widgets \ addressbook \ modelview -- 1.7.2.5 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Qt 4.7
On 06/08/11 18:09, Bernhard Walle wrote: * Tim Sander [2011-06-08 16:39]: Hi Marius because we have to use Qt 4.7, I have ported most of the patches written for Qt 4.6.3 to work with Qt 4.7.2. I also added a menu entry to the qt4.in to give the user the choise which version of Qt to build (4.6 or 4.7) and I modified the makefile to recognize this choise. Is their any interest to adopt this changes to PTXdist? In this caise, I would clean up my patches a little bit and would send them afterwards to this mailinglist. I for one would be interested in your changes. +1. Okay, sent my patches to the ML. Hope the format of the patches is okay. Best Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Qt 4.7
On 06/10/11 08:01, ayserd yawsedr wrote: Hi, Im new to ptxdist. Could you please tell me what to do with this file to get Qt4.7? Thanks in advance! Hi, sorry for my late answer, we had holiday yesterday and I did have the time to answer before the weekend. In this mail I'll give you a short explanation howto apply the patches and which files have to be copied. Please note that the patches are not in ptxdist yet. So I'll describe the clean way to add the patches to your local project and not to ptxdist in general. # Copy the qt4 rule files to your local project: mkdir /YOURPROJECT/rules # if not existing cp /usr/local/lib/ptxdist-2011.06.0/rules/qt4.* /YOURPROJECT/rules/ # Apply patch, which offers choice which version of Qt to build cd /YOURPROJECT/ patch -p1 < /PathToPatch/ptxdist/0001-Offer-choice-between-Qt-4.6-and-Qt-4.7.patch # Apply patch, which creates series file. # This file contains a list which patches should be applied when building Qt. mkdir /YOURPROJECT/patches # if not existing patch -p1 < /PathToPatch/ptxdist/0001-Add-series-for-Qt-4.7.2.patch # Copy my patches to /YOURPROJECT/patches/qt-everywhere-opensource-src-4.7.2/ cp /PathToPatch/0002-disable-ordered-compiling.patch \ /YOURPROJECT/patches/qt-everywhere-opensource-src-4.7.2/ cp /PathToPatch/0004-add-missing-subdir.patch \ /YOURPROJECT/patches/qt-everywhere-opensource-src-4.7.2/ # Copy the following patches from # /usr/local/lib/ptxdist-2011.06.0/patches/qt-everywhere-opensource-src-4.6.3/ to # /YOURPROJECT/patches/qt-everywhere-opensource-src-4.7.2/ 0001-mkspec-for-ptxdist.patch 0003-Hack-hide-cursor-during-startup.patch 0005-Fix-dnd-issue-on-QWS.patch 0008-qmake-make-sure-local-include-dirs-come-first.patch 0009-phonon-fix-colors-for-video-on-qgraphicsview.patch Hope this helps. Best Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] Qt 4.7
On 06/28/11 19:29, darth vader wrote: Hi, I tried the steps above but this is not working for me ( I use ptxdist-2010.08.0). What do I have to do to get Qt4.7 running here? Thanks in advance. Hi, I did the steps I described before ;-) You need to be more detailed if you expect help. The makefile was only tested with ptxdist-2011.05.0, ptxdist-2010.08.0 might be to old. Anyway, I propose to use the ptxdist git repository as Qt 4.7.3 was added a short time before. Regards Marius PS: Please use your real name as sender and try to avoid top posting. -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] libdrm: version bump 2.4.23 -> 2.4.26
Version bump of libdrm. Needed for newer mesalib versions. Signed-off-by: Marius Brehler --- rules/libdrm.in |1 + rules/libdrm.make |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/libdrm.in b/rules/libdrm.in index 471b618..fda0fff 100644 --- a/rules/libdrm.in +++ b/rules/libdrm.in @@ -5,6 +5,7 @@ menuconfig LIBDRM prompt "libdrm" select LIBC_RT select LIBPTHREAD_STUBS + select LIBPCIACCESS help This library provides an user-level interface to the DRM device. It is needed for x.org. diff --git a/rules/libdrm.make b/rules/libdrm.make index 51872c0..ef42876 100644 --- a/rules/libdrm.make +++ b/rules/libdrm.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm # # Paths and names # -LIBDRM_VERSION := 2.4.23 -LIBDRM_MD5 := 82b116a4fc80d44fafe80af9b53100cb +LIBDRM_VERSION := 2.4.26 +LIBDRM_MD5 := 4ae2666aca6b78b20d36a4e64ce5556b LIBDRM := libdrm-$(LIBDRM_VERSION) LIBDRM_SUFFIX := tar.gz LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 0/2] Failing to build Qt4 with OpenGL ES 2.0
Hi, I tried to build Qt4/X11 with OpenGL ES 2.0 support, but it failed with the following error message: The OpenGL ES 2.0 functionality test failed! You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL_ES2, QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBS_OPENGL_ES2 in The QMAKE_LIBS_OPENGL_ES2 var should be set by line 46 of qmake.make -e "s#@QMAKE_LIBS_OPENGL_ES2@#$(strip $(QT4_QMAKE_LIBS_OPENGL_ES2))#g" \ but a look into the modified 'mkspecs/linux-ptx-g++/qmake.conf' shows an empty 'QMAKE_LIBS_OPENGL_ES2 =' entriy. It seems that QT4_QMAKE_LIBS_OPENGL_ES2 isn't set anywhere. The patches I have attached, fix this and work at least with QT 4.7.2. I will also test with the makefiles for Qt 4.7.3 form git. I think a similar change has to be made for OpenGL ES 1.x and ES 1.x CL. Where should the QT4 vars be added? To the makefile? Best Regards Marius Marius Brehler (2): Make Qt compile with OPENGL_ES2 support. Add patch to qt4 to compile with OpenGL ES2. .../0009-Add-OPENGL_ES2-libdir-and-incdir.patch| 38 rules/qt4.make |6 +++ 2 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 patches/qt-everywhere-opensource-src-4.7.3/0009-Add-OPENGL_ES2-libdir-and-incdir.patch -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] Make Qt compile with OPENGL_ES2 support.
Signed-off-by: Marius Brehler --- rules/qt4.make |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/rules/qt4.make b/rules/qt4.make index efeb016..f234bf6 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -31,6 +31,10 @@ QT4_LICENSE := GPL3, LGPLv2.1 # Extract # +QT4_QMAKE_LIBS_OPENGL_ES2 := "-lGLESv2" +QT4_QMAKE_INCDIR_OPENGL_ES2 := "$(SYSROOT)/usr/include/GLES2" +QT4_QMAKE_LIBDIR_OPENGL_ES2 := "$(SYSROOT)/usr/lib" + $(STATEDIR)/qt4.extract: @$(call targetinfo) @$(call clean, $(QT4_DIR)) @@ -43,6 +47,8 @@ $(STATEDIR)/qt4.extract: -e "s#@LDFLAGS@#$(strip $(CROSS_LDFLAGS))#g" \ -e "s#@QMAKE_LIBS_OPENGL_ES1@#$(strip $(QT4_QMAKE_LIBS_OPENGL_ES1))#g" \ -e "s#@QMAKE_LIBS_OPENGL_ES1CL@#$(strip $(QT4_QMAKE_LIBS_OPENGL_ES1CL))#g" \ + -e "s#@QMAKE_INCDIR_OPENGL_ES2@#$(strip $(QT4_QMAKE_INCDIR_OPENGL_ES2))#g" \ + -e "s#@QMAKE_LIBDIR_OPENGL_ES2@#$(strip $(QT4_QMAKE_LIBDIR_OPENGL_ES2))#g" \ -e "s#@QMAKE_LIBS_OPENGL_ES2@#$(strip $(QT4_QMAKE_LIBS_OPENGL_ES2))#g" \ $$file > $${file%%.in}; \ done -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] Add patch to qt4 to compile with OpenGL ES2.
Signed-off-by: Marius Brehler --- .../0009-Add-OPENGL_ES2-libdir-and-incdir.patch| 38 1 files changed, 38 insertions(+), 0 deletions(-) create mode 100644 patches/qt-everywhere-opensource-src-4.7.3/0009-Add-OPENGL_ES2-libdir-and-incdir.patch diff --git a/patches/qt-everywhere-opensource-src-4.7.3/0009-Add-OPENGL_ES2-libdir-and-incdir.patch b/patches/qt-everywhere-opensource-src-4.7.3/0009-Add-OPENGL_ES2-libdir-and-incdir.patch new file mode 100644 index 000..6b9d7bc --- /dev/null +++ b/patches/qt-everywhere-opensource-src-4.7.3/0009-Add-OPENGL_ES2-libdir-and-incdir.patch @@ -0,0 +1,38 @@ +From: Marius Brehler +Date: Thu, 30 Jun 2011 13:50:41 +0200 +Subject: [PATCH] Add OPENGL_ES2 libdir and incdir. + +--- + mkspecs/linux-ptx-g++/qmake.conf.in |2 ++ + mkspecs/qws/linux-ptx-g++/qmake.conf.in |2 ++ + 2 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/mkspecs/linux-ptx-g++/qmake.conf.in b/mkspecs/linux-ptx-g++/qmake.conf.in +index 495c53e..7c0a71d 100644 +--- a/mkspecs/linux-ptx-g++/qmake.conf.in b/mkspecs/linux-ptx-g++/qmake.conf.in +@@ -28,6 +28,8 @@ QMAKE_INCDIR_OPENGL = + QMAKE_LIBDIR_OPENGL = + QMAKE_LIBS_OPENGL_ES1CL = @QMAKE_LIBS_OPENGL_ES1CL@ + QMAKE_LIBS_OPENGL_ES1 = @QMAKE_LIBS_OPENGL_ES1@ ++QMAKE_INCDIR_OPENGL_ES2 = @QMAKE_INCDIR_OPENGL_ES2@ ++QMAKE_LIBDIR_OPENGL_ES2 = @QMAKE_LIBDIR_OPENGL_ES2@ + QMAKE_LIBS_OPENGL_ES2 = @QMAKE_LIBS_OPENGL_ES2@ + + # modifications to linux.conf +diff --git a/mkspecs/qws/linux-ptx-g++/qmake.conf.in b/mkspecs/qws/linux-ptx-g++/qmake.conf.in +index 6b5c824..dcfb591 100644 +--- a/mkspecs/qws/linux-ptx-g++/qmake.conf.in b/mkspecs/qws/linux-ptx-g++/qmake.conf.in +@@ -19,6 +19,8 @@ QMAKE_LFLAGS= @LDFLAGS@ + + QMAKE_LIBS_OPENGL_ES1CL = @QMAKE_LIBS_OPENGL_ES1CL@ + QMAKE_LIBS_OPENGL_ES1 = @QMAKE_LIBS_OPENGL_ES1@ ++QMAKE_INCDIR_OPENGL_ES2 = @QMAKE_INCDIR_OPENGL_ES2@ ++QMAKE_LIBDIR_OPENGL_ES2 = @QMAKE_LIBDIR_OPENGL_ES2@ + QMAKE_LIBS_OPENGL_ES2 = @QMAKE_LIBS_OPENGL_ES2@ + + # modifications to linux.conf +-- +1.7.2.5 + -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] libdrm: version bump 2.4.23 -> 2.4.26
On 06/29/11 15:26, Juergen Beisert wrote: Marius Brehler wrote: Version bump of libdrm. Needed for newer mesalib versions. Signed-off-by: Marius Brehler --- rules/libdrm.in |1 + rules/libdrm.make |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/libdrm.in b/rules/libdrm.in index 471b618..fda0fff 100644 --- a/rules/libdrm.in +++ b/rules/libdrm.in @@ -5,6 +5,7 @@ menuconfig LIBDRM prompt "libdrm" select LIBC_RT select LIBPTHREAD_STUBS + select LIBPCIACCESS Just a question: Will there ever be a chance to get this libdrm and libmesa run on a non-x86 platform? Well at least the EGL and OpenGL (ES) of mesalib should be buildable for other platforms or not? Best Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] qt4: Add option to compile with Accessibility support.
Needed for example to compile Qt Jambi. Signed-off-by: Marius Brehler --- rules/qt4.in |9 + rules/qt4.make |7 ++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/rules/qt4.in b/rules/qt4.in index bec21ab..5683907 100644 --- a/rules/qt4.in +++ b/rules/qt4.in @@ -77,6 +77,15 @@ choice Build Qt for X11 endchoice +config QT4_ACCESSIBILITY + bool + prompt "accessibility" + help + Compile Accessibility support. + +endmenu + + endmenu if QT4_PLATFORM_EMBEDDED diff --git a/rules/qt4.make b/rules/qt4.make index efeb016..71538a2 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -89,7 +89,6 @@ QT4_AUTOCONF := \ -release \ -no-rpath \ -no-fast \ - -no-accessibility \ -no-sql-ibase \ -no-sql-mysql \ -no-sql-odbc \ @@ -117,6 +116,12 @@ QT4_AUTOCONF := \ -make libs \ -nomake docs +ifdef PTXCONF_QT4_ACCESSIBILITY +QT4_AUTOCONF += -accessibility +else +QT4_AUTOCONF += -no-accessibility +endif + QT4_AUTOCONF-$(call ptx/ifdef, PTXCONF_ICONV,y,no) += iconv QT4_AUTOCONF-$(call ptx/ifdef, PTXCONF_GLOBAL_LARGE_FILE,y,no) += largefile -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] qt4: Add option to compile with Accessibility support.
Needed for example to compile Qt Jambi. Signed-off-by: Marius Brehler --- rules/qt4.in |6 ++ rules/qt4.make |2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/rules/qt4.in b/rules/qt4.in index bec21ab..4f8abe0 100644 --- a/rules/qt4.in +++ b/rules/qt4.in @@ -688,6 +688,12 @@ config QT4_DBUS_LINK Build Qt dbus support and link to libdbus-1. endchoice +config QT4_ACCESSIBILITY + bool + prompt "accessibility" + help + Compile Accessibility support. + endmenu config QT4_BUILD_OPENGL diff --git a/rules/qt4.make b/rules/qt4.make index efeb016..cdb6db2 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -89,7 +89,6 @@ QT4_AUTOCONF := \ -release \ -no-rpath \ -no-fast \ - -no-accessibility \ -no-sql-ibase \ -no-sql-mysql \ -no-sql-odbc \ @@ -117,6 +116,7 @@ QT4_AUTOCONF := \ -make libs \ -nomake docs +QT4_AUTOCONF-$(call ptx,ifdef, PTXCONF_QT4_ACCESSIBILITY,y,no) += accessibility QT4_AUTOCONF-$(call ptx/ifdef, PTXCONF_ICONV,y,no) += iconv QT4_AUTOCONF-$(call ptx/ifdef, PTXCONF_GLOBAL_LARGE_FILE,y,no) += largefile -- 1.7.5.4 -- ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 0/2] Failing to build Qt4 with OpenGL ES 2.0
Hello Michael, On 07/03/11 13:52, Michael Olbrich wrote: On Thu, Jun 30, 2011 at 03:18:33PM +0200, Marius Brehler wrote: I tried to build Qt4/X11 with OpenGL ES 2.0 support, but it failed with the following error message: The OpenGL ES 2.0 functionality test failed! You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL_ES2, QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBS_OPENGL_ES2 in The QMAKE_LIBS_OPENGL_ES2 var should be set by line 46 of qmake.make -e "s#@QMAKE_LIBS_OPENGL_ES2@#$(strip $(QT4_QMAKE_LIBS_OPENGL_ES2))#g" \ but a look into the modified 'mkspecs/linux-ptx-g++/qmake.conf' shows an empty 'QMAKE_LIBS_OPENGL_ES2 =' entriy. It seems that QT4_QMAKE_LIBS_OPENGL_ES2 isn't set anywhere. The patches I have attached, fix this and work at least with QT 4.7.2. I will also test with the makefiles for Qt 4.7.3 form git. I think a similar change has to be made for OpenGL ES 1.x and ES 1.x CL. Where should the QT4 vars be added? To the makefile? The problem is, that there are no 'correct' values for these variables. I aggree regarding the QMAKE_LIBS_OPENGL_ES2 value, but aren't the paths to the libraries and includes fixed? The current version is the result of me playing with some OpenGL ES implementation. The idea is to set QT4_QMAKE_LIBS_OPENGL_ES2 etc. in the package that provides it, or some kind of helper package. I suppose that there is no need for a helper package and that it is a good idea to set the OPENGL variables within the package that provides the libs. If you need this to be more flexible, maybe we should change this to just @QMAKE_EXTRAS@ in qmake.conf and the set that as needed, e.g. QT4_QMAKE_EXTRAS := "QT4_QMAKE_LIBS_OPENGL_ES2 = -lfoo\nQMAKE_INCDIR_OPENGL_ES2 = $(SYSROOT)/..." For me it would be enough to set these two additional variables, but give other developers more flexibility (for example to compile with OpenGL or OpenGL ES 1) and to shift around of adding every single variable itself, I would prefere your suggestion to add a QMAKE_EXTRA 'option'. Are you willing to add the changes or should I attach a clean patch within one of my next emails. Best Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] host-retrotranslator: add new host package
Retrotranslator is a tool that makes Java applications compatible with Java 1.4, Java 1.3 and other environments. Signed-off-by: Marius Brehler --- rules/host-retrotranslator.in |7 +++ rules/host-retrotranslator.make | 97 +++ 2 files changed, 104 insertions(+), 0 deletions(-) create mode 100644 rules/host-retrotranslator.in create mode 100644 rules/host-retrotranslator.make diff --git a/rules/host-retrotranslator.in b/rules/host-retrotranslator.in new file mode 100644 index 000..622d058 --- /dev/null +++ b/rules/host-retrotranslator.in @@ -0,0 +1,7 @@ +## SECTION=hosttools_noprompt + +config HOST_RETROTRANSLATOR + tristate + prompt "retrotranslator" + help + Retrotranslator is a tool that makes Java applications compatible with Java 1.4, Java 1.3 and other environments. diff --git a/rules/host-retrotranslator.make b/rules/host-retrotranslator.make new file mode 100644 index 000..5edba8e --- /dev/null +++ b/rules/host-retrotranslator.make @@ -0,0 +1,97 @@ +# -*-makefile-*- +# +# Copyright (C) 2011 by Marius Brehler +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_RETROTRANSLATOR) += host-retrotranslator + +ifdef PTXCONF_HOST_RETROTRANSLATOR +ifeq ($(shell test -x $(PTXCONF_SETUP_JAVA_SDK)/bin/java || echo no),no) +$(warning *** java is mandatory to run retrotranslator) +$(warning *** please run 'ptxdist setup' and set the path to the java sdk) +$(error ) +endif +endif + + +# +# Paths and names +# +HOST_RETROTRANSLATOR_VERSION := 1.2.9 +HOST_RETROTRANSLATOR := Retrotranslator-$(HOST_RETROTRANSLATOR_VERSION)-bin +HOST_RETROTRANSLATOR_SUFFIX:= zip +HOST_RETROTRANSLATOR_URL := http://downloads.sourceforge.net/retrotranslator/$(HOST_RETROTRANSLATOR).$(HOST_RETROTRANSLATOR_SUFFIX) +HOST_RETROTRANSLATOR_SOURCE:= $(SRCDIR)/$(HOST_RETROTRANSLATOR).$(HOST_RETROTRANSLATOR_SUFFIX) +HOST_RETROTRANSLATOR_DIR := $(HOST_BUILDDIR)/$(HOST_RETROTRANSLATOR) +HOST_RETROTRANSLATOR_LICENSE := BSD + +# +# Get +# + +$(HOST_RETROTRANSLATOR_SOURCE): + @$(call targetinfo) + @$(call get, HOST_RETROTRANSLATOR) + +# +# Prepare +# + +#HOST_RETROTRANSLATOR_CONF_ENV := $(HOST_ENV) + +# +# autoconf +# +#HOST_RETROTRANSLATOR_CONF_TOOL:= autoconf +#HOST_RETROTRANSLATOR_CONF_OPT := $(HOST_AUTOCONF) + +#$(STATEDIR)/host-retrotranslator.prepare: +# @$(call targetinfo) +# @$(call clean, $(HOST_RETROTRANSLATOR_DIR)/config.cache) +# cd $(HOST_RETROTRANSLATOR_DIR) && \ +# $(HOST_RETROTRANSLATOR_PATH) $(HOST_RETROTRANSLATOR_ENV) \ +# ./configure $(HOST_RETROTRANSLATOR_CONF_OPT) +# @$(call touch) + +# +# Compile +# + +$(STATEDIR)/host-retrotranslator.compile: + @$(call targetinfo) + @$(call touch) + +# +# Install +# + +$(STATEDIR)/host-retrotranslator.install: + @$(call targetinfo) + install -D "$(HOST_RETROTRANSLATOR_DIR)/retrotranslator-transformer-$(HOST_RETROTRANSLATOR_VERSION).jar" "$(PTXDIST_SYSROOT_HOST)/share/retrotranslator/retrotranslator-transformer-$(HOST_RETROTRANSLATOR_VERSION).jar" + install -D "$(HOST_RETROTRANSLATOR_DIR)/retrotranslator-runtime-$(HOST_RETROTRANSLATOR_VERSION).jar" "$(PTXDIST_SYSROOT_HOST)/share/retrotranslator/retrotranslator-runtime-$(HOST_RETROTRANSLATOR_VERSION).jar" + install -D "$(HOST_RETROTRANSLATOR_DIR)/retrotranslator-runtime13-$(HOST_RETROTRANSLATOR_VERSION).jar" "$(PTXDIST_SYSROOT_HOST)/share/retrotranslator/retrotranslator-runtime13-$(HOST_RETROTRANSLATOR_VERSION).jar" + install -D "$(HOST_RETROTRANSLATOR_DIR)/backport-util-concurrent-3.1.jar" "$(PTXDIST_SYSROOT_HOST)/share/retrotranslator/backport-util-concurrent-3.1.jar" + install -D "$(HOST_RETROTRANSLATOR_DIR)/backport-util-concurrent-java12-3.1.jar" "$(PTXDIST_SYSROOT_HOST)/share/retrotranslator/backport-util-concurrent-java12-3.1.jar" + @$(call touch) + + + + +# +# Clean +# ---
Re: [ptxdist] [PATCH 0/2] Failing to build Qt4 with OpenGL ES 2.0
Hi, On 07/06/11 09:35, Michael Olbrich wrote: On Mon, Jul 04, 2011 at 09:35:03AM +0200, Marius Brehler wrote: On 07/03/11 13:52, Michael Olbrich wrote: On Thu, Jun 30, 2011 at 03:18:33PM +0200, Marius Brehler wrote: I tried to build Qt4/X11 with OpenGL ES 2.0 support, but it failed with the following error message: The OpenGL ES 2.0 functionality test failed! You might need to modify the include and library search paths by editing QMAKE_INCDIR_OPENGL_ES2, QMAKE_LIBDIR_OPENGL_ES2 and QMAKE_LIBS_OPENGL_ES2 in The QMAKE_LIBS_OPENGL_ES2 var should be set by line 46 of qmake.make -e "s#@QMAKE_LIBS_OPENGL_ES2@#$(strip $(QT4_QMAKE_LIBS_OPENGL_ES2))#g" \ but a look into the modified 'mkspecs/linux-ptx-g++/qmake.conf' shows an empty 'QMAKE_LIBS_OPENGL_ES2 =' entriy. It seems that QT4_QMAKE_LIBS_OPENGL_ES2 isn't set anywhere. The patches I have attached, fix this and work at least with QT 4.7.2. I will also test with the makefiles for Qt 4.7.3 form git. I think a similar change has to be made for OpenGL ES 1.x and ES 1.x CL. Where should the QT4 vars be added? To the makefile? The problem is, that there are no 'correct' values for these variables. I aggree regarding the QMAKE_LIBS_OPENGL_ES2 value, but aren't the paths to the libraries and includes fixed? Only if your talking about Mesa. For most embedded targets this will be some closed source stuff, where you should expect anything. And you should only need extra paths if its outside the default: $(SYSROOT)/{usr/,}{lib,include} Okay, currently we use Freescale closed stuff, which provids the libs and headers. As it seems to be based on Mesa path are the same as in Mesa package. But you're right, other vendors may use different paths. The current version is the result of me playing with some OpenGL ES implementation. The idea is to set QT4_QMAKE_LIBS_OPENGL_ES2 etc. in the package that provides it, or some kind of helper package. I suppose that there is no need for a helper package and that it is a good idea to set the OPENGL variables within the package that provides the libs. The helper would only be necessary if you don't want to touch the package providing the opengl. As it is useful to write a local package for the opengl stuff, it shouldn't be necessary to create a helper package. At least I have no stomach ache with touching my package. If you need this to be more flexible, maybe we should change this to just @QMAKE_EXTRAS@ in qmake.conf and the set that as needed, e.g. QT4_QMAKE_EXTRAS := "QT4_QMAKE_LIBS_OPENGL_ES2 = -lfoo\nQMAKE_INCDIR_OPENGL_ES2 = $(SYSROOT)/..." For me it would be enough to set these two additional variables, but give other developers more flexibility (for example to compile with OpenGL or OpenGL ES 1) and to shift around of adding every single variable itself, I would prefere your suggestion to add a QMAKE_EXTRA 'option'. Are you willing to add the changes or should I attach a clean patch within one of my next emails. Send a patch please. I'll do so. Best Regards Marius -- ptxdist mailing list ptxdist@pengutronix.de