Date: Wed, 11 Jul 2018 11:42:31 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474437 - head/graphics/photivo Message-ID: <201807111142.w6BBgVPm058675@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Jul 11 11:42:31 2018 New Revision: 474437 URL: https://svnweb.freebsd.org/changeset/ports/474437 Log: - Flavorize `graphics/photivo' (Qt 4/5), Qt 5 remains the default flavor - Unbreak on aarch64 by using correct type to hold signed 1-byte data [*] Approved by: portmgr (rene) With help of: mandree [*] Modified: head/graphics/photivo/Makefile Modified: head/graphics/photivo/Makefile ============================================================================== --- head/graphics/photivo/Makefile Wed Jul 11 11:42:29 2018 (r474436) +++ head/graphics/photivo/Makefile Wed Jul 11 11:42:31 2018 (r474437) @@ -15,8 +15,6 @@ COMMENT= Free and open source photo processor LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_aarch64= fails to compile: error: constant expression evaluates to -2 which cannot be narrowed to type char - LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libexiv2.so:graphics/exiv2 \ liblqr-1.so:graphics/liblqr-1 \ @@ -31,17 +29,20 @@ DOS2UNIX_FILES= Sources/ptImage.cpp Sources/ptCheck.cp WRKSRC= ${WRKDIR}/${PORTNAME} -_QT4_DEPS= qmake_build moc_build rcc_build uic_build corelib gui network -_QT5_DEPS= qmake_build buildtools_build core gui network widgets +FLAVORS= qt5 qt4 -OPTIONS_DEFINE= QT4 -QT4_DESC= Build against Qt 4 instead of Qt 5 +qt4_CONFLICTS_INSTALL= ${PORTNAME} +qt4_PKGNAMESUFFIX= -qt4 +qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt4 -QT4_USES= qt:4 -QT4_USES_OFF= qt:5 -QT4_USE= QT=${_QT4_DEPS:ts,} -QT4_USE_OFF= QT=${_QT5_DEPS:ts,} -QT4_CMAKE_ON= -DFORCE_QT4:BOOL=true +.if ${FLAVOR:U} == qt4 +USES+= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build corelib gui network +CMAKE_ON= FORCE_QT4 +.else +USES+= qt:5 +USE_QT= qmake_build buildtools_build core gui network widgets +.endif post-patch: @${REINPLACE_CMD} -e 's,#define cimg_use_openmp 1,//&,' \ @@ -55,5 +56,7 @@ post-patch: ${WRKSRC}/Sources/filters/ptFilter_PyramidDenoise.cpp \ ${WRKSRC}/Sources/filters/ptFilter_StdCurve.cpp \ ${WRKSRC}/Sources/filters/ptFilter_WaveletDenoise.cpp + @${REINPLACE_CMD} -e '/static const char src/s,char,int8_t,' \ + ${WRKSRC}/Sources/ptDcRaw.cpp .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807111142.w6BBgVPm058675>