aboutsummaryrefslogtreecommitdiff
path: root/package/cairo
diff options
context:
space:
mode:
authorGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-09-12 04:37:31 +0000
committerGravatar Ulf Samuelsson <ulf.samuelsson@atmel.com>2007-09-12 04:37:31 +0000
commit5f17c052bcae08bfd08ddca736a68b02bf3672e7 (patch)
treee1b822c30143fc5aa457a92f4d97aaa6ed02b878 /package/cairo
parent7521f37372839210e18207223ef54ed768422726 (diff)
downloadbuildroot-5f17c052bcae08bfd08ddca736a68b02bf3672e7.tar.gz
buildroot-5f17c052bcae08bfd08ddca736a68b02bf3672e7.tar.bz2
Update various packages to make X run
Diffstat (limited to 'package/cairo')
-rw-r--r--package/cairo/Config.in2
-rw-r--r--package/cairo/cairo.mk6
2 files changed, 5 insertions, 3 deletions
diff --git a/package/cairo/Config.in b/package/cairo/Config.in
index 60aa6acb1a..9f975c39ea 100644
--- a/package/cairo/Config.in
+++ b/package/cairo/Config.in
@@ -3,6 +3,8 @@ config BR2_PACKAGE_CAIRO
default n
select BR2_PACKAGE_PKGCONFIG
select BR2_PACKAGE_LIBPNG
+ select BR2_PACKAGE_ZLIB
+ select BR2_PACKAGE_FONTCONFIG
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
help
Cairo is a 2D graphics library with support for multiple
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
index 5a617c7101..ac5ebd6f67 100644
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -101,8 +101,8 @@ $(CAIRO_DIR)/.configured: $(CAIRO_DIR)/.unpacked
--enable-shared \
--enable-static \
--with-x \
- --x-includes=$(STAGING_DIR)/usr/include \
- --x-libraries=$(STAGING_DIR)/lib \
+ --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ --x-libraries=$(STAGING_DIR)/usr/lib \
--enable-ps=yes \
--enable-pdf=yes \
--enable-svg=no \
@@ -128,7 +128,7 @@ $(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY)
$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libcairo.so.2.*
touch -c $(TARGET_DIR)/lib/libcairo.so.2.9.3
-cairo: uclibc gettext libintl pkgconfig libglib2 $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3
+cairo: uclibc gettext libintl pkgconfig libglib2 zlib png fontconfig $(XSERVER) $(TARGET_DIR)/lib/libcairo.so.2.9.3
cairo-clean:
rm -f $(TARGET_DIR)/lib/$(CAIRO_BINARY)