From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 00:34:38 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1F35D5E3CED; Mon, 12 Apr 2021 00:34:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJV9n3c37z4nqB; Mon, 12 Apr 2021 00:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F2955C30; Mon, 12 Apr 2021 00:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13C0Ybmi092580; Mon, 12 Apr 2021 00:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0YbWH092579; Mon, 12 Apr 2021 00:34:37 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:37 GMT Message-Id: <202104120034.13C0YbWH092579@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: f99057b3c2e7 - main - graphics/hugin: make compatible with OpenEXR/Imath 3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f99057b3c2e7980852b1be4ab86a5cacaf8ad457 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 00:34:38 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=f99057b3c2e7980852b1be4ab86a5cacaf8ad457 commit f99057b3c2e7980852b1be4ab86a5cacaf8ad457 Author: Matthias Andree AuthorDate: 2021-04-11 18:45:06 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:47 +0000 graphics/hugin: make compatible with OpenEXR/Imath 3.0 --- graphics/hugin/Makefile | 14 +++++++---- .../files/patch-CMakeModules_FindOpenEXR.cmake | 29 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 41c4cc563f35..fa6849503982 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -2,15 +2,15 @@ PORTNAME= hugin PORTVERSION= 2019.2.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} MAINTAINER= grog@FreeBSD.org COMMENT= GUI for Panorama Tools, to stitch panoramic images -LIB_DEPENDS= libIlmImf.so:graphics/openexr \ - libImath.so:graphics/ilmbase \ +LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ + libImath.so:math/Imath \ libboost_thread.so:devel/boost-libs \ liblcms2.so:graphics/lcms2 \ libexiv2.so:graphics/exiv2 \ @@ -26,13 +26,17 @@ RUN_DEPENDS= enblend>=4.1.4:graphics/enblend \ LICENSE= GPLv2 +CFLAGS+= -I${LOCALBASE}/include/Imath + BROKEN_i386= Fails to build: ld: error: src/hugin_base/libhuginbase.so.0.0: undefined reference to __atomic_load USES= cmake compiler:c++11-lib desktop-file-utils gettext gl gnome \ - jpeg pkgconfig shared-mime-info shebangfix sqlite tar:bzip2 + jpeg pkgconfig shared-mime-info shebangfix sqlite tar:bzip2 xorg CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} +USE_GL= gl glew glu glut USE_WX= 3.0+ -USE_GL= glew glut +USE_XORG= x11 + INSTALLS_ICONS= yes SHEBANG_FILES= src/hugin_script_interface/hpi.py \ diff --git a/graphics/hugin/files/patch-CMakeModules_FindOpenEXR.cmake b/graphics/hugin/files/patch-CMakeModules_FindOpenEXR.cmake new file mode 100644 index 000000000000..c11324c7eafe --- /dev/null +++ b/graphics/hugin/files/patch-CMakeModules_FindOpenEXR.cmake @@ -0,0 +1,29 @@ +--- CMakeModules/FindOpenEXR.cmake.orig 2019-12-07 08:35:27 UTC ++++ CMakeModules/FindOpenEXR.cmake +@@ -35,7 +35,7 @@ ENDIF (NOT WIN32 OR MINGW) + include(FindLibraryWithDebug) + find_library_with_debug(OPENEXR_HALF_LIBRARY + WIN32_DEBUG_POSTFIX d +- NAMES Half-2_3 Half ++ NAMES Imath + PATHS + ${_OPENEXRLinkDir} + ${SYSTEM_LIB_DIRS} +@@ -45,7 +45,7 @@ ENDIF (NOT WIN32 OR MINGW) + + find_library_with_debug(OPENEXR_IEX_LIBRARY + WIN32_DEBUG_POSTFIX d +- NAMES Iex-2_3 Iex-2_2 Iex ++ NAMES Iex + PATHS + ${_OPENEXRLinkDir} + ${SYSTEM_LIB_DIRS} +@@ -76,7 +76,7 @@ ENDIF (NOT WIN32 OR MINGW) + + find_library_with_debug(OPENEXR_ILMIMF_LIBRARY + WIN32_DEBUG_POSTFIX d +- NAMES IlmImf-2_3 IlmImf-2_2 IlmImf ++ NAMES OpenEXR + PATHS + ${_OPENEXRLinkDir} + ${SYSTEM_LIB_DIRS}