Bug 150350 - I have upgraded the graphics/cairo port to 1.10.0
Summary: I have upgraded the graphics/cairo port to 1.10.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-gnome (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-09-07 13:00 UTC by Douglas Carmichael
Modified: 2010-11-20 15:41 UTC (History)
0 users

See Also:


Attachments
file.diff (1.50 KB, patch)
2010-09-07 13:00 UTC, Douglas Carmichael
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Douglas Carmichael 2010-09-07 13:00:15 UTC
I have upgraded the graphics/cairo port to 1.10.0.

A patch is attached.

Fix: n/a

Patch attached with submission follows:
How-To-Repeat: n/a
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-09-07 13:00:32 UTC
Responsible Changed
From-To: freebsd-ports-bugs->gnome

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 swell.k 2010-09-07 16:13:48 UTC
Douglas Carmichael <dcarmich@dcarmichael.net> writes:

> @@ -44,20 +44,10 @@
>  PLIST_SUB+=	X11=""
>  .endif
>  
> -OPTIONS+=	GLITZ "Enable Glitz OpenGL Support" Off \
> -		XCB "Enable XCB (X C-language Binding) Support" On
> +OPTIONS+=	XCB "Enable XCB (X C-language Binding) Support" On
>  
>  .include <bsd.port.pre.mk>
>  
> -.if defined(WITH_GLITZ)
> -LIB_DEPENDS+=	glitz-glx.1:${PORTSDIR}/graphics/glitz
> -CONFIGURE_ARGS+=	--enable-glitz
> -PLIST_SUB+=	GLITZ=""
> -.else
> -CONFIGURE_ARGS+=	--disable-glitz
> -PLIST_SUB+=	GLITZ="@comment "
> -.endif
> -

Not sure why you're so happy to remove glitz surface backend. It was
replaced by gl/glew. And you've forgotten to include plist diff.

--- a.diff begins here ---
Index: graphics/cairo/Makefile
===================================================================
RCS file: /a/.cvsup/ports/graphics/cairo/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- graphics/cairo/Makefile	3 Jun 2010 12:35:42 -0000	1.47
+++ graphics/cairo/Makefile	7 Sep 2010 15:05:55 -0000
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	cairo
-PORTVERSION=	1.8.10
-PORTREVISION?=	1
+PORTVERSION=	1.10.0
 PORTEPOCH?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -24,17 +23,16 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/prin
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		pixman-1.9:${PORTSDIR}/x11/pixman
 
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
-		--disable-directfb \
-		--enable-pdf \
-		--enable-ps
-USE_GNOME=	gnomehack ltverhack referencehack
+		--enable-gobject
+USE_GNOME=	glib20 gnomehack ltverhack referencehack
 USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
-		LDFLAGS="${PTHREAD_LIBS}" \
-		png_REQUIRES="libpng"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=--disable-xlib
@@ -44,38 +42,50 @@ USE_XORG+=	xrender
 PLIST_SUB+=	X11=""
 .endif
 
-OPTIONS+=	GLITZ "Enable Glitz OpenGL Support" Off \
+OPTIONS+=	DIRECTFB "Enable DirectFB Support" Off \
+		GL "Enable OpenGL Support" Off \
 		XCB "Enable XCB (X C-language Binding) Support" On
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GLITZ)
-LIB_DEPENDS+=	glitz-glx.1:${PORTSDIR}/graphics/glitz
-CONFIGURE_ARGS+=	--enable-glitz
-PLIST_SUB+=	GLITZ=""
+.if defined(WITH_DIRECTFB)
+LIB_DEPENDS+=	directfb-1.[0-9].3:${PORTSDIR}/devel/directfb
+CONFIGURE_ARGS+=	--enable-directfb
+PLIST_SUB+=	DIRECTFB=""
 .else
-CONFIGURE_ARGS+=	--disable-glitz
-PLIST_SUB+=	GLITZ="@comment "
+CONFIGURE_ARGS+=	--disable-directfb
+PLIST_SUB+=	DIRECTFB="@comment "
 .endif
 
-.ifdef(WITH_XCB)
+.if defined(WITH_GL)
+USE_GL=		yes
+CONFIGURE_ARGS+=	--enable-gl
+PLIST_SUB+=	GL=""
+.else
+PLIST_SUB+=	GL="@comment "
+.endif
+
+.if defined(WITH_XCB)
 BUILD_DEPENDS+= 	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
 RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
-CONFIGURE_ARGS+=	--enable-xcb
+CONFIGURE_ARGS+=	--enable-xcb --enable-xlib-xcb=auto
 PLIST_SUB+=		XCB=""
 .else
-CONFIGURE_ARGS+=	--disable-xcb
 PLIST_SUB+=		XCB="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
-		${WRKSRC}/test/Makefile.in
+	@${REINPLACE_CMD} -e '/test/s/==/=/g' \
+		-e '/LIBS/s/-lrt//' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \
 		${WRKSRC}/src/*.pc.in
-	@${REINPLACE_CMD} -e 's|src test doc|src doc|; \
-		s|@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = test||' \
+	@${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \
 		${WRKSRC}/Makefile.in
+.if defined(WITH_GL)
+	@${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \
+		${WRKSRC}/src/Makefile.in
+.endif
 
 .include <bsd.port.post.mk>
 
Index: graphics/cairo/distinfo
===================================================================
RCS file: /a/.cvsup/ports/graphics/cairo/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- graphics/cairo/distinfo	10 May 2010 21:18:15 -0000	1.23
+++ graphics/cairo/distinfo	7 Sep 2010 12:11:31 -0000
@@ -1,3 +1,3 @@
-MD5 (cairo-1.8.10.tar.gz) = b60a82f405f9400bbfdcf850b1728d25
-SHA256 (cairo-1.8.10.tar.gz) = 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
-SIZE (cairo-1.8.10.tar.gz) = 7102657
+MD5 (cairo-1.10.0.tar.gz) = 70a2ece66cf473d976e2db0f75bf199e
+SHA256 (cairo-1.10.0.tar.gz) = 0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2
+SIZE (cairo-1.10.0.tar.gz) = 24022822
Index: graphics/cairo/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/graphics/cairo/pkg-plist,v
retrieving revision 1.10
diff -u -p -r1.10 pkg-plist
--- graphics/cairo/pkg-plist	10 Jan 2009 05:21:31 -0000	1.10
+++ graphics/cairo/pkg-plist	7 Sep 2010 13:44:21 -0000
@@ -1,28 +1,50 @@
+bin/cairo-trace
 include/cairo/cairo-deprecated.h
+%%DIRECTFB%%include/cairo/cairo-directfb.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
-%%GLITZ%%include/cairo/cairo-glitz.h
+%%GL%%include/cairo/cairo-gl.h
+include/cairo/cairo-gobject.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
+include/cairo/cairo-script-interpreter.h
 include/cairo/cairo-svg.h
 include/cairo/cairo-version.h
-%%XCB%%include/cairo/cairo-xcb-xrender.h
 %%XCB%%include/cairo/cairo-xcb.h
 %%X11%%include/cairo/cairo-xlib-xrender.h
 %%X11%%include/cairo/cairo-xlib.h
 include/cairo/cairo.h
+lib/cairo/libcairo-trace.a
+lib/cairo/libcairo-trace.la
+lib/cairo/libcairo-trace.so
+lib/cairo/libcairo-trace.so.0
+lib/libcairo-gobject.a
+lib/libcairo-gobject.la
+lib/libcairo-gobject.so
+lib/libcairo-gobject.so.2
+lib/libcairo-script-interpreter.a
+lib/libcairo-script-interpreter.la
+lib/libcairo-script-interpreter.so
+lib/libcairo-script-interpreter.so.2
 lib/libcairo.a
 lib/libcairo.la
 lib/libcairo.so
 lib/libcairo.so.2
 libdata/pkgconfig/cairo.pc
+%%DIRECTFB%%libdata/pkgconfig/cairo-directfb.pc
+libdata/pkgconfig/cairo-fc.pc
 libdata/pkgconfig/cairo-ft.pc
-%%GLITZ%%libdata/pkgconfig/cairo-glitz.pc
+%%GL%%libdata/pkgconfig/cairo-gl.pc
+%%GL%%libdata/pkgconfig/cairo-glx.pc
+libdata/pkgconfig/cairo-gobject.pc
 libdata/pkgconfig/cairo-pdf.pc
 libdata/pkgconfig/cairo-png.pc
 libdata/pkgconfig/cairo-ps.pc
 libdata/pkgconfig/cairo-svg.pc
 %%XCB%%libdata/pkgconfig/cairo-xcb.pc
+%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
 %%X11%%libdata/pkgconfig/cairo-xlib.pc
+%%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
 %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
 @dirrm include/cairo
+@dirrm lib/cairo
--- a.diff ends here ---
Comment 3 swell.k 2010-09-09 23:35:20 UTC
Oops, we don't need libGLU for OpenGL backend.

--- b.diff begins here ---
--- graphics/cairo/Makefile~
+++ graphics/cairo/Makefile
@@ -58,7 +58,7 @@ PLIST_SUB+=	DIRECTFB="@comment "
 .endif
 
 .if defined(WITH_GL)
-USE_GL=		yes
+USE_GL=		gl
 CONFIGURE_ARGS+=	--enable-gl
 PLIST_SUB+=	GL=""
 .else
--- b.diff ends here ---
Comment 4 Koop Mast freebsd_committer freebsd_triage 2010-09-30 09:10:47 UTC
State Changed
From-To: open->patched

I committed this in MC. And will appear in the 2.32.0 GNOME update.
Comment 5 Koop Mast freebsd_committer freebsd_triage 2010-11-20 15:41:26 UTC
State Changed
From-To: patched->closed

Committed, thanks!