Patchwork [meta-qt5] qtwebkit: accept gstreamer 0.10 as an option

login
register
mail settings
Submitter Andreas Oberritter
Date Feb. 26, 2014, 8:25 p.m.
Message ID <1393446351-9280-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/67493/
State Superseded, archived
Headers show

Comments

Andreas Oberritter - Feb. 26, 2014, 8:25 p.m.
There's no configuration knob, though. QtWebKit will prefer
gstreamer 1.0 if available.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 recipes-qt/qt5/qtwebkit.inc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Martin Jansa - Feb. 26, 2014, 9:05 p.m.
On Wed, Feb 26, 2014 at 09:25:51PM +0100, Andreas Oberritter wrote:
> There's no configuration knob, though. QtWebKit will prefer
> gstreamer 1.0 if available.

Can you please add configuration knob first?

The problem is that without the knob it will be undeterministic, with
gstreamer010 in PACKAGECONFIG you can run 2nd build with gstreamer10
already staged for some other component and the resulting qtwebkit will
be different than in 1st build.

> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
>  recipes-qt/qt5/qtwebkit.inc | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
> index aea9dad..5e96f39 100644
> --- a/recipes-qt/qt5/qtwebkit.inc
> +++ b/recipes-qt/qt5/qtwebkit.inc
> @@ -5,7 +5,11 @@ 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 libxslt"
> +
> +PACKAGECONFIG ??= "gstreamer10"
> +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
> +PACKAGECONFIG[gstreamer10] = ",,gstreamer1.0 gstreamer1.0-plugins-base"
>  
>  # 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
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Andreas Oberritter - Feb. 28, 2014, 12:59 a.m.
On 26.02.2014 22:05, Martin Jansa wrote:
> On Wed, Feb 26, 2014 at 09:25:51PM +0100, Andreas Oberritter wrote:
>> There's no configuration knob, though. QtWebKit will prefer
>> gstreamer 1.0 if available.
> 
> Can you please add configuration knob first?
> 
> The problem is that without the knob it will be undeterministic, with
> gstreamer010 in PACKAGECONFIG you can run 2nd build with gstreamer10
> already staged for some other component and the resulting qtwebkit will
> be different than in 1st build.

I'll see what I can do. I'm not a big fan of (Qt)WebKit's build system,
so this might take a while.

FWIW, I noticed that qtlocation and qtsensors are optional build
dependencies which need packageconfigs, too.

Regards,
Andreas

>> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
>> ---
>>  recipes-qt/qt5/qtwebkit.inc | 6 +++++-
>>  1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
>> index aea9dad..5e96f39 100644
>> --- a/recipes-qt/qt5/qtwebkit.inc
>> +++ b/recipes-qt/qt5/qtwebkit.inc
>> @@ -5,7 +5,11 @@ 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 libxslt"
>> +
>> +PACKAGECONFIG ??= "gstreamer10"
>> +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
>> +PACKAGECONFIG[gstreamer10] = ",,gstreamer1.0 gstreamer1.0-plugins-base"
>>  
>>  # 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
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> 
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
Martin Jansa - Feb. 28, 2014, 1:13 a.m.
On Fri, Feb 28, 2014 at 01:59:04AM +0100, Andreas Oberritter wrote:
> On 26.02.2014 22:05, Martin Jansa wrote:
> > On Wed, Feb 26, 2014 at 09:25:51PM +0100, Andreas Oberritter wrote:
> >> There's no configuration knob, though. QtWebKit will prefer
> >> gstreamer 1.0 if available.
> > 
> > Can you please add configuration knob first?
> > 
> > The problem is that without the knob it will be undeterministic, with
> > gstreamer010 in PACKAGECONFIG you can run 2nd build with gstreamer10
> > already staged for some other component and the resulting qtwebkit will
> > be different than in 1st build.
> 
> I'll see what I can do. I'm not a big fan of (Qt)WebKit's build system,
> so this might take a while.

You can use the same hack as I've used in qtmultimedia, it's not nice,
but works.

> FWIW, I noticed that qtlocation and qtsensors are optional build
> dependencies which need packageconfigs, too.

True, we're even disabling qtlocation in some our builds (because of
qt3d dependency), so having PACKAGECONFIG would be very appreciated.


> >> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> >> ---
> >>  recipes-qt/qt5/qtwebkit.inc | 6 +++++-
> >>  1 file changed, 5 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
> >> index aea9dad..5e96f39 100644
> >> --- a/recipes-qt/qt5/qtwebkit.inc
> >> +++ b/recipes-qt/qt5/qtwebkit.inc
> >> @@ -5,7 +5,11 @@ 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 libxslt"
> >> +
> >> +PACKAGECONFIG ??= "gstreamer10"
> >> +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
> >> +PACKAGECONFIG[gstreamer10] = ",,gstreamer1.0 gstreamer1.0-plugins-base"
> >>  
> >>  # 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
> >>
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> > 
> > 
> > 
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> > 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Denys Dmytriyenko - Feb. 28, 2014, 4:59 p.m.
On Fri, Feb 28, 2014 at 02:13:01AM +0100, Martin Jansa wrote:
> On Fri, Feb 28, 2014 at 01:59:04AM +0100, Andreas Oberritter wrote:
> > On 26.02.2014 22:05, Martin Jansa wrote:
> > > On Wed, Feb 26, 2014 at 09:25:51PM +0100, Andreas Oberritter wrote:
> > >> There's no configuration knob, though. QtWebKit will prefer
> > >> gstreamer 1.0 if available.
> > > 
> > > Can you please add configuration knob first?
> > > 
> > > The problem is that without the knob it will be undeterministic, with
> > > gstreamer010 in PACKAGECONFIG you can run 2nd build with gstreamer10
> > > already staged for some other component and the resulting qtwebkit will
> > > be different than in 1st build.
> > 
> > I'll see what I can do. I'm not a big fan of (Qt)WebKit's build system,
> > so this might take a while.
> 
> You can use the same hack as I've used in qtmultimedia, it's not nice,
> but works.
> 
> > FWIW, I noticed that qtlocation and qtsensors are optional build
> > dependencies which need packageconfigs, too.
> 
> True, we're even disabling qtlocation in some our builds (because of
> qt3d dependency), so having PACKAGECONFIG would be very appreciated.

+1 on this one!

> > >> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> > >> ---
> > >>  recipes-qt/qt5/qtwebkit.inc | 6 +++++-
> > >>  1 file changed, 5 insertions(+), 1 deletion(-)
> > >>
> > >> diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
> > >> index aea9dad..5e96f39 100644
> > >> --- a/recipes-qt/qt5/qtwebkit.inc
> > >> +++ b/recipes-qt/qt5/qtwebkit.inc
> > >> @@ -5,7 +5,11 @@ 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 libxslt"
> > >> +
> > >> +PACKAGECONFIG ??= "gstreamer10"
> > >> +PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
> > >> +PACKAGECONFIG[gstreamer10] = ",,gstreamer1.0 gstreamer1.0-plugins-base"
> > >>  
> > >>  # 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
> > >>
> > >> _______________________________________________
> > >> Openembedded-devel mailing list
> > >> Openembedded-devel@lists.openembedded.org
> > >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> > > 
> > > 
> > > 
> > > _______________________________________________
> > > Openembedded-devel mailing list
> > > Openembedded-devel@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> > > 
> > 
> > _______________________________________________
> > 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



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

Patch

diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc
index aea9dad..5e96f39 100644
--- a/recipes-qt/qt5/qtwebkit.inc
+++ b/recipes-qt/qt5/qtwebkit.inc
@@ -5,7 +5,11 @@  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 libxslt"
+
+PACKAGECONFIG ??= "gstreamer10"
+PACKAGECONFIG[gstreamer010] = ",,gstreamer gst-plugins-base"
+PACKAGECONFIG[gstreamer10] = ",,gstreamer1.0 gstreamer1.0-plugins-base"
 
 # qtwebkit gets terribly big when linking with all debug info, disable by default
 QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"