[meta-qt5][PATCH 1/3] qtbase/qtwebkit: drop ICU variable

[meta-qt5][PATCH 1/3] qtbase/qtwebkit: drop ICU variable

[Andreas Oberritter]

Pango doesn't seem to be a drop-in replacement for ICU, so
using it as a dependency for the -icu option won't work.

QtWebKit has a hard dependency on icu.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 recipes-qt/qt5/qt5.inc      | 4 ----
 recipes-qt/qt5/qtbase.inc   | 2 +-
 recipes-qt/qt5/qtwebkit.inc | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index e2a1662..dfc1c76 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -3,10 +3,6 @@
 
 inherit qmake5
 
-# Qt5 is dependent on icu for localization
-ICU = "icu "
-ICU_powerpc = "pango"
-
 PACKAGECONFIG_OPENSSL ?= "openssl"
 
 QT_MODULE ?= "${BPN}"
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 378f229..4fe6bd5 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -116,7 +116,7 @@ PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
 PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
 PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
 # needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
-PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}"
+PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
 PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
 # use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected
 PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl"
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index aea9dad..c35504e 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
                     file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
                     file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee"
 
-DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
+DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
 
 # qtwebkit gets terribly big when linking with all debug info, disable by default
 QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
-- 
1.8.3.2

[meta-qt5][PATCH 2/3] qtdeclarative: drop qtsvg dependency, add packageconfig for qtxmlpatterns

[Andreas Oberritter]

The dependency on qtsvg seems to be a leftover from an old version.
Version 5.2.1 of qtdeclarative doesn't include any reference to it.

Depend on qtbase in case qtxmlpatterns gets disabled.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 recipes-qt/qt5/qtdeclarative.inc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index 12e650f..bd68955 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -5,4 +5,15 @@ SRC_URI += " \
     file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
 "
 
-DEPENDS += "qtsvg qtxmlpatterns"
+DEPENDS += "qtbase"
+
+PACKAGECONFIG ??= "qtxmlpatterns"
+PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns"
+
+do_configure_prepend() {
+    # disable qtxmlpatterns test if it isn't enabled by PACKAGECONFIG
+    sed -e 's/^\(qtHaveModule(xmlpatterns)\)/OE_QTXMLPATTERNS_ENABLED:\1/' -i ${S}/src/imports/imports.pro
+    sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro
+}
+
+EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
-- 
1.8.3.2

[meta-qt5][PATCH 3/3] qtwebkit: add packageconfig for gstreamer, qtlocation and qtsensors

[Andreas Oberritter]

Use gstreamer for 1.x, gstreamer010 for 0.10.x.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 recipes-qt/qt5/qtwebkit.inc | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index c35504e..90bd981 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -5,7 +5,29 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
                     file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
                     file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee"
 
-DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
+DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt"
+
+PACKAGECONFIG ??= "gstreamer qtlocation qtsensors"
+PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base"
+PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
+PACKAGECONFIG[qtlocation] = ",,qtlocation"
+PACKAGECONFIG[qtsensors] = ",,qtsensors"
+
+do_configure_prepend() {
+    # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG
+    sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
+    # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG
+    sed -e 's/\s\(packagesExist(".*\<gstreamer-0.10\>.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
+    # disable qtlocation test if it isn't enabled by PACKAGECONFIG
+    sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
+    # disable qtsensors test if it isn't enabled by PACKAGECONFIG
+    sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
+}
+
+EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer', 'CONFIG+=OE_GSTREAMER_ENABLED', '', d)}"
+EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}"
+EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtlocation', 'CONFIG+=OE_QTLOCATION_ENABLED', '', d)}"
+EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtsensors', 'CONFIG+=OE_QTSENSORS_ENABLED', '', d)}"
 
 # qtwebkit gets terribly big when linking with all debug info, disable by default
 QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
-- 
1.8.3.2

Re: [meta-qt5][PATCH 1/3] qtbase/qtwebkit: drop ICU variable

[Gary Thomas]

On 2014-02-28 13:15, Andreas Oberritter wrote:
> Pango doesn't seem to be a drop-in replacement for ICU, so
> using it as a dependency for the -icu option won't work.
> 
> QtWebKit has a hard dependency on icu.
> 
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>

So, does this make QT5 a no-go for PowerPC or any other BigEndian
platform?  Or is there another solution for ICU on PowerPC, etc?

> ---
>  recipes-qt/qt5/qt5.inc      | 4 ----
>  recipes-qt/qt5/qtbase.inc   | 2 +-
>  recipes-qt/qt5/qtwebkit.inc | 2 +-
>  3 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
> index e2a1662..dfc1c76 100644
> --- a/recipes-qt/qt5/qt5.inc
> +++ b/recipes-qt/qt5/qt5.inc
> @@ -3,10 +3,6 @@
>  
>  inherit qmake5
>  
> -# Qt5 is dependent on icu for localization
> -ICU = "icu "
> -ICU_powerpc = "pango"
> -
>  PACKAGECONFIG_OPENSSL ?= "openssl"
>  
>  QT_MODULE ?= "${BPN}"
> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
> index 378f229..4fe6bd5 100644
> --- a/recipes-qt/qt5/qtbase.inc
> +++ b/recipes-qt/qt5/qtbase.inc
> @@ -116,7 +116,7 @@ PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
>  PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
>  PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
>  # needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
> -PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}"
> +PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
>  PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
>  # use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected
>  PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl"
> diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
> index aea9dad..c35504e 100644
> --- a/recipes-qt/qt5/qtwebkit.inc
> +++ b/recipes-qt/qt5/qtwebkit.inc
> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
>                      file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
>                      file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee"
>  
> -DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
> +DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
>  
>  # qtwebkit gets terribly big when linking with all debug info, disable by default
>  QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
> 

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

Re: [meta-qt5][PATCH 1/3] qtbase/qtwebkit: drop ICU variable

[Andreas Oberritter]

On 28.02.2014 22:28, Gary Thomas wrote:
> On 2014-02-28 13:15, Andreas Oberritter wrote:
>> Pango doesn't seem to be a drop-in replacement for ICU, so
>> using it as a dependency for the -icu option won't work.
>>
>> QtWebKit has a hard dependency on icu.
>>
>> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> 
> So, does this make QT5 a no-go for PowerPC or any other BigEndian
> platform?  Or is there another solution for ICU on PowerPC, etc?

I read about the cross-endian problem in Git history, but I don't know
whether it's been fixed in the meantime or not.

However, ICU is a hard dependency for qtwebkit only. So you can build
qtbase and other Qt modules without it simply by not adding 'icu' to
PACKAGECONFIG.

Pango doesn't seem to be used for anything related to unicode in qtbase.
The only file including pango.h is
src/plugins/platformthemes/gtk2/qgtk2dialoghelpers.cpp.

Likewise, WebKit uses pango only for the Gtk port, so adding it as a
dependency to QtWebKit doesn't change anything.

Regards,
Andreas

>> ---
>>  recipes-qt/qt5/qt5.inc      | 4 ----
>>  recipes-qt/qt5/qtbase.inc   | 2 +-
>>  recipes-qt/qt5/qtwebkit.inc | 2 +-
>>  3 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
>> index e2a1662..dfc1c76 100644
>> --- a/recipes-qt/qt5/qt5.inc
>> +++ b/recipes-qt/qt5/qt5.inc
>> @@ -3,10 +3,6 @@
>>  
>>  inherit qmake5
>>  
>> -# Qt5 is dependent on icu for localization
>> -ICU = "icu "
>> -ICU_powerpc = "pango"
>> -
>>  PACKAGECONFIG_OPENSSL ?= "openssl"
>>  
>>  QT_MODULE ?= "${BPN}"
>> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
>> index 378f229..4fe6bd5 100644
>> --- a/recipes-qt/qt5/qtbase.inc
>> +++ b/recipes-qt/qt5/qtbase.inc
>> @@ -116,7 +116,7 @@ PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
>>  PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
>>  PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
>>  # needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
>> -PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}"
>> +PACKAGECONFIG[icu] = "-icu,-no-icu,icu"
>>  PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
>>  # use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected
>>  PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl"
>> diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
>> index aea9dad..c35504e 100644
>> --- a/recipes-qt/qt5/qtwebkit.inc
>> +++ b/recipes-qt/qt5/qtwebkit.inc
>> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
>>                      file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
>>                      file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee"
>>  
>> -DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
>> +DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
>>  
>>  # qtwebkit gets terribly big when linking with all debug info, disable by default
>>  QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
>>
> 

Re: [meta-qt5][PATCH 3/3] qtwebkit: add packageconfig for gstreamer, qtlocation and qtsensors

[Andre McCurdy]

On Fri, Feb 28, 2014 at 12:15 PM, Andreas Oberritter
<obi@opendreambox.org> wrote:
> Use gstreamer for 1.x, gstreamer010 for 0.10.x.
>
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
>  recipes-qt/qt5/qtwebkit.inc | 24 +++++++++++++++++++++++-
>  1 file changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
> index c35504e..90bd981 100644
> --- a/recipes-qt/qt5/qtwebkit.inc
> +++ b/recipes-qt/qt5/qtwebkit.inc
> @@ -5,7 +5,29 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
>                      file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
>                      file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee"
>
> -DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
> +DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt"
> +
> +PACKAGECONFIG ??= "gstreamer qtlocation qtsensors"
> +PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base"
> +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
> +PACKAGECONFIG[qtlocation] = ",,qtlocation"
> +PACKAGECONFIG[qtsensors] = ",,qtsensors"
> +
> +do_configure_prepend() {
> +    # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG
> +    sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
> +    # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG
> +    sed -e 's/\s\(packagesExist(".*\<gstreamer-0.10\>.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
> +    # disable qtlocation test if it isn't enabled by PACKAGECONFIG
> +    sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
> +    # disable qtsensors test if it isn't enabled by PACKAGECONFIG
> +    sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
> +}
> +
> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer', 'CONFIG+=OE_GSTREAMER_ENABLED', '', d)}"
> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}"
> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtlocation', 'CONFIG+=OE_QTLOCATION_ENABLED', '', d)}"
> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtsensors', 'CONFIG+=OE_QTSENSORS_ENABLED', '', d)}"
>
>  # qtwebkit gets terribly big when linking with all debug info, disable by default
>  QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
> --
> 1.8.3.2
>

Hi,

With this change I'm seeing that the CONFIG+= options from the qmake
command line are being added to CONFIG after features.prf has already
been evaluated. Therefore OE_GSTREAMER_ENABLED etc evaluates as false
and qtwebkit is always configured without video support.

From the configure log:

> ! Missing GStreamer or QtMultimedia, disabling HTML5 media element support

From the qmake debug log:

> DEBUG 1: ... features.prf:106: condition "OE_GSTREAMER_ENABLED" is false (around line 5480 of the log)
> ...
> DEBUG 1: (command line):65535: CONFIG := ... OE_GSTREAMER_ENABLED (around line 5802 of the log, just prior to starting on WebKit.pro).

I'm testing with dora + master branch of meta-qt5.

Andre
--

Re: [meta-qt5][PATCH 3/3] qtwebkit: add packageconfig for gstreamer, qtlocation and qtsensors

[Andre McCurdy]

> On Fri, Feb 28, 2014 at 12:15 PM, Andreas Oberritter
> <obi@opendreambox.org> wrote:
>> Use gstreamer for 1.x, gstreamer010 for 0.10.x.
>>
>> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
>> ---
>>  recipes-qt/qt5/qtwebkit.inc | 24 +++++++++++++++++++++++-
>>  1 file changed, 23 insertions(+), 1 deletion(-)
>>
>> diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
>> index c35504e..90bd981 100644
>> --- a/recipes-qt/qt5/qtwebkit.inc
>> +++ b/recipes-qt/qt5/qtwebkit.inc
>> @@ -5,7 +5,29 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
>>                      file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
>>                      file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee"
>>
>> -DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
>> +DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt"
>> +
>> +PACKAGECONFIG ??= "gstreamer qtlocation qtsensors"
>> +PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base"
>> +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
>> +PACKAGECONFIG[qtlocation] = ",,qtlocation"
>> +PACKAGECONFIG[qtsensors] = ",,qtsensors"
>> +
>> +do_configure_prepend() {
>> +    # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG
>> +    sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
>> +    # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG
>> +    sed -e 's/\s\(packagesExist(".*\<gstreamer-0.10\>.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
>> +    # disable qtlocation test if it isn't enabled by PACKAGECONFIG
>> +    sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
>> +    # disable qtsensors test if it isn't enabled by PACKAGECONFIG
>> +    sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
>> +}
>> +
>> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer', 'CONFIG+=OE_GSTREAMER_ENABLED', '', d)}"
>> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}"
>> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtlocation', 'CONFIG+=OE_QTLOCATION_ENABLED', '', d)}"
>> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtsensors', 'CONFIG+=OE_QTSENSORS_ENABLED', '', d)}"
>>
>>  # qtwebkit gets terribly big when linking with all debug info, disable by default
>>  QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
>> --
>
> With this change I'm seeing that the CONFIG+= options from the qmake
> command line are being added to CONFIG after features.prf has already
> been evaluated. Therefore OE_GSTREAMER_ENABLED etc evaluates as false
> and qtwebkit is always configured without video support.
>
> From the configure log:
>
>> ! Missing GStreamer or QtMultimedia, disabling HTML5 media element support
>
> From the qmake debug log:
>
>> DEBUG 1: ... features.prf:106: condition "OE_GSTREAMER_ENABLED" is false (around line 5480 of the log)
>> ...
>> DEBUG 1: (command line):65535: CONFIG := ... OE_GSTREAMER_ENABLED (around line 5802 of the log, just prior to starting on WebKit.pro).
>
> I'm testing with dora + master branch of meta-qt5.
>

Hi all,

I'm still seeing problems since this commit. Even when these new
options are enabled via PACKAGECONFIG, qtwebkit is being configured as
if they were all disabled.

The issue seems to be that the "CONFIG+=OE_xxx_ENABLED" options on the
qmake command line don't work as intended. The options are added to
CONFIG _after_ features.prf is parsed, so testing them in features.prf
always evaluates to false.

Symptoms are "disabling HTML5 media element support" showing up in the
qtwebkit configure log and libQt5WebKit.so.5.2.1 not having any
runtime dependency on libgstreamer, etc.

Is anyone else seeing the same thing ?

Re: [meta-qt5][PATCH 3/3] qtwebkit: add packageconfig for gstreamer, qtlocation and qtsensors

[Andreas Oberritter]

Hello Andre,

On 04.04.2014 05:34, Andre McCurdy wrote:
>> On Fri, Feb 28, 2014 at 12:15 PM, Andreas Oberritter
>> <obi@opendreambox.org> wrote:
>>> Use gstreamer for 1.x, gstreamer010 for 0.10.x.
>>>
>>> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
>>> ---
>>>  recipes-qt/qt5/qtwebkit.inc | 24 +++++++++++++++++++++++-
>>>  1 file changed, 23 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
>>> index c35504e..90bd981 100644
>>> --- a/recipes-qt/qt5/qtwebkit.inc
>>> +++ b/recipes-qt/qt5/qtwebkit.inc
>>> @@ -5,7 +5,29 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
>>>                      file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
>>>                      file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee"
>>>
>>> -DEPENDS += "qtdeclarative qtlocation qtsensors icu ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt"
>>> +DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt"
>>> +
>>> +PACKAGECONFIG ??= "gstreamer qtlocation qtsensors"
>>> +PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base"
>>> +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
>>> +PACKAGECONFIG[qtlocation] = ",,qtlocation"
>>> +PACKAGECONFIG[qtsensors] = ",,qtsensors"
>>> +
>>> +do_configure_prepend() {
>>> +    # disable gstreamer-1.0 test if it isn't enabled by PACKAGECONFIG
>>> +    sed -e 's/\s\(packagesExist(".*\<gstreamer-1.0\>.*")\)/ OE_GSTREAMER_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
>>> +    # disable gstreamer-0.10 test if it isn't enabled by PACKAGECONFIG
>>> +    sed -e 's/\s\(packagesExist(".*\<gstreamer-0.10\>.*")\)/ OE_GSTREAMER010_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
>>> +    # disable qtlocation test if it isn't enabled by PACKAGECONFIG
>>> +    sed -e 's/\s\(qtHaveModule(positioning)\)/ OE_QTLOCATION_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
>>> +    # disable qtsensors test if it isn't enabled by PACKAGECONFIG
>>> +    sed -e 's/\s\(qtHaveModule(sensors)\)/ OE_QTSENSORS_ENABLED:\1/' -i ${S}/Tools/qmake/mkspecs/features/features.prf
>>> +}
>>> +
>>> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer', 'CONFIG+=OE_GSTREAMER_ENABLED', '', d)}"
>>> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}"
>>> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtlocation', 'CONFIG+=OE_QTLOCATION_ENABLED', '', d)}"
>>> +EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtsensors', 'CONFIG+=OE_QTSENSORS_ENABLED', '', d)}"
>>>
>>>  # qtwebkit gets terribly big when linking with all debug info, disable by default
>>>  QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
>>> --
>>
>> With this change I'm seeing that the CONFIG+= options from the qmake
>> command line are being added to CONFIG after features.prf has already
>> been evaluated. Therefore OE_GSTREAMER_ENABLED etc evaluates as false
>> and qtwebkit is always configured without video support.
>>
>> From the configure log:
>>
>>> ! Missing GStreamer or QtMultimedia, disabling HTML5 media element support
>>
>> From the qmake debug log:
>>
>>> DEBUG 1: ... features.prf:106: condition "OE_GSTREAMER_ENABLED" is false (around line 5480 of the log)
>>> ...
>>> DEBUG 1: (command line):65535: CONFIG := ... OE_GSTREAMER_ENABLED (around line 5802 of the log, just prior to starting on WebKit.pro).
>>
>> I'm testing with dora + master branch of meta-qt5.
>>
> 
> Hi all,
> 
> I'm still seeing problems since this commit. Even when these new
> options are enabled via PACKAGECONFIG, qtwebkit is being configured as
> if they were all disabled.
> 
> The issue seems to be that the "CONFIG+=OE_xxx_ENABLED" options on the
> qmake command line don't work as intended. The options are added to
> CONFIG _after_ features.prf is parsed, so testing them in features.prf
> always evaluates to false.
> 
> Symptoms are "disabling HTML5 media element support" showing up in the
> qtwebkit configure log and libQt5WebKit.so.5.2.1 not having any
> runtime dependency on libgstreamer, etc.
> 
> Is anyone else seeing the same thing ?

thanks for your reminder. After your first mail I got distracted and
forgot about looking into this.

I was able to reproduce it and just submitted a patch to the mailing
list. I build-tested it with PACKAGECONFIG = "", "gstreamer" and
"gstreamer qtlocation" on dora.

Regards,
Andreas

Re: [meta-qt5][PATCH 3/3] qtwebkit: add packageconfig for gstreamer, qtlocation and qtsensors

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 692 bytes --]

On Fri, Apr 04, 2014 at 10:37:30PM +0200, Andreas Oberritter wrote:
> Hello Andre,
> 
> thanks for your reminder. After your first mail I got distracted and
> forgot about looking into this.
> 
> I was able to reproduce it and just submitted a patch to the mailing
> list. I build-tested it with PACKAGECONFIG = "", "gstreamer" and
> "gstreamer qtlocation" on dora.

Merged, thanks

> 
> Regards,
> Andreas
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]