[csw-devel] SF.net SVN: gar:[14745] csw/mgar/pkg/libcairo/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Jun 8 12:34:53 CEST 2011 

Revision: 14745
          http://gar.svn.sourceforge.net/gar/?rev=14745&view=rev
Author:   dmichelsen
Date:     2011-06-08 10:34:53 +0000 (Wed, 08 Jun 2011)

Log Message:
-----------
libcairo: Complete rework, split packages

Modified Paths:
--------------
    csw/mgar/pkg/libcairo/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch

Modified: csw/mgar/pkg/libcairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcairo/trunk/Makefile	2011-06-08 02:06:15 UTC (rev 14744)
+++ csw/mgar/pkg/libcairo/trunk/Makefile	2011-06-08 10:34:53 UTC (rev 14745)
@@ -1,52 +1,77 @@
-NAME      = libcairo
-VERSION   = 1.10.2
-CATEGORIES   = lib
+NAME = cairo
+VERSION = 1.10.2
+CATEGORIES = lib
 
-DESCRIPTION  = The Cairo 2D Graphics Library
+DESCRIPTION = The Cairo 2D Graphics Library
 define BLURB
-Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL (through glitz), XCB, BeOS, OS/2, and DirectFB.
+  Cairo is a 2D graphics library with support for multiple output devices.
+  Currently supported output targets include the X Window System, Quartz, Win32,
+  image buffers, PostScript, PDF, and SVG file output. Experimental backends
+  include OpenGL (through glitz), XCB, BeOS, OS/2, and DirectFB.
 endef
 
-MASTER_SITES  = http://www.cairographics.org/releases/
-DISTNAME      = cairo-$(VERSION)
-DISTFILES     = $(DISTNAME).tar.gz 
+MASTER_SITES = http://www.cairographics.org/releases/
+DISTFILES = $(DISTNAME).tar.gz 
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+# Apply patch until this is fixed:
+#   https://bugs.freedesktop.org/show_bug.cgi?id=37916
+PATCHFILES += 0001-Use-detected-EGREP-instead-of-generic-grep.patch
 
-PACKAGES += CSWlibcairo
-CATALOGNAME_CSWlibcairo = libcairo
-SPKG_DESC_CSWlibcairo = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWlibcairo += CSWfconfig
-RUNTIME_DEP_PKGS_CSWlibcairo += CSWftype2
-RUNTIME_DEP_PKGS_CSWlibcairo += CSWpixman
-RUNTIME_DEP_PKGS_CSWlibcairo += CSWpng
-RUNTIME_DEP_PKGS_CSWlibcairo += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibcairo += CSWexpat
-RUNTIME_DEP_PKGS_CSWlibcairo += CSWiconv
+PACKAGES += CSWlibcairo2
+SPKG_DESC_CSWlibcairo2 = The Cairo 2D Graphics Library, libcairo.so.2
+PKGFILES_CSWlibcairo2 = $(call pkgfiles_lib,libcairo.so.2)
+RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWpng
+RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibcairo2 += CSWlibpixman1-0
+OBSOLETED_BY_CSWlibcairo2 = CSWlibcairo
 
-PACKAGES += CSWlibcairodevel
-CATALOGNAME_CSWlibcairodevel = libcairo_devel
-SPKG_DESC_CSWlibcairodevel = $(DESCRIPTION) development package
-PKGFILES_CSWlibcairodevel  = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibcairodevel += $(docdir)/libcairo_devel/.*
-RUNTIME_DEP_PKGS_CSWlibcairodevel = CSWlibcairo
+PACKAGES += CSWlibcairo-script-interpreter2
+SPKG_DESC_CSWlibcairo-script-interpreter2 = The Cairo 2D Graphics Library, libcairo-script-interpreter.so.2
+PKGFILES_CSWlibcairo-script-interpreter2 = $(call pkgfiles_lib,libcairo-script-interpreter.so.2)
+RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWpng
+RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibcairo-script-interpreter2 += CSWlibpixman1-0
+OBSOLETED_BY_CSWlibcairo-script-interpreter2 = CSWlibcairo
 
-PACKAGES += CSWlibcairodoc
-CATALOGNAME_CSWlibcairodoc = libcairo_doc
-SPKG_DESC_CSWlibcairodoc = $(DESCRIPTION) documentation
-PKGFILES_CSWlibcairodoc    = $(sharedstatedir)/gtk-doc.*
-PKGFILES_CSWlibcairodoc   += $(docdir)/libcairo_doc/.*
-ARCHALL_CSWlibcairodoc = 1
+PACKAGES += CSWlibcairo-gobject2
+SPKG_DESC_CSWlibcairo-gobject2 = The Cairo 2D Graphics Library, libcairo-gobject.so.2
+PKGFILES_CSWlibcairo-gobject2 = $(call pkgfiles_lib,libcairo-gobject.so.2)
+RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWpng
+RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWlibpixman1-0
+RUNTIME_DEP_PKGS_CSWlibcairo-gobject2 += CSWglib2
+OBSOLETED_BY_CSWlibcairo-gobject2 = CSWlibcairo
 
-BUILD_DEP_PKGS = CSWlibspectre 
+PACKAGES += CSWlibcairo-dev
+SPKG_DESC_CSWlibcairo-dev = Development files for libcairo.so.2
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibcairo-dev += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibcairo-dev += CSWlibcairo-script-interpreter2
+RUNTIME_DEP_PKGS_CSWlibcairo-dev += CSWlibcairo-gobject2
+OBSOLETED_BY_CSWlibcairo-dev = CSWlibcairodevel
+CATALOGNAME_CSWlibcairodevel = libcairo_devel_stub
 
-# imagediff in testsuite needs -lsocket
-# EXTRA_LDFLAGS = -lsocket -lnsl
+PACKAGES += CSWlibcairo-doc
+SPKG_DESC_CSWlibcairo-doc = $(DESCRIPTION) documentation
+PKGFILES_CSWlibcairo-doc += $(sharedstatedir)/gtk-doc.*
+ARCHALL_CSWlibcairo-doc = 1
+OBSOLETED_BY_CSWlibcairo-doc = CSWlibcairodoc
+CATALOGNAME_CSWlibcairodoc = libcairo_doc_stub
 
-# We don't need it and if defined linking breaks if an old Cairo is installed
-LD_OPTIONS =
-EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+# We do NOT want -L/opt/csw/lib in there as the pathes are detected properly and this disturbs libtool later on
+LINKER_FLAGS =
 
 BUILD64 = 1
 
@@ -70,6 +95,9 @@
 # This is broken due to missing stdint.h and use of setenv(3c)
 CONFIGURE_ARGS += --enable-trace=no
 
+# There are many source tests failing
+SKIPTEST ?= 1
+
 include gar/category.mk
 
 # configure has problems with non-gnu utilities

Added: csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch	                        (rev 0)
+++ csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch	2011-06-08 10:34:53 UTC (rev 14745)
@@ -0,0 +1,28 @@
+From 68bde8c7426b8d95d6c86397591232dd1efa74a1 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 8 Jun 2011 11:16:21 +0200
+Subject: [PATCH] Use detected EGREP instead of generic grep
+
+---
+ src/Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5edf706..f94e470 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -69,9 +69,9 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
+ 	@echo Generating $@
+ 	@(echo EXPORTS; \
+ 	(cd $(srcdir); cat $(enabled_cairo_headers) || echo 'cairo_ERROR ()' ) | \
+-	grep -v -E '^# *include' | \
++	$(EGREP) -v '^# *include' | \
+ 	( cat cairo-features.h - | $(CPP) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \
+-	grep -E '^cairo_.* \(' | \
++	$(EGREP) '^cairo_.* \(' | \
+ 	sed -e 's/[ 	].*//' | \
+ 	sort; \
+ 	echo LIBRARY libcairo-$(CAIRO_VERSION_SONUM).dll; \
+-- 
+1.7.5.4
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the devel mailing list