pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cairo: make progress, add cairo-gobject

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Fri Nov 10 00:56:12 2023 +0100
Changeset:	ed345bcc0e16b8d06bf4fe1703580c9da3e798e8

Modified Files:
	Makefile
	cairo/Makefile
	cairo/Makefile.common
	cairo/PLIST
	cairo/buildlink3.mk
	cairo/options.mk
Added Files:
	cairo-gobject/DESCR
	cairo-gobject/Makefile
	cairo-gobject/PLIST
	cairo-gobject/TODO
	cairo-gobject/buildlink3.mk
Removed Files:
	cairo/TODO

Log Message:
cairo: make progress, add cairo-gobject

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ed345bcc0e16b8d06bf4fe1703580c9da3e798e8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                    |  4 +++-
 cairo-gobject/DESCR         | 17 +++++++++++++++++
 cairo-gobject/Makefile      | 28 ++++++++++++++++++++++++++++
 cairo-gobject/PLIST         |  4 ++++
 cairo-gobject/TODO          |  1 +
 cairo-gobject/buildlink3.mk | 16 ++++++++++++++++
 cairo/Makefile              |  9 ++++++---
 cairo/Makefile.common       |  5 ++---
 cairo/PLIST                 |  8 --------
 cairo/TODO                  |  2 --
 cairo/buildlink3.mk         |  6 +-----
 cairo/options.mk            |  2 +-
 12 files changed, 79 insertions(+), 23 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 003333b88e..635a3f7165 100644
--- a/Makefile
+++ b/Makefile
@@ -257,6 +257,7 @@ SUBDIR+=	bastard
 SUBDIR+=	bats-core
 SUBDIR+=	be
 SUBDIR+=	beast
+SUBDIR+=	bedtools
 SUBDIR+=	beignet
 SUBDIR+=	belle-sip
 SUBDIR+=	bertini
@@ -342,7 +343,7 @@ SUBDIR+=	bub-n-bros
 SUBDIR+=	buddy
 SUBDIR+=	budgie-desktop
 SUBDIR+=	budgie-screensaver
-SUBDIR+=	bugdom
+SUBDIR+=	bugdom2
 SUBDIR+=	bugsx
 SUBDIR+=	bugzilla
 SUBDIR+=	bulk-test-llvm
@@ -368,6 +369,7 @@ SUBDIR+=	cairo
 SUBDIR+=	cairo-dingbat-ttf
 SUBDIR+=	cairo-dock
 SUBDIR+=	cairo-dock-plugins
+SUBDIR+=	cairo-gobject
 SUBDIR+=	cairo-java
 SUBDIR+=	calypso-git
 SUBDIR+=	canna
diff --git a/cairo-gobject/DESCR b/cairo-gobject/DESCR
new file mode 100644
index 0000000000..bf73cea7f7
--- /dev/null
+++ b/cairo-gobject/DESCR
@@ -0,0 +1,17 @@
+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 designed to produce consistent output on all output media while taking
+advantage of display hardware acceleration when available (eg. through the X
+Render Extension).
+
+The cairo API provides operations similar to the drawing operators of
+PostScript and PDF. Operations in cairo including stroking and filling cubic
+Bezier splines, transforming and compositing translucent images, and
+antialiased text rendering. All drawing operations can be transformed by any
+affine transformation (scale, rotation, shear, etc.)
+
+Cairo is implemented as a library written in the C programming language, but
+bindings are available for several different programming languages.
diff --git a/cairo-gobject/Makefile b/cairo-gobject/Makefile
new file mode 100644
index 0000000000..437cddbae4
--- /dev/null
+++ b/cairo-gobject/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.42 2023/01/29 21:14:37 ryoon Exp $
+
+.include "../../wip/cairo/Makefile.common"
+
+PKGNAME=	${DISTNAME:S/-/-gobject-/}
+
+INSTALLATION_DIRS+=	include lib/pkgconfig
+
+PKGCONFIG_OVERRIDE_STAGE=	post-build
+PKGCONFIG_OVERRIDE+=		output/meson-private/*.pc
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/util/cairo-gobject/cairo-gobject.h \
+		${DESTDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/output/util/cairo-gobject/libcairo-gobject.so \
+		${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/output/util/cairo-gobject/libcairo-gobject.so.2 \
+		${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/output/util/cairo-gobject/libcairo-gobject.so.2.*.0 \
+		${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/output/meson-private/cairo-gobject.pc \
+		${DESTDIR}${PREFIX}/lib/pkgconfig
+
+.include "../../wip/cairo/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.14.0
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/cairo-gobject/PLIST b/cairo-gobject/PLIST
new file mode 100644
index 0000000000..7204c01f87
--- /dev/null
+++ b/cairo-gobject/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2011/02/12 13:40:53 drochner Exp $
+include/cairo/cairo-gobject.h
+lib/libcairo-gobject.la
+lib/pkgconfig/cairo-gobject.pc
diff --git a/cairo-gobject/TODO b/cairo-gobject/TODO
new file mode 100644
index 0000000000..32c23e7e27
--- /dev/null
+++ b/cairo-gobject/TODO
@@ -0,0 +1 @@
+- builds all of cairo again and installs too much.
diff --git a/cairo-gobject/buildlink3.mk b/cairo-gobject/buildlink3.mk
new file mode 100644
index 0000000000..207a221bba
--- /dev/null
+++ b/cairo-gobject/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.23 2023/01/29 21:14:37 ryoon Exp $
+
+BUILDLINK_TREE+=	cairo-gobject
+
+.if !defined(CAIRO_GOBJECT_BUILDLINK3_MK)
+CAIRO_GOBJECT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.cairo-gobject+=	cairo-gobject>=1.10.2
+BUILDLINK_ABI_DEPENDS.cairo-gobject+=	cairo-gobject>=1.16.0nb7
+BUILDLINK_PKGSRCDIR.cairo-gobject?=	../../graphics/cairo-gobject
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
+.endif	# CAIRO_GOBJECT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-cairo-gobject
diff --git a/cairo/Makefile b/cairo/Makefile
index 19eaa795e3..e6b4491699 100644
--- a/cairo/Makefile
+++ b/cairo/Makefile
@@ -1,15 +1,18 @@
 # $NetBSD: Makefile,v 1.154 2023/01/29 21:14:37 ryoon Exp $
 
-.include "../../graphics/cairo/Makefile.common"
+.include "../../wip/cairo/Makefile.common"
 
 TEST_TARGET=			check
 
+MESON_ARGS+=	-Dglib=disabled
+
+PKGCONFIG_OVERRIDE_STAGE=       post-build
+PKGCONFIG_OVERRIDE+=		output/meson-private/*.pc
+
 .include "options.mk"
 
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 # include?
 #.include "../../print/libspectre/buildlink3.mk"
diff --git a/cairo/Makefile.common b/cairo/Makefile.common
index 1beaf96e55..e8f9b2564e 100644
--- a/cairo/Makefile.common
+++ b/cairo/Makefile.common
@@ -13,8 +13,8 @@ HOMEPAGE=	https://cairographics.org/
 COMMENT=	Vector graphics library with cross-device output support
 LICENSE=	gnu-lgpl-v2.1 AND mpl-1.1
 
-DISTINFO_FILE=	${.CURDIR}/../../graphics/cairo/distinfo
-PATCHDIR=	${.CURDIR}/../../graphics/cairo/patches
+DISTINFO_FILE=	${.CURDIR}/../../wip/cairo/distinfo
+PATCHDIR=	${.CURDIR}/../../wip/cairo/patches
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pkg-config
@@ -29,4 +29,3 @@ CPPFLAGS.SunOS+=		-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
 
 .include "../../devel/meson/build.mk"
 .include "../../lang/python/tool.mk"
-.include "../../devel/glib2/buildlink3.mk"
diff --git a/cairo/PLIST b/cairo/PLIST
index c88a03a593..ad807141ae 100644
--- a/cairo/PLIST
+++ b/cairo/PLIST
@@ -1,8 +1,6 @@
 @comment $NetBSD$
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
-include/cairo/cairo-ft.h
-include/cairo/cairo-gobject.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 ${PLIST.quartz}include/cairo/cairo-quartz-image.h
@@ -16,18 +14,12 @@ ${PLIST.xcb}include/cairo/cairo-xcb.h
 ${PLIST.x11}include/cairo/cairo-xlib-xrender.h
 ${PLIST.x11}include/cairo/cairo-xlib.h
 include/cairo/cairo.h
-lib/libcairo-gobject.so
-lib/libcairo-gobject.so.2
-lib/libcairo-gobject.so.2.11800.0
 lib/libcairo-script-interpreter.so
 lib/libcairo-script-interpreter.so.2
 lib/libcairo-script-interpreter.so.2.11800.0
 lib/libcairo.so
 lib/libcairo.so.2
 lib/libcairo.so.2.11800.0
-lib/pkgconfig/cairo-fc.pc
-lib/pkgconfig/cairo-ft.pc
-lib/pkgconfig/cairo-gobject.pc
 lib/pkgconfig/cairo-pdf.pc
 lib/pkgconfig/cairo-png.pc
 lib/pkgconfig/cairo-ps.pc
diff --git a/cairo/TODO b/cairo/TODO
deleted file mode 100644
index b3857c5b32..0000000000
--- a/cairo/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- fix pc files
-- split off cairo-gobject again?
diff --git a/cairo/buildlink3.mk b/cairo/buildlink3.mk
index 7ae5350ed0..e9f677ae6d 100644
--- a/cairo/buildlink3.mk
+++ b/cairo/buildlink3.mk
@@ -7,9 +7,7 @@ CAIRO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.0.0nb2
 BUILDLINK_ABI_DEPENDS.cairo+=	cairo>=1.16.0nb9
-BUILDLINK_PKGSRCDIR.cairo?=	../../graphics/cairo
-
-BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
+BUILDLINK_PKGSRCDIR.cairo?=	../../wip/cairo
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -27,8 +25,6 @@ pkgbase := cairo
 
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .endif # CAIRO_BUILDLINK3_MK
diff --git a/cairo/options.mk b/cairo/options.mk
index 132f369f7a..f7f66adc92 100644
--- a/cairo/options.mk
+++ b/cairo/options.mk
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=	x11 xcb
 PKG_SUPPORTED_OPTIONS+=	quartz
 PKG_SUGGESTED_OPTIONS+=	quartz
 .else
-#PKG_SUGGESTED_OPTIONS=	x11 xcb
+PKG_SUGGESTED_OPTIONS=	x11 xcb
 .endif
 
 .include "../../mk/bsd.options.mk"
Home | Main Index | Thread Index | Old Index