[PATCH] graphics/libcaca: fix hidden dependency on ftgl
Dmitry Marakasov
amdmi3 at amdmi3.ru
Tue Oct 29 00:26:35 UTC 2013
>Submitter-Id: current-users
>Originator: Dmitry Marakasov
>Organization:
>Confidential: no
>Synopsis: [PATCH] graphics/libcaca: fix hidden dependency on ftgl
>Severity: non-critical
>Priority: low
>Category: ports
>Class: change-request
>Release: FreeBSD 9.1-RELEASE-p4 amd64
>Environment:
System: FreeBSD hades.panopticon 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0 r251956: Tue Jun 18 21:41:37 MSK
>Description:
libcaca silently picks up graphics/ftgl when it's installed, with no means do disable it via configure args. The patch attached makes ftgl dependency optional and hacks configure to not pick it up when the option is disabled.
Port maintainer (multimedia at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
>How-To-Repeat:
Install graphics/ftgl, install libcaca, ldd /usr/local/lib/libcaca.so
>Fix:
--- libcaca-0.99.b18_4.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 331915)
+++ Makefile (working copy)
@@ -3,7 +3,7 @@
PORTNAME= libcaca
DISTVERSION= 0.99.beta18
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://caca.zoy.org/raw-attachment/wiki/libcaca/
@@ -26,9 +26,10 @@
DOCS= AUTHORS COPYING COPYING.GPL COPYING.LGPL ChangeLog NEWS \
NOTES README THANKS
-OPTIONS_DEFINE= X11 IMLIB2 SLANG DOCS
+OPTIONS_DEFINE= X11 IMLIB2 FTGL SLANG DOCS
OPTIONS_DEFAULT= X11 IMLIB2
X11_DESC= X11 and OpenGL support
+FTGL_DESC= FTGL support
X11_USE= XORG=x11 GL=glut
X11_CONFIGURE_OFF= --disable-x11 --disable-gl
@@ -37,7 +38,16 @@
SLANG_LIB_DEPENDS= libslang.so.2:${PORTSDIR}/devel/libslang2
SLANG_CONFIGURE_ENABLE= slang
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFTGL} && ${PORT_OPTIONS:MX11}
+LIB_DEPENDS+= libftgl.so:${PORTSDIR}/graphics/ftgl
+.endif
+
post-patch:
+.if ! ${PORT_OPTIONS:MFTGL}
+ @${REINPLACE_CMD} -e '/PKG_CONFIG.*ftgl/ s|ftgl|no-&|' ${WRKSRC}/configure
+.endif
@${REINPLACE_CMD} -e 's|-g -O2 ||g ; s| -fomit-frame-pointer||g ; \
s|arpa\/inet.h ||g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|: install-docDATA|:|g ; s| csharp||g' \
--- libcaca-0.99.b18_4.patch ends here ---
More information about the freebsd-multimedia
mailing list