From owner-svn-ports-head@freebsd.org Thu Jan 5 04:23:06 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C466C9FE47; Thu, 5 Jan 2017 04:23:06 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EB30117A6; Thu, 5 Jan 2017 04:23:05 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v054N5OD074378; Thu, 5 Jan 2017 04:23:05 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v054N5Ao074376; Thu, 5 Jan 2017 04:23:05 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201701050423.v054N5Ao074376@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Thu, 5 Jan 2017 04:23:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430615 - in head/graphics/rawtherapee-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2017 04:23:06 -0000 Author: mandree Date: Thu Jan 5 04:23:04 2017 New Revision: 430615 URL: https://svnweb.freebsd.org/changeset/ports/430615 Log: Code generation improvements. On i386, use SSE2 instead of only SSE [1] when compiler optimizations are requested (RT code uses mostly SSE2 for SIMD). Add a patch to re-enable nested OpenMP constructs with clang [1]. Use devel/openmp for libomp. Use clang 3.9 to compile (not 3.7). Reported by: Ingo Weyrich [1] Added: head/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h (contents, props changed) Modified: head/graphics/rawtherapee-devel/Makefile Modified: head/graphics/rawtherapee-devel/Makefile ============================================================================== --- head/graphics/rawtherapee-devel/Makefile Thu Jan 5 03:57:34 2017 (r430614) +++ head/graphics/rawtherapee-devel/Makefile Thu Jan 5 04:23:04 2017 (r430615) @@ -3,7 +3,7 @@ PORTNAME= rawtherapee PORTVERSION= 4.2.99.git000 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://rawtherapee.com/shared/source/ PKGNAMESUFFIX= -devel @@ -39,15 +39,12 @@ CFLAGS+= -I${LOCALBASE}/include -fPIC CXXFLAGS+= -I${LOCALBASE}/include -fPIC LDFLAGS+= -lpthread -L${LOCALBASE}/lib CONFIGURE_ENV= CFLAGS="${CFLAGS}" -# LDFLAGS="${LDFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" CMAKE_ARGS+= -DDOCDIR="${DOCSDIR}" \ -DCREDITSDIR="${DOCSDIR}" \ -DLICENCEDIR="${DOCSDIR}" \ -DDESKTOPDIR="${DESKTOPDIR}" \ -DDATADIR="${DATADIR}" \ -DCACHE_NAME_SUFFIX="" -#-DCMAKE_C_FLAGS="${CFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" -#-DCMAKE_CXX_FLAGS="${CXXFLAGS:C|-Wl,-rpath=${_GCC_RUNTIME}||:C|-L${_GCC_RUNTIME}||}" SUB_FILES= rawtherapee SUB_LIST= RTDIR="${RTDIR}" INSTALLS_ICONS= yes @@ -57,7 +54,7 @@ RTDIR= ${PREFIX}/libdata/${PORTNAME} OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPENMP NATIVE OPTIONS_DEFAULT= OPTIMIZED_CFLAGS OPENMP OPENMP_DESC= Enable multicore processing using OpenMP -OPTIMIZED_CFLAGS_DESC= Use extra compiler optimizations (requires SSE support) +OPTIMIZED_CFLAGS_DESC= Use extra compiler optimizations (requires SSE2 support) NATIVE_DESC= Use -march=native for compilation (do not use for generic packages!) OPENMP_CMAKE_BOOL= OPTION_OMP @@ -70,8 +67,8 @@ CMAKE_ARGS+= -DPROC_TARGET_NUMBER="1" .if ${ARCH} == "amd64" || ${ARCH} == "i386" .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -funroll-loops -msse -CXXFLAGS+= -O3 -funroll-loops -msse +CFLAGS+= -O3 -funroll-loops -msse2 +CXXFLAGS+= -O3 -funroll-loops -msse2 .endif .endif @@ -80,18 +77,18 @@ CMAKE_ARGS+= -DPROC_TARGET_NUMBER="2" .endif .if ${ARCH} == amd64 && ${COMPILER_TYPE} == clang -# Enable OpenMP support with Clang 3.7. -BUILD_DEPENDS+= clang37:devel/llvm37 -RUN_DEPENDS+= clang37:devel/llvm37 - -CPP= clang-cpp37 -CC= clang37 -CXX= clang++37 +# Enable OpenMP support with Clang 3.9. +BUILD_DEPENDS+= clang39:devel/llvm39 +LIB_DEPENDS+= libomp.so.0:devel/openmp + +CPP= clang-cpp39 +CC= clang39 +CXX= clang++39 # FIXME: At least in 3.7.0 and 3.7.1, Clang doesn't find libomp.so # itself. Furthermore, there may be a regression in 3.7.1 because we now # need to explicitly link to libm.so as well. -OPENMP_FLAGS= -L${LOCALBASE}/llvm37/lib -lm -lomp +OPENMP_FLAGS= -L${LOCALBASE}/lib -lm -lomp LDFLAGS+= ${OPENMP_FLAGS} # In cmake, the CMP0056 policy must be explicitly set to NEW to ensure Added: head/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h Thu Jan 5 04:23:04 2017 (r430615) @@ -0,0 +1,11 @@ +--- rtengine/opthelper.h.orig 2017-01-05 02:25:57 UTC ++++ rtengine/opthelper.h +@@ -69,7 +69,7 @@ + #define ALIGNED64 + #define ALIGNED16 + #endif +- #if !defined(__clang__) && defined _OPENMP ++ #if defined(_OPENMP) + #define _RT_NESTED_OPENMP + #endif + #endif