From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 00:34:46 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 C56F85E3CFB; Mon, 12 Apr 2021 00:34:46 +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 4FJV9y33vGz4nyh; Mon, 12 Apr 2021 00:34:46 +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 5B16F5AC1; Mon, 12 Apr 2021 00:34:46 +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 13C0YkR9092754; Mon, 12 Apr 2021 00:34:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0YkCU092753; Mon, 12 Apr 2021 00:34:46 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:46 GMT Message-Id: <202104120034.13C0YkCU092753@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: 9e2ecd86da68 - main - graphics/osg34: 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: 9e2ecd86da6871979e279c7db3649f040c4e9192 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:47 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e2ecd86da6871979e279c7db3649f040c4e9192 commit 9e2ecd86da6871979e279c7db3649f040c4e9192 Author: Matthias Andree AuthorDate: 2021-04-11 22:18:18 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:51 +0000 graphics/osg34: make compatible with OpenEXR/Imath 3.0 --- graphics/osg34/Makefile | 6 +++--- .../files/patch-CMakeModules_FindOpenEXR.cmake | 23 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/graphics/osg34/Makefile b/graphics/osg34/Makefile index 8881ffb9ba01..316f6e9d1772 100644 --- a/graphics/osg34/Makefile +++ b/graphics/osg34/Makefile @@ -3,7 +3,7 @@ PORTNAME= osg PORTVERSION= 3.4.1 DISTVERSIONPREFIX= OpenSceneGraph- -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= graphics PKGNAMESUFFIX= 34 @@ -29,7 +29,7 @@ USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes # needed to ensure build on gcc-based archs; harmless otherwise -CXXFLAGS+= -Wno-narrowing +CXXFLAGS+= -Wno-narrowing -I${LOCALBASE}/include/Imath -DInt64=uint64_t PLIST_SUB= OSG_VERSION=${PORTVERSION} \ OSG_SHLIBVER=131 \ @@ -87,7 +87,7 @@ LUA_VARS_OFF= FORCE_IGNORE+="Lua51 Lua52" NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools NVTT_VARS= FORCE_REQUIRE+=NVTT NVTT_VARS_OFF= FORCE_IGNORE+=NVTT -OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr +OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr libImath.so:math/Imath OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib diff --git a/graphics/osg34/files/patch-CMakeModules_FindOpenEXR.cmake b/graphics/osg34/files/patch-CMakeModules_FindOpenEXR.cmake new file mode 100644 index 000000000000..e8fb99b70796 --- /dev/null +++ b/graphics/osg34/files/patch-CMakeModules_FindOpenEXR.cmake @@ -0,0 +1,23 @@ +--- CMakeModules/FindOpenEXR.cmake.orig 2021-04-11 21:39:01 UTC ++++ CMakeModules/FindOpenEXR.cmake +@@ -51,14 +51,14 @@ MACRO(OPENEXR_FIND libname) + OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d) + ENDMACRO(OPENEXR_FIND) + +-OPENEXR_FIND(IlmImf) ++OPENEXR_FIND(OpenEXR) + OPENEXR_FIND(IlmThread) + OPENEXR_FIND(Iex) +-OPENEXR_FIND(Half) ++OPENEXR_FIND(Imath) + + SET(OPENEXR_FOUND "NO") +-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) +- SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Half_LIBRARY} ${OPENEXR_Iex_LIBRARY} ) +- SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Half_LIBRARY OPENEXR_Iex_LIBRARY ) ++IF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Imath_LIBRARY) ++ SET(OPENEXR_LIBRARIES ${OPENEXR_OpenEXR_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Imath_LIBRARY} ${OPENEXR_Iex_LIBRARY} ) ++ SET(OPENEXR_LIBRARIES_VARS OPENEXR_OpenEXR_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Imath_LIBRARY OPENEXR_Iex_LIBRARY ) + SET(OPENEXR_FOUND "YES") +-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY) ++ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Imath_LIBRARY)