diff --git a/graphics/lux/Makefile b/graphics/lux/Makefile index 2a3b66c57495..cd4023ab21f4 100644 --- a/graphics/lux/Makefile +++ b/graphics/lux/Makefile @@ -1,64 +1,66 @@ PORTNAME= lux -DISTVERSION= 1.1.8 -PORTREVISION= 1 +DISTVERSION= 1.2.2 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/kfj/pv/get/ PKGNAMESUFFIX= -pv # distinguish from www/lux DISTNAME= ${COMMIT} MAINTAINER= fuz@FreeBSD.org COMMENT= Panorama and image viewer WWW= https://bitbucket.org/kfj/pv LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv6= address space exhaustion in compiler LIB_DEPENDS= libhwy.so:devel/highway \ libsfml-window.so:devel/sfml \ libexiv2.so:graphics/exiv2 \ - libvigraimpex.so:graphics/vigra + libvigraimpex.so:graphics/vigra \ + libOpenImageIO.so:graphics/openimageio RUN_DEPENDS= ${GUIFONT}:x11-fonts/noto-sans-basic GUIFONT= ${LOCALBASE}/share/fonts/noto/NotoSans-Regular.ttf -USES= cmake desktop-file-utils dos2unix pkgconfig tar:bz2 +USES= cmake desktop-file-utils dos2unix localbase:ldflags pkgconfig tar:bz2 gl +USE_GL= gl + DOS2UNIX_FILES= tinyfiledialogs.c CMAKE_ON= USE_HWY_LIBRARY CXXFLAGS+= -Wno-deprecated-declarations CONFLICTS= lux WRKSRC= ${WRKDIR}/kfj-pv-${COMMIT} -COMMIT= 15b1fd742285 +COMMIT= 02d14627bc75 OPTIONS_DEFINE_amd64= SSSE3 SSE42 AVX AVX2 AVX512 OPTIONS_DEFINE_i386= SSE2 SSSE3 SSE42 AVX AVX2 AVX512 OPTIONS_DEFAULT_amd64= SSSE3 SSE42 AVX AVX2 AVX512 OPTIONS_DEFAULT_i386= SSSE3 SSE42 AVX AVX2 AVX512 SSE2_DESC= build port for Pentium 4 or newer SSSE3_DESC= support SSSE3 flavor SSE42_DESC= support SSE4.2 flavor AVX_DESC= support AVX flavor AVX2_DESC= support AVX2 flavor AVX512_DESC= support AVX-512F flavor SSE2_CXXFLAGS_OFF= -march=i686 SSE2_CXXFLAGS= -march=pentium4 SSSE3_CMAKE_BOOL= FLV_SSSE3 SSE42_CMAKE_BOOL= FLV_SSE42 AVX_CMAKE_BOOL= FLV_AVX AVX2_CMAKE_BOOL= FLV_AVX2 AVX512_CMAKE_BOOL= FLV_AVX512f .include # cannot use CMAKE_ON after bsd.port.pre.mk # this disables the flavor dispatch code on non-x86 .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DFLV_NATIVE=ON .endif pre-configure: @${REINPLACE_CMD} -e 's,%%GUIFONT%%,${GUIFONT},' ${WRKSRC}/options.h .include diff --git a/graphics/lux/distinfo b/graphics/lux/distinfo index a8e0fb532156..1ad478a2b4b0 100644 --- a/graphics/lux/distinfo +++ b/graphics/lux/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691409081 -SHA256 (15b1fd742285.tar.bz2) = 4a3a32a883e57693e7ff9ab2a3a69342ddfd528d9647b56166da9291422dd835 -SIZE (15b1fd742285.tar.bz2) = 1186035 +TIMESTAMP = 1713874285 +SHA256 (02d14627bc75.tar.bz2) = 4f039706d933b4aa6124a956a832334f623dc2dca999e75b3dbc7a5bcd4983df +SIZE (02d14627bc75.tar.bz2) = 1798981 diff --git a/graphics/lux/files/patch-pv__no__rendering.cc b/graphics/lux/files/patch-pv__no__rendering.cc new file mode 100644 index 000000000000..d3b08ee8e7e8 --- /dev/null +++ b/graphics/lux/files/patch-pv__no__rendering.cc @@ -0,0 +1,12 @@ +--- pv_no_rendering.cc.orig 2024-04-23 12:53:51 UTC ++++ pv_no_rendering.cc +@@ -14875,7 +14875,9 @@ int main ( int argc , const char * argv[] ) + #endif + + OIIO::geterror() ; ++#if OIIO_VERSION_MAJOR * 100 + OIIO_VERSION_MINOR >= 205 + OIIO::shutdown() ; ++#endif + + std::cout << "exiting normally" << std::endl ; +