From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 00:34:49 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 B12B35E3ED0; Mon, 12 Apr 2021 00:34:49 +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 4FJVB10s37z4p4H; Mon, 12 Apr 2021 00:34:49 +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 B01125BC6; Mon, 12 Apr 2021 00:34:48 +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 13C0Ym2S092802; Mon, 12 Apr 2021 00:34:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13C0Ym0B092801; Mon, 12 Apr 2021 00:34:48 GMT (envelope-from git) Date: Mon, 12 Apr 2021 00:34:48 GMT Message-Id: <202104120034.13C0Ym0B092801@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: fd17965a3812 - main - graphics/osg: 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: fd17965a38127d00b3270cec83e58154cdfd6964 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:49 -0000 The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd17965a38127d00b3270cec83e58154cdfd6964 commit fd17965a38127d00b3270cec83e58154cdfd6964 Author: Matthias Andree AuthorDate: 2021-04-11 22:30:02 +0000 Commit: Matthias Andree CommitDate: 2021-04-12 00:33:52 +0000 graphics/osg: make compatible with OpenEXR/Imath 3.0 --- graphics/osg/Makefile | 6 ++-- .../osg/files/patch-CMakeModules_FindOpenEXR.cmake | 35 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index 75f88d6778ec..214780322ddb 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -3,7 +3,7 @@ PORTNAME= osg PORTVERSION= 3.6.5 DISTVERSIONPREFIX= OpenSceneGraph- -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org @@ -28,6 +28,8 @@ USE_GL= gl USE_XORG= x11 USE_LDCONFIG= yes +CFLAGS+= -I${LOCALBASE}/include/Imath -DInt64=uint64_t + PLIST_SUB= OSG_VERSION=${PORTVERSION} \ OSG_SHLIBVER=161 \ OPENTHREADS_VERSION=3.3.1 \ @@ -87,7 +89,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/osg/files/patch-CMakeModules_FindOpenEXR.cmake b/graphics/osg/files/patch-CMakeModules_FindOpenEXR.cmake new file mode 100644 index 000000000000..17951fdb2561 --- /dev/null +++ b/graphics/osg/files/patch-CMakeModules_FindOpenEXR.cmake @@ -0,0 +1,35 @@ +--- CMakeModules/FindOpenEXR.cmake.orig 2021-04-11 22:06:00 UTC ++++ CMakeModules/FindOpenEXR.cmake +@@ -25,7 +25,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIR OpenEXR/ImfIO.h + ) + + # Macro to find exr libraries (deduplicating search paths) +-# example: OPENEXR_FIND_VAR(OPENEXR_IlmImf_LIBRARY IlmImf) ++# example: OPENEXR_FIND_VAR(OPENEXR_OpenEXR_LIBRARY OpenEXR) + MACRO(OPENEXR_FIND_VAR varname libname) + FIND_LIBRARY( ${varname} + NAMES ${libname} ${libname}-2_1 ${libname}-2_2 +@@ -45,17 +45,17 @@ MACRO(OPENEXR_FIND_VAR varname libname) + ENDMACRO(OPENEXR_FIND_VAR) + + # Macro to find exr libraries (and debug versions) +-# example: OPENEXR_FIND(IlmImf) ++# example: OPENEXR_FIND(OpenEXR) + MACRO(OPENEXR_FIND libname) + OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY ${libname}) + OPENEXR_FIND_VAR(OPENEXR_${libname}_LIBRARY_DEBUG ${libname}d) + ENDMACRO(OPENEXR_FIND) + +-OPENEXR_FIND(IlmImf) ++OPENEXR_FIND(OpenEXR) + + SET(OPENEXR_FOUND "NO") +-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY) +- SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} ) +- SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY ) ++IF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY) ++ SET(OPENEXR_LIBRARIES ${OPENEXR_OpenEXR_LIBRARY} ) ++ SET(OPENEXR_LIBRARIES_VARS OPENEXR_OpenEXR_LIBRARY ) + SET(OPENEXR_FOUND "YES") +-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY) ++ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_OpenEXR_LIBRARY)