[oe-commits] : webkit gtk: bump SRCREV
OE GIT Trial
gittrial at amethyst.openembedded.net
Sun Aug 3 16:15:06 UTC 2008
Module: OE.dev
Branch: org.openembedded.dev
Commit: 171cde32d76593232a84e6b4fbfa212bae759f28
URL: http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=171cde32d76593232a84e6b4fbfa212bae759f28
Author: <koen at openembedded.org>
Date: Sun Aug 3 15:52:07 2008 +0000
webkit gtk: bump SRCREV
---
conf/distro/include/sane-srcrevs.inc | 2 +-
packages/webkit/webkit-gtk/GNUmakefile.am | 37 ++++++++++++++++++----------
packages/webkit/webkit-gtk/configure.ac | 25 ++++++++++++++++++-
3 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 1cf02d7..d8c3686 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -171,7 +171,7 @@ SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
SRCREV_pn-usbpath ?= "3172"
SRCREV_pn-usbpath-native ?= "3172"
-SRCREV_pn-webkit-gtk ?= "35062"
+SRCREV_pn-webkit-gtk ?= "35533"
SRCREV_pn-webkit-qt ?= "28656"
SRCREV_pn-webkit-qtopia ?= "28656"
SRCREV_pn-wesnoth ?= "22021"
diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am
index a6ae299..9b2f06f 100644
--- a/packages/webkit/webkit-gtk/GNUmakefile.am
+++ b/packages/webkit/webkit-gtk/GNUmakefile.am
@@ -216,8 +216,8 @@ libWebCore_la_LIBADD = \
$(GSTREAMER_LIBS) \
$(LIBXSLT_LIBS) \
$(HILDON_LIBS) \
- -lpthread \
- -ljpeg
+ $(JPEG_LIBS) \
+ -lpthread
# WebKit
webkitgtk_h_api :=
@@ -320,8 +320,8 @@ webkitgtk_h_api += \
WebKit/gtk/webkit/webkitwebview.h
webkitgtk_built_sources += \
- DerivedSources/webkit-marshal.h \
- DerivedSources/webkit-marshal.cpp \
+ DerivedSources/webkitmarshal.h \
+ DerivedSources/webkitmarshal.cpp \
DerivedSources/webkitenumtypes.cpp \
WebKit/gtk/webkit/webkitenumtypes.h
@@ -367,26 +367,37 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
stamp_files := \
- stamp-webkit-marshal.cpp \
- stamp-webkit-marshal.h \
+ stamp-webkitmarshal.cpp \
+ stamp-webkitmarshal.h \
stamp-webkitenumtypes.cpp \
stamp-webkitenumtypes.h
-WEBKIT_MARSHAL = $(GENSOURCES)/webkit-marshal
-WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list
-
-DerivedSources/webkit-marshal.cpp: stamp-webkit-marshal.cpp
+WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
+WEBKIT_MARSHAL_LIST = $(WEBKIT_MARSHAL).list
+
+$(WEBKIT_MARSHAL_LIST): $(webkitgtk_sources) GNUmakefile.am
+ ( cd $(top_srcdir) && \
+ sed -n -e 's/.*webkit_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
+ $(webkitgtk_sources) ) \
+ | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
+ if cmp -s $@.tmp $@; then \
+ rm $@.tmp; \
+ else \
+ mv $@.tmp $@; \
+ fi
+
+$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp
@true
-DerivedSources/webkit-marshal.h: stamp-webkit-marshal.h
+$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h
@true
-stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
+stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
echo timestamp > $(@F)
-stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST)
+stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \
echo timestamp > $(@F)
diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac
index d0aa7c8..768ae9f 100644
--- a/packages/webkit/webkit-gtk/configure.ac
+++ b/packages/webkit/webkit-gtk/configure.ac
@@ -137,8 +137,29 @@ AC_CHECK_HEADERS([pthread.h],
AC_MSG_ERROR([pthread support is required to build WebKit]))
fi
-# libjpeg headers
-AC_CHECK_HEADERS([jpeglib.h])
+# check for libjpeg the way Gtk does it.
+AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
+ jpeg_ok=yes, jpeg_ok=no
+ AC_MSG_ERROR([JPEG library (libjpeg) not found]))
+if test "$jpeg_ok" = yes; then
+ AC_MSG_CHECKING([for jpeglib])
+ AC_TRY_CPP(
+[#include <stdio.h>
+#undef PACKAGE
+#undef VERSION
+#undef HAVE_STDLIB_H
+#include <jpeglib.h>],
+ jpeg_ok=yes,
+ jpeg_ok=no)
+ AC_MSG_RESULT($jpeg_ok)
+ if test "$jpeg_ok" = yes; then
+ JPEG_LIBS="-ljpeg"
+ # should we check for progressive JPEG like GTK+ as well?
+ else
+ AC_MSG_ERROR([JPEG library (libjpeg) not found])
+ fi
+fi
+AC_SUBST([JPEG_LIBS])
# check for pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
More information about the Openembedded-commits
mailing list