Date: Fri, 11 Mar 2016 12:36:19 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410826 - in head/graphics/devil: . files Message-ID: <201603111236.u2BCaJFn006124@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Mar 11 12:36:19 2016 New Revision: 410826 URL: https://svnweb.freebsd.org/changeset/ports/410826 Log: - Fix build on 11.x [1] - Switch to USES=localbase - Switch to options helpers - Fix testing PR: 196161 Submitted by: jbeich [1] Modified: head/graphics/devil/Makefile head/graphics/devil/files/patch-clang Modified: head/graphics/devil/Makefile ============================================================================== --- head/graphics/devil/Makefile Fri Mar 11 11:53:42 2016 (r410825) +++ head/graphics/devil/Makefile Fri Mar 11 12:36:19 2016 (r410826) @@ -12,7 +12,7 @@ DISTNAME= DevIL-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Full featured cross-platform image library -USES= alias autoreconf libtool pkgconfig +USES= alias autoreconf gmake libtool localbase pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-ILU --enable-ILUT \ --disable-allegro --disable-directx8 --disable-directx9 \ @@ -22,9 +22,6 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:tl} -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - PORTDOCS= * # With EXR the library is not usable from plain C (instant segfault) @@ -55,6 +52,7 @@ MNG_LIB_DEPENDS= libmng.so:${PORTSDIR}/g MNG_CONFIGURE_ENABLE= mng PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_ENABLE= png +PNG_CONFIGURE_OFF= libpng_app=no TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff TIFF_CONFIGURE_ENABLE= tiff EXR_LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR @@ -63,28 +61,11 @@ EXR_CONFIGURE_ENABLE= exr #SQUISH_CONFIGURE_WITH= libsquish NVTT_LIB_DEPENDS= libnvtt.so:${PORTSDIR}/graphics/nvidia-texture-tools NVTT_CONFIGURE_WITH= nvtt - -.include <bsd.port.options.mk> - -.if ! ${PORT_OPTIONS:MPNG} -CONFIGURE_ENV+= libpng_app=no -.endif - -.if ${PORT_OPTIONS:MX11} -USE_GL= glut -.else -CONFIGURE_ARGS+=--disable-opengl --disable-x11 --disable-xpm --disable-shm -.endif - -.if ${PORT_OPTIONS:MSDL} -USE_SDL= sdl -.else -CONFIGURE_ARGS+=--disable-sdl -.endif - -.if ! ${PORT_OPTIONS:MSIMD} -CONFIGURE_ARGS+=--disable-altivec --disable-sse --disable-sse2 --disable-sse3 -.endif +X11_USE= GL=glut +X11_CONFIGURE_OFF=- -disable-opengl --disable-x11 --disable-xpm --disable-shm +SDL_USE= SDL=sdl +SDL_CONFIGURE_OFF= --disable-sdl +SIMD_CONFIGURE_OFF= --disable-altivec --disable-sse --disable-sse2 --disable-sse3 post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.am @@ -93,20 +74,18 @@ post-patch: @${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' \ ${WRKSRC}/src-ILU/ilur/ilur.c -post-configure: - ${REINPLACE_CMD} -e 's,-std=gnu99,,' \ - ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile - post-install: @${RMDIR} ${STAGEDIR}${DATADIR}/examples @${RMDIR} ${STAGEDIR}${DATADIR} - ${MKDIR} ${STAGEDIR}${DOCSDIR} + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in AUTHORS CREDITS ChangeLog Libraries.txt README TODO ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -do-test: build - ${MAKE} -C ${WRKSRC}/test testil +do-test: + cd ${WRKSRC}/test && ${MAKE_CMD} testil cd ${WRKSRC}/test && ${SH} format_test/format_checks.sh .include <bsd.port.mk> Modified: head/graphics/devil/files/patch-clang ============================================================================== --- head/graphics/devil/files/patch-clang Fri Mar 11 11:53:42 2016 (r410825) +++ head/graphics/devil/files/patch-clang Fri Mar 11 12:36:19 2016 (r410826) @@ -2,6 +2,15 @@ Submitted upstream as: https://sourceforge.net/p/openil/bugs/212/ +--- lib/Makefile.am.orig 2009-03-08 20:45:36 UTC ++++ lib/Makefile.am +@@ -41,5 +41,5 @@ endif #BUILD_ILUT + + libIL_la_CPPFLAGS = -I $(il_include) -I $(all_include) + libIL_la_CFLAGS = $(AM_CFLAGS) @IL_CFLAGS@ +-libIL_la_CXXFLAGS = $(AM_CFLAGS) @IL_CFLAGS@ ++libIL_la_CXXFLAGS = $(filter-out -std=% -fgnu89-inline,$(AM_CFLAGS)) @IL_CFLAGS@ + --- src-IL/include/il_internal.h 2009-03-08 03:10:08.000000000 -0400 +++ src-IL/include/il_internal.h 2014-12-20 01:11:39.000000000 -0500 @@ -228,5 +228,5 @@
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603111236.u2BCaJFn006124>