pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

osg: include zlib buildlink, further alignment with freebsd's default options and disabling of redundant configuration checks



Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Wed Feb 14 16:53:49 2018 +0000
Changeset:	edc7c11c272bc98cafa32ccdaf4d58bc4345af3b

Modified Files:
	osg/Makefile
	osg/buildlink3.mk

Log Message:
osg: include zlib buildlink, further alignment with freebsd's default
options and disabling of redundant configuration checks

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

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

diffstat:
 osg/Makefile      | 6 +++++-
 osg/buildlink3.mk | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diffs:
diff --git a/osg/Makefile b/osg/Makefile
index 2a4ee33667..2b4a60cebc 100644
--- a/osg/Makefile
+++ b/osg/Makefile
@@ -28,6 +28,10 @@ CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=TRUE
 CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=TRUE
 CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_LibVNCServer=TRUE
 CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_SDL=TRUE
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_SDL2=TRUE
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=TRUE
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_GLIB=TRUE
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=TRUE
 CMAKE_ARGS+=	-DOSG_USE_QT:BOOL=OFF
 
 CXXFLAGS+=	-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
@@ -50,7 +54,7 @@ PLIST.x11=	yes
 .include "../../mk/jpeg.buildlink3.mk"
 .endif
 
-.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .if ${OPSYS} != "Darwin"
diff --git a/osg/buildlink3.mk b/osg/buildlink3.mk
index 125d3fc367..744ca6d201 100644
--- a/osg/buildlink3.mk
+++ b/osg/buildlink3.mk
@@ -20,6 +20,7 @@ BUILDLINK_PKGSRCDIR.osg?=	../../wip/osg
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .endif
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 
 .endif	# OSG_BUILDLINK3_MK


Home | Main Index | Thread Index | Old Index