Index: head/graphics/rawtherapee/Makefile =================================================================== --- head/graphics/rawtherapee/Makefile (revision 512004) +++ head/graphics/rawtherapee/Makefile (revision 512005) @@ -1,150 +1,132 @@ # Created by: stas # $FreeBSD$ PORTNAME= rawtherapee -PORTVERSION= 5.6 -PORTREVISION= 2 -#DISTNAME= ${PORTNAME}-${PORTVERSION:R}-rc2${DISTVERSIONSUFFIX} +PORTVERSION= 5.7 CATEGORIES= graphics MASTER_SITES= http://rawtherapee.com/shared/source/ MAINTAINER= mandree@FreeBSD.org COMMENT= Powerful RAW image processing application LICENSE= GPLv3 LIB_DEPENDS= \ liblensfun.so:graphics/lensfun \ libcanberra-gtk.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libexpat.so:textproc/expat2 \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libiptcdata.so:graphics/libiptcdata \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libsigc-2.0.so:devel/libsigc++20 \ libtiff.so:graphics/tiff -USES= cmake desktop-file-utils gnome dos2unix \ +USES= cmake desktop-file-utils compiler:gcc-c++11-lib gnome \ jpeg localbase:ldflags pkgconfig tar:xz DOS2UNIX_REGEX= .*\.(cc|h) LDFLAGS+= -Wl,--as-needed # fontconfig, freetype, gettext, libX11 USE_GNOME= gtkmm30 librsvg2 +USE_GCC= 9+ +USE_BINUTILS= yes -# The -D_GLIBCXX_USE_C99 works around stoi not being defined by default, -# because the GCC headers believe FreeBSD insufficiently C99 compliant. -CFLAGS+= -I${LOCALBASE}/include -fPIC -D_GLIBCXX_USE_C99 -Wno-deprecated-declarations -Wno-unused-result -Wno-overloaded-virtual -LDFLAGS+= -lpthread +_LTO_FLAGS= -flto=${_MAKE_JOBS_NUMBER} -fuse-linker-plugin +_AR= ${CC:S/gcc/gcc-ar/} +_RANLIB= ${CC:S/gcc/gcc-ranlib/} +CFLAGS+= -I${LOCALBASE}/include -fPIC ${_LTO_FLAGS} ${_OPT_FLAGS} +LDFLAGS+= -Wl,--as-needed -lpthread ${_LTO_FLAGS} ${_OPT_FLAGS} CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ -DCREDITSDIR="${DOCSDIR}" \ -DLICENCEDIR="${DOCSDIR}" \ -DDESKTOPDIR="${DESKTOPDIR}" \ -DDATADIR="${DATADIR}" \ -DCACHE_NAME_SUFFIX="" \ -Wno-dev \ + -DCMAKE_AR:FILEPATH=${_AR} \ + -DCMAKE_RANLIB:FILEPATH=${_RANLIB} \ -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW # 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default # any more. The CMP0056 policy must be explicitly set to NEW to ensure # linker flags are passed. Else -lomp is not found with clang. # See: https://cmake.org/cmake/help/v3.4/policy/CMP0056.html INSTALLS_ICONS= yes .if defined(PACKAGE_BUILDING) && empty(CFLAGS:M-march*) && (${ARCH} == i386 || ${ARCH} == amd64 || ${ARCH} == aarch64) # this gets translated to -mtune=generic, see ${WRKSRC}/ProcessorTargets.cmake # and as of GCC 8.3, it appears that among FreeBSD's supported architectures, # only the three listed above support this GCC option. CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" .endif RTDIR= ${PREFIX}/libdata/${PORTNAME} -OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS NATIVE -OPTIONS_DEFINE_i386= DOCS OPTIMIZED_CFLAGS NATIVE OPENMP -OPTIONS_DEFINE_amd64= DOCS OPTIMIZED_CFLAGS NATIVE OPENMP -OPTIONS_DEFAULT= OPTIMIZED_CFLAGS OPENMP +OPTIONS_DEFINE= DOCS NATIVE +OPTIONS_DEFINE_i386= DOCS NATIVE OPENMP +OPTIONS_DEFINE_amd64= DOCS NATIVE OPENMP +OPTIONS_DEFAULT= OPENMP OPENMP_DESC= Enable OpenMP parallel processing (i386/amd64 only) -OPTIMIZED_CFLAGS_DESC= Use extra optimizations (needs SSE2 on i386/amd64) NATIVE_DESC= Use -march=native (avoid for generic packages!) OPENMP_CMAKE_BOOL= OPTION_OMP .include # ------------------------------------------------------------------- -# .if (${OPSYS} == FreeBSD) && (${OSVERSION} >= 1300000) # don't waste everybody's time with Tier-2 and moving targets. # might add ARM64 or SPARC64 later on if they are established by the # time FreeBSD 12 is out. ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON=Only amd64 is supported on non-released FreeBSD versions. .endif .if ${PORT_OPTIONS:MNATIVE} CMAKE_ARGS+= -DPROC_TARGET_NUMBER="2" .endif .if !empty(PORT_OPTIONS:MOPENMP) && !empty(OPTIONS_DEFINE:MOPENMP) LIB_DEPENDS+= libomp.so:devel/openmp OPENMP_FLAGS= -lm -lomp LDFLAGS+= ${OPENMP_FLAGS} .endif .if defined(WITH_DEBUG) STRIP= .endif -.if ${ARCH} == i386 -. if ${PORT_OPTIONS:MOPENMP} -# OpenMP + clang on i386 will miss atomic ops => use GCC -USES+= compiler:gcc-c++11-lib -. else -USES+= compiler:c++11-lib -. endif -# If we were to use GCC on i386, we'd need to use -mstackrealign or similar -# options, else we get SIGBUS when SSE2 is enabled due to improper alignment. -# Base clang is good enough though. Workaround implemented below. -.else -USES+= compiler:c++14-lang +_OPT_FLAGS= -O3 -funroll-loops +# GCC 5.4 includes -fexpensive-optimizations in -O2 already +.if (${ARCH} == i386) || (${ARCH} == amd64) +_OPT_FLAGS+= -msse2 .endif -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -funroll-loops -# GCC 5.4 includes -fexpensive-optimizations in -O2 already -. if (${ARCH} == i386) || (${ARCH} == amd64) -CFLAGS+= -msse2 -. endif +.if ${ARCH} == i386 +_OPT_FLAGS+= -mstackrealign .endif # ------------------------------------------------------------------- .include - -.if ${CHOSEN_COMPILER_TYPE} == gcc -# work around compiler faults -.if ${ARCH} == i386 -CFLAGS+= -mstackrealign -.endif -.endif post-patch: @${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \ ${WRKSRC}/CMakeLists.txt # paranoia: run rawtherapee --help to be sure it finds all its # shared libraries (this hinges on proper RPATH setting and propagation) post-install: @${ECHO_MSG} "===> Running smoke tests" @TMP=$$(mktemp -d -t ${PORTNAME}) && trap "rc=$$? ; ${RM} -rf \"$$TMP\" ; exit \$$rc" 0 && \ ${SETENV} LANG= LC_ALL=C LANGUAGE= DISPLAY= HOME="$$TMP" ${STAGEDIR}${PREFIX}/bin/rawtherapee --help 2>&1 \ | ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.*//:C/,.*//}|cannot open display:" && \ ${SETENV} LANG= LC_ALL=C LANGUAGE= DISPLAY= HOME="$$TMP" ${STAGEDIR}${PREFIX}/bin/rawtherapee-cli --version 2>&1 \ | ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.*//:C/,.*//}" .include Index: head/graphics/rawtherapee/distinfo =================================================================== --- head/graphics/rawtherapee/distinfo (revision 512004) +++ head/graphics/rawtherapee/distinfo (revision 512005) @@ -1,3 +1,3 @@ -TIMESTAMP = 1555804282 -SHA256 (rawtherapee-5.6.tar.xz) = f9ea4b159580bd99aa7eaba9487c07e9dc7c095405f310f243400e67ae630d74 -SIZE (rawtherapee-5.6.tar.xz) = 12083264 +TIMESTAMP = 1568321120 +SHA256 (rawtherapee-5.7.tar.xz) = dbd7c7cf7488fb97c520821eee2c745291637644b391e3ec0ed3a29701f1a9c7 +SIZE (rawtherapee-5.7.tar.xz) = 12092496 Index: head/graphics/rawtherapee/pkg-message =================================================================== --- head/graphics/rawtherapee/pkg-message (revision 512004) +++ head/graphics/rawtherapee/pkg-message (revision 512005) @@ -1,15 +1,21 @@ [ { type: install message: <