* [PATCH 01/13] arago-dylan-config: add meta-qt5/master and dependency on meta-ruby from meta-oe
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 13:38 ` Cooper Jr., Franklin
2013-10-02 12:52 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 02/13] matrix-gui-browser: replace ${S} with ${B} in do_install() Denys Dmytriyenko
` (12 subsequent siblings)
13 siblings, 2 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
configs/arago-dylan-config.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configs/arago-dylan-config.txt b/configs/arago-dylan-config.txt
index 59055bd..f5fb666 100644
--- a/configs/arago-dylan-config.txt
+++ b/configs/arago-dylan-config.txt
@@ -3,7 +3,8 @@
bitbake,git://git.openembedded.org/bitbake,master,bbb4fa427739912ff3b87379bf629066f6662458,layers=
meta-arago,git://arago-project.org/git/meta-arago.git,master,HEAD,layers=meta-arago-distro:meta-arago-extras
-meta-openembedded,git://git.openembedded.org/meta-openembedded,dylan,HEAD,layers=toolchain-layer:meta-networking:meta-oe
+meta-qt5,git://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
+meta-openembedded,git://git.openembedded.org/meta-openembedded,dylan,HEAD,layers=toolchain-layer:meta-networking:meta-ruby:meta-oe
meta-ti,git://arago-project.org/git/meta-ti.git,dylan,HEAD,layers=
meta-linaro,git://git.linaro.org/openembedded/meta-linaro.git,dylan,HEAD,layers=meta-linaro-toolchain
oe-core,git://git.openembedded.org/openembedded-core,dylan,HEAD,layers=meta
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 01/13] arago-dylan-config: add meta-qt5/master and dependency on meta-ruby from meta-oe
2013-10-01 7:11 ` [PATCH 01/13] arago-dylan-config: add meta-qt5/master and dependency on meta-ruby from meta-oe Denys Dmytriyenko
@ 2013-10-01 13:38 ` Cooper Jr., Franklin
2013-10-01 13:42 ` Denys Dmytriyenko
2013-10-02 12:52 ` Maupin, Chase
1 sibling, 1 reply; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:38 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
Ack. I'm hoping ruby doesn't need to be installed on the fs for Qt to run.
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> configs/arago-dylan-config.txt | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/configs/arago-dylan-config.txt b/configs/arago-dylan-config.txt
> index 59055bd..f5fb666 100644
> --- a/configs/arago-dylan-config.txt
> +++ b/configs/arago-dylan-config.txt
> @@ -3,7 +3,8 @@
>
> bitbake,git://git.openembedded.org/bitbake,master,bbb4fa427739912ff3b87379bf629066f6662458,layers=
> meta-arago,git://arago-project.org/git/meta-arago.git,master,HEAD,layers=meta-arago-distro:meta-arago-extras
> -meta-openembedded,git://git.openembedded.org/meta-openembedded,dylan,HEAD,layers=toolchain-layer:meta-networking:meta-oe
> +meta-qt5,git://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
> +meta-openembedded,git://git.openembedded.org/meta-openembedded,dylan,HEAD,layers=toolchain-layer:meta-networking:meta-ruby:meta-oe
> meta-ti,git://arago-project.org/git/meta-ti.git,dylan,HEAD,layers=
> meta-linaro,git://git.linaro.org/openembedded/meta-linaro.git,dylan,HEAD,layers=meta-linaro-toolchain
> oe-core,git://git.openembedded.org/openembedded-core,dylan,HEAD,layers=meta
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 01/13] arago-dylan-config: add meta-qt5/master and dependency on meta-ruby from meta-oe
2013-10-01 13:38 ` Cooper Jr., Franklin
@ 2013-10-01 13:42 ` Denys Dmytriyenko
2013-10-01 16:37 ` Cooper Jr., Franklin
0 siblings, 1 reply; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 13:42 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
On Tue, Oct 01, 2013 at 01:38:57PM +0000, Cooper Jr., Franklin wrote:
> Ack. I'm hoping ruby doesn't need to be installed on the fs for Qt to run.
I believe the only dependency is ruby-native needed somewhere during the
build. At least I don't see it in the image or even there are not target
packages produced.
> > On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > configs/arago-dylan-config.txt | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/configs/arago-dylan-config.txt b/configs/arago-dylan-config.txt
> > index 59055bd..f5fb666 100644
> > --- a/configs/arago-dylan-config.txt
> > +++ b/configs/arago-dylan-config.txt
> > @@ -3,7 +3,8 @@
> >
> > bitbake,git://git.openembedded.org/bitbake,master,bbb4fa427739912ff3b87379bf629066f6662458,layers=
> > meta-arago,git://arago-project.org/git/meta-arago.git,master,HEAD,layers=meta-arago-distro:meta-arago-extras
> > -meta-openembedded,git://git.openembedded.org/meta-openembedded,dylan,HEAD,layers=toolchain-layer:meta-networking:meta-oe
> > +meta-qt5,git://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
> > +meta-openembedded,git://git.openembedded.org/meta-openembedded,dylan,HEAD,layers=toolchain-layer:meta-networking:meta-ruby:meta-oe
> > meta-ti,git://arago-project.org/git/meta-ti.git,dylan,HEAD,layers=
> > meta-linaro,git://git.linaro.org/openembedded/meta-linaro.git,dylan,HEAD,layers=meta-linaro-toolchain
> > oe-core,git://git.openembedded.org/openembedded-core,dylan,HEAD,layers=meta
> > --
> > 1.8.3.2
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 01/13] arago-dylan-config: add meta-qt5/master and dependency on meta-ruby from meta-oe
2013-10-01 13:42 ` Denys Dmytriyenko
@ 2013-10-01 16:37 ` Cooper Jr., Franklin
0 siblings, 0 replies; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 16:37 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org
> On Oct 1, 2013, at 8:42 AM, "Dmytriyenko, Denys" <denys@ti.com> wrote:
>
>> On Tue, Oct 01, 2013 at 01:38:57PM +0000, Cooper Jr., Franklin wrote:
>> Ack. I'm hoping ruby doesn't need to be installed on the fs for Qt to run.
>
> I believe the only dependency is ruby-native needed somewhere during the
> build. At least I don't see it in the image or even there are not target
> packages produced.
Awesome thanks for checking.
>
>
>>> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>>>
>>> From: Denys Dmytriyenko <denys@ti.com>
>>>
>>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>>> ---
>>> configs/arago-dylan-config.txt | 3 ++-
>>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/configs/arago-dylan-config.txt b/configs/arago-dylan-config.txt
>>> index 59055bd..f5fb666 100644
>>> --- a/configs/arago-dylan-config.txt
>>> +++ b/configs/arago-dylan-config.txt
>>> @@ -3,7 +3,8 @@
>>>
>>> bitbake,git://git.openembedded.org/bitbake,master,bbb4fa427739912ff3b87379bf629066f6662458,layers=
>>> meta-arago,git://arago-project.org/git/meta-arago.git,master,HEAD,layers=meta-arago-distro:meta-arago-extras
>>> -meta-openembedded,git://git.openembedded.org/meta-openembedded,dylan,HEAD,layers=toolchain-layer:meta-networking:meta-oe
>>> +meta-qt5,git://github.com/meta-qt5/meta-qt5.git,master,HEAD,layers=
>>> +meta-openembedded,git://git.openembedded.org/meta-openembedded,dylan,HEAD,layers=toolchain-layer:meta-networking:meta-ruby:meta-oe
>>> meta-ti,git://arago-project.org/git/meta-ti.git,dylan,HEAD,layers=
>>> meta-linaro,git://git.linaro.org/openembedded/meta-linaro.git,dylan,HEAD,layers=meta-linaro-toolchain
>>> oe-core,git://git.openembedded.org/openembedded-core,dylan,HEAD,layers=meta
>>> --
>>> 1.8.3.2
>>>
>>> _______________________________________________
>>> meta-arago mailing list
>>> meta-arago@arago-project.org
>>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 01/13] arago-dylan-config: add meta-qt5/master and dependency on meta-ruby from meta-oe
2013-10-01 7:11 ` [PATCH 01/13] arago-dylan-config: add meta-qt5/master and dependency on meta-ruby from meta-oe Denys Dmytriyenko
2013-10-01 13:38 ` Cooper Jr., Franklin
@ 2013-10-02 12:52 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 12:52 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 01/13] arago-dylan-config: add meta-
>qt5/master and dependency on meta-ruby from meta-oe
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> configs/arago-dylan-config.txt | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/configs/arago-dylan-config.txt b/configs/arago-dylan-
>config.txt
>index 59055bd..f5fb666 100644
>--- a/configs/arago-dylan-config.txt
>+++ b/configs/arago-dylan-config.txt
>@@ -3,7 +3,8 @@
>
>
>bitbake,git://git.openembedded.org/bitbake,master,bbb4fa427739912f
>f3b87379bf629066f6662458,layers=
> meta-arago,git://arago-project.org/git/meta-
>arago.git,master,HEAD,layers=meta-arago-distro:meta-arago-extras
>-meta-openembedded,git://git.openembedded.org/meta-
>openembedded,dylan,HEAD,layers=toolchain-layer:meta-
>networking:meta-oe
>+meta-qt5,git://github.com/meta-qt5/meta-
>qt5.git,master,HEAD,layers=
>+meta-openembedded,git://git.openembedded.org/meta-
>openembedded,dylan,HEAD,layers=toolchain-layer:meta-
>networking:meta-ruby:meta-oe
> meta-ti,git://arago-project.org/git/meta-
>ti.git,dylan,HEAD,layers=
> meta-linaro,git://git.linaro.org/openembedded/meta-
>linaro.git,dylan,HEAD,layers=meta-linaro-toolchain
> oe-core,git://git.openembedded.org/openembedded-
>core,dylan,HEAD,layers=meta
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 02/13] matrix-gui-browser: replace ${S} with ${B} in do_install()
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
2013-10-01 7:11 ` [PATCH 01/13] arago-dylan-config: add meta-qt5/master and dependency on meta-ruby from meta-oe Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-02 12:54 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 03/13] icu: overlay the latest version from oe-core/master Denys Dmytriyenko
` (11 subsequent siblings)
13 siblings, 1 reply; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Replcae ${S}ource with ${B}uild directory when installing the binary.
Normally B == S when the build output is in the same directory where sources
are, but it's better to use B for when build output is in a different location.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
index ecb97c2..0e508a0 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
@@ -7,7 +7,7 @@ SECTION = "multimedia"
# Make sure that QT font libraries have been installed
RDEPENDS_${PN} += "qt4-embedded-fonts"
-PR = "r1"
+PR = "r2"
SRCREV = "db2e6b10e5a14358b6120a4a28de2f9d591bc55c"
BRANCH ?= "master"
@@ -20,5 +20,5 @@ inherit qt4e
do_install() {
install -d ${D}/${bindir}
- install -m 0755 ${S}/matrix_browser ${D}/${bindir}
+ install -m 0755 ${B}/matrix_browser ${D}/${bindir}
}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 02/13] matrix-gui-browser: replace ${S} with ${B} in do_install()
2013-10-01 7:11 ` [PATCH 02/13] matrix-gui-browser: replace ${S} with ${B} in do_install() Denys Dmytriyenko
@ 2013-10-02 12:54 ` Maupin, Chase
0 siblings, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 12:54 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 02/13] matrix-gui-browser: replace
>${S} with ${B} in do_install()
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>Replcae ${S}ource with ${B}uild directory when installing the
Typo.
Aside from that
Acked-by: Chase Maupin <chase.maupin@ti.com>
>binary.
>Normally B == S when the build output is in the same directory
>where sources
>are, but it's better to use B for when build output is in a
>different location.
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb |
>4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser_2.0.bb
>index ecb97c2..0e508a0 100644
>--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser_2.0.bb
>+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser_2.0.bb
>@@ -7,7 +7,7 @@ SECTION = "multimedia"
> # Make sure that QT font libraries have been installed
> RDEPENDS_${PN} += "qt4-embedded-fonts"
>
>-PR = "r1"
>+PR = "r2"
>
> SRCREV = "db2e6b10e5a14358b6120a4a28de2f9d591bc55c"
> BRANCH ?= "master"
>@@ -20,5 +20,5 @@ inherit qt4e
>
> do_install() {
> install -d ${D}/${bindir}
>- install -m 0755 ${S}/matrix_browser ${D}/${bindir}
>+ install -m 0755 ${B}/matrix_browser ${D}/${bindir}
> }
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 03/13] icu: overlay the latest version from oe-core/master
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
2013-10-01 7:11 ` [PATCH 01/13] arago-dylan-config: add meta-qt5/master and dependency on meta-ruby from meta-oe Denys Dmytriyenko
2013-10-01 7:11 ` [PATCH 02/13] matrix-gui-browser: replace ${S} with ${B} in do_install() Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 13:10 ` Cooper Jr., Franklin
2013-10-02 12:55 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 04/13] icu: disable LDFLAGSICUDT that prevents loading libicudata.so Denys Dmytriyenko
` (10 subsequent siblings)
13 siblings, 2 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../icu/icu-51.2/icu-pkgdata-large-cmd.patch | 29 ++++++++++++
meta-arago-distro/recipes-support/icu/icu.inc | 55 ++++++++++++++++++++++
meta-arago-distro/recipes-support/icu/icu_51.2.bb | 13 +++++
3 files changed, 97 insertions(+)
create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
create mode 100644 meta-arago-distro/recipes-support/icu/icu.inc
create mode 100644 meta-arago-distro/recipes-support/icu/icu_51.2.bb
diff --git a/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch b/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
new file mode 100644
index 0000000..6e40659
--- /dev/null
+++ b/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
@@ -0,0 +1,29 @@
+pkgdata.cpp: use LARGE_BUFFER_MAX_SIZE for cmd
+
+Use LARGE_BUFFER_MAX_SIZE for cmd rather than SMALL_BUFFER_MAX_SIZE,
+otherwise there was a Segmentation fault error when the command line is
+long, this should be a misplay since other cmd uses
+LARGE_BUFFER_MAX_SIZE.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ tools/pkgdata/pkgdata.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp
+--- a/tools/pkgdata/pkgdata.cpp
++++ b/tools/pkgdata/pkgdata.cpp
+@@ -1019,7 +1019,7 @@ normal_symlink_mode:
+
+ static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) {
+ int32_t result = 0;
+- char cmd[SMALL_BUFFER_MAX_SIZE];
++ char cmd[LARGE_BUFFER_MAX_SIZE];
+
+ sprintf(cmd, "cd %s && %s %s %s%s%s",
+ targetDir,
+--
+1.7.10.4
+
diff --git a/meta-arago-distro/recipes-support/icu/icu.inc b/meta-arago-distro/recipes-support/icu/icu.inc
new file mode 100644
index 0000000..e3944cd
--- /dev/null
+++ b/meta-arago-distro/recipes-support/icu/icu.inc
@@ -0,0 +1,55 @@
+SUMMARY = "International Component for Unicode libraries"
+DESCRIPTION = "The International Component for Unicode (ICU) is a mature, portable set of C/C++ and Java libraries for Unicode support, software internationalization (I18N) and globalization (G11N), giving applications the same results on all platforms."
+HOMEPAGE = "http://site.icu-project.org/"
+
+LICENSE = "ICU"
+DEPENDS = "icu-native"
+DEPENDS_class-native = ""
+
+S = "${WORKDIR}/icu/source"
+STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
+
+PARALLEL_MAKE = ""
+CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0"
+
+inherit autotools pkgconfig binconfig
+
+# ICU needs the native build directory as an argument to its --with-cross-build option when
+# cross-compiling. Taken the situation that different builds may share a common sstate-cache
+# into consideration, the native build directory needs to be staged.
+EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
+EXTRA_OECONF_class-native = ""
+
+# ICU puts custom m4 autoconf functions in aclocal.m4.
+# However, this file is deleted in our build system.
+# To make it work, we copy aclocal.m4 to acinclude.m4.
+# This is a bug of ICU. See bug reference:
+# http://bugs.icu-project.org/trac/ticket/9790
+do_configure_prepend() {
+ [ -f ${S}/acinclude.m4 ] || cp ${S}/aclocal.m4 ${S}/acinclude.m4
+}
+
+do_install_append_class-native() {
+ mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
+ cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config
+ cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config
+ cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE}
+ cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE}
+ cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
+
+}
+
+PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
+
+FILES_${PN}-dev += "${libdir}/${BPN}/"
+
+FILES_libicudata = "${libdir}/libicudata.so.*"
+FILES_libicuuc = "${libdir}/libicuuc.so.*"
+FILES_libicui18n = "${libdir}/libicui18n.so.*"
+FILES_libicule = "${libdir}/libicule.so.*"
+FILES_libiculx = "${libdir}/libiculx.so.*"
+FILES_libicutu = "${libdir}/libicutu.so.*"
+FILES_libicuio = "${libdir}/libicuio.so.*"
+
+BBCLASSEXTEND = "native"
+
diff --git a/meta-arago-distro/recipes-support/icu/icu_51.2.bb b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
new file mode 100644
index 0000000..1278d22
--- /dev/null
+++ b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
@@ -0,0 +1,13 @@
+require icu.inc
+
+LIC_FILES_CHKSUM = "file://../license.html;md5=443a74288a72fad9069a74e7637192c1"
+
+PR = "r0"
+
+BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz"
+SRC_URI = "${BASE_SRC_URI} \
+ file://icu-pkgdata-large-cmd.patch \
+ "
+
+SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
+SRC_URI[sha256sum] = "deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 03/13] icu: overlay the latest version from oe-core/master
2013-10-01 7:11 ` [PATCH 03/13] icu: overlay the latest version from oe-core/master Denys Dmytriyenko
@ 2013-10-01 13:10 ` Cooper Jr., Franklin
2013-10-02 12:55 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:10 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
Ack
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> .../icu/icu-51.2/icu-pkgdata-large-cmd.patch | 29 ++++++++++++
> meta-arago-distro/recipes-support/icu/icu.inc | 55 ++++++++++++++++++++++
> meta-arago-distro/recipes-support/icu/icu_51.2.bb | 13 +++++
> 3 files changed, 97 insertions(+)
> create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
> create mode 100644 meta-arago-distro/recipes-support/icu/icu.inc
> create mode 100644 meta-arago-distro/recipes-support/icu/icu_51.2.bb
>
> diff --git a/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch b/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
> new file mode 100644
> index 0000000..6e40659
> --- /dev/null
> +++ b/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
> @@ -0,0 +1,29 @@
> +pkgdata.cpp: use LARGE_BUFFER_MAX_SIZE for cmd
> +
> +Use LARGE_BUFFER_MAX_SIZE for cmd rather than SMALL_BUFFER_MAX_SIZE,
> +otherwise there was a Segmentation fault error when the command line is
> +long, this should be a misplay since other cmd uses
> +LARGE_BUFFER_MAX_SIZE.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> +---
> + tools/pkgdata/pkgdata.cpp | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp
> +--- a/tools/pkgdata/pkgdata.cpp
> ++++ b/tools/pkgdata/pkgdata.cpp
> +@@ -1019,7 +1019,7 @@ normal_symlink_mode:
> +
> + static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) {
> + int32_t result = 0;
> +- char cmd[SMALL_BUFFER_MAX_SIZE];
> ++ char cmd[LARGE_BUFFER_MAX_SIZE];
> +
> + sprintf(cmd, "cd %s && %s %s %s%s%s",
> + targetDir,
> +--
> +1.7.10.4
> +
> diff --git a/meta-arago-distro/recipes-support/icu/icu.inc b/meta-arago-distro/recipes-support/icu/icu.inc
> new file mode 100644
> index 0000000..e3944cd
> --- /dev/null
> +++ b/meta-arago-distro/recipes-support/icu/icu.inc
> @@ -0,0 +1,55 @@
> +SUMMARY = "International Component for Unicode libraries"
> +DESCRIPTION = "The International Component for Unicode (ICU) is a mature, portable set of C/C++ and Java libraries for Unicode support, software internationalization (I18N) and globalization (G11N), giving applications the same results on all platforms."
> +HOMEPAGE = "http://site.icu-project.org/"
> +
> +LICENSE = "ICU"
> +DEPENDS = "icu-native"
> +DEPENDS_class-native = ""
> +
> +S = "${WORKDIR}/icu/source"
> +STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
> +
> +PARALLEL_MAKE = ""
> +CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0"
> +
> +inherit autotools pkgconfig binconfig
> +
> +# ICU needs the native build directory as an argument to its --with-cross-build option when
> +# cross-compiling. Taken the situation that different builds may share a common sstate-cache
> +# into consideration, the native build directory needs to be staged.
> +EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
> +EXTRA_OECONF_class-native = ""
> +
> +# ICU puts custom m4 autoconf functions in aclocal.m4.
> +# However, this file is deleted in our build system.
> +# To make it work, we copy aclocal.m4 to acinclude.m4.
> +# This is a bug of ICU. See bug reference:
> +# http://bugs.icu-project.org/trac/ticket/9790
> +do_configure_prepend() {
> + [ -f ${S}/acinclude.m4 ] || cp ${S}/aclocal.m4 ${S}/acinclude.m4
> +}
> +
> +do_install_append_class-native() {
> + mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
> + cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config
> + cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config
> + cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE}
> + cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE}
> + cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
> +
> +}
> +
> +PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx libicutu libicuio"
> +
> +FILES_${PN}-dev += "${libdir}/${BPN}/"
> +
> +FILES_libicudata = "${libdir}/libicudata.so.*"
> +FILES_libicuuc = "${libdir}/libicuuc.so.*"
> +FILES_libicui18n = "${libdir}/libicui18n.so.*"
> +FILES_libicule = "${libdir}/libicule.so.*"
> +FILES_libiculx = "${libdir}/libiculx.so.*"
> +FILES_libicutu = "${libdir}/libicutu.so.*"
> +FILES_libicuio = "${libdir}/libicuio.so.*"
> +
> +BBCLASSEXTEND = "native"
> +
> diff --git a/meta-arago-distro/recipes-support/icu/icu_51.2.bb b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
> new file mode 100644
> index 0000000..1278d22
> --- /dev/null
> +++ b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
> @@ -0,0 +1,13 @@
> +require icu.inc
> +
> +LIC_FILES_CHKSUM = "file://../license.html;md5=443a74288a72fad9069a74e7637192c1"
> +
> +PR = "r0"
> +
> +BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz"
> +SRC_URI = "${BASE_SRC_URI} \
> + file://icu-pkgdata-large-cmd.patch \
> + "
> +
> +SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
> +SRC_URI[sha256sum] = "deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc"
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 03/13] icu: overlay the latest version from oe-core/master
2013-10-01 7:11 ` [PATCH 03/13] icu: overlay the latest version from oe-core/master Denys Dmytriyenko
2013-10-01 13:10 ` Cooper Jr., Franklin
@ 2013-10-02 12:55 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 12:55 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
Can you add a commit message for why this is overlayerd and when it can be removed?
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 03/13] icu: overlay the latest
>version from oe-core/master
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> .../icu/icu-51.2/icu-pkgdata-large-cmd.patch | 29
>++++++++++++
> meta-arago-distro/recipes-support/icu/icu.inc | 55
>++++++++++++++++++++++
> meta-arago-distro/recipes-support/icu/icu_51.2.bb | 13 +++++
> 3 files changed, 97 insertions(+)
> create mode 100644 meta-arago-distro/recipes-support/icu/icu-
>51.2/icu-pkgdata-large-cmd.patch
> create mode 100644 meta-arago-distro/recipes-support/icu/icu.inc
> create mode 100644 meta-arago-distro/recipes-
>support/icu/icu_51.2.bb
>
>diff --git a/meta-arago-distro/recipes-support/icu/icu-51.2/icu-
>pkgdata-large-cmd.patch b/meta-arago-distro/recipes-
>support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
>new file mode 100644
>index 0000000..6e40659
>--- /dev/null
>+++ b/meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-
>large-cmd.patch
>@@ -0,0 +1,29 @@
>+pkgdata.cpp: use LARGE_BUFFER_MAX_SIZE for cmd
>+
>+Use LARGE_BUFFER_MAX_SIZE for cmd rather than
>SMALL_BUFFER_MAX_SIZE,
>+otherwise there was a Segmentation fault error when the command
>line is
>+long, this should be a misplay since other cmd uses
>+LARGE_BUFFER_MAX_SIZE.
>+
>+Upstream-Status: Pending
>+
>+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>+---
>+ tools/pkgdata/pkgdata.cpp | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+diff --git a/tools/pkgdata/pkgdata.cpp
>b/tools/pkgdata/pkgdata.cpp
>+--- a/tools/pkgdata/pkgdata.cpp
>++++ b/tools/pkgdata/pkgdata.cpp
>+@@ -1019,7 +1019,7 @@ normal_symlink_mode:
>+
>+ static int32_t pkg_installLibrary(const char *installDir, const
>char *targetDir, UBool noVersion) {
>+ int32_t result = 0;
>+- char cmd[SMALL_BUFFER_MAX_SIZE];
>++ char cmd[LARGE_BUFFER_MAX_SIZE];
>+
>+ sprintf(cmd, "cd %s && %s %s %s%s%s",
>+ targetDir,
>+--
>+1.7.10.4
>+
>diff --git a/meta-arago-distro/recipes-support/icu/icu.inc b/meta-
>arago-distro/recipes-support/icu/icu.inc
>new file mode 100644
>index 0000000..e3944cd
>--- /dev/null
>+++ b/meta-arago-distro/recipes-support/icu/icu.inc
>@@ -0,0 +1,55 @@
>+SUMMARY = "International Component for Unicode libraries"
>+DESCRIPTION = "The International Component for Unicode (ICU) is a
>mature, portable set of C/C++ and Java libraries for Unicode
>support, software internationalization (I18N) and globalization
>(G11N), giving applications the same results on all platforms."
>+HOMEPAGE = "http://site.icu-project.org/"
>+
>+LICENSE = "ICU"
>+DEPENDS = "icu-native"
>+DEPENDS_class-native = ""
>+
>+S = "${WORKDIR}/icu/source"
>+STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
>+
>+PARALLEL_MAKE = ""
>+CPPFLAGS_append_libc-uclibc = " -DU_TIMEZONE=0"
>+
>+inherit autotools pkgconfig binconfig
>+
>+# ICU needs the native build directory as an argument to its --
>with-cross-build option when
>+# cross-compiling. Taken the situation that different builds may
>share a common sstate-cache
>+# into consideration, the native build directory needs to be
>staged.
>+EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
>+EXTRA_OECONF_class-native = ""
>+
>+# ICU puts custom m4 autoconf functions in aclocal.m4.
>+# However, this file is deleted in our build system.
>+# To make it work, we copy aclocal.m4 to acinclude.m4.
>+# This is a bug of ICU. See bug reference:
>+# http://bugs.icu-project.org/trac/ticket/9790
>+do_configure_prepend() {
>+ [ -f ${S}/acinclude.m4 ] || cp ${S}/aclocal.m4
>${S}/acinclude.m4
>+}
>+
>+do_install_append_class-native() {
>+ mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
>+ cp -r ${B}/config/icucross.mk
>${D}/${STAGING_ICU_DIR_NATIVE}/config
>+ cp -r ${B}/config/icucross.inc
>${D}/${STAGING_ICU_DIR_NATIVE}/config
>+ cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE}
>+ cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE}
>+ cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
>+
>+}
>+
>+PACKAGES =+ "libicudata libicuuc libicui18n libicule libiculx
>libicutu libicuio"
>+
>+FILES_${PN}-dev += "${libdir}/${BPN}/"
>+
>+FILES_libicudata = "${libdir}/libicudata.so.*"
>+FILES_libicuuc = "${libdir}/libicuuc.so.*"
>+FILES_libicui18n = "${libdir}/libicui18n.so.*"
>+FILES_libicule = "${libdir}/libicule.so.*"
>+FILES_libiculx = "${libdir}/libiculx.so.*"
>+FILES_libicutu = "${libdir}/libicutu.so.*"
>+FILES_libicuio = "${libdir}/libicuio.so.*"
>+
>+BBCLASSEXTEND = "native"
>+
>diff --git a/meta-arago-distro/recipes-support/icu/icu_51.2.bb
>b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
>new file mode 100644
>index 0000000..1278d22
>--- /dev/null
>+++ b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
>@@ -0,0 +1,13 @@
>+require icu.inc
>+
>+LIC_FILES_CHKSUM =
>"file://../license.html;md5=443a74288a72fad9069a74e7637192c1"
>+
>+PR = "r0"
>+
>+BASE_SRC_URI = "http://download.icu-
>project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz"
>+SRC_URI = "${BASE_SRC_URI} \
>+ file://icu-pkgdata-large-cmd.patch \
>+ "
>+
>+SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
>+SRC_URI[sha256sum] =
>"deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc"
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 04/13] icu: disable LDFLAGSICUDT that prevents loading libicudata.so
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (2 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 03/13] icu: overlay the latest version from oe-core/master Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 13:13 ` Cooper Jr., Franklin
2013-10-02 12:55 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 05/13] qtbase: configure and patch Qt5 qtbase for use with SGX in Arago Denys Dmytriyenko
` (9 subsequent siblings)
13 siblings, 2 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
It seems there is a problem loading libicudata.so library (on ARM?) when it's
built with default -nodefaultlibs and -nostdlib LDFLAGS, disable them.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch | 12 ++++++++++++
meta-arago-distro/recipes-support/icu/icu_51.2.bb | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch
diff --git a/meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch b/meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch
new file mode 100644
index 0000000..b26d388
--- /dev/null
+++ b/meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch
@@ -0,0 +1,12 @@
+diff -uNr icu-orig/config/mh-linux icu/config/mh-linux
+--- icu-orig/config/mh-linux 2013-05-23 16:02:40.000000000 -0400
++++ icu/config/mh-linux 2013-09-30 00:19:13.772269345 -0400
+@@ -21,7 +21,7 @@
+ LD_RPATH_PRE = -Wl,-rpath,
+
+ ## These are the library specific LDFLAGS
+-LDFLAGSICUDT=-nodefaultlibs -nostdlib
++#LDFLAGSICUDT=-nodefaultlibs -nostdlib
+
+ ## Compiler switch to embed a library name
+ # The initial tab in the next line is to prevent icu-config from reading it.
diff --git a/meta-arago-distro/recipes-support/icu/icu_51.2.bb b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
index 1278d22..9a6fd70 100644
--- a/meta-arago-distro/recipes-support/icu/icu_51.2.bb
+++ b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
@@ -2,11 +2,12 @@ require icu.inc
LIC_FILES_CHKSUM = "file://../license.html;md5=443a74288a72fad9069a74e7637192c1"
-PR = "r0"
+PR = "r1"
BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz"
SRC_URI = "${BASE_SRC_URI} \
file://icu-pkgdata-large-cmd.patch \
+ file://disable-ldflagsicudt.patch \
"
SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 04/13] icu: disable LDFLAGSICUDT that prevents loading libicudata.so
2013-10-01 7:11 ` [PATCH 04/13] icu: disable LDFLAGSICUDT that prevents loading libicudata.so Denys Dmytriyenko
@ 2013-10-01 13:13 ` Cooper Jr., Franklin
2013-10-02 12:55 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:13 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
Ack
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> It seems there is a problem loading libicudata.so library (on ARM?) when it's
> built with default -nodefaultlibs and -nostdlib LDFLAGS, disable them.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> .../recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch | 12 ++++++++++++
> meta-arago-distro/recipes-support/icu/icu_51.2.bb | 3 ++-
> 2 files changed, 14 insertions(+), 1 deletion(-)
> create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch
>
> diff --git a/meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch b/meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch
> new file mode 100644
> index 0000000..b26d388
> --- /dev/null
> +++ b/meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch
> @@ -0,0 +1,12 @@
> +diff -uNr icu-orig/config/mh-linux icu/config/mh-linux
> +--- icu-orig/config/mh-linux 2013-05-23 16:02:40.000000000 -0400
> ++++ icu/config/mh-linux 2013-09-30 00:19:13.772269345 -0400
> +@@ -21,7 +21,7 @@
> + LD_RPATH_PRE = -Wl,-rpath,
> +
> + ## These are the library specific LDFLAGS
> +-LDFLAGSICUDT=-nodefaultlibs -nostdlib
> ++#LDFLAGSICUDT=-nodefaultlibs -nostdlib
> +
> + ## Compiler switch to embed a library name
> + # The initial tab in the next line is to prevent icu-config from reading it.
> diff --git a/meta-arago-distro/recipes-support/icu/icu_51.2.bb b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
> index 1278d22..9a6fd70 100644
> --- a/meta-arago-distro/recipes-support/icu/icu_51.2.bb
> +++ b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
> @@ -2,11 +2,12 @@ require icu.inc
>
> LIC_FILES_CHKSUM = "file://../license.html;md5=443a74288a72fad9069a74e7637192c1"
>
> -PR = "r0"
> +PR = "r1"
>
> BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz"
> SRC_URI = "${BASE_SRC_URI} \
> file://icu-pkgdata-large-cmd.patch \
> + file://disable-ldflagsicudt.patch \
> "
>
> SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 04/13] icu: disable LDFLAGSICUDT that prevents loading libicudata.so
2013-10-01 7:11 ` [PATCH 04/13] icu: disable LDFLAGSICUDT that prevents loading libicudata.so Denys Dmytriyenko
2013-10-01 13:13 ` Cooper Jr., Franklin
@ 2013-10-02 12:55 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 12:55 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 04/13] icu: disable LDFLAGSICUDT that
>prevents loading libicudata.so
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>It seems there is a problem loading libicudata.so library (on
>ARM?) when it's
>built with default -nodefaultlibs and -nostdlib LDFLAGS, disable
>them.
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> .../recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch | 12
>++++++++++++
> meta-arago-distro/recipes-support/icu/icu_51.2.bb | 3
>++-
> 2 files changed, 14 insertions(+), 1 deletion(-)
> create mode 100644 meta-arago-distro/recipes-support/icu/icu-
>51.2/disable-ldflagsicudt.patch
>
>diff --git a/meta-arago-distro/recipes-support/icu/icu-
>51.2/disable-ldflagsicudt.patch b/meta-arago-distro/recipes-
>support/icu/icu-51.2/disable-ldflagsicudt.patch
>new file mode 100644
>index 0000000..b26d388
>--- /dev/null
>+++ b/meta-arago-distro/recipes-support/icu/icu-51.2/disable-
>ldflagsicudt.patch
>@@ -0,0 +1,12 @@
>+diff -uNr icu-orig/config/mh-linux icu/config/mh-linux
>+--- icu-orig/config/mh-linux 2013-05-23 16:02:40.000000000 -0400
>++++ icu/config/mh-linux 2013-09-30 00:19:13.772269345 -0400
>+@@ -21,7 +21,7 @@
>+ LD_RPATH_PRE = -Wl,-rpath,
>+
>+ ## These are the library specific LDFLAGS
>+-LDFLAGSICUDT=-nodefaultlibs -nostdlib
>++#LDFLAGSICUDT=-nodefaultlibs -nostdlib
>+
>+ ## Compiler switch to embed a library name
>+ # The initial tab in the next line is to prevent icu-config from
>reading it.
>diff --git a/meta-arago-distro/recipes-support/icu/icu_51.2.bb
>b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
>index 1278d22..9a6fd70 100644
>--- a/meta-arago-distro/recipes-support/icu/icu_51.2.bb
>+++ b/meta-arago-distro/recipes-support/icu/icu_51.2.bb
>@@ -2,11 +2,12 @@ require icu.inc
>
> LIC_FILES_CHKSUM =
>"file://../license.html;md5=443a74288a72fad9069a74e7637192c1"
>
>-PR = "r0"
>+PR = "r1"
>
> BASE_SRC_URI = "http://download.icu-
>project.org/files/icu4c/${PV}/icu4c-51_2-src.tgz"
> SRC_URI = "${BASE_SRC_URI} \
> file://icu-pkgdata-large-cmd.patch \
>+ file://disable-ldflagsicudt.patch \
> "
>
> SRC_URI[md5sum] = "072e501b87065f3a0ca888f1b5165709"
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 05/13] qtbase: configure and patch Qt5 qtbase for use with SGX in Arago
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (3 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 04/13] icu: disable LDFLAGSICUDT that prevents loading libicudata.so Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 13:21 ` Cooper Jr., Franklin
2013-10-02 12:56 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 06/13] qtwebkit: add WebGL on eglfs patches Denys Dmytriyenko
` (8 subsequent siblings)
13 siblings, 2 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
* Enable gles2/eglfs and icu features
* Add slightly modified eglfs patches from Prabu
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../qt5/qtbase/0001-qeglfswindow.cpp.patch | 56 ++++++++++++++++++++++
.../qt5/qtbase/0002-qeglfswindow.cpp.patch | 34 +++++++++++++
.../recipes-qt/qt5/qtbase_5.1.0.bbappend | 10 ++++
3 files changed, 100 insertions(+)
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch
new file mode 100644
index 0000000..b95b98e
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch
@@ -0,0 +1,56 @@
+--- qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp.orig 2013-08-09 23:29:18.253037952 +0530
++++ qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp 2013-08-09 23:41:18.509018405 +0530
+@@ -61,23 +61,32 @@ QEglFSWindow::QEglFSWindow(QWindow *w)
+ #endif
+ }
+
+ QEglFSWindow::~QEglFSWindow()
+ {
+ destroy();
+ }
+
++static EGLSurface __singleWindowSurface;
+ void QEglFSWindow::create()
+ {
+ if (m_window)
+ return;
+
+ setWindowState(Qt::WindowFullScreen);
+
++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::Capability::MultipleWindows) && __singleWindowSurface)
++ {
++ m_surface = __singleWindowSurface;
++#ifdef QEGL_EXTRA_DEBUG
++ qWarning("Surface recreate request, re-using %x\n", m_surface);
++#endif
++ return;
++ }
+ if (window()->type() == Qt::Desktop) {
+ QRect rect(QPoint(), QEglFSHooks::hooks()->screenSize());
+ QPlatformWindow::setGeometry(rect);
+ QWindowSystemInterface::handleGeometryChange(window(), rect);
+ return;
+ }
+
+ EGLDisplay display = (static_cast<QEglFSScreen *>(window()->screen()->handle()))->display();
+@@ -104,16 +113,20 @@ void QEglFSWindow::resetSurface()
+
+ m_window = QEglFSHooks::hooks()->createNativeWindow(QEglFSHooks::hooks()->screenSize(), m_format);
+ m_surface = eglCreateWindowSurface(display, m_config, m_window, NULL);
+ if (m_surface == EGL_NO_SURFACE) {
+ EGLint error = eglGetError();
+ eglTerminate(display);
+ qFatal("EGL Error : Could not create the egl surface: error = 0x%x\n", error);
+ }
++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::Capability::MultipleWindows))
++ {
++ __singleWindowSurface = m_surface;
++ }
+ }
+
+ void QEglFSWindow::destroy()
+ {
+ if (m_surface) {
+ EGLDisplay display = static_cast<QEglFSScreen *>(screen())->display();
+ eglDestroySurface(display, m_surface);
+ m_surface = 0;
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch
new file mode 100644
index 0000000..8d17348
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch
@@ -0,0 +1,34 @@
+--- qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp.old 2013-09-09 23:09:24.433774489 +0530
++++ qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp 2013-09-09 23:12:22.105766689 +0530
+@@ -54,30 +54,30 @@ QEglFSWindow::QEglFSWindow(QWindow *w)
+ , m_surface(0)
+ , m_window(0)
+ {
+ static int serialNo = 0;
+ m_winid = ++serialNo;
+ #ifdef QEGL_EXTRA_DEBUG
+ qWarning("QEglWindow %p: %p 0x%x\n", this, w, uint(m_winid));
+ #endif
++ setWindowState(Qt::WindowFullScreen);
+ }
+
+ QEglFSWindow::~QEglFSWindow()
+ {
+ destroy();
+ }
+
+ static EGLSurface __singleWindowSurface;
+ void QEglFSWindow::create()
+ {
+ if (m_window)
+ return;
+
+- setWindowState(Qt::WindowFullScreen);
+
+ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::Capability::MultipleWindows) && __singleWindowSurface)
+ {
+ m_surface = __singleWindowSurface;
+ #ifdef QEGL_EXTRA_DEBUG
+ qWarning("Surface recreate request, re-using %x\n", m_surface);
+ #endif
+ return;
diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend
new file mode 100644
index 0000000..8ae7706
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PACKAGECONFIG_GL = "gles2 icu"
+
+SRC_URI += " \
+ file://0001-qeglfswindow.cpp.patch \
+ file://0002-qeglfswindow.cpp.patch \
+"
+
+PR_append = "-arago0"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 05/13] qtbase: configure and patch Qt5 qtbase for use with SGX in Arago
2013-10-01 7:11 ` [PATCH 05/13] qtbase: configure and patch Qt5 qtbase for use with SGX in Arago Denys Dmytriyenko
@ 2013-10-01 13:21 ` Cooper Jr., Franklin
2013-10-02 12:56 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:21 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
Ack
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> * Enable gles2/eglfs and icu features
> * Add slightly modified eglfs patches from Prabu
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> .../qt5/qtbase/0001-qeglfswindow.cpp.patch | 56 ++++++++++++++++++++++
> .../qt5/qtbase/0002-qeglfswindow.cpp.patch | 34 +++++++++++++
> .../recipes-qt/qt5/qtbase_5.1.0.bbappend | 10 ++++
> 3 files changed, 100 insertions(+)
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend
>
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch
> new file mode 100644
> index 0000000..b95b98e
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch
> @@ -0,0 +1,56 @@
> +--- qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp.orig 2013-08-09 23:29:18.253037952 +0530
> ++++ qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp 2013-08-09 23:41:18.509018405 +0530
> +@@ -61,23 +61,32 @@ QEglFSWindow::QEglFSWindow(QWindow *w)
> + #endif
> + }
> +
> + QEglFSWindow::~QEglFSWindow()
> + {
> + destroy();
> + }
> +
> ++static EGLSurface __singleWindowSurface;
> + void QEglFSWindow::create()
> + {
> + if (m_window)
> + return;
> +
> + setWindowState(Qt::WindowFullScreen);
> +
> ++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::Capability::MultipleWindows) && __singleWindowSurface)
> ++ {
> ++ m_surface = __singleWindowSurface;
> ++#ifdef QEGL_EXTRA_DEBUG
> ++ qWarning("Surface recreate request, re-using %x\n", m_surface);
> ++#endif
> ++ return;
> ++ }
> + if (window()->type() == Qt::Desktop) {
> + QRect rect(QPoint(), QEglFSHooks::hooks()->screenSize());
> + QPlatformWindow::setGeometry(rect);
> + QWindowSystemInterface::handleGeometryChange(window(), rect);
> + return;
> + }
> +
> + EGLDisplay display = (static_cast<QEglFSScreen *>(window()->screen()->handle()))->display();
> +@@ -104,16 +113,20 @@ void QEglFSWindow::resetSurface()
> +
> + m_window = QEglFSHooks::hooks()->createNativeWindow(QEglFSHooks::hooks()->screenSize(), m_format);
> + m_surface = eglCreateWindowSurface(display, m_config, m_window, NULL);
> + if (m_surface == EGL_NO_SURFACE) {
> + EGLint error = eglGetError();
> + eglTerminate(display);
> + qFatal("EGL Error : Could not create the egl surface: error = 0x%x\n", error);
> + }
> ++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::Capability::MultipleWindows))
> ++ {
> ++ __singleWindowSurface = m_surface;
> ++ }
> + }
> +
> + void QEglFSWindow::destroy()
> + {
> + if (m_surface) {
> + EGLDisplay display = static_cast<QEglFSScreen *>(screen())->display();
> + eglDestroySurface(display, m_surface);
> + m_surface = 0;
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch
> new file mode 100644
> index 0000000..8d17348
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch
> @@ -0,0 +1,34 @@
> +--- qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp.old 2013-09-09 23:09:24.433774489 +0530
> ++++ qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp 2013-09-09 23:12:22.105766689 +0530
> +@@ -54,30 +54,30 @@ QEglFSWindow::QEglFSWindow(QWindow *w)
> + , m_surface(0)
> + , m_window(0)
> + {
> + static int serialNo = 0;
> + m_winid = ++serialNo;
> + #ifdef QEGL_EXTRA_DEBUG
> + qWarning("QEglWindow %p: %p 0x%x\n", this, w, uint(m_winid));
> + #endif
> ++ setWindowState(Qt::WindowFullScreen);
> + }
> +
> + QEglFSWindow::~QEglFSWindow()
> + {
> + destroy();
> + }
> +
> + static EGLSurface __singleWindowSurface;
> + void QEglFSWindow::create()
> + {
> + if (m_window)
> + return;
> +
> +- setWindowState(Qt::WindowFullScreen);
> +
> + if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::Capability::MultipleWindows) && __singleWindowSurface)
> + {
> + m_surface = __singleWindowSurface;
> + #ifdef QEGL_EXTRA_DEBUG
> + qWarning("Surface recreate request, re-using %x\n", m_surface);
> + #endif
> + return;
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend
> new file mode 100644
> index 0000000..8ae7706
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend
> @@ -0,0 +1,10 @@
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +
> +PACKAGECONFIG_GL = "gles2 icu"
> +
> +SRC_URI += " \
> + file://0001-qeglfswindow.cpp.patch \
> + file://0002-qeglfswindow.cpp.patch \
> +"
> +
> +PR_append = "-arago0"
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 05/13] qtbase: configure and patch Qt5 qtbase for use with SGX in Arago
2013-10-01 7:11 ` [PATCH 05/13] qtbase: configure and patch Qt5 qtbase for use with SGX in Arago Denys Dmytriyenko
2013-10-01 13:21 ` Cooper Jr., Franklin
@ 2013-10-02 12:56 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 12:56 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 05/13] qtbase: configure and patch
>Qt5 qtbase for use with SGX in Arago
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>* Enable gles2/eglfs and icu features
>* Add slightly modified eglfs patches from Prabu
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> .../qt5/qtbase/0001-qeglfswindow.cpp.patch | 56
>++++++++++++++++++++++
> .../qt5/qtbase/0002-qeglfswindow.cpp.patch | 34
>+++++++++++++
> .../recipes-qt/qt5/qtbase_5.1.0.bbappend | 10 ++++
> 3 files changed, 100 insertions(+)
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-
>qeglfswindow.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0002-
>qeglfswindow.cpp.patch
> create mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtbase_5.1.0.bbappend
>
>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-
>qeglfswindow.cpp.patch b/meta-arago-distro/recipes-
>qt/qt5/qtbase/0001-qeglfswindow.cpp.patch
>new file mode 100644
>index 0000000..b95b98e
>--- /dev/null
>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-
>qeglfswindow.cpp.patch
>@@ -0,0 +1,56 @@
>+--- qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp.orig
> 2013-08-09 23:29:18.253037952 +0530
>++++ qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp 2013-
>08-09 23:41:18.509018405 +0530
>+@@ -61,23 +61,32 @@ QEglFSWindow::QEglFSWindow(QWindow *w)
>+ #endif
>+ }
>+
>+ QEglFSWindow::~QEglFSWindow()
>+ {
>+ destroy();
>+ }
>+
>++static EGLSurface __singleWindowSurface;
>+ void QEglFSWindow::create()
>+ {
>+ if (m_window)
>+ return;
>+
>+ setWindowState(Qt::WindowFullScreen);
>+
>++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()-
>>hasCapability(QPlatformIntegration::Capability::MultipleWindows)
>&& __singleWindowSurface)
>++ {
>++ m_surface = __singleWindowSurface;
>++#ifdef QEGL_EXTRA_DEBUG
>++ qWarning("Surface recreate request, re-using %x\n",
>m_surface);
>++#endif
>++ return;
>++ }
>+ if (window()->type() == Qt::Desktop) {
>+ QRect rect(QPoint(), QEglFSHooks::hooks()-
>>screenSize());
>+ QPlatformWindow::setGeometry(rect);
>+ QWindowSystemInterface::handleGeometryChange(window(),
>rect);
>+ return;
>+ }
>+
>+ EGLDisplay display = (static_cast<QEglFSScreen *>(window()-
>>screen()->handle()))->display();
>+@@ -104,16 +113,20 @@ void QEglFSWindow::resetSurface()
>+
>+ m_window = QEglFSHooks::hooks()-
>>createNativeWindow(QEglFSHooks::hooks()->screenSize(), m_format);
>+ m_surface = eglCreateWindowSurface(display, m_config,
>m_window, NULL);
>+ if (m_surface == EGL_NO_SURFACE) {
>+ EGLint error = eglGetError();
>+ eglTerminate(display);
>+ qFatal("EGL Error : Could not create the egl surface:
>error = 0x%x\n", error);
>+ }
>++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()-
>>hasCapability(QPlatformIntegration::Capability::MultipleWindows))
>++ {
>++ __singleWindowSurface = m_surface;
>++ }
>+ }
>+
>+ void QEglFSWindow::destroy()
>+ {
>+ if (m_surface) {
>+ EGLDisplay display = static_cast<QEglFSScreen
>*>(screen())->display();
>+ eglDestroySurface(display, m_surface);
>+ m_surface = 0;
>diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0002-
>qeglfswindow.cpp.patch b/meta-arago-distro/recipes-
>qt/qt5/qtbase/0002-qeglfswindow.cpp.patch
>new file mode 100644
>index 0000000..8d17348
>--- /dev/null
>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0002-
>qeglfswindow.cpp.patch
>@@ -0,0 +1,34 @@
>+--- qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp.old
> 2013-09-09 23:09:24.433774489 +0530
>++++ qtbase/src/plugins/platforms/eglfs/qeglfswindow.cpp 2013-
>09-09 23:12:22.105766689 +0530
>+@@ -54,30 +54,30 @@ QEglFSWindow::QEglFSWindow(QWindow *w)
>+ , m_surface(0)
>+ , m_window(0)
>+ {
>+ static int serialNo = 0;
>+ m_winid = ++serialNo;
>+ #ifdef QEGL_EXTRA_DEBUG
>+ qWarning("QEglWindow %p: %p 0x%x\n", this, w,
>uint(m_winid));
>+ #endif
>++ setWindowState(Qt::WindowFullScreen);
>+ }
>+
>+ QEglFSWindow::~QEglFSWindow()
>+ {
>+ destroy();
>+ }
>+
>+ static EGLSurface __singleWindowSurface;
>+ void QEglFSWindow::create()
>+ {
>+ if (m_window)
>+ return;
>+
>+- setWindowState(Qt::WindowFullScreen);
>+
>+ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()-
>>hasCapability(QPlatformIntegration::Capability::MultipleWindows)
>&& __singleWindowSurface)
>+ {
>+ m_surface = __singleWindowSurface;
>+ #ifdef QEGL_EXTRA_DEBUG
>+ qWarning("Surface recreate request, re-using %x\n",
>m_surface);
>+ #endif
>+ return;
>diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtbase_5.1.0.bbappend b/meta-arago-distro/recipes-
>qt/qt5/qtbase_5.1.0.bbappend
>new file mode 100644
>index 0000000..8ae7706
>--- /dev/null
>+++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend
>@@ -0,0 +1,10 @@
>+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>+
>+PACKAGECONFIG_GL = "gles2 icu"
>+
>+SRC_URI += " \
>+ file://0001-qeglfswindow.cpp.patch \
>+ file://0002-qeglfswindow.cpp.patch \
>+"
>+
>+PR_append = "-arago0"
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 06/13] qtwebkit: add WebGL on eglfs patches
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (4 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 05/13] qtbase: configure and patch Qt5 qtbase for use with SGX in Arago Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 13:34 ` Cooper Jr., Franklin
2013-10-02 12:56 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 07/13] webkit-examples: enable building and packaging of examples Denys Dmytriyenko
` (7 subsequent siblings)
13 siblings, 2 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
* Add additional patches to enable WebGL on eglfs from Prabu.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../qt5/qtwebkit/GraphicsContext3DQt.cpp.patch | 26 ++
.../qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch | 270 +++++++++++++++++++++
.../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 +++
.../recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch | 24 ++
.../recipes-qt/qt5/qtwebkit/Target.pri.patch | 24 ++
.../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 25 ++
.../recipes-qt/qt5/qtwebkit/features.prf.patch | 20 ++
.../qt5/qtwebkit/qttestbrowser.cpp.patch | 24 ++
.../recipes-qt/qt5/qtwebkit_5.1.0.bbappend | 14 ++
9 files changed, 460 insertions(+)
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
new file mode 100644
index 0000000..aa752bb
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
@@ -0,0 +1,26 @@
+--- qtwebkit/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp.orig 2013-09-07 13:41:19.946858466 +0530
++++ qtwebkit/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2013-09-07 17:48:13.958979770 +0530
+@@ -383,21 +383,23 @@ GraphicsContext3D::GraphicsContext3D(Gra
+ , m_boundTexture0(0)
+ , m_multisampleFBO(0)
+ , m_multisampleDepthStencilBuffer(0)
+ , m_multisampleColorBuffer(0)
+ , m_private(adoptPtr(new GraphicsContext3DPrivate(this, hostWindow, renderStyle)))
+ {
+ validateAttributes();
+
++#if USE(GLX)
+ if (!m_private->m_surface || !m_private->m_platformContext) {
+ LOG_ERROR("GraphicsContext3D: GL context creation failed.");
+ m_private = nullptr;
+ return;
+ }
++#endif
+
+ static bool initialized = false;
+ static bool success = true;
+ if (!initialized) {
+ success = initializeOpenGLShims();
+ initialized = true;
+ }
+ if (!success) {
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
new file mode 100644
index 0000000..46c93f7
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
@@ -0,0 +1,270 @@
+diff -Nurp8 Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfaceGL_NoX.cpp
+--- qtwebkit/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp 1970-01-01 05:30:00.000000000 +0530
++++ qtwebkit/Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfaceGL_NoX.cpp 2013-09-07 13:43:55.186851650 +0530
+@@ -0,0 +1,266 @@
++/*
++ Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
++ */
++
++#include "config.h"
++#include "GraphicsSurface.h"
++
++#if USE(GRAPHICS_SURFACE)
++
++#include "NotImplemented.h"
++#include "TextureMapperGL.h"
++
++#if PLATFORM(QT)
++// Qt headers must be included before gl headers.
++#include <QGuiApplication>
++#include <QOpenGLContext>
++#include <qpa/qplatformnativeinterface.h>
++#elif PLATFORM(EFL)
++#include <GL/gl.h>
++#endif
++
++ #include <GLES2/gl2.h>
++
++namespace WebCore {
++
++class OffScreenRootWindow {
++public:
++ OffScreenRootWindow()
++ {
++ ++m_refCount;
++ }
++
++ ~OffScreenRootWindow()
++ {
++ if (--m_refCount)
++ return;
++ }
++
++private:
++ static int m_refCount;
++};
++
++int OffScreenRootWindow::m_refCount = 0;
++
++
++struct GraphicsSurfacePrivate {
++ GraphicsSurfacePrivate(const PlatformGraphicsContext3D shareContext = 0)
++ : m_textureIsYInverted(false)
++ , m_hasAlpha(false)
++ , m_isReceiver(false)
++ {
++
++#if PLATFORM(QT)
++ if (shareContext) {
++#if 0
++ // This code path requires QXcbNativeInterface::nativeResourceForContext() which is not availble in Qt5 on the build bots yet.
++ QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
++ shareContextObject = static_cast<GLXContext>(nativeInterface->nativeResourceForContext(QByteArrayLiteral("glxcontext"), shareContext));
++ if (!shareContextObject)
++ return;
++#else
++ // This code path should be removed as soon as QXcbNativeInterface::nativeResourceForContext() can provide the GLXContext.
++ QOpenGLContext* previousContext = QOpenGLContext::currentContext();
++ QSurface* previousSurface = previousContext->surface();
++ QSurface* currentSurface = shareContext->surface();
++ shareContext->makeCurrent(currentSurface);
++
++
++ previousContext->makeCurrent(previousSurface);
++#endif
++ }
++#else
++ UNUSED_PARAM(shareContext);
++#endif
++
++
++ }
++
++ GraphicsSurfacePrivate(uint32_t winId)
++ : m_textureIsYInverted(false)
++ , m_hasAlpha(false)
++ , m_isReceiver(true)
++ { }
++
++ ~GraphicsSurfacePrivate()
++ {
++ }
++
++ uint32_t createSurface(const IntSize& size)
++ {
++ return 0;
++ }
++
++ void createPixmap(uint32_t winId)
++ {
++ }
++
++ bool textureIsYInverted()
++ {
++ return m_textureIsYInverted;
++ }
++
++ void makeCurrent()
++ {
++ }
++
++ void doneCurrent()
++ {
++ }
++
++ void swapBuffers()
++ {
++ }
++
++ void copyFromTexture(uint32_t texture, const IntRect& sourceRect)
++ {
++ makeCurrent();
++
++ swapBuffers();
++ doneCurrent();
++ }
++
++ void* display() const { return 0; }
++
++ IntSize size() const
++ {
++ return IntSize(0, 0);
++ }
++
++private:
++ OffScreenRootWindow m_offScreenWindow;
++ IntSize m_size;
++ bool m_textureIsYInverted;
++ bool m_hasAlpha;
++ bool m_isReceiver;
++};
++
++static bool resolveGLMethods()
++{
++ return true;
++}
++
++GraphicsSurfaceToken GraphicsSurface::platformExport()
++{
++ return GraphicsSurfaceToken();
++}
++
++uint32_t GraphicsSurface::platformGetTextureID()
++{
++ return 0;
++}
++
++void GraphicsSurface::platformCopyToGLTexture(uint32_t /*target*/, uint32_t /*id*/, const IntRect& /*targetRect*/, const IntPoint& /*offset*/)
++{
++ // This is not supported by NoX
++}
++
++void GraphicsSurface::platformCopyFromTexture(uint32_t texture, const IntRect& sourceRect)
++{
++ m_private->copyFromTexture(texture, sourceRect);
++}
++
++
++void GraphicsSurface::platformPaintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& transform, float opacity, BitmapTexture* mask)
++{
++ TextureMapperGL* texMapGL = static_cast<TextureMapperGL*>(textureMapper);
++ TransformationMatrix adjustedTransform = transform;
++ adjustedTransform.multiply(TransformationMatrix::rectToRect(FloatRect(FloatPoint::zero(), m_private->size()), targetRect));
++ TextureMapperGL::Flags flags = m_private->textureIsYInverted() ? TextureMapperGL::ShouldFlipTexture : 0;
++ flags |= TextureMapperGL::SupportsBlending;
++ texMapGL->drawTexture(platformGetTextureID(), flags, m_private->size(), targetRect, adjustedTransform, opacity, mask);
++}
++
++uint32_t GraphicsSurface::platformFrontBuffer() const
++{
++ return 0;
++}
++
++uint32_t GraphicsSurface::platformSwapBuffers()
++{
++ m_private->swapBuffers();
++ return 0;
++}
++
++IntSize GraphicsSurface::platformSize() const
++{
++ return m_private->size();
++}
++
++PassRefPtr<GraphicsSurface> GraphicsSurface::platformCreate(const IntSize& size, Flags flags, const PlatformGraphicsContext3D shareContext)
++{
++ if (flags & SupportsCopyToTexture || flags & SupportsSingleBuffered)
++ return PassRefPtr<GraphicsSurface>();
++
++ RefPtr<GraphicsSurface> surface = adoptRef(new GraphicsSurface(size, flags));
++
++ surface->m_private = new GraphicsSurfacePrivate(shareContext);
++ if (!resolveGLMethods())
++ return PassRefPtr<GraphicsSurface>();
++
++ surface->m_platformSurface = surface->m_private->createSurface(size);
++
++ return surface;
++}
++
++PassRefPtr<GraphicsSurface> GraphicsSurface::platformImport(const IntSize& size, Flags flags, const GraphicsSurfaceToken& token)
++{
++ if (flags & SupportsCopyToTexture || flags & SupportsSingleBuffered)
++ return PassRefPtr<GraphicsSurface>();
++
++ RefPtr<GraphicsSurface> surface = adoptRef(new GraphicsSurface(size, flags));
++ surface->m_platformSurface = token.frontBufferHandle;
++
++ surface->m_private = new GraphicsSurfacePrivate(surface->m_platformSurface);
++ if (!resolveGLMethods())
++ return PassRefPtr<GraphicsSurface>();
++
++ return surface;
++}
++
++char* GraphicsSurface::platformLock(const IntRect&, int* /*outputStride*/, LockOptions)
++{
++ // GraphicsSurface is currently only being used for WebGL, which does not require this locking mechanism.
++ return 0;
++}
++
++void GraphicsSurface::platformUnlock()
++{
++ // GraphicsSurface is currently only being used for WebGL, which does not require this locking mechanism.
++}
++
++void GraphicsSurface::platformDestroy()
++{
++ m_private = 0;
++}
++
++#if !PLATFORM(QT)
++PassOwnPtr<GraphicsContext> GraphicsSurface::platformBeginPaint(const IntSize&, char*, int)
++{
++ notImplemented();
++ return nullptr;
++}
++
++PassRefPtr<Image> GraphicsSurface::createReadOnlyImage(const IntRect&)
++{
++ notImplemented();
++ return 0;
++}
++#endif
++}
++#endif
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
new file mode 100644
index 0000000..722df39
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
@@ -0,0 +1,33 @@
+--- qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig 2013-09-07 13:44:47.906849335 +0530
++++ qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h 2013-09-07 13:46:12.554845618 +0530
+@@ -50,17 +50,30 @@ struct GraphicsSurfaceToken {
+ {
+ return frontBufferHandle != rhs.frontBufferHandle;
+ }
+
+ bool isValid() const
+ {
+ return frontBufferHandle;
+ }
++#elif PLATFORM(QT)
++ GraphicsSurfaceToken(uint32_t windowID = 0)
++ : frontBufferHandle(windowID)
++ { }
++
++ bool operator!=(const GraphicsSurfaceToken &rhs) const
++ {
++ return frontBufferHandle != rhs.frontBufferHandle;
++ }
+
++ bool isValid() const
++ {
++ return frontBufferHandle;
++ }
+ #endif
+
+ #if OS(DARWIN) || OS(WINDOWS)
+ GraphicsSurfaceToken(BufferHandle frontBuffer = 0, BufferHandle backBuffer = 0)
+ : frontBufferHandle(frontBuffer)
+ , backBufferHandle(backBuffer)
+ { }
+
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
new file mode 100644
index 0000000..9261bed
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
@@ -0,0 +1,24 @@
+--- qtwebkit/Source/WebCore/platform/graphics/OpenGLShims.cpp.orig 2013-09-07 13:46:41.614844342 +0530
++++ qtwebkit/Source/WebCore/platform/graphics/OpenGLShims.cpp 2013-09-07 13:47:39.602841796 +0530
+@@ -35,17 +35,20 @@ OpenGLFunctionTable* openGLFunctionTable
+ {
+ static OpenGLFunctionTable table;
+ return &table;
+ }
+
+ #if PLATFORM(QT)
+ static void* getProcAddress(const char* procName)
+ {
+- return reinterpret_cast<void*>(QOpenGLContext::currentContext()->getProcAddress(procName));
++ if(QOpenGLContext::currentContext())
++ return reinterpret_cast<void*>(QOpenGLContext::currentContext()->getProcAddress(procName));
++ else
++ return NULL;
+ }
+ #else
+ typedef void* (*glGetProcAddressType) (const char* procName);
+ static void* getProcAddress(const char* procName)
+ {
+ static bool initialized = false;
+ static glGetProcAddressType getProcAddressFunction = 0;
+
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
new file mode 100644
index 0000000..fcd7658
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
@@ -0,0 +1,24 @@
+--- qtwebkit/Source/WebCore/Target.pri.orig 2013-09-07 13:48:04.030840724 +0530
++++ qtwebkit/Source/WebCore/Target.pri 2013-09-07 13:49:01.714838191 +0530
+@@ -4095,16 +4095,21 @@ use?(GRAPHICS_SURFACE) {
+ INCLUDEPATH += /System/Library/Frameworks/CoreFoundation.framework/Headers
+ }
+ win32 {
+ SOURCES += platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp
+ }
+ have?(XCOMPOSITE) {
+ SOURCES += platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
+ }
++ contains(QT_CONFIG, opengles2) {
++ SOURCES -= platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
++ SOURCES += platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp
++ }
++
+ }
+
+ build?(qttestsupport) {
+ HEADERS += platform/qt/QtTestSupport.h
+ SOURCES += platform/qt/QtTestSupport.cpp
+ }
+
+ ALL_IN_ONE_SOURCES += \
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
new file mode 100644
index 0000000..050d301
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
@@ -0,0 +1,25 @@
+--- qtwebkit/Source/WebCore/WebCore.pri.orig 2013-09-08 14:18:22.315635577 +0530
++++ qtwebkit/Source/WebCore/WebCore.pri 2013-09-08 14:18:44.271634981 +0530
+@@ -213,18 +213,20 @@ use?(3D_GRAPHICS) {
+ } else {
+ contains(QT_CONFIG, opengles2): CONFIG += egl
+ }
+ }
+
+ use?(GRAPHICS_SURFACE) {
+ mac: LIBS += -framework IOSurface -framework CoreFoundation
+ linux-*: {
+- LIBS += -lXcomposite -lXrender
+- CONFIG *= x11
++ xlibAvailable() {
++ LIBS += -lXcomposite -lXrender
++ CONFIG *= x11
++ }
+ }
+ }
+
+ have?(sqlite3) {
+ mac {
+ LIBS += -lsqlite3
+ } else {
+ PKGCONFIG += sqlite3
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
new file mode 100644
index 0000000..288f116
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
@@ -0,0 +1,20 @@
+--- qtwebkit/Tools/qmake/mkspecs/features/features.prf.orig 2013-09-07 13:49:38.210836589 +0530
++++ qtwebkit/Tools/qmake/mkspecs/features/features.prf 2013-09-07 13:50:13.574835036 +0530
+@@ -127,16 +127,17 @@ defineTest(detectFeatures) {
+ packagesExist(libudev): WEBKIT_CONFIG += gamepad
+
+ # Support for Graphics Surface
+ # GraphicsSurface requires GraphicsContext3D and hence use_3d_graphics
+ use?(3d_graphics) {
+ mac: WEBKIT_CONFIG += use_graphics_surface
+ win32:contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_graphics_surface
+ linux-*:contains(WEBKIT_CONFIG, have_glx):contains(WEBKIT_CONFIG, have_xcomposite):contains(WEBKIT_CONFIG, have_xrender): WEBKIT_CONFIG += use_graphics_surface
++ linux-*:contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_graphics_surface
+ }
+
+ # Slider Touch is sensible to use when compiling WebKit2
+ enable?(touch_events): WEBKIT_CONFIG += touch_slider
+
+
+ # Minibrowser must be able to query for QtTestSupport
+ build?(qttestsupport): WEBKIT_CONFIG += have_qttestsupport
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
new file mode 100644
index 0000000..9a57be2
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
@@ -0,0 +1,24 @@
+--- qtwebkit/Tools/QtTestBrowser/qttestbrowser.cpp.orig 2013-09-08 17:28:48.633593482 +0530
++++ qtwebkit/Tools/QtTestBrowser/qttestbrowser.cpp 2013-09-08 17:29:07.713592964 +0530
+@@ -235,19 +235,20 @@ void LauncherApplication::handleUserOpti
+ }
+
+ if (args.contains("-webgl")) {
+ requiresGraphicsView("-webgl");
+ windowOptions.useWebGL = true;
+ }
+ #endif
+
++#if 0
+ if (args.contains("-use-test-fonts"))
+ WebKit::QtTestSupport::initializeTestFonts();
+-
++#endif
+ if (args.contains("-print-loaded-urls"))
+ windowOptions.printLoadedUrls = true;
+
+ QString inspectorUrlArg("-inspector-url");
+ int inspectorUrlIndex = args.indexOf(inspectorUrlArg);
+ if (inspectorUrlIndex != -1)
+ windowOptions.inspectorUrl = takeOptionValue(&args, inspectorUrlIndex);
+
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
new file mode 100644
index 0000000..aed6b51
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
@@ -0,0 +1,14 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " \
+ file://features.prf.patch \
+ file://GraphicsContext3DQt.cpp.patch \
+ file://GraphicsSurfaceGL_NoX.cpp.patch \
+ file://GraphicsSurfaceToken.h.patch \
+ file://OpenGLShims.cpp.patch \
+ file://qttestbrowser.cpp.patch \
+ file://Target.pri.patch \
+ file://WebCore.pri.patch \
+"
+
+PR_append = "-arago0"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 06/13] qtwebkit: add WebGL on eglfs patches
2013-10-01 7:11 ` [PATCH 06/13] qtwebkit: add WebGL on eglfs patches Denys Dmytriyenko
@ 2013-10-01 13:34 ` Cooper Jr., Franklin
2013-10-01 13:37 ` Denys Dmytriyenko
2013-10-02 12:56 ` Maupin, Chase
1 sibling, 1 reply; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:34 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
It would be nice to include this link: http://qt-project.org/forums/viewthread/23323 in the commit message addressing the bug these patches are trying to fix.
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> * Add additional patches to enable WebGL on eglfs from Prabu.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> .../qt5/qtwebkit/GraphicsContext3DQt.cpp.patch | 26 ++
> .../qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch | 270 +++++++++++++++++++++
> .../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 +++
> .../recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch | 24 ++
> .../recipes-qt/qt5/qtwebkit/Target.pri.patch | 24 ++
> .../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 25 ++
> .../recipes-qt/qt5/qtwebkit/features.prf.patch | 20 ++
> .../qt5/qtwebkit/qttestbrowser.cpp.patch | 24 ++
> .../recipes-qt/qt5/qtwebkit_5.1.0.bbappend | 14 ++
> 9 files changed, 460 insertions(+)
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
>
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
> new file mode 100644
> index 0000000..aa752bb
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
> @@ -0,0 +1,26 @@
> +--- qtwebkit/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp.orig 2013-09-07 13:41:19.946858466 +0530
> ++++ qtwebkit/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2013-09-07 17:48:13.958979770 +0530
> +@@ -383,21 +383,23 @@ GraphicsContext3D::GraphicsContext3D(Gra
> + , m_boundTexture0(0)
> + , m_multisampleFBO(0)
> + , m_multisampleDepthStencilBuffer(0)
> + , m_multisampleColorBuffer(0)
> + , m_private(adoptPtr(new GraphicsContext3DPrivate(this, hostWindow, renderStyle)))
> + {
> + validateAttributes();
> +
> ++#if USE(GLX)
> + if (!m_private->m_surface || !m_private->m_platformContext) {
> + LOG_ERROR("GraphicsContext3D: GL context creation failed.");
> + m_private = nullptr;
> + return;
> + }
> ++#endif
> +
> + static bool initialized = false;
> + static bool success = true;
> + if (!initialized) {
> + success = initializeOpenGLShims();
> + initialized = true;
> + }
> + if (!success) {
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> new file mode 100644
> index 0000000..46c93f7
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> @@ -0,0 +1,270 @@
> +diff -Nurp8 Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfaceGL_NoX.cpp
> +--- qtwebkit/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp 1970-01-01 05:30:00.000000000 +0530
> ++++ qtwebkit/Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfaceGL_NoX.cpp 2013-09-07 13:43:55.186851650 +0530
> +@@ -0,0 +1,266 @@
> ++/*
> ++ Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
> ++
> ++ This library is free software; you can redistribute it and/or
> ++ modify it under the terms of the GNU Library General Public
> ++ License as published by the Free Software Foundation; either
> ++ version 2 of the License, or (at your option) any later version.
> ++
> ++ This library is distributed in the hope that it will be useful,
> ++ but WITHOUT ANY WARRANTY; without even the implied warranty of
> ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> ++ Library General Public License for more details.
> ++
> ++ You should have received a copy of the GNU Library General Public License
> ++ along with this library; see the file COPYING.LIB. If not, write to
> ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
> ++ Boston, MA 02110-1301, USA.
> ++ */
> ++
> ++#include "config.h"
> ++#include "GraphicsSurface.h"
> ++
> ++#if USE(GRAPHICS_SURFACE)
> ++
> ++#include "NotImplemented.h"
> ++#include "TextureMapperGL.h"
> ++
> ++#if PLATFORM(QT)
> ++// Qt headers must be included before gl headers.
> ++#include <QGuiApplication>
> ++#include <QOpenGLContext>
> ++#include <qpa/qplatformnativeinterface.h>
> ++#elif PLATFORM(EFL)
> ++#include <GL/gl.h>
> ++#endif
> ++
> ++ #include <GLES2/gl2.h>
> ++
> ++namespace WebCore {
> ++
> ++class OffScreenRootWindow {
> ++public:
> ++ OffScreenRootWindow()
> ++ {
> ++ ++m_refCount;
> ++ }
> ++
> ++ ~OffScreenRootWindow()
> ++ {
> ++ if (--m_refCount)
> ++ return;
> ++ }
> ++
> ++private:
> ++ static int m_refCount;
> ++};
> ++
> ++int OffScreenRootWindow::m_refCount = 0;
> ++
> ++
> ++struct GraphicsSurfacePrivate {
> ++ GraphicsSurfacePrivate(const PlatformGraphicsContext3D shareContext = 0)
> ++ : m_textureIsYInverted(false)
> ++ , m_hasAlpha(false)
> ++ , m_isReceiver(false)
> ++ {
> ++
> ++#if PLATFORM(QT)
> ++ if (shareContext) {
> ++#if 0
> ++ // This code path requires QXcbNativeInterface::nativeResourceForContext() which is not availble in Qt5 on the build bots yet.
> ++ QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
> ++ shareContextObject = static_cast<GLXContext>(nativeInterface->nativeResourceForContext(QByteArrayLiteral("glxcontext"), shareContext));
> ++ if (!shareContextObject)
> ++ return;
> ++#else
> ++ // This code path should be removed as soon as QXcbNativeInterface::nativeResourceForContext() can provide the GLXContext.
> ++ QOpenGLContext* previousContext = QOpenGLContext::currentContext();
> ++ QSurface* previousSurface = previousContext->surface();
> ++ QSurface* currentSurface = shareContext->surface();
> ++ shareContext->makeCurrent(currentSurface);
> ++
> ++
> ++ previousContext->makeCurrent(previousSurface);
> ++#endif
> ++ }
> ++#else
> ++ UNUSED_PARAM(shareContext);
> ++#endif
> ++
> ++
> ++ }
> ++
> ++ GraphicsSurfacePrivate(uint32_t winId)
> ++ : m_textureIsYInverted(false)
> ++ , m_hasAlpha(false)
> ++ , m_isReceiver(true)
> ++ { }
> ++
> ++ ~GraphicsSurfacePrivate()
> ++ {
> ++ }
> ++
> ++ uint32_t createSurface(const IntSize& size)
> ++ {
> ++ return 0;
> ++ }
> ++
> ++ void createPixmap(uint32_t winId)
> ++ {
> ++ }
> ++
> ++ bool textureIsYInverted()
> ++ {
> ++ return m_textureIsYInverted;
> ++ }
> ++
> ++ void makeCurrent()
> ++ {
> ++ }
> ++
> ++ void doneCurrent()
> ++ {
> ++ }
> ++
> ++ void swapBuffers()
> ++ {
> ++ }
> ++
> ++ void copyFromTexture(uint32_t texture, const IntRect& sourceRect)
> ++ {
> ++ makeCurrent();
> ++
> ++ swapBuffers();
> ++ doneCurrent();
> ++ }
> ++
> ++ void* display() const { return 0; }
> ++
> ++ IntSize size() const
> ++ {
> ++ return IntSize(0, 0);
> ++ }
> ++
> ++private:
> ++ OffScreenRootWindow m_offScreenWindow;
> ++ IntSize m_size;
> ++ bool m_textureIsYInverted;
> ++ bool m_hasAlpha;
> ++ bool m_isReceiver;
> ++};
> ++
> ++static bool resolveGLMethods()
> ++{
> ++ return true;
> ++}
> ++
> ++GraphicsSurfaceToken GraphicsSurface::platformExport()
> ++{
> ++ return GraphicsSurfaceToken();
> ++}
> ++
> ++uint32_t GraphicsSurface::platformGetTextureID()
> ++{
> ++ return 0;
> ++}
> ++
> ++void GraphicsSurface::platformCopyToGLTexture(uint32_t /*target*/, uint32_t /*id*/, const IntRect& /*targetRect*/, const IntPoint& /*offset*/)
> ++{
> ++ // This is not supported by NoX
> ++}
> ++
> ++void GraphicsSurface::platformCopyFromTexture(uint32_t texture, const IntRect& sourceRect)
> ++{
> ++ m_private->copyFromTexture(texture, sourceRect);
> ++}
> ++
> ++
> ++void GraphicsSurface::platformPaintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& transform, float opacity, BitmapTexture* mask)
> ++{
> ++ TextureMapperGL* texMapGL = static_cast<TextureMapperGL*>(textureMapper);
> ++ TransformationMatrix adjustedTransform = transform;
> ++ adjustedTransform.multiply(TransformationMatrix::rectToRect(FloatRect(FloatPoint::zero(), m_private->size()), targetRect));
> ++ TextureMapperGL::Flags flags = m_private->textureIsYInverted() ? TextureMapperGL::ShouldFlipTexture : 0;
> ++ flags |= TextureMapperGL::SupportsBlending;
> ++ texMapGL->drawTexture(platformGetTextureID(), flags, m_private->size(), targetRect, adjustedTransform, opacity, mask);
> ++}
> ++
> ++uint32_t GraphicsSurface::platformFrontBuffer() const
> ++{
> ++ return 0;
> ++}
> ++
> ++uint32_t GraphicsSurface::platformSwapBuffers()
> ++{
> ++ m_private->swapBuffers();
> ++ return 0;
> ++}
> ++
> ++IntSize GraphicsSurface::platformSize() const
> ++{
> ++ return m_private->size();
> ++}
> ++
> ++PassRefPtr<GraphicsSurface> GraphicsSurface::platformCreate(const IntSize& size, Flags flags, const PlatformGraphicsContext3D shareContext)
> ++{
> ++ if (flags & SupportsCopyToTexture || flags & SupportsSingleBuffered)
> ++ return PassRefPtr<GraphicsSurface>();
> ++
> ++ RefPtr<GraphicsSurface> surface = adoptRef(new GraphicsSurface(size, flags));
> ++
> ++ surface->m_private = new GraphicsSurfacePrivate(shareContext);
> ++ if (!resolveGLMethods())
> ++ return PassRefPtr<GraphicsSurface>();
> ++
> ++ surface->m_platformSurface = surface->m_private->createSurface(size);
> ++
> ++ return surface;
> ++}
> ++
> ++PassRefPtr<GraphicsSurface> GraphicsSurface::platformImport(const IntSize& size, Flags flags, const GraphicsSurfaceToken& token)
> ++{
> ++ if (flags & SupportsCopyToTexture || flags & SupportsSingleBuffered)
> ++ return PassRefPtr<GraphicsSurface>();
> ++
> ++ RefPtr<GraphicsSurface> surface = adoptRef(new GraphicsSurface(size, flags));
> ++ surface->m_platformSurface = token.frontBufferHandle;
> ++
> ++ surface->m_private = new GraphicsSurfacePrivate(surface->m_platformSurface);
> ++ if (!resolveGLMethods())
> ++ return PassRefPtr<GraphicsSurface>();
> ++
> ++ return surface;
> ++}
> ++
> ++char* GraphicsSurface::platformLock(const IntRect&, int* /*outputStride*/, LockOptions)
> ++{
> ++ // GraphicsSurface is currently only being used for WebGL, which does not require this locking mechanism.
> ++ return 0;
> ++}
> ++
> ++void GraphicsSurface::platformUnlock()
> ++{
> ++ // GraphicsSurface is currently only being used for WebGL, which does not require this locking mechanism.
> ++}
> ++
> ++void GraphicsSurface::platformDestroy()
> ++{
> ++ m_private = 0;
> ++}
> ++
> ++#if !PLATFORM(QT)
> ++PassOwnPtr<GraphicsContext> GraphicsSurface::platformBeginPaint(const IntSize&, char*, int)
> ++{
> ++ notImplemented();
> ++ return nullptr;
> ++}
> ++
> ++PassRefPtr<Image> GraphicsSurface::createReadOnlyImage(const IntRect&)
> ++{
> ++ notImplemented();
> ++ return 0;
> ++}
> ++#endif
> ++}
> ++#endif
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> new file mode 100644
> index 0000000..722df39
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> @@ -0,0 +1,33 @@
> +--- qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig 2013-09-07 13:44:47.906849335 +0530
> ++++ qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h 2013-09-07 13:46:12.554845618 +0530
> +@@ -50,17 +50,30 @@ struct GraphicsSurfaceToken {
> + {
> + return frontBufferHandle != rhs.frontBufferHandle;
> + }
> +
> + bool isValid() const
> + {
> + return frontBufferHandle;
> + }
> ++#elif PLATFORM(QT)
> ++ GraphicsSurfaceToken(uint32_t windowID = 0)
> ++ : frontBufferHandle(windowID)
> ++ { }
> ++
> ++ bool operator!=(const GraphicsSurfaceToken &rhs) const
> ++ {
> ++ return frontBufferHandle != rhs.frontBufferHandle;
> ++ }
> +
> ++ bool isValid() const
> ++ {
> ++ return frontBufferHandle;
> ++ }
> + #endif
> +
> + #if OS(DARWIN) || OS(WINDOWS)
> + GraphicsSurfaceToken(BufferHandle frontBuffer = 0, BufferHandle backBuffer = 0)
> + : frontBufferHandle(frontBuffer)
> + , backBufferHandle(backBuffer)
> + { }
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
> new file mode 100644
> index 0000000..9261bed
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
> @@ -0,0 +1,24 @@
> +--- qtwebkit/Source/WebCore/platform/graphics/OpenGLShims.cpp.orig 2013-09-07 13:46:41.614844342 +0530
> ++++ qtwebkit/Source/WebCore/platform/graphics/OpenGLShims.cpp 2013-09-07 13:47:39.602841796 +0530
> +@@ -35,17 +35,20 @@ OpenGLFunctionTable* openGLFunctionTable
> + {
> + static OpenGLFunctionTable table;
> + return &table;
> + }
> +
> + #if PLATFORM(QT)
> + static void* getProcAddress(const char* procName)
> + {
> +- return reinterpret_cast<void*>(QOpenGLContext::currentContext()->getProcAddress(procName));
> ++ if(QOpenGLContext::currentContext())
> ++ return reinterpret_cast<void*>(QOpenGLContext::currentContext()->getProcAddress(procName));
> ++ else
> ++ return NULL;
> + }
> + #else
> + typedef void* (*glGetProcAddressType) (const char* procName);
> + static void* getProcAddress(const char* procName)
> + {
> + static bool initialized = false;
> + static glGetProcAddressType getProcAddressFunction = 0;
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
> new file mode 100644
> index 0000000..fcd7658
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
> @@ -0,0 +1,24 @@
> +--- qtwebkit/Source/WebCore/Target.pri.orig 2013-09-07 13:48:04.030840724 +0530
> ++++ qtwebkit/Source/WebCore/Target.pri 2013-09-07 13:49:01.714838191 +0530
> +@@ -4095,16 +4095,21 @@ use?(GRAPHICS_SURFACE) {
> + INCLUDEPATH += /System/Library/Frameworks/CoreFoundation.framework/Headers
> + }
> + win32 {
> + SOURCES += platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp
> + }
> + have?(XCOMPOSITE) {
> + SOURCES += platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
> + }
> ++ contains(QT_CONFIG, opengles2) {
> ++ SOURCES -= platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
> ++ SOURCES += platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp
> ++ }
> ++
> + }
> +
> + build?(qttestsupport) {
> + HEADERS += platform/qt/QtTestSupport.h
> + SOURCES += platform/qt/QtTestSupport.cpp
> + }
> +
> + ALL_IN_ONE_SOURCES += \
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
> new file mode 100644
> index 0000000..050d301
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
> @@ -0,0 +1,25 @@
> +--- qtwebkit/Source/WebCore/WebCore.pri.orig 2013-09-08 14:18:22.315635577 +0530
> ++++ qtwebkit/Source/WebCore/WebCore.pri 2013-09-08 14:18:44.271634981 +0530
> +@@ -213,18 +213,20 @@ use?(3D_GRAPHICS) {
> + } else {
> + contains(QT_CONFIG, opengles2): CONFIG += egl
> + }
> + }
> +
> + use?(GRAPHICS_SURFACE) {
> + mac: LIBS += -framework IOSurface -framework CoreFoundation
> + linux-*: {
> +- LIBS += -lXcomposite -lXrender
> +- CONFIG *= x11
> ++ xlibAvailable() {
> ++ LIBS += -lXcomposite -lXrender
> ++ CONFIG *= x11
> ++ }
> + }
> + }
> +
> + have?(sqlite3) {
> + mac {
> + LIBS += -lsqlite3
> + } else {
> + PKGCONFIG += sqlite3
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
> new file mode 100644
> index 0000000..288f116
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
> @@ -0,0 +1,20 @@
> +--- qtwebkit/Tools/qmake/mkspecs/features/features.prf.orig 2013-09-07 13:49:38.210836589 +0530
> ++++ qtwebkit/Tools/qmake/mkspecs/features/features.prf 2013-09-07 13:50:13.574835036 +0530
> +@@ -127,16 +127,17 @@ defineTest(detectFeatures) {
> + packagesExist(libudev): WEBKIT_CONFIG += gamepad
> +
> + # Support for Graphics Surface
> + # GraphicsSurface requires GraphicsContext3D and hence use_3d_graphics
> + use?(3d_graphics) {
> + mac: WEBKIT_CONFIG += use_graphics_surface
> + win32:contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_graphics_surface
> + linux-*:contains(WEBKIT_CONFIG, have_glx):contains(WEBKIT_CONFIG, have_xcomposite):contains(WEBKIT_CONFIG, have_xrender): WEBKIT_CONFIG += use_graphics_surface
> ++ linux-*:contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_graphics_surface
> + }
> +
> + # Slider Touch is sensible to use when compiling WebKit2
> + enable?(touch_events): WEBKIT_CONFIG += touch_slider
> +
> +
> + # Minibrowser must be able to query for QtTestSupport
> + build?(qttestsupport): WEBKIT_CONFIG += have_qttestsupport
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
> new file mode 100644
> index 0000000..9a57be2
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
> @@ -0,0 +1,24 @@
> +--- qtwebkit/Tools/QtTestBrowser/qttestbrowser.cpp.orig 2013-09-08 17:28:48.633593482 +0530
> ++++ qtwebkit/Tools/QtTestBrowser/qttestbrowser.cpp 2013-09-08 17:29:07.713592964 +0530
> +@@ -235,19 +235,20 @@ void LauncherApplication::handleUserOpti
> + }
> +
> + if (args.contains("-webgl")) {
> + requiresGraphicsView("-webgl");
> + windowOptions.useWebGL = true;
> + }
> + #endif
> +
> ++#if 0
> + if (args.contains("-use-test-fonts"))
> + WebKit::QtTestSupport::initializeTestFonts();
> +-
> ++#endif
> + if (args.contains("-print-loaded-urls"))
> + windowOptions.printLoadedUrls = true;
> +
> + QString inspectorUrlArg("-inspector-url");
> + int inspectorUrlIndex = args.indexOf(inspectorUrlArg);
> + if (inspectorUrlIndex != -1)
> + windowOptions.inspectorUrl = takeOptionValue(&args, inspectorUrlIndex);
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
> new file mode 100644
> index 0000000..aed6b51
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
> @@ -0,0 +1,14 @@
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +
> +SRC_URI += " \
> + file://features.prf.patch \
> + file://GraphicsContext3DQt.cpp.patch \
> + file://GraphicsSurfaceGL_NoX.cpp.patch \
> + file://GraphicsSurfaceToken.h.patch \
> + file://OpenGLShims.cpp.patch \
> + file://qttestbrowser.cpp.patch \
> + file://Target.pri.patch \
> + file://WebCore.pri.patch \
> +"
> +
> +PR_append = "-arago0"
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 06/13] qtwebkit: add WebGL on eglfs patches
2013-10-01 13:34 ` Cooper Jr., Franklin
@ 2013-10-01 13:37 ` Denys Dmytriyenko
0 siblings, 0 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 13:37 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
On Tue, Oct 01, 2013 at 01:34:30PM +0000, Cooper Jr., Franklin wrote:
> It would be nice to include this link:
> http://qt-project.org/forums/viewthread/23323 in the commit message
> addressing the bug these patches are trying to fix.
Ok, can do.
> > On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > * Add additional patches to enable WebGL on eglfs from Prabu.
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > .../qt5/qtwebkit/GraphicsContext3DQt.cpp.patch | 26 ++
> > .../qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch | 270 +++++++++++++++++++++
> > .../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 +++
> > .../recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch | 24 ++
> > .../recipes-qt/qt5/qtwebkit/Target.pri.patch | 24 ++
> > .../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 25 ++
> > .../recipes-qt/qt5/qtwebkit/features.prf.patch | 20 ++
> > .../qt5/qtwebkit/qttestbrowser.cpp.patch | 24 ++
> > .../recipes-qt/qt5/qtwebkit_5.1.0.bbappend | 14 ++
> > 9 files changed, 460 insertions(+)
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
> >
> > diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
> > new file mode 100644
> > index 0000000..aa752bb
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
> > @@ -0,0 +1,26 @@
> > +--- qtwebkit/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp.orig 2013-09-07 13:41:19.946858466 +0530
> > ++++ qtwebkit/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2013-09-07 17:48:13.958979770 +0530
> > +@@ -383,21 +383,23 @@ GraphicsContext3D::GraphicsContext3D(Gra
> > + , m_boundTexture0(0)
> > + , m_multisampleFBO(0)
> > + , m_multisampleDepthStencilBuffer(0)
> > + , m_multisampleColorBuffer(0)
> > + , m_private(adoptPtr(new GraphicsContext3DPrivate(this, hostWindow, renderStyle)))
> > + {
> > + validateAttributes();
> > +
> > ++#if USE(GLX)
> > + if (!m_private->m_surface || !m_private->m_platformContext) {
> > + LOG_ERROR("GraphicsContext3D: GL context creation failed.");
> > + m_private = nullptr;
> > + return;
> > + }
> > ++#endif
> > +
> > + static bool initialized = false;
> > + static bool success = true;
> > + if (!initialized) {
> > + success = initializeOpenGLShims();
> > + initialized = true;
> > + }
> > + if (!success) {
> > diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> > new file mode 100644
> > index 0000000..46c93f7
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> > @@ -0,0 +1,270 @@
> > +diff -Nurp8 Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfaceGL_NoX.cpp
> > +--- qtwebkit/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp 1970-01-01 05:30:00.000000000 +0530
> > ++++ qtwebkit/Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfaceGL_NoX.cpp 2013-09-07 13:43:55.186851650 +0530
> > +@@ -0,0 +1,266 @@
> > ++/*
> > ++ Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
> > ++
> > ++ This library is free software; you can redistribute it and/or
> > ++ modify it under the terms of the GNU Library General Public
> > ++ License as published by the Free Software Foundation; either
> > ++ version 2 of the License, or (at your option) any later version.
> > ++
> > ++ This library is distributed in the hope that it will be useful,
> > ++ but WITHOUT ANY WARRANTY; without even the implied warranty of
> > ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> > ++ Library General Public License for more details.
> > ++
> > ++ You should have received a copy of the GNU Library General Public License
> > ++ along with this library; see the file COPYING.LIB. If not, write to
> > ++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
> > ++ Boston, MA 02110-1301, USA.
> > ++ */
> > ++
> > ++#include "config.h"
> > ++#include "GraphicsSurface.h"
> > ++
> > ++#if USE(GRAPHICS_SURFACE)
> > ++
> > ++#include "NotImplemented.h"
> > ++#include "TextureMapperGL.h"
> > ++
> > ++#if PLATFORM(QT)
> > ++// Qt headers must be included before gl headers.
> > ++#include <QGuiApplication>
> > ++#include <QOpenGLContext>
> > ++#include <qpa/qplatformnativeinterface.h>
> > ++#elif PLATFORM(EFL)
> > ++#include <GL/gl.h>
> > ++#endif
> > ++
> > ++ #include <GLES2/gl2.h>
> > ++
> > ++namespace WebCore {
> > ++
> > ++class OffScreenRootWindow {
> > ++public:
> > ++ OffScreenRootWindow()
> > ++ {
> > ++ ++m_refCount;
> > ++ }
> > ++
> > ++ ~OffScreenRootWindow()
> > ++ {
> > ++ if (--m_refCount)
> > ++ return;
> > ++ }
> > ++
> > ++private:
> > ++ static int m_refCount;
> > ++};
> > ++
> > ++int OffScreenRootWindow::m_refCount = 0;
> > ++
> > ++
> > ++struct GraphicsSurfacePrivate {
> > ++ GraphicsSurfacePrivate(const PlatformGraphicsContext3D shareContext = 0)
> > ++ : m_textureIsYInverted(false)
> > ++ , m_hasAlpha(false)
> > ++ , m_isReceiver(false)
> > ++ {
> > ++
> > ++#if PLATFORM(QT)
> > ++ if (shareContext) {
> > ++#if 0
> > ++ // This code path requires QXcbNativeInterface::nativeResourceForContext() which is not availble in Qt5 on the build bots yet.
> > ++ QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
> > ++ shareContextObject = static_cast<GLXContext>(nativeInterface->nativeResourceForContext(QByteArrayLiteral("glxcontext"), shareContext));
> > ++ if (!shareContextObject)
> > ++ return;
> > ++#else
> > ++ // This code path should be removed as soon as QXcbNativeInterface::nativeResourceForContext() can provide the GLXContext.
> > ++ QOpenGLContext* previousContext = QOpenGLContext::currentContext();
> > ++ QSurface* previousSurface = previousContext->surface();
> > ++ QSurface* currentSurface = shareContext->surface();
> > ++ shareContext->makeCurrent(currentSurface);
> > ++
> > ++
> > ++ previousContext->makeCurrent(previousSurface);
> > ++#endif
> > ++ }
> > ++#else
> > ++ UNUSED_PARAM(shareContext);
> > ++#endif
> > ++
> > ++
> > ++ }
> > ++
> > ++ GraphicsSurfacePrivate(uint32_t winId)
> > ++ : m_textureIsYInverted(false)
> > ++ , m_hasAlpha(false)
> > ++ , m_isReceiver(true)
> > ++ { }
> > ++
> > ++ ~GraphicsSurfacePrivate()
> > ++ {
> > ++ }
> > ++
> > ++ uint32_t createSurface(const IntSize& size)
> > ++ {
> > ++ return 0;
> > ++ }
> > ++
> > ++ void createPixmap(uint32_t winId)
> > ++ {
> > ++ }
> > ++
> > ++ bool textureIsYInverted()
> > ++ {
> > ++ return m_textureIsYInverted;
> > ++ }
> > ++
> > ++ void makeCurrent()
> > ++ {
> > ++ }
> > ++
> > ++ void doneCurrent()
> > ++ {
> > ++ }
> > ++
> > ++ void swapBuffers()
> > ++ {
> > ++ }
> > ++
> > ++ void copyFromTexture(uint32_t texture, const IntRect& sourceRect)
> > ++ {
> > ++ makeCurrent();
> > ++
> > ++ swapBuffers();
> > ++ doneCurrent();
> > ++ }
> > ++
> > ++ void* display() const { return 0; }
> > ++
> > ++ IntSize size() const
> > ++ {
> > ++ return IntSize(0, 0);
> > ++ }
> > ++
> > ++private:
> > ++ OffScreenRootWindow m_offScreenWindow;
> > ++ IntSize m_size;
> > ++ bool m_textureIsYInverted;
> > ++ bool m_hasAlpha;
> > ++ bool m_isReceiver;
> > ++};
> > ++
> > ++static bool resolveGLMethods()
> > ++{
> > ++ return true;
> > ++}
> > ++
> > ++GraphicsSurfaceToken GraphicsSurface::platformExport()
> > ++{
> > ++ return GraphicsSurfaceToken();
> > ++}
> > ++
> > ++uint32_t GraphicsSurface::platformGetTextureID()
> > ++{
> > ++ return 0;
> > ++}
> > ++
> > ++void GraphicsSurface::platformCopyToGLTexture(uint32_t /*target*/, uint32_t /*id*/, const IntRect& /*targetRect*/, const IntPoint& /*offset*/)
> > ++{
> > ++ // This is not supported by NoX
> > ++}
> > ++
> > ++void GraphicsSurface::platformCopyFromTexture(uint32_t texture, const IntRect& sourceRect)
> > ++{
> > ++ m_private->copyFromTexture(texture, sourceRect);
> > ++}
> > ++
> > ++
> > ++void GraphicsSurface::platformPaintToTextureMapper(TextureMapper* textureMapper, const FloatRect& targetRect, const TransformationMatrix& transform, float opacity, BitmapTexture* mask)
> > ++{
> > ++ TextureMapperGL* texMapGL = static_cast<TextureMapperGL*>(textureMapper);
> > ++ TransformationMatrix adjustedTransform = transform;
> > ++ adjustedTransform.multiply(TransformationMatrix::rectToRect(FloatRect(FloatPoint::zero(), m_private->size()), targetRect));
> > ++ TextureMapperGL::Flags flags = m_private->textureIsYInverted() ? TextureMapperGL::ShouldFlipTexture : 0;
> > ++ flags |= TextureMapperGL::SupportsBlending;
> > ++ texMapGL->drawTexture(platformGetTextureID(), flags, m_private->size(), targetRect, adjustedTransform, opacity, mask);
> > ++}
> > ++
> > ++uint32_t GraphicsSurface::platformFrontBuffer() const
> > ++{
> > ++ return 0;
> > ++}
> > ++
> > ++uint32_t GraphicsSurface::platformSwapBuffers()
> > ++{
> > ++ m_private->swapBuffers();
> > ++ return 0;
> > ++}
> > ++
> > ++IntSize GraphicsSurface::platformSize() const
> > ++{
> > ++ return m_private->size();
> > ++}
> > ++
> > ++PassRefPtr<GraphicsSurface> GraphicsSurface::platformCreate(const IntSize& size, Flags flags, const PlatformGraphicsContext3D shareContext)
> > ++{
> > ++ if (flags & SupportsCopyToTexture || flags & SupportsSingleBuffered)
> > ++ return PassRefPtr<GraphicsSurface>();
> > ++
> > ++ RefPtr<GraphicsSurface> surface = adoptRef(new GraphicsSurface(size, flags));
> > ++
> > ++ surface->m_private = new GraphicsSurfacePrivate(shareContext);
> > ++ if (!resolveGLMethods())
> > ++ return PassRefPtr<GraphicsSurface>();
> > ++
> > ++ surface->m_platformSurface = surface->m_private->createSurface(size);
> > ++
> > ++ return surface;
> > ++}
> > ++
> > ++PassRefPtr<GraphicsSurface> GraphicsSurface::platformImport(const IntSize& size, Flags flags, const GraphicsSurfaceToken& token)
> > ++{
> > ++ if (flags & SupportsCopyToTexture || flags & SupportsSingleBuffered)
> > ++ return PassRefPtr<GraphicsSurface>();
> > ++
> > ++ RefPtr<GraphicsSurface> surface = adoptRef(new GraphicsSurface(size, flags));
> > ++ surface->m_platformSurface = token.frontBufferHandle;
> > ++
> > ++ surface->m_private = new GraphicsSurfacePrivate(surface->m_platformSurface);
> > ++ if (!resolveGLMethods())
> > ++ return PassRefPtr<GraphicsSurface>();
> > ++
> > ++ return surface;
> > ++}
> > ++
> > ++char* GraphicsSurface::platformLock(const IntRect&, int* /*outputStride*/, LockOptions)
> > ++{
> > ++ // GraphicsSurface is currently only being used for WebGL, which does not require this locking mechanism.
> > ++ return 0;
> > ++}
> > ++
> > ++void GraphicsSurface::platformUnlock()
> > ++{
> > ++ // GraphicsSurface is currently only being used for WebGL, which does not require this locking mechanism.
> > ++}
> > ++
> > ++void GraphicsSurface::platformDestroy()
> > ++{
> > ++ m_private = 0;
> > ++}
> > ++
> > ++#if !PLATFORM(QT)
> > ++PassOwnPtr<GraphicsContext> GraphicsSurface::platformBeginPaint(const IntSize&, char*, int)
> > ++{
> > ++ notImplemented();
> > ++ return nullptr;
> > ++}
> > ++
> > ++PassRefPtr<Image> GraphicsSurface::createReadOnlyImage(const IntRect&)
> > ++{
> > ++ notImplemented();
> > ++ return 0;
> > ++}
> > ++#endif
> > ++}
> > ++#endif
> > diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> > new file mode 100644
> > index 0000000..722df39
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> > @@ -0,0 +1,33 @@
> > +--- qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h.orig 2013-09-07 13:44:47.906849335 +0530
> > ++++ qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurfaceToken.h 2013-09-07 13:46:12.554845618 +0530
> > +@@ -50,17 +50,30 @@ struct GraphicsSurfaceToken {
> > + {
> > + return frontBufferHandle != rhs.frontBufferHandle;
> > + }
> > +
> > + bool isValid() const
> > + {
> > + return frontBufferHandle;
> > + }
> > ++#elif PLATFORM(QT)
> > ++ GraphicsSurfaceToken(uint32_t windowID = 0)
> > ++ : frontBufferHandle(windowID)
> > ++ { }
> > ++
> > ++ bool operator!=(const GraphicsSurfaceToken &rhs) const
> > ++ {
> > ++ return frontBufferHandle != rhs.frontBufferHandle;
> > ++ }
> > +
> > ++ bool isValid() const
> > ++ {
> > ++ return frontBufferHandle;
> > ++ }
> > + #endif
> > +
> > + #if OS(DARWIN) || OS(WINDOWS)
> > + GraphicsSurfaceToken(BufferHandle frontBuffer = 0, BufferHandle backBuffer = 0)
> > + : frontBufferHandle(frontBuffer)
> > + , backBufferHandle(backBuffer)
> > + { }
> > +
> > diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
> > new file mode 100644
> > index 0000000..9261bed
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
> > @@ -0,0 +1,24 @@
> > +--- qtwebkit/Source/WebCore/platform/graphics/OpenGLShims.cpp.orig 2013-09-07 13:46:41.614844342 +0530
> > ++++ qtwebkit/Source/WebCore/platform/graphics/OpenGLShims.cpp 2013-09-07 13:47:39.602841796 +0530
> > +@@ -35,17 +35,20 @@ OpenGLFunctionTable* openGLFunctionTable
> > + {
> > + static OpenGLFunctionTable table;
> > + return &table;
> > + }
> > +
> > + #if PLATFORM(QT)
> > + static void* getProcAddress(const char* procName)
> > + {
> > +- return reinterpret_cast<void*>(QOpenGLContext::currentContext()->getProcAddress(procName));
> > ++ if(QOpenGLContext::currentContext())
> > ++ return reinterpret_cast<void*>(QOpenGLContext::currentContext()->getProcAddress(procName));
> > ++ else
> > ++ return NULL;
> > + }
> > + #else
> > + typedef void* (*glGetProcAddressType) (const char* procName);
> > + static void* getProcAddress(const char* procName)
> > + {
> > + static bool initialized = false;
> > + static glGetProcAddressType getProcAddressFunction = 0;
> > +
> > diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
> > new file mode 100644
> > index 0000000..fcd7658
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
> > @@ -0,0 +1,24 @@
> > +--- qtwebkit/Source/WebCore/Target.pri.orig 2013-09-07 13:48:04.030840724 +0530
> > ++++ qtwebkit/Source/WebCore/Target.pri 2013-09-07 13:49:01.714838191 +0530
> > +@@ -4095,16 +4095,21 @@ use?(GRAPHICS_SURFACE) {
> > + INCLUDEPATH += /System/Library/Frameworks/CoreFoundation.framework/Headers
> > + }
> > + win32 {
> > + SOURCES += platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp
> > + }
> > + have?(XCOMPOSITE) {
> > + SOURCES += platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
> > + }
> > ++ contains(QT_CONFIG, opengles2) {
> > ++ SOURCES -= platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
> > ++ SOURCES += platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp
> > ++ }
> > ++
> > + }
> > +
> > + build?(qttestsupport) {
> > + HEADERS += platform/qt/QtTestSupport.h
> > + SOURCES += platform/qt/QtTestSupport.cpp
> > + }
> > +
> > + ALL_IN_ONE_SOURCES += \
> > diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
> > new file mode 100644
> > index 0000000..050d301
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
> > @@ -0,0 +1,25 @@
> > +--- qtwebkit/Source/WebCore/WebCore.pri.orig 2013-09-08 14:18:22.315635577 +0530
> > ++++ qtwebkit/Source/WebCore/WebCore.pri 2013-09-08 14:18:44.271634981 +0530
> > +@@ -213,18 +213,20 @@ use?(3D_GRAPHICS) {
> > + } else {
> > + contains(QT_CONFIG, opengles2): CONFIG += egl
> > + }
> > + }
> > +
> > + use?(GRAPHICS_SURFACE) {
> > + mac: LIBS += -framework IOSurface -framework CoreFoundation
> > + linux-*: {
> > +- LIBS += -lXcomposite -lXrender
> > +- CONFIG *= x11
> > ++ xlibAvailable() {
> > ++ LIBS += -lXcomposite -lXrender
> > ++ CONFIG *= x11
> > ++ }
> > + }
> > + }
> > +
> > + have?(sqlite3) {
> > + mac {
> > + LIBS += -lsqlite3
> > + } else {
> > + PKGCONFIG += sqlite3
> > diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
> > new file mode 100644
> > index 0000000..288f116
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
> > @@ -0,0 +1,20 @@
> > +--- qtwebkit/Tools/qmake/mkspecs/features/features.prf.orig 2013-09-07 13:49:38.210836589 +0530
> > ++++ qtwebkit/Tools/qmake/mkspecs/features/features.prf 2013-09-07 13:50:13.574835036 +0530
> > +@@ -127,16 +127,17 @@ defineTest(detectFeatures) {
> > + packagesExist(libudev): WEBKIT_CONFIG += gamepad
> > +
> > + # Support for Graphics Surface
> > + # GraphicsSurface requires GraphicsContext3D and hence use_3d_graphics
> > + use?(3d_graphics) {
> > + mac: WEBKIT_CONFIG += use_graphics_surface
> > + win32:contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_graphics_surface
> > + linux-*:contains(WEBKIT_CONFIG, have_glx):contains(WEBKIT_CONFIG, have_xcomposite):contains(WEBKIT_CONFIG, have_xrender): WEBKIT_CONFIG += use_graphics_surface
> > ++ linux-*:contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_graphics_surface
> > + }
> > +
> > + # Slider Touch is sensible to use when compiling WebKit2
> > + enable?(touch_events): WEBKIT_CONFIG += touch_slider
> > +
> > +
> > + # Minibrowser must be able to query for QtTestSupport
> > + build?(qttestsupport): WEBKIT_CONFIG += have_qttestsupport
> > diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
> > new file mode 100644
> > index 0000000..9a57be2
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
> > @@ -0,0 +1,24 @@
> > +--- qtwebkit/Tools/QtTestBrowser/qttestbrowser.cpp.orig 2013-09-08 17:28:48.633593482 +0530
> > ++++ qtwebkit/Tools/QtTestBrowser/qttestbrowser.cpp 2013-09-08 17:29:07.713592964 +0530
> > +@@ -235,19 +235,20 @@ void LauncherApplication::handleUserOpti
> > + }
> > +
> > + if (args.contains("-webgl")) {
> > + requiresGraphicsView("-webgl");
> > + windowOptions.useWebGL = true;
> > + }
> > + #endif
> > +
> > ++#if 0
> > + if (args.contains("-use-test-fonts"))
> > + WebKit::QtTestSupport::initializeTestFonts();
> > +-
> > ++#endif
> > + if (args.contains("-print-loaded-urls"))
> > + windowOptions.printLoadedUrls = true;
> > +
> > + QString inspectorUrlArg("-inspector-url");
> > + int inspectorUrlIndex = args.indexOf(inspectorUrlArg);
> > + if (inspectorUrlIndex != -1)
> > + windowOptions.inspectorUrl = takeOptionValue(&args, inspectorUrlIndex);
> > +
> > diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
> > new file mode 100644
> > index 0000000..aed6b51
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
> > @@ -0,0 +1,14 @@
> > +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> > +
> > +SRC_URI += " \
> > + file://features.prf.patch \
> > + file://GraphicsContext3DQt.cpp.patch \
> > + file://GraphicsSurfaceGL_NoX.cpp.patch \
> > + file://GraphicsSurfaceToken.h.patch \
> > + file://OpenGLShims.cpp.patch \
> > + file://qttestbrowser.cpp.patch \
> > + file://Target.pri.patch \
> > + file://WebCore.pri.patch \
> > +"
> > +
> > +PR_append = "-arago0"
> > --
> > 1.8.3.2
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 06/13] qtwebkit: add WebGL on eglfs patches
2013-10-01 7:11 ` [PATCH 06/13] qtwebkit: add WebGL on eglfs patches Denys Dmytriyenko
2013-10-01 13:34 ` Cooper Jr., Franklin
@ 2013-10-02 12:56 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 12:56 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
With Franklins feedback addressed
Sincerely,
Chase Maupin
Integration Team Manager
Linux Core Product Development
e-mail: chase.maupin@ti.com
phone: (214) 567-2950
For support:
Forums - http://community.ti.com/forums/
Wiki - http://wiki.davincidsp.com/
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 06/13] qtwebkit: add WebGL on eglfs
>patches
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>* Add additional patches to enable WebGL on eglfs from Prabu.
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> .../qt5/qtwebkit/GraphicsContext3DQt.cpp.patch | 26 ++
> .../qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch | 270
>+++++++++++++++++++++
> .../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 +++
> .../recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch | 24 ++
> .../recipes-qt/qt5/qtwebkit/Target.pri.patch | 24 ++
> .../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 25 ++
> .../recipes-qt/qt5/qtwebkit/features.prf.patch | 20 ++
> .../qt5/qtwebkit/qttestbrowser.cpp.patch | 24 ++
> .../recipes-qt/qt5/qtwebkit_5.1.0.bbappend | 14 ++
> 9 files changed, 460 insertions(+)
> create mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
> create mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> create mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> create mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit/OpenGLShims.cpp.patch
> create mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit/Target.pri.patch
> create mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit/WebCore.pri.patch
> create mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit/features.prf.patch
> create mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit/qttestbrowser.cpp.patch
> create mode 100644 meta-arago-distro/recipes-
>qt/qt5/qtwebkit_5.1.0.bbappend
>
>diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch b/meta-arago-
>distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
>new file mode 100644
>index 0000000..aa752bb
>--- /dev/null
>+++ b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
>@@ -0,0 +1,26 @@
>+---
>qtwebkit/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.c
>pp.orig 2013-09-07 13:41:19.946858466 +0530
>++++
>qtwebkit/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.c
>pp 2013-09-07 17:48:13.958979770 +0530
>+@@ -383,21 +383,23 @@ GraphicsContext3D::GraphicsContext3D(Gra
>+ , m_boundTexture0(0)
>+ , m_multisampleFBO(0)
>+ , m_multisampleDepthStencilBuffer(0)
>+ , m_multisampleColorBuffer(0)
>+ , m_private(adoptPtr(new GraphicsContext3DPrivate(this,
>hostWindow, renderStyle)))
>+ {
>+ validateAttributes();
>+
>++#if USE(GLX)
>+ if (!m_private->m_surface || !m_private->m_platformContext)
>{
>+ LOG_ERROR("GraphicsContext3D: GL context creation
>failed.");
>+ m_private = nullptr;
>+ return;
>+ }
>++#endif
>+
>+ static bool initialized = false;
>+ static bool success = true;
>+ if (!initialized) {
>+ success = initializeOpenGLShims();
>+ initialized = true;
>+ }
>+ if (!success) {
>diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch b/meta-arago-
>distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
>new file mode 100644
>index 0000000..46c93f7
>--- /dev/null
>+++ b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
>@@ -0,0 +1,270 @@
>+diff -Nurp8
>Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX
>.cpp
>Source/WebCore/platform/graphics/surfaces/qt_new/GraphicsSurfaceGL
>_NoX.cpp
>+---
>qtwebkit/Source/WebCore/platform/graphics/surfaces/qt/GraphicsSurf
>aceGL_NoX.cpp 1970-01-01 05:30:00.000000000 +0530
>++++
>qtwebkit/Source/WebCore/platform/graphics/surfaces/qt_new/Graphics
>SurfaceGL_NoX.cpp 2013-09-07 13:43:55.186851650 +0530
>+@@ -0,0 +1,266 @@
>++/*
>++ Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-
>ies)
>++
>++ This library is free software; you can redistribute it and/or
>++ modify it under the terms of the GNU Library General Public
>++ License as published by the Free Software Foundation; either
>++ version 2 of the License, or (at your option) any later
>version.
>++
>++ This library is distributed in the hope that it will be useful,
>++ but WITHOUT ANY WARRANTY; without even the implied warranty of
>++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>GNU
>++ Library General Public License for more details.
>++
>++ You should have received a copy of the GNU Library General
>Public License
>++ along with this library; see the file COPYING.LIB. If not,
>write to
>++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth
>Floor,
>++ Boston, MA 02110-1301, USA.
>++ */
>++
>++#include "config.h"
>++#include "GraphicsSurface.h"
>++
>++#if USE(GRAPHICS_SURFACE)
>++
>++#include "NotImplemented.h"
>++#include "TextureMapperGL.h"
>++
>++#if PLATFORM(QT)
>++// Qt headers must be included before gl headers.
>++#include <QGuiApplication>
>++#include <QOpenGLContext>
>++#include <qpa/qplatformnativeinterface.h>
>++#elif PLATFORM(EFL)
>++#include <GL/gl.h>
>++#endif
>++
>++ #include <GLES2/gl2.h>
>++
>++namespace WebCore {
>++
>++class OffScreenRootWindow {
>++public:
>++ OffScreenRootWindow()
>++ {
>++ ++m_refCount;
>++ }
>++
>++ ~OffScreenRootWindow()
>++ {
>++ if (--m_refCount)
>++ return;
>++ }
>++
>++private:
>++ static int m_refCount;
>++};
>++
>++int OffScreenRootWindow::m_refCount = 0;
>++
>++
>++struct GraphicsSurfacePrivate {
>++ GraphicsSurfacePrivate(const PlatformGraphicsContext3D
>shareContext = 0)
>++ : m_textureIsYInverted(false)
>++ , m_hasAlpha(false)
>++ , m_isReceiver(false)
>++ {
>++
>++#if PLATFORM(QT)
>++ if (shareContext) {
>++#if 0
>++ // This code path requires
>QXcbNativeInterface::nativeResourceForContext() which is not
>availble in Qt5 on the build bots yet.
>++ QPlatformNativeInterface* nativeInterface =
>QGuiApplication::platformNativeInterface();
>++ shareContextObject =
>static_cast<GLXContext>(nativeInterface-
>>nativeResourceForContext(QByteArrayLiteral("glxcontext"),
>shareContext));
>++ if (!shareContextObject)
>++ return;
>++#else
>++ // This code path should be removed as soon as
>QXcbNativeInterface::nativeResourceForContext() can provide the
>GLXContext.
>++ QOpenGLContext* previousContext =
>QOpenGLContext::currentContext();
>++ QSurface* previousSurface = previousContext-
>>surface();
>++ QSurface* currentSurface = shareContext->surface();
>++ shareContext->makeCurrent(currentSurface);
>++
>++
>++ previousContext->makeCurrent(previousSurface);
>++#endif
>++ }
>++#else
>++ UNUSED_PARAM(shareContext);
>++#endif
>++
>++
>++ }
>++
>++ GraphicsSurfacePrivate(uint32_t winId)
>++ : m_textureIsYInverted(false)
>++ , m_hasAlpha(false)
>++ , m_isReceiver(true)
>++ { }
>++
>++ ~GraphicsSurfacePrivate()
>++ {
>++ }
>++
>++ uint32_t createSurface(const IntSize& size)
>++ {
>++ return 0;
>++ }
>++
>++ void createPixmap(uint32_t winId)
>++ {
>++ }
>++
>++ bool textureIsYInverted()
>++ {
>++ return m_textureIsYInverted;
>++ }
>++
>++ void makeCurrent()
>++ {
>++ }
>++
>++ void doneCurrent()
>++ {
>++ }
>++
>++ void swapBuffers()
>++ {
>++ }
>++
>++ void copyFromTexture(uint32_t texture, const IntRect&
>sourceRect)
>++ {
>++ makeCurrent();
>++
>++ swapBuffers();
>++ doneCurrent();
>++ }
>++
>++ void* display() const { return 0; }
>++
>++ IntSize size() const
>++ {
>++ return IntSize(0, 0);
>++ }
>++
>++private:
>++ OffScreenRootWindow m_offScreenWindow;
>++ IntSize m_size;
>++ bool m_textureIsYInverted;
>++ bool m_hasAlpha;
>++ bool m_isReceiver;
>++};
>++
>++static bool resolveGLMethods()
>++{
>++ return true;
>++}
>++
>++GraphicsSurfaceToken GraphicsSurface::platformExport()
>++{
>++ return GraphicsSurfaceToken();
>++}
>++
>++uint32_t GraphicsSurface::platformGetTextureID()
>++{
>++ return 0;
>++}
>++
>++void GraphicsSurface::platformCopyToGLTexture(uint32_t
>/*target*/, uint32_t /*id*/, const IntRect& /*targetRect*/, const
>IntPoint& /*offset*/)
>++{
>++ // This is not supported by NoX
>++}
>++
>++void GraphicsSurface::platformCopyFromTexture(uint32_t texture,
>const IntRect& sourceRect)
>++{
>++ m_private->copyFromTexture(texture, sourceRect);
>++}
>++
>++
>++void
>GraphicsSurface::platformPaintToTextureMapper(TextureMapper*
>textureMapper, const FloatRect& targetRect, const
>TransformationMatrix& transform, float opacity, BitmapTexture*
>mask)
>++{
>++ TextureMapperGL* texMapGL =
>static_cast<TextureMapperGL*>(textureMapper);
>++ TransformationMatrix adjustedTransform = transform;
>++
>adjustedTransform.multiply(TransformationMatrix::rectToRect(FloatR
>ect(FloatPoint::zero(), m_private->size()), targetRect));
>++ TextureMapperGL::Flags flags = m_private-
>>textureIsYInverted() ? TextureMapperGL::ShouldFlipTexture : 0;
>++ flags |= TextureMapperGL::SupportsBlending;
>++ texMapGL->drawTexture(platformGetTextureID(), flags,
>m_private->size(), targetRect, adjustedTransform, opacity, mask);
>++}
>++
>++uint32_t GraphicsSurface::platformFrontBuffer() const
>++{
>++ return 0;
>++}
>++
>++uint32_t GraphicsSurface::platformSwapBuffers()
>++{
>++ m_private->swapBuffers();
>++ return 0;
>++}
>++
>++IntSize GraphicsSurface::platformSize() const
>++{
>++ return m_private->size();
>++}
>++
>++PassRefPtr<GraphicsSurface>
>GraphicsSurface::platformCreate(const IntSize& size, Flags flags,
>const PlatformGraphicsContext3D shareContext)
>++{
>++ if (flags & SupportsCopyToTexture || flags &
>SupportsSingleBuffered)
>++ return PassRefPtr<GraphicsSurface>();
>++
>++ RefPtr<GraphicsSurface> surface = adoptRef(new
>GraphicsSurface(size, flags));
>++
>++ surface->m_private = new
>GraphicsSurfacePrivate(shareContext);
>++ if (!resolveGLMethods())
>++ return PassRefPtr<GraphicsSurface>();
>++
>++ surface->m_platformSurface = surface->m_private-
>>createSurface(size);
>++
>++ return surface;
>++}
>++
>++PassRefPtr<GraphicsSurface>
>GraphicsSurface::platformImport(const IntSize& size, Flags flags,
>const GraphicsSurfaceToken& token)
>++{
>++ if (flags & SupportsCopyToTexture || flags &
>SupportsSingleBuffered)
>++ return PassRefPtr<GraphicsSurface>();
>++
>++ RefPtr<GraphicsSurface> surface = adoptRef(new
>GraphicsSurface(size, flags));
>++ surface->m_platformSurface = token.frontBufferHandle;
>++
>++ surface->m_private = new GraphicsSurfacePrivate(surface-
>>m_platformSurface);
>++ if (!resolveGLMethods())
>++ return PassRefPtr<GraphicsSurface>();
>++
>++ return surface;
>++}
>++
>++char* GraphicsSurface::platformLock(const IntRect&, int*
>/*outputStride*/, LockOptions)
>++{
>++ // GraphicsSurface is currently only being used for WebGL,
>which does not require this locking mechanism.
>++ return 0;
>++}
>++
>++void GraphicsSurface::platformUnlock()
>++{
>++ // GraphicsSurface is currently only being used for WebGL,
>which does not require this locking mechanism.
>++}
>++
>++void GraphicsSurface::platformDestroy()
>++{
>++ m_private = 0;
>++}
>++
>++#if !PLATFORM(QT)
>++PassOwnPtr<GraphicsContext>
>GraphicsSurface::platformBeginPaint(const IntSize&, char*, int)
>++{
>++ notImplemented();
>++ return nullptr;
>++}
>++
>++PassRefPtr<Image> GraphicsSurface::createReadOnlyImage(const
>IntRect&)
>++{
>++ notImplemented();
>++ return 0;
>++}
>++#endif
>++}
>++#endif
>diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch b/meta-arago-
>distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
>new file mode 100644
>index 0000000..722df39
>--- /dev/null
>+++ b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
>@@ -0,0 +1,33 @@
>+---
>qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurface
>Token.h.orig 2013-09-07 13:44:47.906849335 +0530
>++++
>qtwebkit/Source/WebCore/platform/graphics/surfaces/GraphicsSurface
>Token.h 2013-09-07 13:46:12.554845618 +0530
>+@@ -50,17 +50,30 @@ struct GraphicsSurfaceToken {
>+ {
>+ return frontBufferHandle != rhs.frontBufferHandle;
>+ }
>+
>+ bool isValid() const
>+ {
>+ return frontBufferHandle;
>+ }
>++#elif PLATFORM(QT)
>++ GraphicsSurfaceToken(uint32_t windowID = 0)
>++ : frontBufferHandle(windowID)
>++ { }
>++
>++ bool operator!=(const GraphicsSurfaceToken &rhs) const
>++ {
>++ return frontBufferHandle != rhs.frontBufferHandle;
>++ }
>+
>++ bool isValid() const
>++ {
>++ return frontBufferHandle;
>++ }
>+ #endif
>+
>+ #if OS(DARWIN) || OS(WINDOWS)
>+ GraphicsSurfaceToken(BufferHandle frontBuffer = 0,
>BufferHandle backBuffer = 0)
>+ : frontBufferHandle(frontBuffer)
>+ , backBufferHandle(backBuffer)
>+ { }
>+
>diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/OpenGLShims.cpp.patch b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/OpenGLShims.cpp.patch
>new file mode 100644
>index 0000000..9261bed
>--- /dev/null
>+++ b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/OpenGLShims.cpp.patch
>@@ -0,0 +1,24 @@
>+---
>qtwebkit/Source/WebCore/platform/graphics/OpenGLShims.cpp.orig
> 2013-09-07 13:46:41.614844342 +0530
>++++ qtwebkit/Source/WebCore/platform/graphics/OpenGLShims.cpp
> 2013-09-07 13:47:39.602841796 +0530
>+@@ -35,17 +35,20 @@ OpenGLFunctionTable* openGLFunctionTable
>+ {
>+ static OpenGLFunctionTable table;
>+ return &table;
>+ }
>+
>+ #if PLATFORM(QT)
>+ static void* getProcAddress(const char* procName)
>+ {
>+- return
>reinterpret_cast<void*>(QOpenGLContext::currentContext()-
>>getProcAddress(procName));
>++ if(QOpenGLContext::currentContext())
>++ return
>reinterpret_cast<void*>(QOpenGLContext::currentContext()-
>>getProcAddress(procName));
>++ else
>++ return NULL;
>+ }
>+ #else
>+ typedef void* (*glGetProcAddressType) (const char* procName);
>+ static void* getProcAddress(const char* procName)
>+ {
>+ static bool initialized = false;
>+ static glGetProcAddressType getProcAddressFunction = 0;
>+
>diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/Target.pri.patch b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/Target.pri.patch
>new file mode 100644
>index 0000000..fcd7658
>--- /dev/null
>+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
>@@ -0,0 +1,24 @@
>+--- qtwebkit/Source/WebCore/Target.pri.orig 2013-09-07
>13:48:04.030840724 +0530
>++++ qtwebkit/Source/WebCore/Target.pri 2013-09-07
>13:49:01.714838191 +0530
>+@@ -4095,16 +4095,21 @@ use?(GRAPHICS_SURFACE) {
>+ INCLUDEPATH +=
>/System/Library/Frameworks/CoreFoundation.framework/Headers
>+ }
>+ win32 {
>+ SOURCES +=
>platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp
>+ }
>+ have?(XCOMPOSITE) {
>+ SOURCES +=
>platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
>+ }
>++ contains(QT_CONFIG, opengles2) {
>++ SOURCES -=
>platform/graphics/surfaces/qt/GraphicsSurfaceGLX.cpp
>++ SOURCES +=
>platform/graphics/surfaces/qt/GraphicsSurfaceGL_NoX.cpp
>++ }
>++
>+ }
>+
>+ build?(qttestsupport) {
>+ HEADERS += platform/qt/QtTestSupport.h
>+ SOURCES += platform/qt/QtTestSupport.cpp
>+ }
>+
>+ ALL_IN_ONE_SOURCES += \
>diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/WebCore.pri.patch b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/WebCore.pri.patch
>new file mode 100644
>index 0000000..050d301
>--- /dev/null
>+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
>@@ -0,0 +1,25 @@
>+--- qtwebkit/Source/WebCore/WebCore.pri.orig 2013-09-08
>14:18:22.315635577 +0530
>++++ qtwebkit/Source/WebCore/WebCore.pri 2013-09-08
>14:18:44.271634981 +0530
>+@@ -213,18 +213,20 @@ use?(3D_GRAPHICS) {
>+ } else {
>+ contains(QT_CONFIG, opengles2): CONFIG += egl
>+ }
>+ }
>+
>+ use?(GRAPHICS_SURFACE) {
>+ mac: LIBS += -framework IOSurface -framework CoreFoundation
>+ linux-*: {
>+- LIBS += -lXcomposite -lXrender
>+- CONFIG *= x11
>++ xlibAvailable() {
>++ LIBS += -lXcomposite -lXrender
>++ CONFIG *= x11
>++ }
>+ }
>+ }
>+
>+ have?(sqlite3) {
>+ mac {
>+ LIBS += -lsqlite3
>+ } else {
>+ PKGCONFIG += sqlite3
>diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/features.prf.patch b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/features.prf.patch
>new file mode 100644
>index 0000000..288f116
>--- /dev/null
>+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
>@@ -0,0 +1,20 @@
>+--- qtwebkit/Tools/qmake/mkspecs/features/features.prf.orig
> 2013-09-07 13:49:38.210836589 +0530
>++++ qtwebkit/Tools/qmake/mkspecs/features/features.prf 2013-
>09-07 13:50:13.574835036 +0530
>+@@ -127,16 +127,17 @@ defineTest(detectFeatures) {
>+ packagesExist(libudev): WEBKIT_CONFIG += gamepad
>+
>+ # Support for Graphics Surface
>+ # GraphicsSurface requires GraphicsContext3D and hence
>use_3d_graphics
>+ use?(3d_graphics) {
>+ mac: WEBKIT_CONFIG += use_graphics_surface
>+ win32:contains(QT_CONFIG, opengles2): WEBKIT_CONFIG +=
>use_graphics_surface
>+ linux-*:contains(WEBKIT_CONFIG,
>have_glx):contains(WEBKIT_CONFIG,
>have_xcomposite):contains(WEBKIT_CONFIG, have_xrender):
>WEBKIT_CONFIG += use_graphics_surface
>++ linux-*:contains(QT_CONFIG, opengles2): WEBKIT_CONFIG +=
>use_graphics_surface
>+ }
>+
>+ # Slider Touch is sensible to use when compiling WebKit2
>+ enable?(touch_events): WEBKIT_CONFIG += touch_slider
>+
>+
>+ # Minibrowser must be able to query for QtTestSupport
>+ build?(qttestsupport): WEBKIT_CONFIG += have_qttestsupport
>diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/qttestbrowser.cpp.patch b/meta-arago-
>distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
>new file mode 100644
>index 0000000..9a57be2
>--- /dev/null
>+++ b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit/qttestbrowser.cpp.patch
>@@ -0,0 +1,24 @@
>+--- qtwebkit/Tools/QtTestBrowser/qttestbrowser.cpp.orig 2013-
>09-08 17:28:48.633593482 +0530
>++++ qtwebkit/Tools/QtTestBrowser/qttestbrowser.cpp 2013-09-08
>17:29:07.713592964 +0530
>+@@ -235,19 +235,20 @@ void LauncherApplication::handleUserOpti
>+ }
>+
>+ if (args.contains("-webgl")) {
>+ requiresGraphicsView("-webgl");
>+ windowOptions.useWebGL = true;
>+ }
>+ #endif
>+
>++#if 0
>+ if (args.contains("-use-test-fonts"))
>+ WebKit::QtTestSupport::initializeTestFonts();
>+-
>++#endif
>+ if (args.contains("-print-loaded-urls"))
>+ windowOptions.printLoadedUrls = true;
>+
>+ QString inspectorUrlArg("-inspector-url");
>+ int inspectorUrlIndex = args.indexOf(inspectorUrlArg);
>+ if (inspectorUrlIndex != -1)
>+ windowOptions.inspectorUrl = takeOptionValue(&args,
>inspectorUrlIndex);
>+
>diff --git a/meta-arago-distro/recipes-
>qt/qt5/qtwebkit_5.1.0.bbappend b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit_5.1.0.bbappend
>new file mode 100644
>index 0000000..aed6b51
>--- /dev/null
>+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
>@@ -0,0 +1,14 @@
>+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>+
>+SRC_URI += " \
>+ file://features.prf.patch \
>+ file://GraphicsContext3DQt.cpp.patch \
>+ file://GraphicsSurfaceGL_NoX.cpp.patch \
>+ file://GraphicsSurfaceToken.h.patch \
>+ file://OpenGLShims.cpp.patch \
>+ file://qttestbrowser.cpp.patch \
>+ file://Target.pri.patch \
>+ file://WebCore.pri.patch \
>+"
>+
>+PR_append = "-arago0"
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 07/13] webkit-examples: enable building and packaging of examples
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (5 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 06/13] qtwebkit: add WebGL on eglfs patches Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 13:20 ` Cooper Jr., Franklin
2013-10-02 12:57 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 08/13] qt5.bbclass: add new class similar to existing qt4e for configuring recipes Denys Dmytriyenko
` (6 subsequent siblings)
13 siblings, 2 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-qt/qt5/qtwebkit-examples/examples-build.patch | 9 +++++++++
.../recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend | 5 +++++
2 files changed, 14 insertions(+)
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch
create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch
new file mode 100644
index 0000000..d7dc6ae
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch
@@ -0,0 +1,9 @@
+diff -uNr qtwebkit-examples-opensource-src-5.1.0-orig/qtwebkit-examples.pro qtwebkit-examples-opensource-src-5.1.0/qtwebkit-examples.pro
+--- qtwebkit-examples-opensource-src-5.1.0-orig/qtwebkit-examples.pro 2013-07-02 03:10:27.000000000 -0400
++++ qtwebkit-examples-opensource-src-5.1.0/qtwebkit-examples.pro 2013-09-29 21:31:10.761137146 -0400
+@@ -2,4 +2,4 @@
+
+ load(qt_parts)
+
+-SUBDIRS += doc
++SUBDIRS += doc examples
diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
new file mode 100644
index 0000000..7e41331
--- /dev/null
+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://examples-build.patch"
+
+PR_append = "-arago0"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 07/13] webkit-examples: enable building and packaging of examples
2013-10-01 7:11 ` [PATCH 07/13] webkit-examples: enable building and packaging of examples Denys Dmytriyenko
@ 2013-10-01 13:20 ` Cooper Jr., Franklin
2013-10-02 12:57 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:20 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
Ack
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> .../recipes-qt/qt5/qtwebkit-examples/examples-build.patch | 9 +++++++++
> .../recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend | 5 +++++
> 2 files changed, 14 insertions(+)
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
>
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch b/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch
> new file mode 100644
> index 0000000..d7dc6ae
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch
> @@ -0,0 +1,9 @@
> +diff -uNr qtwebkit-examples-opensource-src-5.1.0-orig/qtwebkit-examples.pro qtwebkit-examples-opensource-src-5.1.0/qtwebkit-examples.pro
> +--- qtwebkit-examples-opensource-src-5.1.0-orig/qtwebkit-examples.pro 2013-07-02 03:10:27.000000000 -0400
> ++++ qtwebkit-examples-opensource-src-5.1.0/qtwebkit-examples.pro 2013-09-29 21:31:10.761137146 -0400
> +@@ -2,4 +2,4 @@
> +
> + load(qt_parts)
> +
> +-SUBDIRS += doc
> ++SUBDIRS += doc examples
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend b/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
> new file mode 100644
> index 0000000..7e41331
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
> @@ -0,0 +1,5 @@
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> +
> +SRC_URI += "file://examples-build.patch"
> +
> +PR_append = "-arago0"
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 07/13] webkit-examples: enable building and packaging of examples
2013-10-01 7:11 ` [PATCH 07/13] webkit-examples: enable building and packaging of examples Denys Dmytriyenko
2013-10-01 13:20 ` Cooper Jr., Franklin
@ 2013-10-02 12:57 ` Maupin, Chase
2013-10-02 13:40 ` Denys Dmytriyenko
1 sibling, 1 reply; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 12:57 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
Some more explanation would be helpful here. What is in the examples that you need to build and package?
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 07/13] webkit-examples: enable
>building and packaging of examples
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> .../recipes-qt/qt5/qtwebkit-examples/examples-build.patch
>| 9 +++++++++
> .../recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
>| 5 +++++
> 2 files changed, 14 insertions(+)
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-
>examples/examples-build.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-
>examples_5.1.0.bbappend
>
>diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit-
>examples/examples-build.patch b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit-examples/examples-build.patch
>new file mode 100644
>index 0000000..d7dc6ae
>--- /dev/null
>+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-
>build.patch
>@@ -0,0 +1,9 @@
>+diff -uNr qtwebkit-examples-opensource-src-5.1.0-orig/qtwebkit-
>examples.pro qtwebkit-examples-opensource-src-5.1.0/qtwebkit-
>examples.pro
>+--- qtwebkit-examples-opensource-src-5.1.0-orig/qtwebkit-
>examples.pro 2013-07-02 03:10:27.000000000 -0400
>++++ qtwebkit-examples-opensource-src-5.1.0/qtwebkit-examples.pro
> 2013-09-29 21:31:10.761137146 -0400
>+@@ -2,4 +2,4 @@
>+
>+ load(qt_parts)
>+
>+-SUBDIRS += doc
>++SUBDIRS += doc examples
>diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit-
>examples_5.1.0.bbappend b/meta-arago-distro/recipes-
>qt/qt5/qtwebkit-examples_5.1.0.bbappend
>new file mode 100644
>index 0000000..7e41331
>--- /dev/null
>+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit-
>examples_5.1.0.bbappend
>@@ -0,0 +1,5 @@
>+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>+
>+SRC_URI += "file://examples-build.patch"
>+
>+PR_append = "-arago0"
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 07/13] webkit-examples: enable building and packaging of examples
2013-10-02 12:57 ` Maupin, Chase
@ 2013-10-02 13:40 ` Denys Dmytriyenko
2013-10-02 14:59 ` Maupin, Chase
0 siblings, 1 reply; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-02 13:40 UTC (permalink / raw)
To: Maupin, Chase; +Cc: meta-arago@arago-project.org
On Wed, Oct 02, 2013 at 12:57:56PM +0000, Maupin, Chase wrote:
> Some more explanation would be helpful here. What is in the examples that
> you need to build and package?
There are examples in the examples :) Seriously though, those are just basic
qtwebkit examples - standard ones Qt comes with. The point is there's a recipe
for them, but it doesn't build or package them, so pretty much useless,
besides the sources. We don't really need them, I was just testing and
experimenting with them.
> >-----Original Message-----
> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> >bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
> >Sent: Tuesday, October 01, 2013 2:11 AM
> >To: meta-arago@arago-project.org
> >Subject: [meta-arago] [PATCH 07/13] webkit-examples: enable
> >building and packaging of examples
> >
> >From: Denys Dmytriyenko <denys@ti.com>
> >
> >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> >---
> > .../recipes-qt/qt5/qtwebkit-examples/examples-build.patch
> >| 9 +++++++++
> > .../recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
> >| 5 +++++
> > 2 files changed, 14 insertions(+)
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-
> >examples/examples-build.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-
> >examples_5.1.0.bbappend
> >
> >diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit-
> >examples/examples-build.patch b/meta-arago-distro/recipes-
> >qt/qt5/qtwebkit-examples/examples-build.patch
> >new file mode 100644
> >index 0000000..d7dc6ae
> >--- /dev/null
> >+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-
> >build.patch
> >@@ -0,0 +1,9 @@
> >+diff -uNr qtwebkit-examples-opensource-src-5.1.0-orig/qtwebkit-
> >examples.pro qtwebkit-examples-opensource-src-5.1.0/qtwebkit-
> >examples.pro
> >+--- qtwebkit-examples-opensource-src-5.1.0-orig/qtwebkit-
> >examples.pro 2013-07-02 03:10:27.000000000 -0400
> >++++ qtwebkit-examples-opensource-src-5.1.0/qtwebkit-examples.pro
> > 2013-09-29 21:31:10.761137146 -0400
> >+@@ -2,4 +2,4 @@
> >+
> >+ load(qt_parts)
> >+
> >+-SUBDIRS += doc
> >++SUBDIRS += doc examples
> >diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit-
> >examples_5.1.0.bbappend b/meta-arago-distro/recipes-
> >qt/qt5/qtwebkit-examples_5.1.0.bbappend
> >new file mode 100644
> >index 0000000..7e41331
> >--- /dev/null
> >+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit-
> >examples_5.1.0.bbappend
> >@@ -0,0 +1,5 @@
> >+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> >+
> >+SRC_URI += "file://examples-build.patch"
> >+
> >+PR_append = "-arago0"
> >--
> >1.8.3.2
> >
> >_______________________________________________
> >meta-arago mailing list
> >meta-arago@arago-project.org
> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 07/13] webkit-examples: enable building and packaging of examples
2013-10-02 13:40 ` Denys Dmytriyenko
@ 2013-10-02 14:59 ` Maupin, Chase
0 siblings, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 14:59 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org
>-----Original Message-----
>From: Dmytriyenko, Denys
>Sent: Wednesday, October 02, 2013 8:40 AM
>To: Maupin, Chase
>Cc: Denys Dmytriyenko; meta-arago@arago-project.org
>Subject: Re: [meta-arago] [PATCH 07/13] webkit-examples: enable
>building and packaging of examples
>
>On Wed, Oct 02, 2013 at 12:57:56PM +0000, Maupin, Chase wrote:
>> Some more explanation would be helpful here. What is in the
>examples that
>> you need to build and package?
>
>There are examples in the examples :) Seriously though, those are
>just basic
>qtwebkit examples - standard ones Qt comes with. The point is
>there's a recipe
>for them, but it doesn't build or package them, so pretty much
>useless,
>besides the sources. We don't really need them, I was just testing
>and
>experimenting with them.
OK. I was curious if there was some specific example in there we were trying to get. I’m all for enabling more examples :)
>
>
>> >-----Original Message-----
>> >From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>> >bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>> >Sent: Tuesday, October 01, 2013 2:11 AM
>> >To: meta-arago@arago-project.org
>> >Subject: [meta-arago] [PATCH 07/13] webkit-examples: enable
>> >building and packaging of examples
>> >
>> >From: Denys Dmytriyenko <denys@ti.com>
>> >
>> >Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>> >---
>> > .../recipes-qt/qt5/qtwebkit-examples/examples-build.patch
>> >| 9 +++++++++
>> > .../recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
>> >| 5 +++++
>> > 2 files changed, 14 insertions(+)
>> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-
>> >examples/examples-build.patch
>> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-
>> >examples_5.1.0.bbappend
>> >
>> >diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit-
>> >examples/examples-build.patch b/meta-arago-distro/recipes-
>> >qt/qt5/qtwebkit-examples/examples-build.patch
>> >new file mode 100644
>> >index 0000000..d7dc6ae
>> >--- /dev/null
>> >+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit-
>examples/examples-
>> >build.patch
>> >@@ -0,0 +1,9 @@
>> >+diff -uNr qtwebkit-examples-opensource-src-5.1.0-
>orig/qtwebkit-
>> >examples.pro qtwebkit-examples-opensource-src-5.1.0/qtwebkit-
>> >examples.pro
>> >+--- qtwebkit-examples-opensource-src-5.1.0-orig/qtwebkit-
>> >examples.pro 2013-07-02 03:10:27.000000000 -0400
>> >++++ qtwebkit-examples-opensource-src-5.1.0/qtwebkit-
>examples.pro
>> > 2013-09-29 21:31:10.761137146 -0400
>> >+@@ -2,4 +2,4 @@
>> >+
>> >+ load(qt_parts)
>> >+
>> >+-SUBDIRS += doc
>> >++SUBDIRS += doc examples
>> >diff --git a/meta-arago-distro/recipes-qt/qt5/qtwebkit-
>> >examples_5.1.0.bbappend b/meta-arago-distro/recipes-
>> >qt/qt5/qtwebkit-examples_5.1.0.bbappend
>> >new file mode 100644
>> >index 0000000..7e41331
>> >--- /dev/null
>> >+++ b/meta-arago-distro/recipes-qt/qt5/qtwebkit-
>> >examples_5.1.0.bbappend
>> >@@ -0,0 +1,5 @@
>> >+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>> >+
>> >+SRC_URI += "file://examples-build.patch"
>> >+
>> >+PR_append = "-arago0"
>> >--
>> >1.8.3.2
>> >
>> >_______________________________________________
>> >meta-arago mailing list
>> >meta-arago@arago-project.org
>> >http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 08/13] qt5.bbclass: add new class similar to existing qt4e for configuring recipes
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (6 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 07/13] webkit-examples: enable building and packaging of examples Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 13:49 ` Cooper Jr., Franklin
2013-10-02 12:58 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 09/13] qt-provider.bbclass: class to allow seamless switching between Qt4 and Qt5 Denys Dmytriyenko
` (5 subsequent siblings)
13 siblings, 2 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
The base class to set everything for recipes to build against Qt5
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/classes/qt5.bbclass | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 meta-arago-distro/classes/qt5.bbclass
diff --git a/meta-arago-distro/classes/qt5.bbclass b/meta-arago-distro/classes/qt5.bbclass
new file mode 100644
index 0000000..8669ea4
--- /dev/null
+++ b/meta-arago-distro/classes/qt5.bbclass
@@ -0,0 +1,20 @@
+# Class to mimic the old qt4e to prep recipe for use with Qt5 libraries
+
+QT5EDEPENDS ?= "qtbase "
+DEPENDS_prepend = "${QT5EDEPENDS}"
+
+inherit qmake5
+
+# we don't want conflicts with qt4
+OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
+OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}"
+OE_QMAKE_PATH_DATA = "${OE_QMAKE_PATH_QT_DATA}"
+OE_QMAKE_PATH_BINS = "${OE_QMAKE_PATH_QT_BINS}"
+OE_QMAKE_PATH_TRANSLATIONS = "${OE_QMAKE_PATH_QT_TRANSLATIONS}"
+OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}"
+OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}"
+OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}"
+OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}"
+
+# Qt uses atomic instructions not supported in thumb mode
+ARM_INSTRUCTION_SET = "arm"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 08/13] qt5.bbclass: add new class similar to existing qt4e for configuring recipes
2013-10-01 7:11 ` [PATCH 08/13] qt5.bbclass: add new class similar to existing qt4e for configuring recipes Denys Dmytriyenko
@ 2013-10-01 13:49 ` Cooper Jr., Franklin
2013-10-02 12:58 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:49 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
Ack. Similar comment about up streaming this but I'm assuming like your previous respond that you plan on doing so.
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> The base class to set everything for recipes to build against Qt5
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> meta-arago-distro/classes/qt5.bbclass | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
> create mode 100644 meta-arago-distro/classes/qt5.bbclass
>
> diff --git a/meta-arago-distro/classes/qt5.bbclass b/meta-arago-distro/classes/qt5.bbclass
> new file mode 100644
> index 0000000..8669ea4
> --- /dev/null
> +++ b/meta-arago-distro/classes/qt5.bbclass
> @@ -0,0 +1,20 @@
> +# Class to mimic the old qt4e to prep recipe for use with Qt5 libraries
> +
> +QT5EDEPENDS ?= "qtbase "
> +DEPENDS_prepend = "${QT5EDEPENDS}"
> +
> +inherit qmake5
> +
> +# we don't want conflicts with qt4
> +OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
> +OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}"
> +OE_QMAKE_PATH_DATA = "${OE_QMAKE_PATH_QT_DATA}"
> +OE_QMAKE_PATH_BINS = "${OE_QMAKE_PATH_QT_BINS}"
> +OE_QMAKE_PATH_TRANSLATIONS = "${OE_QMAKE_PATH_QT_TRANSLATIONS}"
> +OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}"
> +OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}"
> +OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}"
> +OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}"
> +
> +# Qt uses atomic instructions not supported in thumb mode
> +ARM_INSTRUCTION_SET = "arm"
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 08/13] qt5.bbclass: add new class similar to existing qt4e for configuring recipes
2013-10-01 7:11 ` [PATCH 08/13] qt5.bbclass: add new class similar to existing qt4e for configuring recipes Denys Dmytriyenko
2013-10-01 13:49 ` Cooper Jr., Franklin
@ 2013-10-02 12:58 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 12:58 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
Echo of Franklin's upstreaming comment.
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 08/13] qt5.bbclass: add new class
>similar to existing qt4e for configuring recipes
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>The base class to set everything for recipes to build against Qt5
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> meta-arago-distro/classes/qt5.bbclass | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
> create mode 100644 meta-arago-distro/classes/qt5.bbclass
>
>diff --git a/meta-arago-distro/classes/qt5.bbclass b/meta-arago-
>distro/classes/qt5.bbclass
>new file mode 100644
>index 0000000..8669ea4
>--- /dev/null
>+++ b/meta-arago-distro/classes/qt5.bbclass
>@@ -0,0 +1,20 @@
>+# Class to mimic the old qt4e to prep recipe for use with Qt5
>libraries
>+
>+QT5EDEPENDS ?= "qtbase "
>+DEPENDS_prepend = "${QT5EDEPENDS}"
>+
>+inherit qmake5
>+
>+# we don't want conflicts with qt4
>+OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
>+OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}"
>+OE_QMAKE_PATH_DATA = "${OE_QMAKE_PATH_QT_DATA}"
>+OE_QMAKE_PATH_BINS = "${OE_QMAKE_PATH_QT_BINS}"
>+OE_QMAKE_PATH_TRANSLATIONS = "${OE_QMAKE_PATH_QT_TRANSLATIONS}"
>+OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}"
>+OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}"
>+OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}"
>+OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}"
>+
>+# Qt uses atomic instructions not supported in thumb mode
>+ARM_INSTRUCTION_SET = "arm"
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 09/13] qt-provider.bbclass: class to allow seamless switching between Qt4 and Qt5
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (7 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 08/13] qt5.bbclass: add new class similar to existing qt4e for configuring recipes Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 13:36 ` Cooper Jr., Franklin
2013-10-02 12:59 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 10/13] arago-prefs: load up Qt5 preferred versions Denys Dmytriyenko
` (4 subsequent siblings)
13 siblings, 2 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Recipes that need to compile against either Qt4 or Qt5 should inherit this class
instead of "inherit qt4e" or "inherit qt5" directly. Setting global QT_PROVIDER
to either "qt4e" or "qt5" will configure those recipes automatically.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/classes/qt-provider.bbclass | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 meta-arago-distro/classes/qt-provider.bbclass
diff --git a/meta-arago-distro/classes/qt-provider.bbclass b/meta-arago-distro/classes/qt-provider.bbclass
new file mode 100644
index 0000000..444c76a
--- /dev/null
+++ b/meta-arago-distro/classes/qt-provider.bbclass
@@ -0,0 +1,19 @@
+# Class to handle switching between Qt4 and Qt5
+# Usage:
+# 1. Set QT_PROVIDER in distro config to either "qt4e" or "qt5"
+# It defaults to "qt4e" when not set
+# Hasn't been tested with "qt4x11" but should theoretically work
+# 2. Update recipes to inherit qt-provider instead of qt4e directly
+# 3. May need to use below QT_DEPENDS_* and QT_RDEPENDS_* variables
+# instead of the actual Qt-version specific values
+
+QT_PROVIDER ?= "qt4e"
+
+inherit ${QT_PROVIDER}
+
+# Build-time dependencies
+QT_DEPENDS_BASE = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase', 'qt4-embedded', d)}"
+QT_DEPENDS_WEBKIT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtwebkit', '', d)}"
+
+# Run-time dependencies
+QT_RDEPENDS_FONTS = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase-fonts', 'qt4-embedded-fonts', d)}"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 09/13] qt-provider.bbclass: class to allow seamless switching between Qt4 and Qt5
2013-10-01 7:11 ` [PATCH 09/13] qt-provider.bbclass: class to allow seamless switching between Qt4 and Qt5 Denys Dmytriyenko
@ 2013-10-01 13:36 ` Cooper Jr., Franklin
2013-10-01 13:38 ` Denys Dmytriyenko
2013-10-02 12:59 ` Maupin, Chase
1 sibling, 1 reply; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:36 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
Ack.
As a temp solution I can understand some of these classes being added to meta-arago but in the long term will these patches be moved to meta-qt5?
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Recipes that need to compile against either Qt4 or Qt5 should inherit this class
> instead of "inherit qt4e" or "inherit qt5" directly. Setting global QT_PROVIDER
> to either "qt4e" or "qt5" will configure those recipes automatically.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> meta-arago-distro/classes/qt-provider.bbclass | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
> create mode 100644 meta-arago-distro/classes/qt-provider.bbclass
>
> diff --git a/meta-arago-distro/classes/qt-provider.bbclass b/meta-arago-distro/classes/qt-provider.bbclass
> new file mode 100644
> index 0000000..444c76a
> --- /dev/null
> +++ b/meta-arago-distro/classes/qt-provider.bbclass
> @@ -0,0 +1,19 @@
> +# Class to handle switching between Qt4 and Qt5
> +# Usage:
> +# 1. Set QT_PROVIDER in distro config to either "qt4e" or "qt5"
> +# It defaults to "qt4e" when not set
> +# Hasn't been tested with "qt4x11" but should theoretically work
> +# 2. Update recipes to inherit qt-provider instead of qt4e directly
> +# 3. May need to use below QT_DEPENDS_* and QT_RDEPENDS_* variables
> +# instead of the actual Qt-version specific values
> +
> +QT_PROVIDER ?= "qt4e"
> +
> +inherit ${QT_PROVIDER}
> +
> +# Build-time dependencies
> +QT_DEPENDS_BASE = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase', 'qt4-embedded', d)}"
> +QT_DEPENDS_WEBKIT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtwebkit', '', d)}"
> +
> +# Run-time dependencies
> +QT_RDEPENDS_FONTS = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase-fonts', 'qt4-embedded-fonts', d)}"
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 09/13] qt-provider.bbclass: class to allow seamless switching between Qt4 and Qt5
2013-10-01 13:36 ` Cooper Jr., Franklin
@ 2013-10-01 13:38 ` Denys Dmytriyenko
0 siblings, 0 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 13:38 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
On Tue, Oct 01, 2013 at 01:36:49PM +0000, Cooper Jr., Franklin wrote:
> Ack.
>
> As a temp solution I can understand some of these classes being added to
> meta-arago but in the long term will these patches be moved to meta-qt5?
Once they are tested in our environment, I was planning to offer them upstream :)
> > On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Recipes that need to compile against either Qt4 or Qt5 should inherit this class
> > instead of "inherit qt4e" or "inherit qt5" directly. Setting global QT_PROVIDER
> > to either "qt4e" or "qt5" will configure those recipes automatically.
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > meta-arago-distro/classes/qt-provider.bbclass | 19 +++++++++++++++++++
> > 1 file changed, 19 insertions(+)
> > create mode 100644 meta-arago-distro/classes/qt-provider.bbclass
> >
> > diff --git a/meta-arago-distro/classes/qt-provider.bbclass b/meta-arago-distro/classes/qt-provider.bbclass
> > new file mode 100644
> > index 0000000..444c76a
> > --- /dev/null
> > +++ b/meta-arago-distro/classes/qt-provider.bbclass
> > @@ -0,0 +1,19 @@
> > +# Class to handle switching between Qt4 and Qt5
> > +# Usage:
> > +# 1. Set QT_PROVIDER in distro config to either "qt4e" or "qt5"
> > +# It defaults to "qt4e" when not set
> > +# Hasn't been tested with "qt4x11" but should theoretically work
> > +# 2. Update recipes to inherit qt-provider instead of qt4e directly
> > +# 3. May need to use below QT_DEPENDS_* and QT_RDEPENDS_* variables
> > +# instead of the actual Qt-version specific values
> > +
> > +QT_PROVIDER ?= "qt4e"
> > +
> > +inherit ${QT_PROVIDER}
> > +
> > +# Build-time dependencies
> > +QT_DEPENDS_BASE = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase', 'qt4-embedded', d)}"
> > +QT_DEPENDS_WEBKIT = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtwebkit', '', d)}"
> > +
> > +# Run-time dependencies
> > +QT_RDEPENDS_FONTS = "${@base_conditional('QT_PROVIDER', 'qt5', 'qtbase-fonts', 'qt4-embedded-fonts', d)}"
> > --
> > 1.8.3.2
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 09/13] qt-provider.bbclass: class to allow seamless switching between Qt4 and Qt5
2013-10-01 7:11 ` [PATCH 09/13] qt-provider.bbclass: class to allow seamless switching between Qt4 and Qt5 Denys Dmytriyenko
2013-10-01 13:36 ` Cooper Jr., Franklin
@ 2013-10-02 12:59 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 12:59 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
And very nice by the way
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 09/13] qt-provider.bbclass: class to
>allow seamless switching between Qt4 and Qt5
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>Recipes that need to compile against either Qt4 or Qt5 should
>inherit this class
>instead of "inherit qt4e" or "inherit qt5" directly. Setting
>global QT_PROVIDER
>to either "qt4e" or "qt5" will configure those recipes
>automatically.
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> meta-arago-distro/classes/qt-provider.bbclass | 19
>+++++++++++++++++++
> 1 file changed, 19 insertions(+)
> create mode 100644 meta-arago-distro/classes/qt-provider.bbclass
>
>diff --git a/meta-arago-distro/classes/qt-provider.bbclass b/meta-
>arago-distro/classes/qt-provider.bbclass
>new file mode 100644
>index 0000000..444c76a
>--- /dev/null
>+++ b/meta-arago-distro/classes/qt-provider.bbclass
>@@ -0,0 +1,19 @@
>+# Class to handle switching between Qt4 and Qt5
>+# Usage:
>+# 1. Set QT_PROVIDER in distro config to either "qt4e" or "qt5"
>+# It defaults to "qt4e" when not set
>+# Hasn't been tested with "qt4x11" but should theoretically
>work
>+# 2. Update recipes to inherit qt-provider instead of qt4e
>directly
>+# 3. May need to use below QT_DEPENDS_* and QT_RDEPENDS_*
>variables
>+# instead of the actual Qt-version specific values
>+
>+QT_PROVIDER ?= "qt4e"
>+
>+inherit ${QT_PROVIDER}
>+
>+# Build-time dependencies
>+QT_DEPENDS_BASE = "${@base_conditional('QT_PROVIDER', 'qt5',
>'qtbase', 'qt4-embedded', d)}"
>+QT_DEPENDS_WEBKIT = "${@base_conditional('QT_PROVIDER', 'qt5',
>'qtwebkit', '', d)}"
>+
>+# Run-time dependencies
>+QT_RDEPENDS_FONTS = "${@base_conditional('QT_PROVIDER', 'qt5',
>'qtbase-fonts', 'qt4-embedded-fonts', d)}"
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 10/13] arago-prefs: load up Qt5 preferred versions
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (8 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 09/13] qt-provider.bbclass: class to allow seamless switching between Qt4 and Qt5 Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-02 13:00 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 11/13] arago.conf: set QT_PROVIDER to Qt5, bump distro version Denys Dmytriyenko
` (3 subsequent siblings)
13 siblings, 1 reply; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/include/arago-prefs.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 70f02b9..fac831f 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -1,3 +1,6 @@
+# Set preferred Qt5 versions. Different namespace from Qt4, so no conflict
+include conf/distro/include/qt5-versions.inc
+
# Use the latest version of ltp-ddt for kernel versions 3.8+
PREFERRED_PROVIDER_ltp-ddt = "ltp-ddt"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 10/13] arago-prefs: load up Qt5 preferred versions
2013-10-01 7:11 ` [PATCH 10/13] arago-prefs: load up Qt5 preferred versions Denys Dmytriyenko
@ 2013-10-02 13:00 ` Maupin, Chase
0 siblings, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 13:00 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 10/13] arago-prefs: load up Qt5
>preferred versions
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> meta-arago-distro/conf/distro/include/arago-prefs.inc | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc
>b/meta-arago-distro/conf/distro/include/arago-prefs.inc
>index 70f02b9..fac831f 100644
>--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
>+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
>@@ -1,3 +1,6 @@
>+# Set preferred Qt5 versions. Different namespace from Qt4, so no
>conflict
>+include conf/distro/include/qt5-versions.inc
>+
> # Use the latest version of ltp-ddt for kernel versions 3.8+
> PREFERRED_PROVIDER_ltp-ddt = "ltp-ddt"
>
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 11/13] arago.conf: set QT_PROVIDER to Qt5, bump distro version
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (9 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 10/13] arago-prefs: load up Qt5 preferred versions Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 13:23 ` Cooper Jr., Franklin
2013-10-01 7:11 ` [PATCH 12/13] matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible Denys Dmytriyenko
` (2 subsequent siblings)
13 siblings, 1 reply; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/arago.conf | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 18299bd..7ecd2b4 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -1,6 +1,8 @@
# Name and version of the distribution
DISTRO_NAME = "Arago"
-DISTRO_VERSION = "2013.08"
+DISTRO_VERSION = "2013.10"
+
+QT_PROVIDER = "qt5"
# SDK paths and names
SDK_NAME_PREFIX = "arago"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 11/13] arago.conf: set QT_PROVIDER to Qt5, bump distro version
2013-10-01 7:11 ` [PATCH 11/13] arago.conf: set QT_PROVIDER to Qt5, bump distro version Denys Dmytriyenko
@ 2013-10-01 13:23 ` Cooper Jr., Franklin
2013-10-01 13:28 ` Denys Dmytriyenko
0 siblings, 1 reply; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:23 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
As long as we put this on a separate branch based on my reasoning I mentioned on this patch set cover sheet then I have no problem with this.
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> meta-arago-distro/conf/distro/arago.conf | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
> index 18299bd..7ecd2b4 100644
> --- a/meta-arago-distro/conf/distro/arago.conf
> +++ b/meta-arago-distro/conf/distro/arago.conf
> @@ -1,6 +1,8 @@
> # Name and version of the distribution
> DISTRO_NAME = "Arago"
> -DISTRO_VERSION = "2013.08"
> +DISTRO_VERSION = "2013.10"
> +
> +QT_PROVIDER = "qt5"
>
> # SDK paths and names
> SDK_NAME_PREFIX = "arago"
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 11/13] arago.conf: set QT_PROVIDER to Qt5, bump distro version
2013-10-01 13:23 ` Cooper Jr., Franklin
@ 2013-10-01 13:28 ` Denys Dmytriyenko
2013-10-01 14:44 ` Cooper Jr., Franklin
0 siblings, 1 reply; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 13:28 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
On Tue, Oct 01, 2013 at 01:23:27PM +0000, Cooper Jr., Franklin wrote:
> As long as we put this on a separate branch based on my reasoning I
> mentioned on this patch set cover sheet then I have no problem with this.
Yeah, this was rather meant for the demo of Qt5-based matrix-browser, not as a
default value right away. I'd rather drop this and stick with Qt4 for a while,
if we can get everything else in to the master.
> > On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > meta-arago-distro/conf/distro/arago.conf | 4 +++-
> > 1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
> > index 18299bd..7ecd2b4 100644
> > --- a/meta-arago-distro/conf/distro/arago.conf
> > +++ b/meta-arago-distro/conf/distro/arago.conf
> > @@ -1,6 +1,8 @@
> > # Name and version of the distribution
> > DISTRO_NAME = "Arago"
> > -DISTRO_VERSION = "2013.08"
> > +DISTRO_VERSION = "2013.10"
> > +
> > +QT_PROVIDER = "qt5"
> >
> > # SDK paths and names
> > SDK_NAME_PREFIX = "arago"
> > --
> > 1.8.3.2
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 11/13] arago.conf: set QT_PROVIDER to Qt5, bump distro version
2013-10-01 13:28 ` Denys Dmytriyenko
@ 2013-10-01 14:44 ` Cooper Jr., Franklin
0 siblings, 0 replies; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 14:44 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org
> -----Original Message-----
> From: Dmytriyenko, Denys
> Sent: Tuesday, October 01, 2013 8:29 AM
> To: Cooper Jr., Franklin
> Cc: meta-arago@arago-project.org
> Subject: Re: [meta-arago] [PATCH 11/13] arago.conf: set QT_PROVIDER to Qt5,
> bump distro version
>
> On Tue, Oct 01, 2013 at 01:23:27PM +0000, Cooper Jr., Franklin wrote:
> > As long as we put this on a separate branch based on my reasoning I
> > mentioned on this patch set cover sheet then I have no problem with this.
>
> Yeah, this was rather meant for the demo of Qt5-based matrix-browser, not as a
> default value right away. I'd rather drop this and stick with Qt4 for a while, if we
> can get everything else in to the master.
[Franklin] Sounds good.
>
>
> > > On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org>
> wrote:
> > >
> > > From: Denys Dmytriyenko <denys@ti.com>
> > >
> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > > ---
> > > meta-arago-distro/conf/distro/arago.conf | 4 +++-
> > > 1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/meta-arago-distro/conf/distro/arago.conf
> > > b/meta-arago-distro/conf/distro/arago.conf
> > > index 18299bd..7ecd2b4 100644
> > > --- a/meta-arago-distro/conf/distro/arago.conf
> > > +++ b/meta-arago-distro/conf/distro/arago.conf
> > > @@ -1,6 +1,8 @@
> > > # Name and version of the distribution DISTRO_NAME = "Arago"
> > > -DISTRO_VERSION = "2013.08"
> > > +DISTRO_VERSION = "2013.10"
> > > +
> > > +QT_PROVIDER = "qt5"
> > >
> > > # SDK paths and names
> > > SDK_NAME_PREFIX = "arago"
> > > --
> > > 1.8.3.2
> > >
> > > _______________________________________________
> > > meta-arago mailing list
> > > meta-arago@arago-project.org
> > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 12/13] matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (10 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 11/13] arago.conf: set QT_PROVIDER to Qt5, bump distro version Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 13:24 ` Cooper Jr., Franklin
2013-10-02 13:03 ` Maupin, Chase
2013-10-01 7:11 ` [PATCH 13/13] arago-qt5-image: add test minimal image for testing Qt5 migration Denys Dmytriyenko
2013-10-01 12:42 ` [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Cooper Jr., Franklin
13 siblings, 2 replies; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Uses qt-provider class to build against either Qt4 or Qt5 depending on global
distro variable QT_PROVIDER.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../matrix/matrix-gui-browser/qt5-gui-widgets-move.patch | 12 ++++++++++++
.../recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch | 12 ++++++++++++
.../recipes-core/matrix/matrix-gui-browser_2.0.bb | 12 ++++++++----
3 files changed, 32 insertions(+), 4 deletions(-)
create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch
create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch
new file mode 100644
index 0000000..e725004
--- /dev/null
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch
@@ -0,0 +1,12 @@
+diff -uNr git-orig/main.cpp git/main.cpp
+--- git-orig/main.cpp 2013-09-29 20:06:36.000000000 -0400
++++ git/main.cpp 2013-09-29 20:11:52.762449142 -0400
+@@ -36,7 +36,7 @@
+ *
+ */
+
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QWebView>
+ #include <QGraphicsWebView>
+ #include <iostream>
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch
new file mode 100644
index 0000000..abbbcc8
--- /dev/null
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch
@@ -0,0 +1,12 @@
+diff -uNr git-orig/matrix_browser.pro git/matrix_browser.pro
+--- git-orig/matrix_browser.pro 2013-09-29 18:43:16.000000000 -0400
++++ git/matrix_browser.pro 2013-09-29 19:00:24.182913775 -0400
+@@ -6,7 +6,7 @@
+ TARGET = matrix_browser
+ DEPENDPATH += .
+ INCLUDEPATH += .
+-QT += webkit
++QT += webkitwidgets
+ # Input
+ SOURCES += main.cpp
+
diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
index 0e508a0..329b65a 100644
--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
@@ -4,19 +4,23 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=884b90f5bf0d711fe32c4f04b5276496"
SECTION = "multimedia"
+inherit qt-provider
+
# Make sure that QT font libraries have been installed
-RDEPENDS_${PN} += "qt4-embedded-fonts"
+RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
+
+DEPENDS += "${QT_DEPENDS_WEBKIT}"
-PR = "r2"
+PR = "r3"
SRCREV = "db2e6b10e5a14358b6120a4a28de2f9d591bc55c"
BRANCH ?= "master"
SRC_URI = "git://gitorious.org/matrix-gui-v2/matrix_browser.git;protocol=git;branch=${BRANCH}"
-S = "${WORKDIR}/git"
+SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', 'file://qt5-webkit.patch file://qt5-gui-widgets-move.patch', '', d)}"
-inherit qt4e
+S = "${WORKDIR}/git"
do_install() {
install -d ${D}/${bindir}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 12/13] matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible
2013-10-01 7:11 ` [PATCH 12/13] matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible Denys Dmytriyenko
@ 2013-10-01 13:24 ` Cooper Jr., Franklin
2013-10-02 13:03 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:24 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
Ack
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Uses qt-provider class to build against either Qt4 or Qt5 depending on global
> distro variable QT_PROVIDER.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> .../matrix/matrix-gui-browser/qt5-gui-widgets-move.patch | 12 ++++++++++++
> .../recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch | 12 ++++++++++++
> .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 12 ++++++++----
> 3 files changed, 32 insertions(+), 4 deletions(-)
> create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch
> create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch
>
> diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch
> new file mode 100644
> index 0000000..e725004
> --- /dev/null
> +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch
> @@ -0,0 +1,12 @@
> +diff -uNr git-orig/main.cpp git/main.cpp
> +--- git-orig/main.cpp 2013-09-29 20:06:36.000000000 -0400
> ++++ git/main.cpp 2013-09-29 20:11:52.762449142 -0400
> +@@ -36,7 +36,7 @@
> + *
> + */
> +
> +-#include <QtGui>
> ++#include <QtWidgets>
> + #include <QWebView>
> + #include <QGraphicsWebView>
> + #include <iostream>
> diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch
> new file mode 100644
> index 0000000..abbbcc8
> --- /dev/null
> +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch
> @@ -0,0 +1,12 @@
> +diff -uNr git-orig/matrix_browser.pro git/matrix_browser.pro
> +--- git-orig/matrix_browser.pro 2013-09-29 18:43:16.000000000 -0400
> ++++ git/matrix_browser.pro 2013-09-29 19:00:24.182913775 -0400
> +@@ -6,7 +6,7 @@
> + TARGET = matrix_browser
> + DEPENDPATH += .
> + INCLUDEPATH += .
> +-QT += webkit
> ++QT += webkitwidgets
> + # Input
> + SOURCES += main.cpp
> +
> diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
> index 0e508a0..329b65a 100644
> --- a/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
> +++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-browser_2.0.bb
> @@ -4,19 +4,23 @@ LICENSE = "BSD"
> LIC_FILES_CHKSUM = "file://main.cpp;beginline=9;endline=37;md5=884b90f5bf0d711fe32c4f04b5276496"
> SECTION = "multimedia"
>
> +inherit qt-provider
> +
> # Make sure that QT font libraries have been installed
> -RDEPENDS_${PN} += "qt4-embedded-fonts"
> +RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
> +
> +DEPENDS += "${QT_DEPENDS_WEBKIT}"
>
> -PR = "r2"
> +PR = "r3"
>
> SRCREV = "db2e6b10e5a14358b6120a4a28de2f9d591bc55c"
> BRANCH ?= "master"
>
> SRC_URI = "git://gitorious.org/matrix-gui-v2/matrix_browser.git;protocol=git;branch=${BRANCH}"
>
> -S = "${WORKDIR}/git"
> +SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', 'file://qt5-webkit.patch file://qt5-gui-widgets-move.patch', '', d)}"
>
> -inherit qt4e
> +S = "${WORKDIR}/git"
>
> do_install() {
> install -d ${D}/${bindir}
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 12/13] matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible
2013-10-01 7:11 ` [PATCH 12/13] matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible Denys Dmytriyenko
2013-10-01 13:24 ` Cooper Jr., Franklin
@ 2013-10-02 13:03 ` Maupin, Chase
1 sibling, 0 replies; 49+ messages in thread
From: Maupin, Chase @ 2013-10-02 13:03 UTC (permalink / raw)
To: Denys Dmytriyenko, meta-arago@arago-project.org
Acked-by: Chase Maupin <chase.maupin@ti.com>
>-----Original Message-----
>From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
>bounces@arago-project.org] On Behalf Of Denys Dmytriyenko
>Sent: Tuesday, October 01, 2013 2:11 AM
>To: meta-arago@arago-project.org
>Subject: [meta-arago] [PATCH 12/13] matrix-gui-browser: update
>recipe to be Qt4 and Qt5 compatible
>
>From: Denys Dmytriyenko <denys@ti.com>
>
>Uses qt-provider class to build against either Qt4 or Qt5
>depending on global
>distro variable QT_PROVIDER.
>
>Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>---
> .../matrix/matrix-gui-browser/qt5-gui-widgets-move.patch | 12
>++++++++++++
> .../recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch | 12
>++++++++++++
> .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 12
>++++++++----
> 3 files changed, 32 insertions(+), 4 deletions(-)
> create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-
>gui-browser/qt5-gui-widgets-move.patch
> create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-
>gui-browser/qt5-webkit.patch
>
>diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser/qt5-gui-widgets-move.patch b/meta-arago-extras/recipes-
>core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch
>new file mode 100644
>index 0000000..e725004
>--- /dev/null
>+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser/qt5-gui-widgets-move.patch
>@@ -0,0 +1,12 @@
>+diff -uNr git-orig/main.cpp git/main.cpp
>+--- git-orig/main.cpp 2013-09-29 20:06:36.000000000 -0400
>++++ git/main.cpp 2013-09-29 20:11:52.762449142 -0400
>+@@ -36,7 +36,7 @@
>+ *
>+ */
>+
>+-#include <QtGui>
>++#include <QtWidgets>
>+ #include <QWebView>
>+ #include <QGraphicsWebView>
>+ #include <iostream>
>diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser/qt5-webkit.patch b/meta-arago-extras/recipes-
>core/matrix/matrix-gui-browser/qt5-webkit.patch
>new file mode 100644
>index 0000000..abbbcc8
>--- /dev/null
>+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser/qt5-webkit.patch
>@@ -0,0 +1,12 @@
>+diff -uNr git-orig/matrix_browser.pro git/matrix_browser.pro
>+--- git-orig/matrix_browser.pro 2013-09-29 18:43:16.000000000
>-0400
>++++ git/matrix_browser.pro 2013-09-29 19:00:24.182913775 -0400
>+@@ -6,7 +6,7 @@
>+ TARGET = matrix_browser
>+ DEPENDPATH += .
>+ INCLUDEPATH += .
>+-QT += webkit
>++QT += webkitwidgets
>+ # Input
>+ SOURCES += main.cpp
>+
>diff --git a/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser_2.0.bb b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser_2.0.bb
>index 0e508a0..329b65a 100644
>--- a/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser_2.0.bb
>+++ b/meta-arago-extras/recipes-core/matrix/matrix-gui-
>browser_2.0.bb
>@@ -4,19 +4,23 @@ LICENSE = "BSD"
> LIC_FILES_CHKSUM =
>"file://main.cpp;beginline=9;endline=37;md5=884b90f5bf0d711fe32c4f
>04b5276496"
> SECTION = "multimedia"
>
>+inherit qt-provider
>+
> # Make sure that QT font libraries have been installed
>-RDEPENDS_${PN} += "qt4-embedded-fonts"
>+RDEPENDS_${PN} += "${QT_RDEPENDS_FONTS}"
>+
>+DEPENDS += "${QT_DEPENDS_WEBKIT}"
>
>-PR = "r2"
>+PR = "r3"
>
> SRCREV = "db2e6b10e5a14358b6120a4a28de2f9d591bc55c"
> BRANCH ?= "master"
>
> SRC_URI = "git://gitorious.org/matrix-gui-
>v2/matrix_browser.git;protocol=git;branch=${BRANCH}"
>
>-S = "${WORKDIR}/git"
>+SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5',
>'file://qt5-webkit.patch file://qt5-gui-widgets-move.patch', '',
>d)}"
>
>-inherit qt4e
>+S = "${WORKDIR}/git"
>
> do_install() {
> install -d ${D}/${bindir}
>--
>1.8.3.2
>
>_______________________________________________
>meta-arago mailing list
>meta-arago@arago-project.org
>http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* [PATCH 13/13] arago-qt5-image: add test minimal image for testing Qt5 migration
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (11 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 12/13] matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible Denys Dmytriyenko
@ 2013-10-01 7:11 ` Denys Dmytriyenko
2013-10-01 12:50 ` Cooper Jr., Franklin
2013-10-01 12:42 ` [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Cooper Jr., Franklin
13 siblings, 1 reply; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 7:11 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-core/images/arago-qt5-image.bb | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 meta-arago-distro/recipes-core/images/arago-qt5-image.bb
diff --git a/meta-arago-distro/recipes-core/images/arago-qt5-image.bb b/meta-arago-distro/recipes-core/images/arago-qt5-image.bb
new file mode 100644
index 0000000..7d8ced9
--- /dev/null
+++ b/meta-arago-distro/recipes-core/images/arago-qt5-image.bb
@@ -0,0 +1,18 @@
+# Arago TI SDK base image
+# gives you an image with Qt/E and other common packages shared by all TI SDKs.
+
+require arago-image.inc
+inherit remove-net-rules
+
+COMPATIBLE_MACHINE = "omap3|omapl138|ti33x|ti43x|omap4|omap-a15"
+
+IMAGE_INSTALL += "\
+ packagegroup-arago-base \
+ packagegroup-arago-console \
+ packagegroup-arago-base-tisdk \
+ matrix-gui-browser \
+ qtwebkit-examples-examples \
+ qtbase-plugins \
+ "
+
+export IMAGE_BASENAME = "arago-qt5-image"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 49+ messages in thread* Re: [PATCH 13/13] arago-qt5-image: add test minimal image for testing Qt5 migration
2013-10-01 7:11 ` [PATCH 13/13] arago-qt5-image: add test minimal image for testing Qt5 migration Denys Dmytriyenko
@ 2013-10-01 12:50 ` Cooper Jr., Franklin
2013-10-01 13:24 ` Denys Dmytriyenko
0 siblings, 1 reply; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 12:50 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
I'm not sure if Matrix is a useful application to include I'm this test image. The backend for Matrix isn't included and no Matrix apps will be installed so I'm assuming all this would do is open a white Window.
Why not include something like the thermostat demo which is a much full featured demo based on QWidgets and is probably our best means to discover any potential problems.
> On Oct 1, 2013, at 2:17 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> .../recipes-core/images/arago-qt5-image.bb | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
> create mode 100644 meta-arago-distro/recipes-core/images/arago-qt5-image.bb
>
> diff --git a/meta-arago-distro/recipes-core/images/arago-qt5-image.bb b/meta-arago-distro/recipes-core/images/arago-qt5-image.bb
> new file mode 100644
> index 0000000..7d8ced9
> --- /dev/null
> +++ b/meta-arago-distro/recipes-core/images/arago-qt5-image.bb
> @@ -0,0 +1,18 @@
> +# Arago TI SDK base image
> +# gives you an image with Qt/E and other common packages shared by all TI SDKs.
> +
> +require arago-image.inc
> +inherit remove-net-rules
> +
> +COMPATIBLE_MACHINE = "omap3|omapl138|ti33x|ti43x|omap4|omap-a15"
> +
> +IMAGE_INSTALL += "\
> + packagegroup-arago-base \
> + packagegroup-arago-console \
> + packagegroup-arago-base-tisdk \
> + matrix-gui-browser \
> + qtwebkit-examples-examples \
> + qtbase-plugins \
> + "
> +
> +export IMAGE_BASENAME = "arago-qt5-image"
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 13/13] arago-qt5-image: add test minimal image for testing Qt5 migration
2013-10-01 12:50 ` Cooper Jr., Franklin
@ 2013-10-01 13:24 ` Denys Dmytriyenko
2013-10-01 13:42 ` Cooper Jr., Franklin
0 siblings, 1 reply; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 13:24 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
On Tue, Oct 01, 2013 at 12:50:57PM +0000, Cooper Jr., Franklin wrote:
> I'm not sure if Matrix is a useful application to include I'm this test
> image. The backend for Matrix isn't included and no Matrix apps will be
> installed so I'm assuming all this would do is open a white Window.
It's a full WebKit-based browser, similar to one of the examples. You call it
with an URL and it loads and renders that page. Tried it on http://google.com
> Why not include something like the thermostat demo which is a much full
> featured demo based on QWidgets and is probably our best means to discover
> any potential problems.
Sure, why not :)
--
Denys
> > On Oct 1, 2013, at 2:17 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> > ---
> > .../recipes-core/images/arago-qt5-image.bb | 18 ++++++++++++++++++
> > 1 file changed, 18 insertions(+)
> > create mode 100644 meta-arago-distro/recipes-core/images/arago-qt5-image.bb
> >
> > diff --git a/meta-arago-distro/recipes-core/images/arago-qt5-image.bb b/meta-arago-distro/recipes-core/images/arago-qt5-image.bb
> > new file mode 100644
> > index 0000000..7d8ced9
> > --- /dev/null
> > +++ b/meta-arago-distro/recipes-core/images/arago-qt5-image.bb
> > @@ -0,0 +1,18 @@
> > +# Arago TI SDK base image
> > +# gives you an image with Qt/E and other common packages shared by all TI SDKs.
> > +
> > +require arago-image.inc
> > +inherit remove-net-rules
> > +
> > +COMPATIBLE_MACHINE = "omap3|omapl138|ti33x|ti43x|omap4|omap-a15"
> > +
> > +IMAGE_INSTALL += "\
> > + packagegroup-arago-base \
> > + packagegroup-arago-console \
> > + packagegroup-arago-base-tisdk \
> > + matrix-gui-browser \
> > + qtwebkit-examples-examples \
> > + qtbase-plugins \
> > + "
> > +
> > +export IMAGE_BASENAME = "arago-qt5-image"
> > --
> > 1.8.3.2
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 13/13] arago-qt5-image: add test minimal image for testing Qt5 migration
2013-10-01 13:24 ` Denys Dmytriyenko
@ 2013-10-01 13:42 ` Cooper Jr., Franklin
0 siblings, 0 replies; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:42 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org
> On Oct 1, 2013, at 8:24 AM, "Dmytriyenko, Denys" <denys@ti.com> wrote:
>
>> On Tue, Oct 01, 2013 at 12:50:57PM +0000, Cooper Jr., Franklin wrote:
>> I'm not sure if Matrix is a useful application to include I'm this test
>> image. The backend for Matrix isn't included and no Matrix apps will be
>> installed so I'm assuming all this would do is open a white Window.
>
> It's a full WebKit-based browser, similar to one of the examples. You call it
> with an URL and it loads and renders that page. Tried it on http://google.com
I know I just didn't think it was a good Qt 5 test app more of a does QWebkit works.
>
>> Why not include something like the thermostat demo which is a much full
>> featured demo based on QWidgets and is probably our best means to discover
>> any potential problems.
>
> Sure, why not :)
>
> --
> Denys
>
>
>>> On Oct 1, 2013, at 2:17 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>>>
>>> From: Denys Dmytriyenko <denys@ti.com>
>>>
>>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
>>> ---
>>> .../recipes-core/images/arago-qt5-image.bb | 18 ++++++++++++++++++
>>> 1 file changed, 18 insertions(+)
>>> create mode 100644 meta-arago-distro/recipes-core/images/arago-qt5-image.bb
>>>
>>> diff --git a/meta-arago-distro/recipes-core/images/arago-qt5-image.bb b/meta-arago-distro/recipes-core/images/arago-qt5-image.bb
>>> new file mode 100644
>>> index 0000000..7d8ced9
>>> --- /dev/null
>>> +++ b/meta-arago-distro/recipes-core/images/arago-qt5-image.bb
>>> @@ -0,0 +1,18 @@
>>> +# Arago TI SDK base image
>>> +# gives you an image with Qt/E and other common packages shared by all TI SDKs.
>>> +
>>> +require arago-image.inc
>>> +inherit remove-net-rules
>>> +
>>> +COMPATIBLE_MACHINE = "omap3|omapl138|ti33x|ti43x|omap4|omap-a15"
>>> +
>>> +IMAGE_INSTALL += "\
>>> + packagegroup-arago-base \
>>> + packagegroup-arago-console \
>>> + packagegroup-arago-base-tisdk \
>>> + matrix-gui-browser \
>>> + qtwebkit-examples-examples \
>>> + qtbase-plugins \
>>> + "
>>> +
>>> +export IMAGE_BASENAME = "arago-qt5-image"
>>> --
>>> 1.8.3.2
>>>
>>> _______________________________________________
>>> meta-arago mailing list
>>> meta-arago@arago-project.org
>>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread
* Re: [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5
2013-10-01 7:10 [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Denys Dmytriyenko
` (12 preceding siblings ...)
2013-10-01 7:11 ` [PATCH 13/13] arago-qt5-image: add test minimal image for testing Qt5 migration Denys Dmytriyenko
@ 2013-10-01 12:42 ` Cooper Jr., Franklin
2013-10-01 13:21 ` Denys Dmytriyenko
13 siblings, 1 reply; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 12:42 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-arago@arago-project.org
Can we place these patches in a temp master-qt5 branch while we work through some issues?
I am assuming we still need to evaluate the other Qt applications since I only see patches for the Matrix app.
I'm also assuming tweaks also need to be done for the toolchain SDK.
I thought Qt 5.1.1 was the first version that could be ran without SGX support. Any way we can bump the version especially with the latest kernel for 335x not currently having SGX support.
> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>
> From: Denys Dmytriyenko <denys@ti.com>
>
> This patchset adds Qt5 integration with easy switching between Qt4 and Qt5,
> as well as updates matrix-gui-browser to be built against one or another
> version of Qt.
>
> Denys Dmytriyenko (12):
> matrix-gui-browser: replace ${S} with ${B} in do_install()
> icu: overlay the latest version from oe-core/master
> icu: disable LDFLAGSICUDT that prevents loading libicudata.so
> qtbase: configure and patch Qt5 qtbase for use with SGX in Arago
> qtwebkit: add WebGL on eglfs patches
> webkit-examples: enable building and packaging of examples
> qt5.bbclass: add new class similar to existing qt4e for configuring
> recipes
> qt-provider.bbclass: class to allow seamless switching between Qt4 and
> Qt5
> arago-prefs: load up Qt5 preferred versions
> arago.conf: set QT_PROVIDER to Qt5, bump distro version
> matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible
> arago-qt5-image: add test minimal image for testing Qt5 migration
>
> meta-arago-distro/classes/qt-provider.bbclass | 19 ++
> meta-arago-distro/classes/qt5.bbclass | 20 ++
> meta-arago-distro/conf/distro/arago.conf | 4 +-
> .../conf/distro/include/arago-prefs.inc | 3 +
> .../recipes-core/images/arago-qt5-image.bb | 18 ++
> .../qt5/qtbase/0001-qeglfswindow.cpp.patch | 56 +++++
> .../qt5/qtbase/0002-qeglfswindow.cpp.patch | 34 +++
> .../recipes-qt/qt5/qtbase_5.1.0.bbappend | 10 +
> .../qt5/qtwebkit-examples/examples-build.patch | 9 +
> .../qt5/qtwebkit-examples_5.1.0.bbappend | 5 +
> .../qt5/qtwebkit/GraphicsContext3DQt.cpp.patch | 26 ++
> .../qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch | 270 +++++++++++++++++++++
> .../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 +++
> .../recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch | 24 ++
> .../recipes-qt/qt5/qtwebkit/Target.pri.patch | 24 ++
> .../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 25 ++
> .../recipes-qt/qt5/qtwebkit/features.prf.patch | 20 ++
> .../qt5/qtwebkit/qttestbrowser.cpp.patch | 24 ++
> .../recipes-qt/qt5/qtwebkit_5.1.0.bbappend | 14 ++
> .../icu/icu-51.2/disable-ldflagsicudt.patch | 12 +
> .../icu/icu-51.2/icu-pkgdata-large-cmd.patch | 29 +++
> meta-arago-distro/recipes-support/icu/icu.inc | 55 +++++
> meta-arago-distro/recipes-support/icu/icu_51.2.bb | 14 ++
> .../matrix-gui-browser/qt5-gui-widgets-move.patch | 12 +
> .../matrix/matrix-gui-browser/qt5-webkit.patch | 12 +
> .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 14 +-
> 26 files changed, 780 insertions(+), 6 deletions(-)
> create mode 100644 meta-arago-distro/classes/qt-provider.bbclass
> create mode 100644 meta-arago-distro/classes/qt5.bbclass
> create mode 100644 meta-arago-distro/recipes-core/images/arago-qt5-image.bb
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
> create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch
> create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
> create mode 100644 meta-arago-distro/recipes-support/icu/icu.inc
> create mode 100644 meta-arago-distro/recipes-support/icu/icu_51.2.bb
> create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch
> create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch
>
> --
> 1.8.3.2
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5
2013-10-01 12:42 ` [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5 Cooper Jr., Franklin
@ 2013-10-01 13:21 ` Denys Dmytriyenko
2013-10-01 13:47 ` Cooper Jr., Franklin
0 siblings, 1 reply; 49+ messages in thread
From: Denys Dmytriyenko @ 2013-10-01 13:21 UTC (permalink / raw)
To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org
Don't expect this to be a final product upfront. This is not! This is just a
proof of concept of integrating Qt5 into our distro (and later SDK). This is
to provide people with early access to the framework, let them play with it,
test the concept and start migrating their apps.
On Tue, Oct 01, 2013 at 12:42:54PM +0000, Cooper Jr., Franklin wrote:
> Can we place these patches in a temp master-qt5 branch while we work through
> some issues?
While creating a separate branch should be fine, I don't see much need for
it. It is designed to be transparent to the existing apps and works as is when
defaults to Qt4. We can drop patch #11 that sets Qt5 as default and stick to
Qt4 as the default for some time. But keeping it in master should enable
people to start easily play with it and port apps.
> I am assuming we still need to evaluate the other Qt applications since I
> only see patches for the Matrix app.
Correct.
> I'm also assuming tweaks also need to be done for the toolchain SDK.
Yes, could be. And as you noticed, it comes with a new test image just for
Qt5 - I left existing images and packagegroups untouched. There are too many
Qt4 dependencies hard coded there already...
> I thought Qt 5.1.1 was the first version that could be ran without SGX
> support. Any way we can bump the version especially with the latest kernel
> for 335x not currently having SGX support.
I used meta-qt5 master instead of dylan to be able to access 5.1.0 version. We
can bump it further to 5.1.1, if upstream won't do it themselves any time
soon. Right now I was concentrating on integrating everthing into Arago and
picking up Prabu's patches to make eglfs work with SGX. Although, can't test
it fully anyway...
--
Denys
> > On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
> >
> > From: Denys Dmytriyenko <denys@ti.com>
> >
> > This patchset adds Qt5 integration with easy switching between Qt4 and Qt5,
> > as well as updates matrix-gui-browser to be built against one or another
> > version of Qt.
> >
> > Denys Dmytriyenko (12):
> > matrix-gui-browser: replace ${S} with ${B} in do_install()
> > icu: overlay the latest version from oe-core/master
> > icu: disable LDFLAGSICUDT that prevents loading libicudata.so
> > qtbase: configure and patch Qt5 qtbase for use with SGX in Arago
> > qtwebkit: add WebGL on eglfs patches
> > webkit-examples: enable building and packaging of examples
> > qt5.bbclass: add new class similar to existing qt4e for configuring
> > recipes
> > qt-provider.bbclass: class to allow seamless switching between Qt4 and
> > Qt5
> > arago-prefs: load up Qt5 preferred versions
> > arago.conf: set QT_PROVIDER to Qt5, bump distro version
> > matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible
> > arago-qt5-image: add test minimal image for testing Qt5 migration
> >
> > meta-arago-distro/classes/qt-provider.bbclass | 19 ++
> > meta-arago-distro/classes/qt5.bbclass | 20 ++
> > meta-arago-distro/conf/distro/arago.conf | 4 +-
> > .../conf/distro/include/arago-prefs.inc | 3 +
> > .../recipes-core/images/arago-qt5-image.bb | 18 ++
> > .../qt5/qtbase/0001-qeglfswindow.cpp.patch | 56 +++++
> > .../qt5/qtbase/0002-qeglfswindow.cpp.patch | 34 +++
> > .../recipes-qt/qt5/qtbase_5.1.0.bbappend | 10 +
> > .../qt5/qtwebkit-examples/examples-build.patch | 9 +
> > .../qt5/qtwebkit-examples_5.1.0.bbappend | 5 +
> > .../qt5/qtwebkit/GraphicsContext3DQt.cpp.patch | 26 ++
> > .../qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch | 270 +++++++++++++++++++++
> > .../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 +++
> > .../recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch | 24 ++
> > .../recipes-qt/qt5/qtwebkit/Target.pri.patch | 24 ++
> > .../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 25 ++
> > .../recipes-qt/qt5/qtwebkit/features.prf.patch | 20 ++
> > .../qt5/qtwebkit/qttestbrowser.cpp.patch | 24 ++
> > .../recipes-qt/qt5/qtwebkit_5.1.0.bbappend | 14 ++
> > .../icu/icu-51.2/disable-ldflagsicudt.patch | 12 +
> > .../icu/icu-51.2/icu-pkgdata-large-cmd.patch | 29 +++
> > meta-arago-distro/recipes-support/icu/icu.inc | 55 +++++
> > meta-arago-distro/recipes-support/icu/icu_51.2.bb | 14 ++
> > .../matrix-gui-browser/qt5-gui-widgets-move.patch | 12 +
> > .../matrix/matrix-gui-browser/qt5-webkit.patch | 12 +
> > .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 14 +-
> > 26 files changed, 780 insertions(+), 6 deletions(-)
> > create mode 100644 meta-arago-distro/classes/qt-provider.bbclass
> > create mode 100644 meta-arago-distro/classes/qt5.bbclass
> > create mode 100644 meta-arago-distro/recipes-core/images/arago-qt5-image.bb
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
> > create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
> > create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch
> > create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
> > create mode 100644 meta-arago-distro/recipes-support/icu/icu.inc
> > create mode 100644 meta-arago-distro/recipes-support/icu/icu_51.2.bb
> > create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch
> > create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch
> >
> > --
> > 1.8.3.2
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread* Re: [PATCH 00/13] RFC: Add Qt5 support and update matrix-browser to use either Qt4 or Qt5
2013-10-01 13:21 ` Denys Dmytriyenko
@ 2013-10-01 13:47 ` Cooper Jr., Franklin
0 siblings, 0 replies; 49+ messages in thread
From: Cooper Jr., Franklin @ 2013-10-01 13:47 UTC (permalink / raw)
To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org
> On Oct 1, 2013, at 8:21 AM, "Dmytriyenko, Denys" <denys@ti.com> wrote:
>
> Don't expect this to be a final product upfront. This is not!
> This is just a
> proof of concept of integrating Qt5 into our distro (and later SDK). This is
> to provide people with early access to the framework, let them play with it,
> test the concept and start migrating their apps.
I feel a lot better then :)
>
>
>> On Tue, Oct 01, 2013 at 12:42:54PM +0000, Cooper Jr., Franklin wrote:
>> Can we place these patches in a temp master-qt5 branch while we work through
>> some issues?
>
> While creating a separate branch should be fine, I don't see much need for
> it. It is designed to be transparent to the existing apps and works as is when
> defaults to Qt4. We can drop patch #11 that sets Qt5 as default and stick to
> Qt4 as the default for some time. But keeping it in master should enable
> people to start easily play with it and port apps.
I'm ok with that
>
>
>> I am assuming we still need to evaluate the other Qt applications since I
>> only see patches for the Matrix app.
>
> Correct.
>
>
>> I'm also assuming tweaks also need to be done for the toolchain SDK.
>
> Yes, could be. And as you noticed, it comes with a new test image just for
> Qt5 - I left existing images and packagegroups untouched. There are too many
> Qt4 dependencies hard coded there already...
>
>
>> I thought Qt 5.1.1 was the first version that could be ran without SGX
>> support. Any way we can bump the version especially with the latest kernel
>> for 335x not currently having SGX support.
>
> I used meta-qt5 master instead of dylan to be able to access 5.1.0 version. We
> can bump it further to 5.1.1, if upstream won't do it themselves any time
> soon. Right now I was concentrating on integrating everthing into Arago and
> picking up Prabu's patches to make eglfs work with SGX. Although, can't test
> it fully anyway...
>
> --
> Denys
>
>
>>> On Oct 1, 2013, at 2:11 AM, "Denys Dmytriyenko" <denis@denix.org> wrote:
>>>
>>> From: Denys Dmytriyenko <denys@ti.com>
>>>
>>> This patchset adds Qt5 integration with easy switching between Qt4 and Qt5,
>>> as well as updates matrix-gui-browser to be built against one or another
>>> version of Qt.
>>>
>>> Denys Dmytriyenko (12):
>>> matrix-gui-browser: replace ${S} with ${B} in do_install()
>>> icu: overlay the latest version from oe-core/master
>>> icu: disable LDFLAGSICUDT that prevents loading libicudata.so
>>> qtbase: configure and patch Qt5 qtbase for use with SGX in Arago
>>> qtwebkit: add WebGL on eglfs patches
>>> webkit-examples: enable building and packaging of examples
>>> qt5.bbclass: add new class similar to existing qt4e for configuring
>>> recipes
>>> qt-provider.bbclass: class to allow seamless switching between Qt4 and
>>> Qt5
>>> arago-prefs: load up Qt5 preferred versions
>>> arago.conf: set QT_PROVIDER to Qt5, bump distro version
>>> matrix-gui-browser: update recipe to be Qt4 and Qt5 compatible
>>> arago-qt5-image: add test minimal image for testing Qt5 migration
>>>
>>> meta-arago-distro/classes/qt-provider.bbclass | 19 ++
>>> meta-arago-distro/classes/qt5.bbclass | 20 ++
>>> meta-arago-distro/conf/distro/arago.conf | 4 +-
>>> .../conf/distro/include/arago-prefs.inc | 3 +
>>> .../recipes-core/images/arago-qt5-image.bb | 18 ++
>>> .../qt5/qtbase/0001-qeglfswindow.cpp.patch | 56 +++++
>>> .../qt5/qtbase/0002-qeglfswindow.cpp.patch | 34 +++
>>> .../recipes-qt/qt5/qtbase_5.1.0.bbappend | 10 +
>>> .../qt5/qtwebkit-examples/examples-build.patch | 9 +
>>> .../qt5/qtwebkit-examples_5.1.0.bbappend | 5 +
>>> .../qt5/qtwebkit/GraphicsContext3DQt.cpp.patch | 26 ++
>>> .../qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch | 270 +++++++++++++++++++++
>>> .../qt5/qtwebkit/GraphicsSurfaceToken.h.patch | 33 +++
>>> .../recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch | 24 ++
>>> .../recipes-qt/qt5/qtwebkit/Target.pri.patch | 24 ++
>>> .../recipes-qt/qt5/qtwebkit/WebCore.pri.patch | 25 ++
>>> .../recipes-qt/qt5/qtwebkit/features.prf.patch | 20 ++
>>> .../qt5/qtwebkit/qttestbrowser.cpp.patch | 24 ++
>>> .../recipes-qt/qt5/qtwebkit_5.1.0.bbappend | 14 ++
>>> .../icu/icu-51.2/disable-ldflagsicudt.patch | 12 +
>>> .../icu/icu-51.2/icu-pkgdata-large-cmd.patch | 29 +++
>>> meta-arago-distro/recipes-support/icu/icu.inc | 55 +++++
>>> meta-arago-distro/recipes-support/icu/icu_51.2.bb | 14 ++
>>> .../matrix-gui-browser/qt5-gui-widgets-move.patch | 12 +
>>> .../matrix/matrix-gui-browser/qt5-webkit.patch | 12 +
>>> .../recipes-core/matrix/matrix-gui-browser_2.0.bb | 14 +-
>>> 26 files changed, 780 insertions(+), 6 deletions(-)
>>> create mode 100644 meta-arago-distro/classes/qt-provider.bbclass
>>> create mode 100644 meta-arago-distro/classes/qt5.bbclass
>>> create mode 100644 meta-arago-distro/recipes-core/images/arago-qt5-image.bb
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-qeglfswindow.cpp.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0002-qeglfswindow.cpp.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase_5.1.0.bbappend
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-examples/examples-build.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit-examples_5.1.0.bbappend
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsContext3DQt.cpp.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceGL_NoX.cpp.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/GraphicsSurfaceToken.h.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/OpenGLShims.cpp.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/Target.pri.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/WebCore.pri.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/features.prf.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit/qttestbrowser.cpp.patch
>>> create mode 100644 meta-arago-distro/recipes-qt/qt5/qtwebkit_5.1.0.bbappend
>>> create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/disable-ldflagsicudt.patch
>>> create mode 100644 meta-arago-distro/recipes-support/icu/icu-51.2/icu-pkgdata-large-cmd.patch
>>> create mode 100644 meta-arago-distro/recipes-support/icu/icu.inc
>>> create mode 100644 meta-arago-distro/recipes-support/icu/icu_51.2.bb
>>> create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-gui-widgets-move.patch
>>> create mode 100644 meta-arago-extras/recipes-core/matrix/matrix-gui-browser/qt5-webkit.patch
>>>
>>> --
>>> 1.8.3.2
>>>
>>> _______________________________________________
>>> meta-arago mailing list
>>> meta-arago@arago-project.org
>>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>> _______________________________________________
>> meta-arago mailing list
>> meta-arago@arago-project.org
>> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 49+ messages in thread