Commit Graph

38 Commits

Author SHA1 Message Date
Jerzy Grzegorek e800531761 package: indentation cleanup
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-02 23:27:01 +01:00
Thomas De Schampheleire aaffd209fa packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:54:16 +02:00
Thomas De Schampheleire 1d2574ac6f packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_AUTORECONF_OPT.

Sed command used:
    find * -type f | xargs sed -i 's#_AUTORECONF_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:53:25 +02:00
Thomas De Schampheleire d6c32da881 packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_STAGING_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_INSTALL_STAGING_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:49:36 +02:00
Thomas De Schampheleire 57f2b8d255 packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_TARGET_OPT.

Sed command used:
   find * -type f | xargs sed -i 's#_INSTALL_TARGET_OPT\>#&S#g'

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-10-04 18:48:33 +02:00
Bernd Kuhls 042a3b7efa package/webkit: Fix OpenGL-related dependencies
fixes
http://autobuild.buildroot.net/results/27a/27a674c6a19a729fae5cc33de0360b2a061930c1/

This patch indeed fixes several problems based on the autobuilder-defconfig used.

1) Add missing dependencies when opengl is detected by webkit to satisfy autobuilder:

checking which GPU acceleration backend to use... opengl
checking for XCOMPOSITE... yes
checking for XDAMAGE... no
configure: error: Package requirements (xdamage) were not met:

2) ... but opengl should not have been detected with the used defconfig:
$ grep MESA .config
BR2_PACKAGE_MESA3D=y

which will lead to a link error although webkit configure found all dependencies:

/home/br2/output/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/4.7.3/../../../../mips-linux-gnu/bin/ld: cannot find -lGL

3) same is valid for glx, having GL/glx.h means nothing

4) add some configure options for gles/egl as well, just to make sure ;)

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-20 00:31:42 +02:00
Simon Dawson a6e5afc3cc webkit: fix target install
Commit 33a9d34ff3 fixed the staging
install for webkit, which was hanging due to deadlock during parallel
make install.

This problem also afflicts the target install, which is fixed by this patch.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-10-22 16:29:07 +02:00
Peter Korsgaard 33a9d34ff3 webkit: fix staging install
Parallel 'make install' seems to deadlock here (make 3.81). Work around it
by disabling parallel make for the install step.

We only disable parallel make for the install step, as the build step works
with parallel make, and webkit is a huge package, so build time goes up
significantly with make -j1.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-09 11:27:55 +02:00
Markos Chandras 52fcc6a256 webkit: Version bump to 1.11.5
Also apply the following patches:
- upstream fix for 32-bit autotools
- upstream fix for conditional gstreamer build of gtklauncher
- upstream fix for detecting the latest harfbuzz
- Update existing patch for disabling docs
- Update existing patch for execinfo_h
- upstream patch for the MIPS DFG support. This fixes
compilation problems on MIPS.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-08 22:50:06 +02:00
Gustavo Zacarias 01e9002ada webkit: needs host-ruby
Fixes:
http://autobuild.buildroot.net/results/13a/13a4ad4622be0c9f395e8c81db2a842b71962f61/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-10 23:08:05 +02:00
Spenser Gilliland 69e3d032ed webkit: bump to version 1.9.6
Remove bison-2.6-compat patch as it has been incorporated upstream.
Remove fix build issue with old gtk as gtk has been bumped to a newer
version.
Remove fix-build-with-gcc-4-6 as it has incorporated upstream.
Remove directfb patches due to depreciation
Remove pool patch as it is no longer required
Remove pthread_getattr_np as webkit no longer uses this function.

Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-08 22:54:24 +02:00
Alexandre Belloni 8dfd59d114 Normalize separator size to 80
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 22:30:24 +02:00
Michael J. Hammel 498ddd195a Update webkit download URL
Signed-off-by: Michael J. Hammel <mjhammel@graphics-muse.org>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-05-06 23:57:07 +02:00
Thomas Petazzoni 2b29492cf7 webkit: remove X.org server dependency
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-12 22:53:41 +01:00
Thomas Petazzoni d11bb6da1c webkit: fix build with bison 2.6
WebKit 1.2.7 does not build with Bison 2.6, but Bison 2.6 is our
host-bison, so if the build machine has bison 2.6, or if by chance it
gets built before webkit, then the build fails with errors such as:

  http://autobuild.buildroot.org/results/0b7cfbebd4388cabfa243b5ef74e3b6316fd9fd9/build-end.log

(the real error is not visible due to the overwhelming number of
warnings).

So, we add a patch that modifies WebKit to make it compatible with
Bison 2.6 (patch taken from upstream), and we also add 'host-bison' to
the WebKit dependencies, so that we are sure that a well-known version
of bison is used.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-15 21:17:14 +01:00
Thomas Petazzoni d2d81f4b34 webkit: silence gazillions of warnings
Building webkit with a recent gcc versions gives gazillions of
warnings such as 'warning: cast from 'WTF::AlignedBufferChar* {aka
char*}' to 'JSC::Identifier*' increases required alignment of target
type [-Wcast-align]'.

Those make the webkit build very noise, and hard to debug, so let's
silence those warnings.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-12-15 19:07:33 +01:00
Arnout Vandecappelle (Essensium/Mind) e1502ebc0c all packages: rename XXXTARGETS to xxx-package
Also remove the redundant $(call ...).

This is a purely mechanical change, performed with
find package linux toolchain boot -name \*.mk | \
  xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \
               -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \
               -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-17 20:23:05 +02:00
Thomas Petazzoni 300f9c9c9d package: remove useless arguments from AUTOTARGETS
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.

[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-09-29 23:12:27 +02:00
Gustavo Zacarias 0a70aa0cc5 webkit: bump to version 1.2.7
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-31 15:23:13 +02:00
Peter Korsgaard 07c469ed16 webkit: prefer X11 backend if both directfb and x11 are available
This shouldn't happen with any sane configuration, but is possible with
randpackageconfig builds, where it breaks the build as libgtk would prefer
X11 and webkit directfb, causing it to fail with:

No package 'gtk+-directfb-2.0' found

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-27 22:09:07 +02:00
Gustavo Zacarias f99f6aaa79 webkit: security bump to version 1.2.6
Bump to version 1.2.6 which includes security fixes for:
CVE-2010-1791, CVE-2010-3812, CVE-2010-3813, CVE-2010-4197,
CVE-2010-4198, CVE-2010-4204 and CVE-2010-4206.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-01-11 00:18:54 +01:00
Gustavo Zacarias e4cce3732c webkit: bump to version 1.2.5
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-22 23:46:38 +01:00
Peter Korsgaard e152912065 webkit: needs libcurl, not the curl binary
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-19 10:17:09 +01:00
Thomas Petazzoni 6e231c18f8 webkit: the X11 variant needs libXt
Fixes bug #829.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-27 22:49:35 +02:00
Thomas Petazzoni 760c2d1726 webkit: bump to webkitgtk 1.2.3
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-27 22:48:08 +02:00
Thomas Petazzoni 9dd1a03a78 webkit: fix misc build issues
Webkit depends on libjpeg, so add it as a dependency. Webkit also uses
icu but fails to find it if we don't pass ac_cv_path_icu_config to its
./configure script.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-06 10:32:35 +02:00
Peter Korsgaard 0f4d293c30 webkit: remove user visible rendering target selection
Instead use the same logic as in libgtk2. The rendering target selected
MUST be the same as libgtk2's, so just figure it out automatically
instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-25 23:25:37 +02:00
Thomas Petazzoni 09216ec22b webkit: several build fixes
This patch fixes different problems:

 * The autogen script of Webkit did not find autoconf, automake and
   aclocal since they are not installed in the host, but in
   $(HOST_DIR). Therefore we pass HOST_CONFIGURE_OPTS to autogen.sh so
   that the PATH is correct.

 * The autogen script was complaining that gtk-doc.make could not be
   find. As compiling gtk-doc completely is a pain (depends on
   Docbook), we just include gtk-doc.make into package/webkit/, and
   copy it to the source directory.

 * The autogen script was complaining about macros used in
   gtk-doc.make that did not exist. This is because aclocal was not
   run with $(STAGING_DIR)/usr/share/aclocal/ in the include
   path. Therefore, we fix ACLOCAL_FLAGS of Webkit's autogen script
   before running it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-02-23 20:34:56 +01:00
Lionel Landwerlin f7a6cfc225 webkit: fix dependencies on host tools flex and gperf
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-27 14:58:40 +01:00
Lionel Landwerlin c8bafd2669 webkit: convert to newstyle autotools infrastructure
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-27 14:58:08 +01:00
Thomas Petazzoni 7df179ae00 webkit: disable the libtool patch
The version of Webkit packaged in Buildroot uses libtool 2.x, for
which our package/buildroot-libtool.patch does not apply. So we
disable this patch. However, on my system, the lack of libtool
modification prevents the final linking to succeed (due to libtool
trying to link target code with host libraries). This will have to be
fixed separatly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-08-10 20:14:55 +02:00
Will Newton 81f9990e02 webkit: Update to WebKit svn r44552.
Closes #427

- Fix generation of configure script and Makefiles.
 - Add dependencies on libsoup and enchant.
 - Allow configuration of rendering target (currently X11 or DirectFB).

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-08-02 22:15:12 +02:00
Peter Korsgaard 01bcd0320e libglib2: build host version for build-time binaries
Build host version of glib in HOST_DIR and use the build-time binaries
from there instead of relying on what is installed on the host.
2009-03-16 15:49:03 +00:00
Peter Korsgaard c6da11ea45 webkit: don't depend on X server 2009-01-27 15:02:40 +00:00
Peter Korsgaard 02a623ddf9 buildroot: remove trailing spaces
for i in `find -name 'Config*' -o -name 'Makefile*' -o -name '*.mk'`;
do
	sed -i 's/ \+$//' $i;
done
2008-08-04 19:07:05 +00:00
Ulf Samuelsson 1a75be4d73 Use HOST_GLIB for packages 2008-07-05 09:30:17 +00:00
John Voltz 910017dfc6 update webkit version 2008-04-24 13:22:34 +00:00
John Voltz b1ca8e68ae added webkit 2008-03-06 18:28:48 +00:00