Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/cairo
@ 2008-07-05 15:14 correa at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: correa at uclibc.org @ 2008-07-05 15:14 UTC (permalink / raw)
  To: buildroot

Author: correa
Date: 2008-07-05 08:14:11 -0700 (Sat, 05 Jul 2008)
New Revision: 22654

Log:
Fix #3584, when building cairo with DirectFB, depend on DirectFB

Modified:
   trunk/buildroot/package/cairo/Config.in
   trunk/buildroot/package/cairo/cairo.mk


Changeset:
Modified: trunk/buildroot/package/cairo/Config.in
===================================================================
--- trunk/buildroot/package/cairo/Config.in	2008-07-05 09:30:17 UTC (rev 22653)
+++ trunk/buildroot/package/cairo/Config.in	2008-07-05 15:14:11 UTC (rev 22654)
@@ -5,7 +5,7 @@
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_FONTCONFIG
-	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
+	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
 	help
 	  Cairo is a 2D graphics library with support for multiple
 	  output devices. Currently supported output targets include

Modified: trunk/buildroot/package/cairo/cairo.mk
===================================================================
--- trunk/buildroot/package/cairo/cairo.mk	2008-07-05 09:30:17 UTC (rev 22653)
+++ trunk/buildroot/package/cairo/cairo.mk	2008-07-05 15:14:11 UTC (rev 22654)
@@ -43,8 +43,9 @@
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
 	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
+	CAIRO_DEPENDENCIES_EXTRA = directfb
 endif
 
-CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib png fontconfig $(XSERVER) 
+CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib png fontconfig $(CAIRO_DEPENDENCIES_EXTRA) $(XSERVER) 
 
 $(eval $(call AUTOTARGETS,package,cairo))

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cairo
@ 2009-01-14 13:36 thomasez at uclibc.org
  2009-01-14 14:24 ` Daniel Laird
  0 siblings, 1 reply; 16+ messages in thread
From: thomasez at uclibc.org @ 2009-01-14 13:36 UTC (permalink / raw)
  To: buildroot

Author: thomasez
Date: 2009-01-14 13:36:36 +0000 (Wed, 14 Jan 2009)
New Revision: 24829

Log:
Better to use the correct --without 


Modified:
   trunk/buildroot/package/cairo/cairo.mk


Changeset:
Modified: trunk/buildroot/package/cairo/cairo.mk
===================================================================
--- trunk/buildroot/package/cairo/cairo.mk	2009-01-14 12:49:24 UTC (rev 24828)
+++ trunk/buildroot/package/cairo/cairo.mk	2009-01-14 13:36:36 UTC (rev 24829)
@@ -46,7 +46,7 @@
 	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
 	CAIRO_DEPENDENCIES_EXTRA = directfb
 endif
-CAIRO_CONF_OPT += --disable-gtk-doc --with-html-dir=""
+CAIRO_CONF_OPT += --disable-gtk-doc --without-html-dir
 
 CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 
 

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cairo
@ 2009-01-14 12:26 thomasez at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: thomasez at uclibc.org @ 2009-01-14 12:26 UTC (permalink / raw)
  To: buildroot

Author: thomasez
Date: 2009-01-14 12:26:30 +0000 (Wed, 14 Jan 2009)
New Revision: 24827

Log:
Woops, we do need /dev/null, not a directory with html in it.


Modified:
   trunk/buildroot/package/cairo/cairo.mk


Changeset:
Modified: trunk/buildroot/package/cairo/cairo.mk
===================================================================
--- trunk/buildroot/package/cairo/cairo.mk	2009-01-14 11:19:09 UTC (rev 24826)
+++ trunk/buildroot/package/cairo/cairo.mk	2009-01-14 12:26:30 UTC (rev 24827)
@@ -46,7 +46,7 @@
 	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
 	CAIRO_DEPENDENCIES_EXTRA = directfb
 endif
-CAIRO_CONF_OPT += --disable-gtk-doc --with-html-dir=/dev/null
+CAIRO_CONF_OPT += --disable-gtk-doc --with-html-dir=""
 
 CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 
 

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cairo
@ 2009-01-12 15:22 thomasez at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: thomasez at uclibc.org @ 2009-01-12 15:22 UTC (permalink / raw)
  To: buildroot

Author: thomasez
Date: 2009-01-12 15:22:41 +0000 (Mon, 12 Jan 2009)
New Revision: 24801

Log:
Fix dependencies.


Modified:
   trunk/buildroot/package/cairo/Config.in
   trunk/buildroot/package/cairo/cairo.mk


Changeset:
Modified: trunk/buildroot/package/cairo/Config.in
===================================================================
--- trunk/buildroot/package/cairo/Config.in	2009-01-12 15:10:04 UTC (rev 24800)
+++ trunk/buildroot/package/cairo/Config.in	2009-01-12 15:22:41 UTC (rev 24801)
@@ -3,6 +3,7 @@
 	select BR2_PACKAGE_PKGCONFIG
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_PIXMAN
 	select BR2_PACKAGE_FONTCONFIG
 	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX||BR2_PACKAGE_DIRECTFB
 	help

Modified: trunk/buildroot/package/cairo/cairo.mk
===================================================================
--- trunk/buildroot/package/cairo/cairo.mk	2009-01-12 15:10:04 UTC (rev 24800)
+++ trunk/buildroot/package/cairo/cairo.mk	2009-01-12 15:22:41 UTC (rev 24801)
@@ -41,15 +41,13 @@
 		ac_use_included_regex=no gl_cv_c_restrict=no \
 		ac_cv_path_GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal
 
-CAIRO_CONF_OPT = --disable-gtk-doc --with-html-dir=/dev/null
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
-	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb \
-		--disable-gtk-doc --with-html-dir=/dev/null
+	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
 	CAIRO_DEPENDENCIES_EXTRA = directfb
 endif
+CAIRO_CONF_OPT += --disable-gtk-doc --with-html-dir=/dev/null
 
+CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 
 
-CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig libglib2 zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 
-
 $(eval $(call AUTOTARGETS,package,cairo))

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cairo
@ 2008-10-22 15:01 laird at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: laird at uclibc.org @ 2008-10-22 15:01 UTC (permalink / raw)
  To: buildroot

Author: laird
Date: 2008-10-22 08:01:00 -0700 (Wed, 22 Oct 2008)
New Revision: 23766

Log:
package/cairo/cairo.mk: Bounce version and add patches for DirectFB

Update Cairo to 1.6.4
Add DirectFB patches as supplied by DirectFB author Dennis Kropp

Signed-off-by: Daniel Laird <daniel.j.laird@nxp.com>



Added:
   trunk/buildroot/package/cairo/cairo-1.6.4-directfb-all.patch

Modified:
   trunk/buildroot/package/cairo/cairo.mk


Changeset:

Sorry, the patch is too large to include (1039 lines).
Please use ViewCVS to see it!

http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=23766

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cairo
@ 2007-01-17 13:49 jacmet at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: jacmet at uclibc.org @ 2007-01-17 13:49 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2007-01-17 05:49:35 -0800 (Wed, 17 Jan 2007)
New Revision: 17343

Log:
Fixup description (pango cut'n'paste)

Modified:
   trunk/buildroot/package/cairo/Config.in


Changeset:
Modified: trunk/buildroot/package/cairo/Config.in
===================================================================
--- trunk/buildroot/package/cairo/Config.in	2007-01-17 13:46:45 UTC (rev 17342)
+++ trunk/buildroot/package/cairo/Config.in	2007-01-17 13:49:35 UTC (rev 17343)
@@ -5,10 +5,10 @@
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_XORG
 	help
-	  Pango is a library for laying out and rendering of text, with an
-	  emphasis on internationalization. Pango can be used anywhere that
-	  text layout is needed, though most of the work on Pango so far has
-	  been done in the context of the GTK+ widget toolkit. Pango forms the
-	  core of text and font handling for GTK+-2.x.
+	  Cairo is a 2D graphics library with support for multiple
+	  output devices. Currently supported output targets include
+	  the X Window System, Win32, image buffers, and PostScript,
+	  PDF, and SVG file output. Experimental backends include
+	  OpenGL (through glitz), Quartz, and XCB.
 
-	  http://www.pango.org/
+	  http://cairographics.org/

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cairo
@ 2007-01-17 13:46 jacmet at uclibc.org
  2007-01-18 18:40 ` Erik Andersen
  0 siblings, 1 reply; 16+ messages in thread
From: jacmet at uclibc.org @ 2007-01-17 13:46 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2007-01-17 05:46:45 -0800 (Wed, 17 Jan 2007)
New Revision: 17342

Log:
s/pango/cairo/

Modified:
   trunk/buildroot/package/cairo/Config.in


Changeset:
Modified: trunk/buildroot/package/cairo/Config.in
===================================================================
--- trunk/buildroot/package/cairo/Config.in	2007-01-17 13:05:14 UTC (rev 17341)
+++ trunk/buildroot/package/cairo/Config.in	2007-01-17 13:46:45 UTC (rev 17342)
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_CAIRO
-	bool "pango"
+	bool "cairo"
 	default n
 	select BR2_PACKAGE_PKGCONFIG
 	select BR2_PACKAGE_LIBPNG

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cairo
@ 2007-01-11  8:45 andersen at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2007-01-11  8:45 UTC (permalink / raw)
  To: buildroot

Author: andersen
Date: 2007-01-11 00:45:28 -0800 (Thu, 11 Jan 2007)
New Revision: 17248

Log:
it seems pdf and ps support are required for gtk2


Modified:
   trunk/buildroot/package/cairo/cairo.mk


Changeset:
Modified: trunk/buildroot/package/cairo/cairo.mk
===================================================================
--- trunk/buildroot/package/cairo/cairo.mk	2007-01-11 08:42:34 UTC (rev 17247)
+++ trunk/buildroot/package/cairo/cairo.mk	2007-01-11 08:45:28 UTC (rev 17248)
@@ -109,8 +109,8 @@
 		--with-x \
 		--x-includes=$(STAGING_DIR)/usr/X11R6/include \
 		--x-libraries=$(STAGING_DIR)/usr/X11R6/lib \
-		--enable-ps=no \
-		--enable-pdf=no \
+		--enable-ps=yes \
+		--enable-pdf=yes \
 		--enable-svg=no \
 		--enable-png=yes \
 		--enable-freetype=yes \

^ permalink raw reply	[flat|nested] 16+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cairo
@ 2007-01-11  7:36 andersen at uclibc.org
  0 siblings, 0 replies; 16+ messages in thread
From: andersen at uclibc.org @ 2007-01-11  7:36 UTC (permalink / raw)
  To: buildroot

Author: andersen
Date: 2007-01-10 23:35:59 -0800 (Wed, 10 Jan 2007)
New Revision: 17244

Log:
fix build deps


Modified:
   trunk/buildroot/package/cairo/cairo.mk


Changeset:
Modified: trunk/buildroot/package/cairo/cairo.mk
===================================================================
--- trunk/buildroot/package/cairo/cairo.mk	2007-01-11 07:27:37 UTC (rev 17243)
+++ trunk/buildroot/package/cairo/cairo.mk	2007-01-11 07:35:59 UTC (rev 17244)
@@ -8,7 +8,7 @@
 CAIRO_SITE:=http://cairographics.org/releases
 CAIRO_CAT:=$(ZCAT)
 CAIRO_DIR:=$(BUILD_DIR)/cairo-$(CAIRO_VERSION)
-CAIRO_BINARY:=libcairo-1.0.a
+CAIRO_BINARY:=libcairo.a
 
 ifeq ($(BR2_ENDIAN),"BIG")
 CAIRO_BE:=yes
@@ -119,11 +119,11 @@
 	);
 	touch $(CAIRO_DIR)/.configured
 
-$(CAIRO_DIR)/cairo/.libs/$(CAIRO_BINARY): $(CAIRO_DIR)/.configured
+$(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY): $(CAIRO_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(CAIRO_DIR)
-	touch -c $(CAIRO_DIR)/cairo/.libs/$(CAIRO_BINARY)
+	touch -c $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY)
 
-$(STAGING_DIR)/lib/$(CAIRO_BINARY): $(CAIRO_DIR)/cairo/.libs/$(CAIRO_BINARY)
+$(STAGING_DIR)/lib/$(CAIRO_BINARY): $(CAIRO_DIR)/src/.libs/$(CAIRO_BINARY)
 	$(MAKE) prefix=$(STAGING_DIR) \
 	    exec_prefix=$(STAGING_DIR) \
 	    bindir=$(STAGING_DIR)/bin \
@@ -139,6 +139,7 @@
 	    infodir=$(STAGING_DIR)/info \
 	    mandir=$(STAGING_DIR)/man \
 	    -C $(CAIRO_DIR) install;
+	touch -c $(STAGING_DIR)/lib/$(CAIRO_BINARY)
 
 $(TARGET_DIR)/lib/libcairo.so.2.9.3: $(STAGING_DIR)/lib/$(CAIRO_BINARY)
 	cp -a $(STAGING_DIR)/lib/libcairo.so $(TARGET_DIR)/lib/
@@ -146,7 +147,7 @@
 	$(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 xorg cairo $(TARGET_DIR)/lib/libcairo.so.2.9.3
+cairo: uclibc gettext libintl pkgconfig libglib2 xorg $(TARGET_DIR)/lib/libcairo.so.2.9.3
 
 cairo-clean:
 	rm -f $(TARGET_DIR)/lib/$(CAIRO_BINARY)

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2009-01-17 21:41 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-05 15:14 [Buildroot] svn commit: trunk/buildroot/package/cairo correa at uclibc.org
  -- strict thread matches above, loose matches on Subject: below --
2009-01-14 13:36 thomasez at uclibc.org
2009-01-14 14:24 ` Daniel Laird
2009-01-14 14:50   ` Sven Neumann
2009-01-17  9:55     ` Thomas Lundquist
2009-01-17 16:27       ` Peter Korsgaard
2009-01-17 20:03         ` Thomas Lundquist
2009-01-17 21:41           ` danieljlaird at hotmail.com
2009-01-14 12:26 thomasez at uclibc.org
2009-01-12 15:22 thomasez at uclibc.org
2008-10-22 15:01 laird at uclibc.org
2007-01-17 13:49 jacmet at uclibc.org
2007-01-17 13:46 jacmet at uclibc.org
2007-01-18 18:40 ` Erik Andersen
2007-01-11  8:45 andersen at uclibc.org
2007-01-11  7:36 andersen at uclibc.org

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox