webkit-gtk: merge with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3639 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 10 insertions, 2 deletions

diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/packages/webkit/webkit-gtk_svn.bb
index 262c6820db..6a99a96001 100644
--- a/meta/packages/webkit/webkit-gtk_svn.bb
+++ b/meta/packages/webkit/webkit-gtk_svn.bb
@@ -1,15 +1,23 @@
 DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+"
 
+# If you activate HTML5 media support (ENABLE_VIDEO=1) you'll need:
+# DEPENDS += " gstreamer gst-plugins-base gnome-vfs "
+
 
 WEBKIT_PORT = "gtk-port"
 WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt"
 
 FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
-FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
+FILES_webkit-gtklauncher-dbg += "${bindir}/.debug/GtkLauncher"
 
 require webkit.inc
 
-PR = "r3"
+SRC_URI += "file://autogen.sh \
+            file://configure.ac \
+            file://GNUmakefile.am \
+           "
+
+PR = "r4"
 
 do_install() {
         install -d ${D}${bindir}