* Make webkitgtk buildable for distributions without opengl support. * Properly package error.html resource file.
Signed-off-by: Peter Tworek <[email protected]> --- meta/recipes-sato/webkit/webkit-gtk_svn.bb | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb index 9652953..2d9ec80 100644 --- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb +++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb @@ -8,13 +8,14 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90" DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3" +DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3" SRCREV_FORMAT = "source" SRCREV = "101488" PV = "1.7.2+svnr${SRCPV}" -PR = "r0" +PR = "r1" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \ @@ -41,6 +42,7 @@ EXTRA_OECONF = "\ --enable-image-resizer \ --enable-link-prefetch \ --with-gtk=2.0 \ + ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ UNICODE_CFLAGS=-D_REENTRANT \ " @@ -81,7 +83,7 @@ FILES_${PN}launcher = "${bindir}/GtkLauncher" FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*" FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/" -FILES_${PN} += "${datadir}/webkit-*/resources/error.html \ +FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \ ${datadir}/webkitgtk-*/images \ ${datadir}/glib-2.0/schemas" -- 1.7.3.4 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
