diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index a10bb13..fe8dc00 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,10 +1,9 @@ # Created by: Michael Johnson # $FreeBSD$ -# $MCom: ports/trunk/graphics/cairo/Makefile 18928 2013-11-30 02:00:25Z marcus $ PORTNAME= cairo -PORTVERSION= 1.12.18 -PORTREVISION= 1 +PORTVERSION= 1.14.0 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -37,18 +36,20 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --disable-gallium \ --disable-glesv2 \ --disable-wgl \ - --disable-egl \ --enable-tee -OPTIONS_DEFINE= OPENGL XCB GLIB X11 -OPTIONS_DEFAULT=XCB GLIB X11 +OPTIONS_DEFINE= OPENGL XCB GLIB X11 EGL +OPTIONS_DEFAULT=OPENGL XCB GLIB X11 EGL XCB_DESC= Enable XCB (X C-language Binding) Support GLIB_DESC= Enable GObject Functions Feature +EGL_DESC= 2D/3D rendering support via EGL OPTIONS_SUB= yes X11_USE= xorg=xrender,xext X11_CONFIGURE_ENABLE=xlib OPENGL_USE= gl=gl xorg=glproto:both,dri2proto:both OPENGL_CONFIGURE_ENABLE=gl +EGL_USE= gl=egl +EGL_CONFIGURE_ENABLE=egl GLIB_USE= gnome=glib20 GLIB_CONFIGURE_ENABLE= gobject XCB_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil @@ -56,7 +57,7 @@ XCB_RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x1 XCB_CONFIGURE_ENABLE= xcb # this has another option --enable-xlib-xcb=auto but it is buggy. -PLIST_SUB+= LIBVER=2.11200.18 +PLIST_SUB+= LIBVER=2.11400.0 .include @@ -72,10 +73,6 @@ post-patch: @${REINPLACE_CMD} -e 's|-ldl||g' \ ${WRKSRC}/util/*/Makefile.in \ ${WRKSRC}/boilerplate/Makefile.in -.if ${PORT_OPTIONS:MOPENGL} - @${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \ - ${WRKSRC}/src/Makefile.in -.endif .include diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index b722880..6c08c4d 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,2 +1,2 @@ -SHA256 (cairo-1.12.18.tar.xz) = dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6 -SIZE (cairo-1.12.18.tar.xz) = 38276736 +SHA256 (cairo-1.14.0.tar.xz) = 2cf5f81432e77ea4359af9dcd0f4faf37d015934501391c311bfd2d19a0134b7 +SIZE (cairo-1.14.0.tar.xz) = 36584076 diff --git a/graphics/cairo/files/patch-src_cairo-gl.h b/graphics/cairo/files/patch-src_cairo-gl.h new file mode 100644 index 0000000..68e1e93 --- /dev/null +++ b/graphics/cairo/files/patch-src_cairo-gl.h @@ -0,0 +1,29 @@ +--- src/cairo-gl.h.orig 2013-03-15 21:29:27.000000000 +0100 ++++ src/cairo-gl.h 2015-01-05 10:30:46.611768380 +0100 +@@ -92,7 +92,7 @@ + cairo_gl_device_set_thread_aware (cairo_device_t *device, + cairo_bool_t thread_aware); + +-#if CAIRO_HAS_GLX_FUNCTIONS ++#if defined(CAIRO_HAS_GLX_FUNCTIONS) + #include + + cairo_public cairo_device_t * +@@ -110,7 +110,7 @@ + int width, int height); + #endif + +-#if CAIRO_HAS_WGL_FUNCTIONS ++#if defined(CAIRO_HAS_WGL_FUNCTIONS) + #include + + cairo_public cairo_device_t * +@@ -126,7 +126,7 @@ + int height); + #endif + +-#if CAIRO_HAS_EGL_FUNCTIONS ++#if defined(CAIRO_HAS_EGL_FUNCTIONS) + #include + + cairo_public cairo_device_t * diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index c2305df..74fbbcf 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -41,6 +41,7 @@ lib/libcairo.so lib/libcairo.so.2 lib/libcairo.so.%%LIBVER%% libdata/pkgconfig/cairo.pc +%%EGL%%libdata/pkgconfig/cairo-egl.pc libdata/pkgconfig/cairo-fc.pc libdata/pkgconfig/cairo-ft.pc %%OPENGL%%libdata/pkgconfig/cairo-gl.pc