Skip to contentSkip to conversation

qtwebkit: Depend on gstreamer-1.0 instead of 0.10

PATCH In review Martin Jansa 2 participants 4 messages Dec 31, 2013 – Jan 6, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qtwebkit: Depend on gstreamer-1.0 instead of 0.10

* since this commit:
commit e0debe138cb59c140ebbc69755d36028d2b89459
Author: Allan Sandfeld Jensen <[email protected]>
Date: Thu Feb 28 13:42:27 2013 +0100
Subject: Switch QtWebKit to GStreamer 1.0.

qtwebkit supports 1.0 and will use that by default when found

---
 recipes-qt/qt5/qtwebkit.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtwebkit.inc +1 -1
index c0e0648..9b334ae 100644
@@ -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=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
 
-DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer gst-plugins-base libxslt"
+DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer-1.0 gst-plugins-base-1.0 libxslt"
 
 # qtwebkit gets terribly big when linking with all debug info, disable by default
 QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
Signature · 1 line
1.8.4.3
#1 lore raw
Quoted 25 lines · Martin Jansa

* since this commit:
commit e0debe138cb59c140ebbc69755d36028d2b89459
Author: Allan Sandfeld Jensen <[email protected]>
Date: Thu Feb 28 13:42:27 2013 +0100
Subject: Switch QtWebKit to GStreamer 1.0.

qtwebkit supports 1.0 and will use that by default when found

---
 recipes-qt/qt5/qtwebkit.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtwebkit.inc +0 -0
index c0e0648..9b334ae 100644
@@ -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=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"

Quoted 9 lines

-DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer gst-plugins-base libxslt"
+DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer-1.0 gst-plugins-base-1.0 libxslt"

 # qtwebkit gets terribly big when linking with all debug info, disable by
default
 QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"

hmm. that's a bit rough... GST1.0 for ARM SoC is (sadly) still not the norm.. I haven't checked upstream, but does it still support 0.10 or 1.0 or only 1.0? If both are supported could (should?) we use PACKAGECONFIG to offer both in our recipe?

right now i am using the dora branch and qt5.1.1 which hasn't been updated for a while, which is fine.

thanks

#2 lore raw
Quoted 32 lines · Nicolas Dechesne
Quoted 30 lines · Martin Jansa

* since this commit:
commit e0debe138cb59c140ebbc69755d36028d2b89459
Author: Allan Sandfeld Jensen <[email protected]>
Date: Thu Feb 28 13:42:27 2013 +0100
Subject: Switch QtWebKit to GStreamer 1.0.

qtwebkit supports 1.0 and will use that by default when found

---
 recipes-qt/qt5/qtwebkit.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtwebkit.inc +0 -0
index c0e0648..9b334ae 100644
@@ -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=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"

-DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer gst-plugins-base libxslt"
+DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer-1.0 gst-plugins-base-1.0 libxslt"

Quoted 9 lines
Quoted 4 lines
 # qtwebkit gets terribly big when linking with all debug info, disable by
default
 QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"

hmm. that's a bit rough... GST1.0 for ARM SoC is (sadly) still not the norm.. I haven't checked upstream, but does it still support 0.10 or 1.0 or only 1.0? If both are supported could (should?) we use PACKAGECONFIG to offer both in our recipe?

PACKAGECONFIG is possible and even easier with this upstream change (before it was always checking for 0.10 first and you would need to patch .pri file first to make the dependency deterministic).

Quoted 2 lines

right now i am using the dora branch and qt5.1.1 which hasn't been updated for a while, which is fine.

This is only for master which will soon became just qt5.2.0 where gstreamer-1.0 is used by default and I believe more tested than integration with gstreamer-0.10.

So it won't change anything for people using 5.1.1 from dora branch. If someone really wants to use gst-0.10 with 5.2.0 I would accept patch for PACKAGECONFIG.

gst-1.0* seems to be working fine for our ARM project and we've removed all gst-0.10 from our images lately - that's why I've noticed this qtwebkit dependency.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#3 lore raw
Quoted 4 lines · Martin Jansa
Quoted 1 line

right now i am using the dora branch and qt5.1.1 which hasn't been

updated

Quoted 1 line

for a while, which is fine.

Quoted 8 lines

This is only for master which will soon became just qt5.2.0 where gstreamer-1.0 is used by default and I believe more tested than integration with gstreamer-0.10.

So it won't change anything for people using 5.1.1 from dora branch. If someone really wants to use gst-0.10 with 5.2.0 I would accept patch for PACKAGECONFIG.

Ok. thanks. I don't need it, now, at least. if we ever move to qt5.2 and still use gst0.10, then i will submit the patch

Quoted 4 lines

gst-1.0* seems to be working fine for our ARM project and we've removed all gst-0.10 from our images lately - that's why I've noticed this qtwebkit dependency.

well, assuming you get the video codec plugins ported onto gst1.0 ;-) which might not always be a trivial thing.. anyways, right now we don't have the choice and gst0.10 is required!

thanks for your quick answer.