cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- tweak WANTLIB

Browse Source 
- libcairo-trace is not a regular library
- move cairo-trace to PRFAG.shared

input from Brad and ajacoutot@

ok ajacoutot@
This commit is contained in:
eric 2012-08-26 17:22:27 +00:00
parent 65d930bff4
commit 39490b7fab
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
graphics/cairo/Makefile
View File

@ -1,24 +1,24 @@
# $OpenBSD: Makefile,v 1.39 2012/08/17 07:58:50 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.40 2012/08/26 17:22:27 eric Exp $
COMMENT= vector graphics library
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
REVISION= 0
REVISION= 1
HOMEPAGE= http://cairographics.org/
MAINTAINER= Eric Faurot <eric@openbsd.org>
WANTLIB= GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender \
Xxf86vm drm expat ffi fontconfig freetype glib-2.0 \
gobject-2.0 gthread-2.0 m pcre pixman-1 png \
pthread-stubs stdc++ xcb xcb-render xcb-shm z
Xxf86vm c drm expat ffi fontconfig freetype \
glib-2.0 gobject-2.0 gthread-2.0 m pcre pixman-1 \
png pthread-stubs pthread stdc++ xcb xcb-render \
xcb-shm z
# LGPLv2.1 / MPL 1.1
PERMIT_PACKAGE_CDROM= Yes

12
graphics/cairo/patches/patch-util_cairo-trace_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.1 2012/08/26 17:22:27 eric Exp $
--- util/cairo-trace/Makefile.in.orig Sun Aug 26 14:51:26 2012
+++ util/cairo-trace/Makefile.in Sun Aug 26 14:51:03 2012
@@ -396,7 +396,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$
$(AM_CPPFLAGS)
libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS)
-libcairo_trace_la_LDFLAGS = -no-undefined
+libcairo_trace_la_LDFLAGS = -no-undefined -module -avoid-version
libcairo_trace_la_LIBADD = $(real_pthread_LIBS) -lz $(am__append_1) \
$(am__append_3)
EXTRA_DIST = \

5
graphics/cairo/pkg/PFRAG.shared
View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2012/08/16 17:03:18 eric Exp $
@comment $OpenBSD: PFRAG.shared,v 1.6 2012/08/26 17:22:27 eric Exp $
bin/cairo-trace
lib/cairo/cairo-fdr.so
@lib lib/cairo/libcairo-trace.so.${LIBcairo-trace_VERSION}
lib/cairo/libcairo-trace.so
@lib lib/libcairo-gobject.so.${LIBcairo-gobject_VERSION}
@lib lib/libcairo-script-interpreter.so.${LIBcairo-script-interpreter_VERSION}
@lib lib/libcairo.so.${LIBcairo_VERSION}

7
graphics/cairo/pkg/PLIST
View File

@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.13 2012/08/17 07:58:51 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.14 2012/08/26 17:22:27 eric Exp $
%%SHARED%%
bin/cairo-trace
include/cairo/
include/cairo/cairo-deprecated.h
include/cairo/cairo-features.h
@ -22,8 +21,8 @@ include/cairo/cairo.h
lib/cairo/
@comment lib/cairo/cairo-fdr.a
@comment lib/cairo/cairo-fdr.la
lib/cairo/libcairo-trace.a
lib/cairo/libcairo-trace.la
@comment lib/cairo/libcairo-trace.a
@comment lib/cairo/libcairo-trace.la
lib/libcairo-gobject.a
lib/libcairo-gobject.la
lib/libcairo-script-interpreter.a