mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- Update to 0.4.0

Browse Source
This commit is contained in:
Michael Johnson 2005-03-09 04:13:40 +00:00
parent e71f54cc47
commit d17299719d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=130672
7 changed files with 61 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/cairo/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= cairo
PORTVERSION= 0.3.0
PORTVERSION= 0.4.0
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/snapshots/
@ -21,6 +21,8 @@ USE_GNOME= gnometarget gnomehack
USE_LIBTOOL_VER=15
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR}
CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
LDFLAGS="${PTHREAD_LIBS}"
@ -28,8 +30,11 @@ OPTIONS+= GLITZ "Enable Glitz OpenGL Support" Off
.include <bsd.port.pre.mk>
.if defined(WITH_GLITZ)
.if defined(WITH_GLITZ) || exists(${LOCALBASE}/lib/libglitz.a)
LIB_DEPENDS+= glitz-glx.1:${PORTSDIR}/graphics/glitz
PLIST_SUB+= GLITZ=""
.else
PLIST_SUB+= GLITZ="@comment "
.endif
.if !defined(WITHOUT_X11)

4
graphics/cairo/distinfo
View File

@ -1,2 +1,2 @@
MD5 (cairo-0.3.0.tar.gz) = 78c1a536d3a45bdc06a8335d33e63d8f
SIZE (cairo-0.3.0.tar.gz) = 514446
MD5 (cairo-0.4.0.tar.gz) = 2c76c6f6717cb5fc7398eb2e0f9cb025
SIZE (cairo-0.4.0.tar.gz) = 781463

10
graphics/cairo/files/patch-cairo.pc.in Normal file
View File

@ -0,0 +1,10 @@
--- cairo.pc.in.orig Thu Mar 3 03:57:38 2005
+++ cairo.pc.in Thu Mar 3 03:57:50 2005
@@ -7,6 +7,6 @@
Description: Multi-platform 2D graphics library
Version: @VERSION@
-Requires: @FREETYPE_REQUIRES@ libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
+Requires: @FREETYPE_REQUIRES@ libpixman @PNG_REQUIRES@ @GLITZ_REQUIRES@
Libs: @FREETYPE_LIBS@ -L${libdir} -lcairo
Cflags: @FREETYPE_CFLAGS@ -I${includedir}/cairo

15
graphics/cairo/files/patch-configure Normal file
View File

@ -0,0 +1,15 @@
--- configure.orig Thu Mar 3 03:43:20 2005
+++ configure Thu Mar 3 03:44:40 2005
@@ -20306,10 +20306,10 @@
echo "${ECHO_T}$XRENDER_LIBS" >&6
else
XRENDER_CFLAGS=""
- XRENDER_LIBS=""
+ XRENDER_LIBS="-lXrender"
+ succeeded=yes
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrender >= 0.6"`
fi

15
graphics/cairo/files/patch-src_cairo_font.c
View File

@ -1,15 +0,0 @@
--- src/cairo_font.c.orig Thu Jan 13 09:37:40 2005
+++ src/cairo_font.c Wed Feb 16 00:50:47 2005
@@ -85,9 +85,11 @@
void *key,
void **return_value)
{
- const cairo_font_backend_t *backend = CAIRO_FONT_BACKEND_DEFAULT;
+ const cairo_font_backend_t *backend;
cairo_font_cache_key_t *k;
cairo_font_cache_entry_t *entry;
+
+ backend = CAIRO_FONT_BACKEND_DEFAULT;
k = (cairo_font_cache_key_t *) key;
/* XXX: The current freetype backend may return NULL, (for example

166
graphics/cairo/files/patch-src_cairo_glitz_surface.c
View File

@ -1,166 +0,0 @@
--- src/cairo_glitz_surface.c.orig Thu Jan 20 11:29:19 2005
+++ src/cairo_glitz_surface.c Wed Feb 16 19:20:26 2005
@@ -333,7 +333,7 @@
if (format == NULL)
return NULL;
- surface = glitz_surface_create (drawable, format, 1, 1);
+ surface = glitz_surface_create (drawable, format, 1, 1, 0, NULL);
if (surface == NULL)
return NULL;
@@ -355,7 +355,6 @@
glitz_drawable_format_t templ;
glitz_format_t *format;
glitz_drawable_t *pbuffer;
- glitz_pbuffer_attributes_t attributes;
unsigned long mask;
int i;
@@ -397,21 +396,13 @@
if (!dformat)
return CAIRO_INT_STATUS_UNSUPPORTED;
- attributes.width = glitz_surface_get_width (surface);
- attributes.height = glitz_surface_get_height (surface);
- mask = GLITZ_PBUFFER_WIDTH_MASK | GLITZ_PBUFFER_HEIGHT_MASK;
-
- pbuffer = glitz_create_pbuffer_drawable (drawable, dformat,
- &attributes, mask);
+ pbuffer =
+ glitz_create_pbuffer_drawable (drawable, dformat,
+ glitz_surface_get_width (surface),
+ glitz_surface_get_height (surface));
if (!pbuffer)
return CAIRO_INT_STATUS_UNSUPPORTED;
- if (glitz_drawable_get_width (pbuffer) < attributes.width ||
- glitz_drawable_get_height (pbuffer) < attributes.height) {
- glitz_drawable_destroy (pbuffer);
- return CAIRO_INT_STATUS_UNSUPPORTED;
- }
-
glitz_surface_attach (surface, pbuffer,
GLITZ_DRAWABLE_BUFFER_FRONT_COLOR,
0, 0);
@@ -457,7 +448,7 @@
if (gformat == NULL)
return NULL;
- surface = glitz_surface_create (drawable, gformat, width, height);
+ surface = glitz_surface_create (drawable, gformat, width, height, 0, NULL);
if (surface == NULL)
return NULL;
@@ -510,7 +501,8 @@
int width,
int height,
glitz_buffer_t *geometry,
- glitz_geometry_format_t *format)
+ glitz_geometry_format_t *format,
+ int count)
{
if (_glitz_ensure_target (dst))
return CAIRO_INT_STATUS_UNSUPPORTED;
@@ -518,9 +510,10 @@
if (glitz_surface_get_status (dst))
return CAIRO_STATUS_NO_TARGET_SURFACE;
- glitz_set_geometry (dst,
- 0, 0,
- format, geometry);
+ if (geometry) {
+ glitz_set_geometry (dst, GLITZ_GEOMETRY_TYPE_VERTEX, format, geometry);
+ glitz_set_array (dst, 0, 2, count, 0, 0);
+ }
glitz_composite (op,
src,
@@ -531,7 +524,7 @@
dst_x, dst_y,
width, height);
- glitz_set_geometry (dst, 0, 0, NULL, NULL);
+ glitz_set_geometry (dst, GLITZ_GEOMETRY_TYPE_NONE, NULL, NULL);
if (glitz_surface_get_status (dst) == GLITZ_STATUS_NOT_SUPPORTED)
return CAIRO_INT_STATUS_UNSUPPORTED;
@@ -589,7 +582,7 @@
mask_x, mask_y,
dst_x, dst_y,
width, height,
- NULL, NULL);
+ NULL, NULL, 0);
if (src_clone)
cairo_surface_destroy (&src_clone->base);
@@ -624,16 +617,16 @@
glitz_buffer_t *buffer;
glitz_geometry_format_t gf;
cairo_int_status_t status;
- int width, height;
+ int width, height, count;
void *data;
- gf.mode = GLITZ_GEOMETRY_MODE_DIRECT;
- gf.edge_hint = GLITZ_GEOMETRY_EDGE_HINT_SHARP;
- gf.primitive = GLITZ_GEOMETRY_PRIMITIVE_QUADS;
- gf.type = GLITZ_DATA_TYPE_FLOAT;
- gf.first = 0;
- gf.count = n_rects * 4;
+ gf.vertex.primitive = GLITZ_PRIMITIVE_QUADS;
+ gf.vertex.type = GLITZ_DATA_TYPE_FLOAT;
+ gf.vertex.bytes_per_vertex = 2 * sizeof (glitz_float_t);
+ gf.vertex.attributes = 0;
+ count = n_rects * 4;
+
data = malloc (n_rects * 8 * sizeof (glitz_float_t));
if (!data)
return CAIRO_STATUS_NO_MEMORY;
@@ -678,7 +671,7 @@
0, 0,
0, 0,
width, height,
- buffer, &gf);
+ buffer, &gf, count);
glitz_surface_destroy (solid);
glitz_buffer_destroy (buffer);
@@ -715,7 +708,7 @@
glitz_buffer_t *buffer;
glitz_geometry_format_t gf;
cairo_int_status_t status;
- int x_dst, y_dst, x_rel, y_rel, width, height;
+ int x_dst, y_dst, x_rel, y_rel, width, height, count;
void *data;
if (op == CAIRO_OPERATOR_SATURATE)
@@ -724,12 +717,12 @@
if (generic_src->backend != dst->base.backend)
return CAIRO_INT_STATUS_UNSUPPORTED;
- gf.mode = GLITZ_GEOMETRY_MODE_DIRECT;
- gf.edge_hint = GLITZ_GEOMETRY_EDGE_HINT_GOOD_SMOOTH;
- gf.primitive = GLITZ_GEOMETRY_PRIMITIVE_QUADS;
- gf.type = GLITZ_DATA_TYPE_FLOAT;
- gf.first = 0;
- gf.count = n_traps * 4;
+ gf.vertex.primitive = GLITZ_PRIMITIVE_QUADS;
+ gf.vertex.type = GLITZ_DATA_TYPE_FLOAT;
+ gf.vertex.bytes_per_vertex = 2 * sizeof (glitz_float_t);
+ gf.vertex.attributes = 0;
+
+ count = n_traps * 4;
data = malloc (n_traps * 8 * sizeof (glitz_float_t));
if (!data)
@@ -795,7 +788,7 @@
0, 0,
x_dst, y_dst,
width, height,
- buffer, &gf);
+ buffer, &gf, count);
if (mask)
glitz_surface_destroy (mask);

31
graphics/cairo/pkg-plist
View File

@ -1,16 +1,39 @@
include/cairo/cairo-atsui.h
include/cairo/cairo-features.h
include/cairo/cairo-ft.h
include/cairo/cairo-glitz.h
%%GLITZ%%include/cairo/cairo-glitz.h
include/cairo/cairo-pdf.h
include/cairo/cairo-png.h
include/cairo/cairo-ps.h
include/cairo/cairo-quartz.h
include/cairo/cairo-xcb.h
include/cairo/cairo-xlib.h
include/cairo/cairo.h
lib/libcairo.a
lib/libcairo.so
lib/libcairo.so.1
libdata/pkgconfig/cairo.pc
%%DOCSDIR%%/cairo/cairo-ATSUI-Fonts.html
%%DOCSDIR%%/cairo/cairo-FreeType-Fonts.html
%%DOCSDIR%%/cairo/cairo-Glitz-backend.html
%%DOCSDIR%%/cairo/cairo-Microsoft-Windows-Backend.html
%%DOCSDIR%%/cairo/cairo-PDF-Backend.html
%%DOCSDIR%%/cairo/cairo-PNG-Backend.html
%%DOCSDIR%%/cairo/cairo-PS-Backend.html
%%DOCSDIR%%/cairo/cairo-Quartz-Backend.html
%%DOCSDIR%%/cairo/cairo-XCB-Backend.html
%%DOCSDIR%%/cairo/cairo-XLib-Backend.html
%%DOCSDIR%%/cairo/cairo-cairo-matrix-t.html
%%DOCSDIR%%/cairo/cairo-cairo-pattern-t.html
%%DOCSDIR%%/cairo/cairo-cairo-surface-t.html
%%DOCSDIR%%/cairo/cairo-cairo-t.html
%%DOCSDIR%%/cairo/cairo.devhelp
%%DOCSDIR%%/cairo/home.png
%%DOCSDIR%%/cairo/index.html
%%DOCSDIR%%/cairo/index.sgml
%%DOCSDIR%%/cairo/left.png
%%DOCSDIR%%/cairo/pt01.html
%%DOCSDIR%%/cairo/pt02.html
%%DOCSDIR%%/cairo/right.png
%%DOCSDIR%%/cairo/style.css
%%DOCSDIR%%/cairo/up.png
@dirrm %%DOCSDIR%%/cairo
@dirrm %%DOCSDIR%%
@dirrm include/cairo