aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Makefile.in2
-rw-r--r--package/berkeleydb/berkeleydb.mk1
-rw-r--r--package/dbus/dbus.mk3
-rw-r--r--package/directfb/Config.in14
-rw-r--r--package/directfb/directfb.mk16
-rw-r--r--package/enchant/Config.in2
-rw-r--r--package/enchant/enchant.mk2
-rw-r--r--package/libsoup/libsoup.mk2
-rw-r--r--package/libxslt/libxslt.mk2
-rw-r--r--package/webkit/Config.in1
-rw-r--r--package/webkit/webkit.mk1
11 files changed, 39 insertions, 7 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index 0829e8f3bb..2dbf37fbf7 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -354,7 +354,7 @@ DISABLE_LARGEFILE= --disable-largefile
endif
ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-DISABLE_DOCUMENTATION=--without-html-dir --disable-gtk-doc
+DISABLE_DOCUMENTATION=--disable-gtk-doc
endif
ifneq ($(BR2_INET_IPV6),y)
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index a6e0439741..bea3eb718b 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -20,6 +20,7 @@ $(DB_DIR)/.dist: $(DL_DIR)/$(DB_SOURCE)
touch $@
$(DB_DIR)/.configured: $(DB_DIR)/.dist
+ $(CONFIG_UPDATE) $(DB_DIR)/dist
(cd $(DB_DIR)/build_unix; rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index 7326b419bb..dd11677e05 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -3,9 +3,10 @@
# dbus
#
#############################################################
-DBUS_VERSION = 1.2.12
+DBUS_VERSION = 1.2.16
DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
+DBUS_LIBTOOL_PATCH = NO
DBUS_INSTALL_STAGING = YES
DBUS_INSTALL_TARGET = YES
ifeq ($(BR2_ENABLE_DEBUG),y)
diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index fce9ed46cc..bb355309cb 100644
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@@ -11,7 +11,18 @@ config BR2_PACKAGE_DIRECTFB_MULTI
select BR2_PACKAGE_LINUX_FUSION
help
Enable use of multiple concurrent DirectFB applications
- http://www.directfb.org/
+
+config BR2_PACKAGE_DIRECTFB_DEBUG
+ bool "directfb debugging"
+ depends on BR2_PACKAGE_DIRECTFB
+ help
+ Compile DirectFB with lots of debug output
+
+config BR2_PACKAGE_DIRECTFB_TRACE
+ bool "directfb call trace support"
+ depends on BR2_PACKAGE_DIRECTFB
+ help
+ Enable call tracing for DirectFB applications
config BR2_PACKAGE_DIRECTFB_XSERVER
bool "build with X server backend"
@@ -76,7 +87,6 @@ config BR2_PACKAGE_DIRECTFB_GIF
bool "enable GIF support"
default y
depends on BR2_PACKAGE_DIRECTFB
- select BR2_PACKAGE_LIBUNGIF
config BR2_PACKAGE_DIRECTFB_JPEG
bool "enable JPEG support"
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index 93b45938df..1c3b78adfb 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -19,6 +19,19 @@ else
DIRECTFB_MULTI:=
DIRECTFB_FUSION:=
endif
+
+ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG),y)
+DIRECTFB_DEBUG:=--enable-debug
+else
+DIRECTFB_DEBUG:=
+endif
+
+ifeq ($(BR2_PACKAGE_DIRECTFB_TRACE),y)
+DIRECTFB_TRACE:=--enable-trace
+else
+DIRECTFB_TRACE:=
+endif
+
ifeq ($(BR2_PACKAGE_XSERVER),y)
DIRECTFB_X:=--enable-x11
else
@@ -78,7 +91,6 @@ endif
ifeq ($(BR2_PACKAGE_DIRECTFB_GIF),y)
DIRECTFB_GIF:=--enable-gif
-DIRECTFB_DEP+= libungif
else
DIRECTFB_GIF:=--disable-gif
endif
@@ -111,6 +123,8 @@ DIRECTFB_CONF_OPT = \
--enable-shared \
--disable-explicit-deps \
$(DIRECTFB_MULTI) \
+ $(DIRECTFB_DEBUG) \
+ $(DIRECTFB_TRACE) \
$(DIRECTFB_X) \
$(DIRECTFB_JPEG) \
$(DIRECTFB_PNG) \
diff --git a/package/enchant/Config.in b/package/enchant/Config.in
index 0771a47b9f..e65d68116f 100644
--- a/package/enchant/Config.in
+++ b/package/enchant/Config.in
@@ -1,5 +1,7 @@
config BR2_PACKAGE_ENCHANT
bool "enchant"
+ depends on BR2_INSTALL_LIBSTDCPP
+ select BR2_PACKAGE_LIBGLIB2
help
Enchant is a spell-checking library that provides a consistent
API across a number of spell-checking system backends.
diff --git a/package/enchant/enchant.mk b/package/enchant/enchant.mk
index d972465152..63cd311c65 100644
--- a/package/enchant/enchant.mk
+++ b/package/enchant/enchant.mk
@@ -11,4 +11,6 @@ ENCHANT_INSTALL_STAGING = YES
ENCHANT_INSTALL_TARGET = YES
ENCHANT_LIBTOOL_PATCH = NO
+ENCHANT_DEPENDENCIES = libglib2 host-pkgconfig
+
$(eval $(call AUTOTARGETS,package,enchant))
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index c0b85e2f90..b4eaa5a2ec 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -8,7 +8,7 @@ LIBSOUP_MAJOR_VERSION:=2.26
LIBSOUP_VERSION:=$(LIBSOUP_MAJOR_VERSION).2
LIBSOUP_SOURCE:=libsoup-$(LIBSOUP_VERSION).tar.bz2
LIBSOUP_SITE:=http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION)
-LIBSOUP_AUTORECONF = NO
+LIBSOUP_AUTORECONF = YES
LIBSOUP_INSTALL_STAGING = YES
LIBSOUP_INSTALL_TARGET = YES
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 8d8785f494..35659d355f 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -21,7 +21,7 @@ LIBXSLT_CONF_OPT = --with-gnu-ld --enable-shared \
$(DISABLE_NLS) $(DISABLE_IPV6) \
--without-debugging --without-python \
--without-threads \
- --with-libxml-include-prefix=$(STAGING_DIR)/usr/include/libxml2
+ --with-libxml-prefix=$(STAGING_DIR)/usr/
LIBXSLT_DEPENDENCIES = uclibc $(LIBXSLT_DEPENDENCIES_EXTRA)
diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index ecf8694291..3c669a53f3 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_WEBKIT
select BR2_PACKAGE_SQLITE
select BR2_PACKAGE_ENCHANT
select BR2_PACKAGE_LIBSOUP
+ select BR2_PACKAGE_CAIRO_PNG
help
WebKit is an open source, standards compliant web browser engine.
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 17f1318f95..bc7d062d2e 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -10,6 +10,7 @@ WEBKIT_SITE = http://nightly.webkit.org/files/trunk/src/
WEBKIT_INSTALL_STAGING = YES
WEBKIT_INSTALL_TARGET = YES
WEBKIT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
+WEBKIT_LIBTOOL_PATCH = NO
WEBKIT_DEPENDENCIES = icu curl libxml2 libxslt libgtk2 sqlite enchant \
libsoup