Re: UPDATE: graphics/cairo
On Sun, Feb 03, 2013 at 09:26:48AM +, Stuart Henderson wrote:
Cairo uses lzo2 now, check the changelog..also fixes a hardcoded
path to x11.
Diff looks good but I am a little twitchy about updating a widely used
library at this point, bearing in mind that if it causes problems there
might not be time to fix them, this at least needs some wide testing.
It's working ok for what I use on amd64 but could do with tests on
more arches..
So here is the diff I intend to commit.
Ok? Any strong objection? Should we wait post-5.3?
Eric.
Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile30 Jan 2013 13:17:51 - 1.45
+++ Makefile7 Feb 2013 11:02:56 -
@@ -2,11 +2,10 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.12.8
-REVISION= 1
-SHARED_LIBS+= cairo 12.1
+DISTNAME= cairo-1.12.12
+SHARED_LIBS+= cairo 12.2
SHARED_LIBS+= cairo-gobject 1.0
-SHARED_LIBS+= cairo-script-interpreter 1.0
+SHARED_LIBS+= cairo-script-interpreter 1.1
CATEGORIES=graphics
DPB_PROPERTIES=parallel
EXTRACT_SUFX= .tar.xz
@@ -16,7 +15,7 @@ HOMEPAGE= http://cairographics.org/
MAINTAINER=Eric Faurot e...@openbsd.org
WANTLIB += X11 Xau Xdmcp Xext Xrender expat ffi fontconfig freetype
-WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 m pcre pixman-1 png
+WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 lzo2 m pcre pixman-1 png
WANTLIB += pthread pthread-stubs xcb xcb-render xcb-shm z
# LGPLv2.1 / MPL 1.1
@@ -32,8 +31,9 @@ MODULES= devel/gettext
USE_LIBTOOL= Yes
USE_GMAKE= Yes
-LIB_DEPENDS= graphics/png \
- devel/glib2
+LIB_DEPENDS= archivers/lzo2 \
+ devel/glib2 \
+ graphics/png
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=${CONFIGURE_SHARED} \
@@ -44,7 +44,9 @@ CONFIGURE_ARGS += --enable-tee
# If one of these tools is found at configure stage, it might be used,
# no matter whether we use --disable-gtk-doc or not.
-CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK= \
+CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib \
+ ac_cv_path_GTKDOC_CHECK= \
ac_cv_path_GTKDOC_REBASE= \
ac_cv_path_GTKDOC_MKPDF=
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo12 Nov 2012 12:29:07 - 1.20
+++ distinfo7 Feb 2013 11:02:56 -
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.8.tar.xz) = j7tvxmEXq0EAutgwy0R5SX5TxvP6y5i/BcjSmFVOvdk=
-SIZE (cairo-1.12.8.tar.xz) = 42113752
+SHA256 (cairo-1.12.12.tar.xz) = FPaTdZ7Mh0cjVa6PDDRzGoV4tAi2B8/QtdNDMf8F2Bo=
+SIZE (cairo-1.12.12.tar.xz) = 42139096
Index: patches/patch-util_cairo-fdr_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-fdr_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-util_cairo-fdr_Makefile_in
--- patches/patch-util_cairo-fdr_Makefile_in12 Nov 2012 12:29:07 -
1.2
+++ patches/patch-util_cairo-fdr_Makefile_in7 Feb 2013 11:02:56 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.2 2012/11/12 12:29:07 eric Exp $
util/cairo-fdr/Makefile.in.origMon Oct 22 06:08:40 2012
-+++ util/cairo-fdr/Makefile.in Wed Oct 24 03:52:52 2012
-@@ -379,7 +379,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
+--- util/cairo-fdr/Makefile.in.origThu Jan 31 10:25:59 2013
util/cairo-fdr/Makefile.in Sat Feb 2 00:30:35 2013
+@@ -380,7 +380,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
cairo_fdr_la_SOURCES = fdr.c
cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
Index: patches/patch-util_cairo-trace_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-trace_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-util_cairo-trace_Makefile_in
--- patches/patch-util_cairo-trace_Makefile_in 16 Jan 2013 14:29:15 -
1.4
+++ patches/patch-util_cairo-trace_Makefile_in 7 Feb 2013 11:02:56 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.4 2013/01/16 14:29:15
ajacoutot Exp $
util/cairo-trace/Makefile.in.orig Mon Oct 22 06:08:41 2012
-+++ util/cairo-trace/Makefile.in Wed Oct 24 03:51:46 2012
-@@ -399,7 +399,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR=\$
+--- util/cairo-trace/Makefile.in.orig Thu Jan 31 10:26:00 2013
util/cairo-trace/Makefile.in Sat Feb 2 00:30:35 2013
+@@ -400,7 +400,7 @@
Re: UPDATE: graphics/cairo
On 2013/02/07 12:11, Eric Faurot wrote: On Sun, Feb 03, 2013 at 09:26:48AM +, Stuart Henderson wrote: Cairo uses lzo2 now, check the changelog..also fixes a hardcoded path to x11. Diff looks good but I am a little twitchy about updating a widely used library at this point, bearing in mind that if it causes problems there might not be time to fix them, this at least needs some wide testing. It's working ok for what I use on amd64 but could do with tests on more arches.. So here is the diff I intend to commit. Ok? Any strong objection? Should we wait post-5.3? I would really like to have at least one test report from a big endian arch...
Re: UPDATE: graphics/cairo
On Sat, Feb 02, 2013 at 09:00:46AM +0100, Antoine Jacoutot wrote:
On Fri, Feb 01, 2013 at 07:27:22PM +0100, Eric Faurot wrote:
Hi,
This is an update to cairo 1.12.12.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile30 Jan 2013 13:17:51 - 1.45
+++ Makefile1 Feb 2013 17:44:05 -
@@ -2,9 +2,8 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.12.8
-REVISION= 1
-SHARED_LIBS+= cairo 12.1
+DISTNAME= cairo-1.12.12
+SHARED_LIBS+= cairo 12.2
SHARED_LIBS+= cairo-gobject 1.0
SHARED_LIBS+= cairo-script-interpreter 1.0
CATEGORIES=graphics
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo12 Nov 2012 12:29:07 - 1.20
+++ distinfo1 Feb 2013 17:44:05 -
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.8.tar.xz) = j7tvxmEXq0EAutgwy0R5SX5TxvP6y5i/BcjSmFVOvdk=
-SIZE (cairo-1.12.8.tar.xz) = 42113752
+SHA256 (cairo-1.12.12.tar.xz) =
FPaTdZ7Mh0cjVa6PDDRzGoV4tAi2B8/QtdNDMf8F2Bo=
+SIZE (cairo-1.12.12.tar.xz) = 42139096
Index: patches/patch-src_cairo_pc_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-src_cairo_pc_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_cairo_pc_in
--- patches/patch-src_cairo_pc_in 30 Jan 2013 13:17:51 - 1.1
+++ patches/patch-src_cairo_pc_in 1 Feb 2013 17:44:05 -
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_cairo_pc_in,v 1.1 2013/01/30 13:17:51 brad Exp $
src/cairo.pc.in.orig Tue Jan 29 07:56:53 2013
-+++ src/cairo.pc.inTue Jan 29 08:22:13 2013
+--- src/cairo.pc.in.orig Sun Dec 6 09:29:25 2009
src/cairo.pc.inFri Feb 1 17:25:52 2013
@@ -8,6 +8,6 @@ Description: Multi-platform 2D graphics library
Version: @VERSION@
@PKGCONFIG_REQUIRES@: @CAIRO_REQUIRES@
-Libs: -L${libdir} -lcairo
-+Libs: -L${libdir} -Wl,-rpath-link,${X11BASE}/lib -lcairo
++Libs: -L${libdir} -Wl,-rpath-link,/usr/X11R6/lib -lcairo
Keep ${X11BASE} here ;-)
Libs.private: @CAIRO_NONPKGCONFIG_LIBS@
Cflags: -I${includedir}/cairo
Index: patches/patch-util_cairo-fdr_Makefile_in
===
RCS file:
/cvs/ports/graphics/cairo/patches/patch-util_cairo-fdr_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-util_cairo-fdr_Makefile_in
--- patches/patch-util_cairo-fdr_Makefile_in12 Nov 2012 12:29:07
- 1.2
+++ patches/patch-util_cairo-fdr_Makefile_in1 Feb 2013 17:44:05
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.2 2012/11/12 12:29:07 eric
Exp $
util/cairo-fdr/Makefile.in.origMon Oct 22 06:08:40 2012
-+++ util/cairo-fdr/Makefile.in Wed Oct 24 03:52:52 2012
-@@ -379,7 +379,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
+--- util/cairo-fdr/Makefile.in.origThu Jan 31 16:25:59 2013
util/cairo-fdr/Makefile.in Fri Feb 1 17:25:52 2013
+@@ -380,7 +380,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
cairo_fdr_la_SOURCES = fdr.c
cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
Index: patches/patch-util_cairo-trace_Makefile_in
===
RCS file:
/cvs/ports/graphics/cairo/patches/patch-util_cairo-trace_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-util_cairo-trace_Makefile_in
--- patches/patch-util_cairo-trace_Makefile_in 16 Jan 2013 14:29:15
- 1.4
+++ patches/patch-util_cairo-trace_Makefile_in 1 Feb 2013 17:44:05
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.4 2013/01/16 14:29:15
ajacoutot Exp $
util/cairo-trace/Makefile.in.orig Mon Oct 22 06:08:41 2012
-+++ util/cairo-trace/Makefile.in Wed Oct 24 03:51:46 2012
-@@ -399,7 +399,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR=\$
+--- util/cairo-trace/Makefile.in.orig Thu Jan 31 16:26:00 2013
util/cairo-trace/Makefile.in Fri Feb 1 17:25:52 2013
+@@ -400,7 +400,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR=\$
$(AM_CPPFLAGS)
libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
Looks fine and considering the amount of bugs this release fixed it'd be nice
to have it for 5.3.
Ok, so can we move this forward?
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: graphics/cairo
On Sat, Feb 02, 2013 at 06:21:49AM -0500, Brad Smith wrote: On Fri, Feb 01, 2013 at 07:27:22PM +0100, Eric Faurot wrote: Hi, This is an update to cairo 1.12.12. Eric. Here is a better diff. It's not a better diff until you've said what it changes compared to eric's diff. Why adding a dep on lzo2 ? Landry
Re: UPDATE: graphics/cairo
On 2013/02/03 09:57, Landry Breuil wrote: On Sat, Feb 02, 2013 at 06:21:49AM -0500, Brad Smith wrote: On Fri, Feb 01, 2013 at 07:27:22PM +0100, Eric Faurot wrote: Hi, This is an update to cairo 1.12.12. Eric. Here is a better diff. It's not a better diff until you've said what it changes compared to eric's diff. Why adding a dep on lzo2 ? Cairo uses lzo2 now, check the changelog..also fixes a hardcoded path to x11. Diff looks good but I am a little twitchy about updating a widely used library at this point, bearing in mind that if it causes problems there might not be time to fix them, this at least needs some wide testing. It's working ok for what I use on amd64 but could do with tests on more arches..
Re: UPDATE: graphics/cairo
- Original message - On 2013/02/03 09:57, Landry Breuil wrote: On Sat, Feb 02, 2013 at 06:21:49AM -0500, Brad Smith wrote: On Fri, Feb 01, 2013 at 07:27:22PM +0100, Eric Faurot wrote: Hi, This is an update to cairo 1.12.12. Eric. Here is a better diff. It's not a better diff until you've said what it changes compared to eric's diff. Why adding a dep on lzo2 ? Cairo uses lzo2 now, check the changelog..also fixes a hardcoded path to x11. This is why. Diff looks good but I am a little twitchy about updating a widely used library at this point, bearing in mind that if it causes problems there might not be time to fix them, this at least needs some wide testing. It's working ok for what I use on amd64 but could do with tests on more arches.. I think this should be good for the release with the bug fixes it has but yes it should be tested a fair bit. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: graphics/cairo
On Fri, Feb 01, 2013 at 07:27:22PM +0100, Eric Faurot wrote:
Hi,
This is an update to cairo 1.12.12.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile 30 Jan 2013 13:17:51 - 1.45
+++ Makefile 1 Feb 2013 17:44:05 -
@@ -2,9 +2,8 @@
COMMENT= vector graphics library
-DISTNAME=cairo-1.12.8
-REVISION=1
-SHARED_LIBS+=cairo 12.1
+DISTNAME=cairo-1.12.12
+SHARED_LIBS+=cairo 12.2
SHARED_LIBS+=cairo-gobject 1.0
SHARED_LIBS+=cairo-script-interpreter 1.0
CATEGORIES= graphics
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo 12 Nov 2012 12:29:07 - 1.20
+++ distinfo 1 Feb 2013 17:44:05 -
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.8.tar.xz) = j7tvxmEXq0EAutgwy0R5SX5TxvP6y5i/BcjSmFVOvdk=
-SIZE (cairo-1.12.8.tar.xz) = 42113752
+SHA256 (cairo-1.12.12.tar.xz) = FPaTdZ7Mh0cjVa6PDDRzGoV4tAi2B8/QtdNDMf8F2Bo=
+SIZE (cairo-1.12.12.tar.xz) = 42139096
Index: patches/patch-src_cairo_pc_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-src_cairo_pc_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_cairo_pc_in
--- patches/patch-src_cairo_pc_in 30 Jan 2013 13:17:51 - 1.1
+++ patches/patch-src_cairo_pc_in 1 Feb 2013 17:44:05 -
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_cairo_pc_in,v 1.1 2013/01/30 13:17:51 brad Exp $
src/cairo.pc.in.orig Tue Jan 29 07:56:53 2013
-+++ src/cairo.pc.in Tue Jan 29 08:22:13 2013
+--- src/cairo.pc.in.orig Sun Dec 6 09:29:25 2009
src/cairo.pc.in Fri Feb 1 17:25:52 2013
@@ -8,6 +8,6 @@ Description: Multi-platform 2D graphics library
Version: @VERSION@
@PKGCONFIG_REQUIRES@: @CAIRO_REQUIRES@
-Libs: -L${libdir} -lcairo
-+Libs: -L${libdir} -Wl,-rpath-link,${X11BASE}/lib -lcairo
++Libs: -L${libdir} -Wl,-rpath-link,/usr/X11R6/lib -lcairo
Keep ${X11BASE} here ;-)
Libs.private: @CAIRO_NONPKGCONFIG_LIBS@
Cflags: -I${includedir}/cairo
Index: patches/patch-util_cairo-fdr_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-fdr_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-util_cairo-fdr_Makefile_in
--- patches/patch-util_cairo-fdr_Makefile_in 12 Nov 2012 12:29:07 -
1.2
+++ patches/patch-util_cairo-fdr_Makefile_in 1 Feb 2013 17:44:05 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.2 2012/11/12 12:29:07 eric
Exp $
util/cairo-fdr/Makefile.in.orig Mon Oct 22 06:08:40 2012
-+++ util/cairo-fdr/Makefile.in Wed Oct 24 03:52:52 2012
-@@ -379,7 +379,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
+--- util/cairo-fdr/Makefile.in.orig Thu Jan 31 16:25:59 2013
util/cairo-fdr/Makefile.in Fri Feb 1 17:25:52 2013
+@@ -380,7 +380,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
cairo_fdr_la_SOURCES = fdr.c
cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
Index: patches/patch-util_cairo-trace_Makefile_in
===
RCS file:
/cvs/ports/graphics/cairo/patches/patch-util_cairo-trace_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-util_cairo-trace_Makefile_in
--- patches/patch-util_cairo-trace_Makefile_in16 Jan 2013 14:29:15
- 1.4
+++ patches/patch-util_cairo-trace_Makefile_in1 Feb 2013 17:44:05
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.4 2013/01/16 14:29:15
ajacoutot Exp $
util/cairo-trace/Makefile.in.origMon Oct 22 06:08:41 2012
-+++ util/cairo-trace/Makefile.in Wed Oct 24 03:51:46 2012
-@@ -399,7 +399,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR=\$
+--- util/cairo-trace/Makefile.in.origThu Jan 31 16:26:00 2013
util/cairo-trace/Makefile.in Fri Feb 1 17:25:52 2013
+@@ -400,7 +400,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR=\$
$(AM_CPPFLAGS)
libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
Looks fine and considering the amount of bugs this release fixed it'd be nice
to have it for 5.3.
--
Antoine
Re: UPDATE: graphics/cairo
On Sat, Feb 2, 2013 at 9:00 AM, Antoine Jacoutot ajacou...@bsdfrog.org wrote:
Keep ${X11BASE} here ;-)
Looks fine and considering the amount of bugs this release fixed it'd be nice
to have it for 5.3.
Looks fine to me too.
ciao,
David
Re: UPDATE: graphics/cairo
On Fri, Feb 01, 2013 at 07:27:22PM +0100, Eric Faurot wrote:
Hi,
This is an update to cairo 1.12.12.
Eric.
Here is a better diff.
Index: Makefile
===
RCS file: /home/cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile30 Jan 2013 13:17:51 - 1.45
+++ Makefile2 Feb 2013 08:46:33 -
@@ -2,11 +2,10 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.12.8
-REVISION= 1
-SHARED_LIBS+= cairo 12.1
+DISTNAME= cairo-1.12.12
+SHARED_LIBS+= cairo 12.2
SHARED_LIBS+= cairo-gobject 1.0
-SHARED_LIBS+= cairo-script-interpreter 1.0
+SHARED_LIBS+= cairo-script-interpreter 1.1
CATEGORIES=graphics
DPB_PROPERTIES=parallel
EXTRACT_SUFX= .tar.xz
@@ -16,7 +15,7 @@ HOMEPAGE= http://cairographics.org/
MAINTAINER=Eric Faurot e...@openbsd.org
WANTLIB += X11 Xau Xdmcp Xext Xrender expat ffi fontconfig freetype
-WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 m pcre pixman-1 png
+WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 lzo2 m pcre pixman-1 png
WANTLIB += pthread pthread-stubs xcb xcb-render xcb-shm z
# LGPLv2.1 / MPL 1.1
@@ -32,8 +31,9 @@ MODULES= devel/gettext
USE_LIBTOOL= Yes
USE_GMAKE= Yes
-LIB_DEPENDS= graphics/png \
- devel/glib2
+LIB_DEPENDS= archivers/lzo2 \
+ devel/glib2 \
+ graphics/png
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=${CONFIGURE_SHARED} \
@@ -44,7 +44,9 @@ CONFIGURE_ARGS += --enable-tee
# If one of these tools is found at configure stage, it might be used,
# no matter whether we use --disable-gtk-doc or not.
-CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK= \
+CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib \
+ ac_cv_path_GTKDOC_CHECK= \
ac_cv_path_GTKDOC_REBASE= \
ac_cv_path_GTKDOC_MKPDF=
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo12 Nov 2012 12:29:07 - 1.20
+++ distinfo2 Feb 2013 04:44:41 -
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.8.tar.xz) = j7tvxmEXq0EAutgwy0R5SX5TxvP6y5i/BcjSmFVOvdk=
-SIZE (cairo-1.12.8.tar.xz) = 42113752
+SHA256 (cairo-1.12.12.tar.xz) = FPaTdZ7Mh0cjVa6PDDRzGoV4tAi2B8/QtdNDMf8F2Bo=
+SIZE (cairo-1.12.12.tar.xz) = 42139096
Index: patches/patch-util_cairo-fdr_Makefile_in
===
RCS file:
/home/cvs/ports/graphics/cairo/patches/patch-util_cairo-fdr_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-util_cairo-fdr_Makefile_in
--- patches/patch-util_cairo-fdr_Makefile_in12 Nov 2012 12:29:07 -
1.2
+++ patches/patch-util_cairo-fdr_Makefile_in2 Feb 2013 05:30:59 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.2 2012/11/12 12:29:07 eric Exp $
util/cairo-fdr/Makefile.in.origMon Oct 22 06:08:40 2012
-+++ util/cairo-fdr/Makefile.in Wed Oct 24 03:52:52 2012
-@@ -379,7 +379,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
+--- util/cairo-fdr/Makefile.in.origThu Jan 31 10:25:59 2013
util/cairo-fdr/Makefile.in Sat Feb 2 00:30:35 2013
+@@ -380,7 +380,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \
cairo_fdr_la_SOURCES = fdr.c
cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS)
cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS)
Index: patches/patch-util_cairo-trace_Makefile_in
===
RCS file:
/home/cvs/ports/graphics/cairo/patches/patch-util_cairo-trace_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-util_cairo-trace_Makefile_in
--- patches/patch-util_cairo-trace_Makefile_in 16 Jan 2013 14:29:15 -
1.4
+++ patches/patch-util_cairo-trace_Makefile_in 2 Feb 2013 05:31:04 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.4 2013/01/16 14:29:15
ajacoutot Exp $
util/cairo-trace/Makefile.in.orig Mon Oct 22 06:08:41 2012
-+++ util/cairo-trace/Makefile.in Wed Oct 24 03:51:46 2012
-@@ -399,7 +399,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR=\$
+--- util/cairo-trace/Makefile.in.orig Thu Jan 31 10:26:00 2013
util/cairo-trace/Makefile.in Sat Feb 2 00:30:35 2013
+@@ -400,7 +400,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR=\$
$(AM_CPPFLAGS)
libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: graphics/cairo
On Fri, Feb 01, 2013 at 07:27:22PM +0100, Eric Faurot wrote:
Hi,
This is an update to cairo 1.12.12.
diff -u -p -r1.1 patch-src_cairo_pc_in
--- patches/patch-src_cairo_pc_in 30 Jan 2013 13:17:51 - 1.1
+++ patches/patch-src_cairo_pc_in 1 Feb 2013 17:44:05 -
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_cairo_pc_in,v 1.1 2013/01/30 13:17:51 brad Exp $
src/cairo.pc.in.orig Tue Jan 29 07:56:53 2013
-+++ src/cairo.pc.in Tue Jan 29 08:22:13 2013
+--- src/cairo.pc.in.orig Sun Dec 6 09:29:25 2009
src/cairo.pc.in Fri Feb 1 17:25:52 2013
@@ -8,6 +8,6 @@ Description: Multi-platform 2D graphics library
Version: @VERSION@
@PKGCONFIG_REQUIRES@: @CAIRO_REQUIRES@
-Libs: -L${libdir} -lcairo
-+Libs: -L${libdir} -Wl,-rpath-link,${X11BASE}/lib -lcairo
++Libs: -L${libdir} -Wl,-rpath-link,/usr/X11R6/lib -lcairo
Libs.private: @CAIRO_NONPKGCONFIG_LIBS@
Cflags: -I${includedir}/cairo
This looks wrong. X11BASE may not be defined when someone parses
cairo.pc, but hard-coding the /usr/X11R6 value seems to ack that the
value of X11BASE will never change
Something like @X11BASE@ with the proper substitution at configure time is
probably better.
But dozeen of other packages may be affected by the same kind of
issues, and I'm too lazy now to check what's the approved approach for
other cases.
Anyways if this change is wanted, it should probably be a separate commit.
--
Matthieu Herrb
Re: UPDATE: graphics/cairo
On 2013/02/02 01:28, Matthieu Herrb wrote:
This looks wrong. X11BASE may not be defined when someone parses
cairo.pc, but hard-coding the /usr/X11R6 value seems to ack that the
value of X11BASE will never change
${X11BASE} here is fine, it is handled by ${SUBST_CMD} in the pre-configure
target.
Re: UPDATE: graphics/cairo
On Sun, Aug 12, 2012 at 11:20:04PM +0200, Antoine Jacoutot wrote:
On Sun, Aug 12, 2012 at 05:15:10PM -0400, Brad Smith wrote:
On Sun, Aug 12, 2012 at 11:11:38PM +0200, Antoine Jacoutot wrote:
I don't think this is right.
We usually do this for modules, but here we also have a shared library in
this path.
lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
It's a loadable module for cairo-trace, not a library for apps to use.
Then why doesn't it use -module -avoid-version?
It looks like an oversight for not using -avoid-version. OpenBSD again is
the odd man out and handles shared libraries differently from other ELF-based
OS's. Anyway it doesn't make any difference and is more of a cosmetic thing.
I'll file a bug report and get this and the other issues fixed for some
future release.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: graphics/cairo
On Tue, Aug 14, 2012 at 09:12:37AM -0400, Brad Smith wrote:
On Sun, Aug 12, 2012 at 11:20:04PM +0200, Antoine Jacoutot wrote:
On Sun, Aug 12, 2012 at 05:15:10PM -0400, Brad Smith wrote:
On Sun, Aug 12, 2012 at 11:11:38PM +0200, Antoine Jacoutot wrote:
I don't think this is right.
We usually do this for modules, but here we also have a shared library
in this path.
lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
It's a loadable module for cairo-trace, not a library for apps to use.
Then why doesn't it use -module -avoid-version?
It looks like an oversight for not using -avoid-version. OpenBSD again is
the odd man out and handles shared libraries differently from other ELF-based
OS's. Anyway it doesn't make any difference and is more of a cosmetic thing.
I'll file a bug report and get this and the other issues fixed for some
future release.
Just add the -avoid-version patch and OK for me.
--
Antoine
Re: UPDATE: graphics/cairo
On Tue, Aug 14, 2012 at 03:31:38PM +0200, Antoine Jacoutot wrote:
On Tue, Aug 14, 2012 at 09:12:37AM -0400, Brad Smith wrote:
On Sun, Aug 12, 2012 at 11:20:04PM +0200, Antoine Jacoutot wrote:
On Sun, Aug 12, 2012 at 05:15:10PM -0400, Brad Smith wrote:
On Sun, Aug 12, 2012 at 11:11:38PM +0200, Antoine Jacoutot wrote:
I don't think this is right.
We usually do this for modules, but here we also have a shared
library in this path.
lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
It's a loadable module for cairo-trace, not a library for apps to use.
Then why doesn't it use -module -avoid-version?
It looks like an oversight for not using -avoid-version. OpenBSD again is
the odd man out and handles shared libraries differently from other
ELF-based
OS's. Anyway it doesn't make any difference and is more of a cosmetic thing.
I'll file a bug report and get this and the other issues fixed for some
future release.
Just add the -avoid-version patch and OK for me.
Instead of worrying about irrelevant stuff that doesn't change anything
tell me if you've done any run-time testing and if so with what GPU hardware.
Do you use anything with Intel hw?
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: graphics/cairo
On Tue, Aug 14, 2012 at 10:06:44AM -0400, Brad Smith wrote:
On Tue, Aug 14, 2012 at 03:31:38PM +0200, Antoine Jacoutot wrote:
On Tue, Aug 14, 2012 at 09:12:37AM -0400, Brad Smith wrote:
On Sun, Aug 12, 2012 at 11:20:04PM +0200, Antoine Jacoutot wrote:
On Sun, Aug 12, 2012 at 05:15:10PM -0400, Brad Smith wrote:
On Sun, Aug 12, 2012 at 11:11:38PM +0200, Antoine Jacoutot wrote:
I don't think this is right.
We usually do this for modules, but here we also have a shared
library in this path.
lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
It's a loadable module for cairo-trace, not a library for apps to use.
Then why doesn't it use -module -avoid-version?
It looks like an oversight for not using -avoid-version. OpenBSD again is
the odd man out and handles shared libraries differently from other
ELF-based
OS's. Anyway it doesn't make any difference and is more of a cosmetic
thing.
I'll file a bug report and get this and the other issues fixed for some
future release.
Just add the -avoid-version patch and OK for me.
Instead of worrying about irrelevant stuff that doesn't change anything
tell me if you've done any run-time testing and if so with what GPU hardware.
Do you use anything with Intel hw?
Stop trying to be clever.
I am the *one* who asked Eric to make the update. I was the *first* to try his
diff weeks before he sent it to ports.
I am the *one* who contacted Matthieu regarding the ATI bug. I am the *one* to
look into which commit fixed the ATI issue.
I am the first *one* with Eric to do any kind of testing on this. I am the
*one* who ask this goes into a bulk weeks ago.
The reason I am focusing on irrelevant stuff is because *I* already tested
everything else. It may be irrelevant to you but you don't make the call.
Several of us work on the entire tree instead of focusing on a couple of ports;
consistency is a MUST for me because it helps when working with big tree.
If you don't agree how ports work; then go elsewhere.
tell me if you've done any run-time testing and if so with what GPU hardware.
I owe you nothing. Eric and I originated the update so *you* should tell *us*
about your testing.
I've had enough of the socially retarded!
--
Antoine
Re: UPDATE: graphics/cairo
On Thu, Aug 09, 2012 at 02:41:12AM -0400, Brad Smith wrote:
On Wed, Aug 08, 2012 at 04:37:43PM +0200, Eric Faurot wrote:
Hi.
This diff updates cairo to 1.12.2 and integrates a bugfix. There is
a known text display problem on some radeon chipsets which is fixed
in an upcoming update of the ati driver.
Eric.
Some of the patches can be removed, CONFIGURE_ARGS options removed
and I resorted the WANTLIBS. I also updated the DESCR as the feature
set has changed a bit since the initial revision of DESCR.
This update could also expose bugs with other DDX drivers but
especially the Intel driver.
An update diff. Gets rid of some files not necessary for the
modules.
Index: Makefile
===
RCS file: /home/cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile1 Nov 2011 20:30:49 - 1.37
+++ Makefile12 Aug 2012 14:30:58 -
@@ -2,22 +2,22 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.10.2
-REVISION= 3
-SHARED_LIBS= cairo 11.1
-SHARED_LIBS+= cairo-trace 0.0
-SHARED_LIBS+= cairo-gobject 0.0
-SHARED_LIBS+= cairo-script-interpreter 0.0
+DISTNAME= cairo-1.12.2
+SHARED_LIBS+= cairo 12.0
+SHARED_LIBS+= cairo-trace 1.0
+SHARED_LIBS+= cairo-gobject 1.0
+SHARED_LIBS+= cairo-script-interpreter 1.0
CATEGORIES=graphics
+EXTRACT_SUFX= .tar.xz
-HOMEPAGE= http://cairographics.org/introduction
+HOMEPAGE= http://cairographics.org/
MAINTAINER=Eric Faurot e...@openbsd.org
WANTLIB= GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender \
- Xxf86vm drm expat fontconfig freetype glib-2.0 \
+ Xxf86vm drm expat ffi fontconfig freetype glib-2.0 \
gobject-2.0 gthread-2.0 m pcre pixman-1 png \
- pthread-stubs xcb xcb-render xcb-shm z ffi stdc++
+ pthread-stubs stdc++ xcb xcb-render xcb-shm z
# LGPLv2.1 / MPL 1.1
PERMIT_PACKAGE_CDROM= Yes
@@ -39,15 +39,12 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ENV= PTHREAD_LIBS=-pthread
CONFIGURE_ARGS=--enable-gl \
--enable-tee \
- --enable-xml \
- --enable-xcb
+ --enable-xml
REGRESS_DEPENDS= print/ghostscript/gnu
-.include bsd.port.mk
+post-install:
+ @rm ${PREFIX}/lib/cairo/*.a
+ @rm ${PREFIX}/lib/cairo/*.la
-.for i in ${GCC2_ARCHS}
-. if ${MACHINE_ARCH} == $i
-PATCH_LIST=patch-* gcc2-patch-*
-. endif
-.endfor
+.include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo5 Jan 2011 13:26:05 - 1.18
+++ distinfo9 Aug 2012 06:18:05 -
@@ -1,5 +1,2 @@
-MD5 (cairo-1.10.2.tar.gz) = 8QGp6It4MzeyCy4m39JtXw==
-RMD160 (cairo-1.10.2.tar.gz) = jI3gASA5j+KzpgoI/1mkZLLuv0c=
-SHA1 (cairo-1.10.2.tar.gz) = zM5a4D+ZxQXbl8KGoMmpCpJtPG4=
-SHA256 (cairo-1.10.2.tar.gz) = MgGMeZg1juvCrVeP+NhVnTT8gCUglfEQpXLtI9mJ/EE=
-SIZE (cairo-1.10.2.tar.gz) = 23558405
+SHA256 (cairo-1.12.2.tar.xz) = t4a8SnBUK8sJ8tnRPl5qDIZAjL9tHt3l8N6Afuz5P5Y=
+SIZE (cairo-1.12.2.tar.xz) = 42051584
Index: patches/gcc2-patch-src_cairo-gl-private_h
===
RCS file: patches/gcc2-patch-src_cairo-gl-private_h
diff -N patches/gcc2-patch-src_cairo-gl-private_h
--- patches/gcc2-patch-src_cairo-gl-private_h 5 Jan 2011 13:26:05 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-remove unnamed union to please gcc-2.95
-
-$OpenBSD: gcc2-patch-src_cairo-gl-private_h,v 1.1 2011/01/05 13:26:05 eric Exp
$
src/cairo-gl-private.h.origMon Jan 3 12:23:14 2011
-+++ src/cairo-gl-private.h Mon Jan 3 12:23:40 2011
-@@ -142,7 +142,6 @@ typedef enum cairo_gl_var_type {
- */
- typedef struct cairo_gl_operand {
- cairo_gl_operand_type_t type;
--union {
- struct {
- GLuint tex;
- cairo_gl_surface_t *surface;
-@@ -167,7 +166,6 @@ typedef struct cairo_gl_operand {
- float radius_1;
- cairo_extend_t extend;
- } radial;
--};
- unsigned int vertex_offset;
- } cairo_gl_operand_t;
-
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/graphics/cairo/patches/patch-configure,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure
--- patches/patch-configure 28 Jun 2011 11:04:40 - 1.9
+++ patches/patch-configure 6 Aug 2012 04:32:04 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-configure,v 1.9 2011/06/
Use `Requires', not `Requires.private', because
Re: UPDATE: graphics/cairo
On Fri, Aug 10, 2012 at 07:47:31PM +0200, Eric Faurot wrote: On Thu, Aug 09, 2012 at 02:41:12AM -0400, Brad Smith wrote: Thanks for the patch. RCS file: /home/cvs/ports/graphics/cairo/pkg/PFRAG.shared,v retrieving revision 1.4 diff -u -p -r1.4 PFRAG.shared --- pkg/PFRAG.shared11 Oct 2010 08:09:44 - 1.4 +++ pkg/PFRAG.shared30 Jul 2012 04:45:02 - @@ -1,4 +1,5 @@ @comment $OpenBSD: PFRAG.shared,v 1.4 2010/10/11 08:09:44 eric Exp $ +lib/cairo/cairo-fdr.so.0.0 This is not tracked by SHARED_LIBS and nothing uses that. Do we really want/need this? It's not supposed to be. It's a module to be LD_PRELOAD'd as another debugging aid in addition to cairo-trace. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: graphics/cairo
On Sun, Aug 12, 2012 at 04:28:49PM -0400, Brad Smith wrote:
On Thu, Aug 09, 2012 at 02:41:12AM -0400, Brad Smith wrote:
On Wed, Aug 08, 2012 at 04:37:43PM +0200, Eric Faurot wrote:
Hi.
This diff updates cairo to 1.12.2 and integrates a bugfix. There is
a known text display problem on some radeon chipsets which is fixed
in an upcoming update of the ati driver.
Eric.
Some of the patches can be removed, CONFIGURE_ARGS options removed
and I resorted the WANTLIBS. I also updated the DESCR as the feature
set has changed a bit since the initial revision of DESCR.
This update could also expose bugs with other DDX drivers but
especially the Intel driver.
An update diff. Gets rid of some files not necessary for the
modules.
Index: Makefile
===
RCS file: /home/cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 1 Nov 2011 20:30:49 - 1.37
+++ Makefile 12 Aug 2012 14:30:58 -
@@ -2,22 +2,22 @@
COMMENT= vector graphics library
-DISTNAME=cairo-1.10.2
-REVISION=3
-SHARED_LIBS= cairo 11.1
-SHARED_LIBS+=cairo-trace 0.0
-SHARED_LIBS+=cairo-gobject 0.0
-SHARED_LIBS+=cairo-script-interpreter 0.0
+DISTNAME=cairo-1.12.2
+SHARED_LIBS+=cairo 12.0
+SHARED_LIBS+=cairo-trace 1.0
+SHARED_LIBS+=cairo-gobject 1.0
+SHARED_LIBS+=cairo-script-interpreter 1.0
CATEGORIES= graphics
+EXTRACT_SUFX=.tar.xz
-HOMEPAGE=http://cairographics.org/introduction
+HOMEPAGE=http://cairographics.org/
MAINTAINER= Eric Faurot e...@openbsd.org
WANTLIB= GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender \
- Xxf86vm drm expat fontconfig freetype glib-2.0 \
+ Xxf86vm drm expat ffi fontconfig freetype glib-2.0 \
gobject-2.0 gthread-2.0 m pcre pixman-1 png \
- pthread-stubs xcb xcb-render xcb-shm z ffi stdc++
+ pthread-stubs stdc++ xcb xcb-render xcb-shm z
# LGPLv2.1 / MPL 1.1
PERMIT_PACKAGE_CDROM=Yes
@@ -39,15 +39,12 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ENV= PTHREAD_LIBS=-pthread
CONFIGURE_ARGS= --enable-gl \
--enable-tee \
- --enable-xml \
- --enable-xcb
+ --enable-xml
REGRESS_DEPENDS= print/ghostscript/gnu
-.include bsd.port.mk
+post-install:
+ @rm ${PREFIX}/lib/cairo/*.a
+ @rm ${PREFIX}/lib/cairo/*.la
I don't think this is right.
We usually do this for modules, but here we also have a shared library in this
path.
lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
-.for i in ${GCC2_ARCHS}
-. if ${MACHINE_ARCH} == $i
-PATCH_LIST= patch-* gcc2-patch-*
-. endif
-.endfor
+.include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo 5 Jan 2011 13:26:05 - 1.18
+++ distinfo 9 Aug 2012 06:18:05 -
@@ -1,5 +1,2 @@
-MD5 (cairo-1.10.2.tar.gz) = 8QGp6It4MzeyCy4m39JtXw==
-RMD160 (cairo-1.10.2.tar.gz) = jI3gASA5j+KzpgoI/1mkZLLuv0c=
-SHA1 (cairo-1.10.2.tar.gz) = zM5a4D+ZxQXbl8KGoMmpCpJtPG4=
-SHA256 (cairo-1.10.2.tar.gz) = MgGMeZg1juvCrVeP+NhVnTT8gCUglfEQpXLtI9mJ/EE=
-SIZE (cairo-1.10.2.tar.gz) = 23558405
+SHA256 (cairo-1.12.2.tar.xz) = t4a8SnBUK8sJ8tnRPl5qDIZAjL9tHt3l8N6Afuz5P5Y=
+SIZE (cairo-1.12.2.tar.xz) = 42051584
Index: patches/gcc2-patch-src_cairo-gl-private_h
===
RCS file: patches/gcc2-patch-src_cairo-gl-private_h
diff -N patches/gcc2-patch-src_cairo-gl-private_h
--- patches/gcc2-patch-src_cairo-gl-private_h 5 Jan 2011 13:26:05 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-remove unnamed union to please gcc-2.95
-
-$OpenBSD: gcc2-patch-src_cairo-gl-private_h,v 1.1 2011/01/05 13:26:05 eric
Exp $
src/cairo-gl-private.h.orig Mon Jan 3 12:23:14 2011
-+++ src/cairo-gl-private.h Mon Jan 3 12:23:40 2011
-@@ -142,7 +142,6 @@ typedef enum cairo_gl_var_type {
- */
- typedef struct cairo_gl_operand {
- cairo_gl_operand_type_t type;
--union {
- struct {
- GLuint tex;
- cairo_gl_surface_t *surface;
-@@ -167,7 +166,6 @@ typedef struct cairo_gl_operand {
- float radius_1;
- cairo_extend_t extend;
- } radial;
--};
- unsigned int vertex_offset;
- } cairo_gl_operand_t;
-
Index: patches/patch-configure
===
RCS file:
Re: UPDATE: graphics/cairo
On Sun, Aug 12, 2012 at 11:11:38PM +0200, Antoine Jacoutot wrote:
I don't think this is right.
We usually do this for modules, but here we also have a shared library in
this path.
lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
It's a loadable module for cairo-trace, not a library for apps to use.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: graphics/cairo
On Sun, Aug 12, 2012 at 05:15:10PM -0400, Brad Smith wrote:
On Sun, Aug 12, 2012 at 11:11:38PM +0200, Antoine Jacoutot wrote:
I don't think this is right.
We usually do this for modules, but here we also have a shared library in
this path.
lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
It's a loadable module for cairo-trace, not a library for apps to use.
Then why doesn't it use -module -avoid-version?
--
Antoine
Re: UPDATE: graphics/cairo
On Thu, Aug 09, 2012 at 02:41:12AM -0400, Brad Smith wrote:
Thanks for the patch.
RCS file: /home/cvs/ports/graphics/cairo/pkg/PFRAG.shared,v
retrieving revision 1.4
diff -u -p -r1.4 PFRAG.shared
--- pkg/PFRAG.shared 11 Oct 2010 08:09:44 - 1.4
+++ pkg/PFRAG.shared 30 Jul 2012 04:45:02 -
@@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2010/10/11 08:09:44 eric Exp $
+lib/cairo/cairo-fdr.so.0.0
This is not tracked by SHARED_LIBS and nothing uses that.
Do we really want/need this?
@lib lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
@lib lib/libcairo-gobject.so.${LIBcairo-gobject_VERSION}
@lib
lib/libcairo-script-interpreter.so.${LIBcairo-script-interpreter_VERSION}
Re: UPDATE: graphics/cairo
On Wed, Aug 08, 2012 at 04:37:43PM +0200, Eric Faurot wrote:
Hi.
This diff updates cairo to 1.12.2 and integrates a bugfix. There is
a known text display problem on some radeon chipsets which is fixed
in an upcoming update of the ati driver.
Eric.
Some of the patches can be removed, CONFIGURE_ARGS options removed
and I resorted the WANTLIBS. I also updated the DESCR as the feature
set has changed a bit since the initial revision of DESCR.
This update could also expose bugs with other DDX drivers but
especially the Intel driver.
Index: Makefile
===
RCS file: /home/cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile1 Nov 2011 20:30:49 - 1.37
+++ Makefile9 Aug 2012 06:13:05 -
@@ -2,22 +2,22 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.10.2
-REVISION= 3
-SHARED_LIBS= cairo 11.1
-SHARED_LIBS+= cairo-trace 0.0
-SHARED_LIBS+= cairo-gobject 0.0
-SHARED_LIBS+= cairo-script-interpreter 0.0
+DISTNAME= cairo-1.12.2
+SHARED_LIBS+= cairo 12.0
+SHARED_LIBS+= cairo-trace 1.0
+SHARED_LIBS+= cairo-gobject 1.0
+SHARED_LIBS+= cairo-script-interpreter 1.0
CATEGORIES=graphics
+EXTRACT_SUFX= .tar.xz
-HOMEPAGE= http://cairographics.org/introduction
+HOMEPAGE= http://cairographics.org/
MAINTAINER=Eric Faurot e...@openbsd.org
WANTLIB= GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender \
- Xxf86vm drm expat fontconfig freetype glib-2.0 \
+ Xxf86vm drm expat ffi fontconfig freetype glib-2.0 \
gobject-2.0 gthread-2.0 m pcre pixman-1 png \
- pthread-stubs xcb xcb-render xcb-shm z ffi stdc++
+ pthread-stubs stdc++ xcb xcb-render xcb-shm z
# LGPLv2.1 / MPL 1.1
PERMIT_PACKAGE_CDROM= Yes
@@ -39,15 +39,8 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ENV= PTHREAD_LIBS=-pthread
CONFIGURE_ARGS=--enable-gl \
--enable-tee \
- --enable-xml \
- --enable-xcb
+ --enable-xml
REGRESS_DEPENDS= print/ghostscript/gnu
.include bsd.port.mk
-
-.for i in ${GCC2_ARCHS}
-. if ${MACHINE_ARCH} == $i
-PATCH_LIST=patch-* gcc2-patch-*
-. endif
-.endfor
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo5 Jan 2011 13:26:05 - 1.18
+++ distinfo9 Aug 2012 06:18:05 -
@@ -1,5 +1,2 @@
-MD5 (cairo-1.10.2.tar.gz) = 8QGp6It4MzeyCy4m39JtXw==
-RMD160 (cairo-1.10.2.tar.gz) = jI3gASA5j+KzpgoI/1mkZLLuv0c=
-SHA1 (cairo-1.10.2.tar.gz) = zM5a4D+ZxQXbl8KGoMmpCpJtPG4=
-SHA256 (cairo-1.10.2.tar.gz) = MgGMeZg1juvCrVeP+NhVnTT8gCUglfEQpXLtI9mJ/EE=
-SIZE (cairo-1.10.2.tar.gz) = 23558405
+SHA256 (cairo-1.12.2.tar.xz) = t4a8SnBUK8sJ8tnRPl5qDIZAjL9tHt3l8N6Afuz5P5Y=
+SIZE (cairo-1.12.2.tar.xz) = 42051584
Index: patches/gcc2-patch-src_cairo-gl-private_h
===
RCS file: patches/gcc2-patch-src_cairo-gl-private_h
diff -N patches/gcc2-patch-src_cairo-gl-private_h
--- patches/gcc2-patch-src_cairo-gl-private_h 5 Jan 2011 13:26:05 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-remove unnamed union to please gcc-2.95
-
-$OpenBSD: gcc2-patch-src_cairo-gl-private_h,v 1.1 2011/01/05 13:26:05 eric Exp
$
src/cairo-gl-private.h.origMon Jan 3 12:23:14 2011
-+++ src/cairo-gl-private.h Mon Jan 3 12:23:40 2011
-@@ -142,7 +142,6 @@ typedef enum cairo_gl_var_type {
- */
- typedef struct cairo_gl_operand {
- cairo_gl_operand_type_t type;
--union {
- struct {
- GLuint tex;
- cairo_gl_surface_t *surface;
-@@ -167,7 +166,6 @@ typedef struct cairo_gl_operand {
- float radius_1;
- cairo_extend_t extend;
- } radial;
--};
- unsigned int vertex_offset;
- } cairo_gl_operand_t;
-
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/graphics/cairo/patches/patch-configure,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure
--- patches/patch-configure 28 Jun 2011 11:04:40 - 1.9
+++ patches/patch-configure 6 Aug 2012 04:32:04 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-configure,v 1.9 2011/06/
Use `Requires', not `Requires.private', because otherwise libraries
required for linking aren't exposed.
configure.orig Sat Dec 25 15:22:57 2010
-+++ configure Tue Jun 28 12:27:44 2011
-@@ -16983,10 +16983,7 @@ if test x$PKG_CONFIG = x; then
+--- configure.orig Sun Apr 29 14:49:59 2012
Re: UPDATE: graphics/cairo
Similar to the one Brad sent some time ago... So, OK for me!
ciao,
David
On Mon, Jan 3, 2011 at 2:14 PM, Eric Faurot e...@faurot.net wrote:
This is an update to cairo 1.10.2, with a patch to help it build on gcc2
archs.
Eric.
Index: Makefile
===
RCS file: /cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile 17 Nov 2010 08:05:13 - 1.31
+++ Makefile 3 Jan 2011 13:02:44 -
@@ -2,8 +2,7 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.10.0
-REVISION= 0
+DISTNAME= cairo-1.10.2
SHARED_LIBS= cairo 11.0
SHARED_LIBS+= cairo-trace 0.0
SHARED_LIBS+= cairo-gobject 0.0
@@ -45,3 +44,9 @@
REGRESS_DEPENDS= print/ghostscript/gnu
.include bsd.port.mk
+
+.for i in ${GCC2_ARCHS}
+. if ${MACHINE_ARCH} == $i
+PATCH_LIST= patch-* gcc2-patch-*
+. endif
+.endfor
Index: distinfo
===
RCS file: /cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo 11 Oct 2010 08:09:44 - 1.17
+++ distinfo 3 Jan 2011 13:02:44 -
@@ -1,5 +1,5 @@
-MD5 (cairo-1.10.0.tar.gz) = cKLs5mz0c9l24tsPdb8Zng==
-RMD160 (cairo-1.10.0.tar.gz) = +mXU85JjCIV9E/PtDBAPifB13AE=
-SHA1 (cairo-1.10.0.tar.gz) = 7+fkdAjVGIaQIozK3IUjZS9r9wI=
-SHA256 (cairo-1.10.0.tar.gz) = DyzkzEYVWUCI1064tTYLrXw8w8Pam2Gvm/2XntHtlLI=
-SIZE (cairo-1.10.0.tar.gz) = 24022822
+MD5 (cairo-1.10.2.tar.gz) = 8QGp6It4MzeyCy4m39JtXw==
+RMD160 (cairo-1.10.2.tar.gz) = jI3gASA5j+KzpgoI/1mkZLLuv0c=
+SHA1 (cairo-1.10.2.tar.gz) = zM5a4D+ZxQXbl8KGoMmpCpJtPG4=
+SHA256 (cairo-1.10.2.tar.gz) = MgGMeZg1juvCrVeP+NhVnTT8gCUglfEQpXLtI9mJ/EE=
+SIZE (cairo-1.10.2.tar.gz) = 23558405
Index: patches/gcc2-patch-src_cairo-gl-private_h
===
RCS file: patches/gcc2-patch-src_cairo-gl-private_h
diff -N patches/gcc2-patch-src_cairo-gl-private_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/gcc2-patch-src_cairo-gl-private_h 3 Jan 2011 13:02:44 -
@@ -0,0 +1,21 @@
+remove unnamed union to please gcc-2.95
+
+$OpenBSD$
+--- src/cairo-gl-private.h.orig Mon Jan 3 12:23:14 2011
src/cairo-gl-private.h Mon Jan 3 12:23:40 2011
+@@ -142,7 +142,6 @@ typedef enum cairo_gl_var_type {
+ */
+ typedef struct cairo_gl_operand {
+ cairo_gl_operand_type_t type;
+- union {
+ struct {
+ GLuint tex;
+ cairo_gl_surface_t *surface;
+@@ -167,7 +166,6 @@ typedef struct cairo_gl_operand {
+ float radius_1;
+ cairo_extend_t extend;
+ } radial;
+- };
+ unsigned int vertex_offset;
+ } cairo_gl_operand_t;
+
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/graphics/cairo/patches/patch-src_Makefile_in,v
retrieving revision 1.5
diff -u -r1.5 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 11 Oct 2010 08:09:44 - 1.5
+++ patches/patch-src_Makefile_in 3 Jan 2011 13:02:44 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.5 2010/10/11 08:09:44 eric Exp $
src/Makefile.in.orig Mon Sep 6 18:16:41 2010
-+++ src/Makefile.in Mon Sep 13 17:44:05 2010
-@@ -2425,7 +2425,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
+--- src/Makefile.in.orig Sat Dec 25 15:22:52 2010
src/Makefile.in Mon Dec 27 10:07:21 2010
+@@ -2429,7 +2429,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
) $@
@ ! grep -q cairo_ERROR $@ || ($(RM) $@; false)
Index: patches/patch-src_cairo_h
===
RCS file: patches/patch-src_cairo_h
diff -N patches/patch-src_cairo_h
--- patches/patch-src_cairo_h 11 Oct 2010 08:09:44 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_cairo_h,v 1.1 2010/10/11 08:09:44 eric Exp $
src/cairo.h.orig Sat Oct 9 10:54:20 2010
-+++ src/cairo.h Sat Oct 9 10:54:10 2010
-@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type {
- CAIRO_DEVICE_TYPE_SCRIPT,
- CAIRO_DEVICE_TYPE_XCB,
- CAIRO_DEVICE_TYPE_XLIB,
-- CAIRO_DEVICE_TYPE_XML,
-+ CAIRO_DEVICE_TYPE_XML
- } cairo_device_type_t;
-
- cairo_public cairo_device_type_t
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/cairo/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 17 Oct 2010 12:50:53 - 1.9
+++ pkg/PLIST 3 Jan 2011 13:02:44 -
@@ -63,6 +63,7 @@
share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
Re: UPDATE: graphics/cairo
- Original message - This is an update to cairo 1.10.2, with a patch to help it build on gcc2 archs. Has this been run through a full build on sparc? -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: graphics/cairo
- Original message - On Mon, Jan 03, 2011 at 08:40:37AM -0500, Brad wrote: - Original message - This is an update to cairo 1.10.2, with a patch to help it build on gcc2 archs. Has this been run through a full build on sparc? I asked sebastia@ to test it (he sent me the gcc2 patch). Well that'll take awhile on sparc. Since cairo is already broken on sparc as is it would be better to put this in minus the patch and then put that in once he gets back to you after a full build run. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: graphics/cairo
Eric Faurot wrote: On Tue, 8 Apr 2008 23:50:35 +0200 Eric Faurot [EMAIL PROTECTED] wrote: Hi, This diff updates cairo to 1.5.20, which is supposed, among other things, to fix the xlib backend issues. So, we might be able to finally get rid of our patches. It will not build without pixman 0.10 that matthieu@ committed to xenocara a couple of hours ago: update from sources, or wait for new X snaps. Please test, especially on non-standard X setup (uncommon modes, weird framebuffers, ...). Eric. New diff for cairo-1.6.4 I've been running with that on my machines for some time now, and haven't seen problems. I only run apps using cairo on modern hw though. -- Matthieu Herrb
Re: UPDATE: graphics/cairo
On Tue, 8 Apr 2008 23:50:35 +0200 Eric Faurot [EMAIL PROTECTED] wrote: Hi, This diff updates cairo to 1.5.20, which is supposed, among other things, to fix the xlib backend issues. So, we might be able to finally get rid of our patches. It will not build without pixman 0.10 that matthieu@ committed to xenocara a couple of hours ago: update from sources, or wait for new X snaps. Please test, especially on non-standard X setup (uncommon modes, weird framebuffers, ...). Eric. New diff for cairo-1.6.4 Eric. cairo.diff Description: Binary data
Re: UPDATE: graphics/cairo
On 7/8/07, steven mestdagh [EMAIL PROTECTED] wrote: please test/comment/ok. looks ok. tested on amd64. Eric.
Re: UPDATE: graphics/cairo and graphics/py-cairo
On 11/24/05, Aleksander Piotrowski [EMAIL PROTECTED] wrote: Eric Faurot [EMAIL PROTECTED] wrote: I understand. I am using this patch locally and I have xchat, firefox 1.5rc3 working well. I can make a full package build, run make newlib-depends-check and see what happens. Would that help? Anyway, we can leavecairo like this for now. It simply adds a useless lib dependency, but nothing harmful as far as I can tell. However py-gtk2 really requires the updated py-cairo (for pycairo.pc) Yeah, but 150+ ports are more important that one py-gtk2 port. Sorry, it was not clear: the py-cairo update does not depend on the cairo update. I was suggesting to update py-cairo and py-gtk2 but leave cairo untouched for now. And yes, as you are updating port that has lots of dependant ports, you should, erm, you have to run full pkg build to be sure that everything is OK after that change. I'll do that. Eric.
Re: UPDATE: graphics/cairo and graphics/py-cairo
Eric Faurot [EMAIL PROTECTED] wrote: Remove the incorrect -lfreetype flag in cairo.pc. This is IMHO a mistake in cairo distribution because one can link against libcairo without linking against libfreetype. The -L/usr/X11R6/lib flag is Have you talked to the cairo people about this? left to allow ports like pango to detect cairo correctly (pango, for example). I wonder if it is really the way to go and I am starting to think that the whole pkg-config concept is actually broken. Anyway, the change affects all ports that use pkg-config to link against cairo but do not explicitly need freetype. Their WANTLIB might need to be fixed (remove freetype). Seeing that it might again affect ~150 ports, I'm reluctant about this change. -- Christian naddy Weisgerber [EMAIL PROTECTED]
Re: UPDATE: graphics/cairo and graphics/py-cairo
Eric Faurot [EMAIL PROTECTED] wrote: Seeing that it might again affect ~150 ports, I'm reluctant about this change. I understand. I am using this patch locally and I have xchat, firefox 1.5rc3 working well. I can make a full package build, run make newlib-depends-check and see what happens. Would that help? Anyway, we can leavecairo like this for now. It simply adds a useless lib dependency, but nothing harmful as far as I can tell. However py-gtk2 really requires the updated py-cairo (for pycairo.pc) Yeah, but 150+ ports are more important that one py-gtk2 port. And yes, as you are updating port that has lots of dependant ports, you should, erm, you have to run full pkg build to be sure that everything is OK after that change. Alek -- From: Przemyslaw Frasunek Subject: OpenBSD rootkit? To: [EMAIL PROTECTED] -- http://www.monkey.org/openbsd/archive/tech/0207/msg00123.html
Re: UPDATE: graphics/cairo and graphics/py-cairo
Hi py-cairo.diff was broken, sorry. Here is a better one. Eric. py-cairo.diff Description: Binary data
Re: UPDATE: graphics/cairo
Aleksander Piotrowski [EMAIL PROTECTED] wrote: on i386, make regress gives me: 9 of 63 tests failed. Good! 1.0.0 had 15/59 failures Yeah, six tests fixed and now please fix the rest. Including the five that are expected to fail? Tall order. Come on guys, don't discourage contributors if you can't even be bothered to look at their submissions. -- Christian naddy Weisgerber [EMAIL PROTECTED]
Re: UPDATE: graphics/cairo
Eric Faurot [EMAIL PROTECTED] wrote: on i386, make regress gives me: 9 of 63 tests failed. Good! 1.0.0 had 15/59 failures Yeah, six tests fixed and now please fix the rest. Alek -- Szef egzekucyjny Liverpoolu, Rick Parry, powiedzial w wywiadzie dla BBC Sport, ze odrzuciby nawet ofert 50 milionów funtów za kapitana druyny Stevena Gerrarda. -- http://www.sports.pl/index.phtml?show=1s=15ns=46973
Re: UPDATE: graphics/cairo
On 10/29/05, Aleksander Piotrowski [EMAIL PROTECTED] wrote: Eric Faurot [EMAIL PROTECTED] wrote: on i386, make regress gives me: 9 of 63 tests failed. Good! 1.0.0 had 15/59 failures Yeah, six tests fixed and now please fix the rest. Well, there is nothing much to fix really. The test suite is a bit picky. There are just small subpixel differences here and there between the expected images and the ones actually rendered. Nothing to worry about. That is confirmed by cairo project leader. Should I make it NO_REGRESS? Eric.
Re: UPDATE: graphics/cairo
On Sat, Oct 29, 2005 at 04:42:55PM +0200, Eric Faurot wrote: On 10/29/05, Aleksander Piotrowski [EMAIL PROTECTED] wrote: Eric Faurot [EMAIL PROTECTED] wrote: on i386, make regress gives me: 9 of 63 tests failed. Good! 1.0.0 had 15/59 failures Yeah, six tests fixed and now please fix the rest. Well, there is nothing much to fix really. The test suite is a bit picky. There are just small subpixel differences here and there between the expected images and the ones actually rendered. Nothing to worry about. That is confirmed by cairo project leader. Should I make it NO_REGRESS? No, of course not. NO_REGRESS is used to mark ports without regression tests, not the ones that do not pass all their tests.
Re: UPDATE: graphics/cairo
On Fri, Oct 28, 2005 at 02:49:14PM +0200, Eric Faurot wrote: Hi, This diff updates graphics/cairo to 1.0.2 on i386, make regress gives me: 9 of 63 tests failed. -- Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
