pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics
Module Name: pkgsrc
Committed By: nia
Date: Sat Sep 21 21:34:44 UTC 2019
Modified Files:
pkgsrc/graphics/ilmbase: Makefile PLIST distinfo
pkgsrc/graphics/openexr: Makefile PLIST distinfo
Added Files:
pkgsrc/graphics/openexr: Makefile.common
pkgsrc/graphics/openexr/patches:
patch-OpenEXR_IlmImf_ImfSystemSpecific.h
Removed Files:
pkgsrc/graphics/ilmbase/patches: patch-Iex_IexBaseExc.cpp
patch-Iex_IexThrowErrnoExc.cpp patch-Imath_ImathFun.h
patch-bootstrap patch-configure
pkgsrc/graphics/openexr/patches: patch-IlmImf_ImfSystemSpecific.cpp
patch-IlmImf_ImfSystemSpecific.h patch-bootstrap patch-configure
Log Message:
openexr: Update to 2.4.0
Summary of changes:
All code compiles without warnings on gcc, clang, msvc
Cleanup of license and copyright notices
floating-point exception handling is disabled by default
New Slice::Make method to reliably compute base pointer for a slice.
Miscellaneous bug fixes
This version fixes the following security vulnerabilities:
CVE-2018-18444 Issue #351 Out of Memory
CVE-2018-18443 Issue #350 heap-buffer-overflow
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/ilmbase/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/ilmbase/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/ilmbase/distinfo
cvs rdiff -u -r1.1 -r0 \
pkgsrc/graphics/ilmbase/patches/patch-Iex_IexBaseExc.cpp \
pkgsrc/graphics/ilmbase/patches/patch-Imath_ImathFun.h \
pkgsrc/graphics/ilmbase/patches/patch-bootstrap \
pkgsrc/graphics/ilmbase/patches/patch-configure
cvs rdiff -u -r1.2 -r0 \
pkgsrc/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/openexr/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/openexr/Makefile.common
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/openexr/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/openexr/distinfo
cvs rdiff -u -r1.2 -r0 \
pkgsrc/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.cpp \
pkgsrc/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.h
cvs rdiff -u -r0 -r1.1 \
pkgsrc/graphics/openexr/patches/patch-OpenEXR_IlmImf_ImfSystemSpecific.h
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/openexr/patches/patch-bootstrap \
pkgsrc/graphics/openexr/patches/patch-configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/ilmbase/Makefile
diff -u pkgsrc/graphics/ilmbase/Makefile:1.22 pkgsrc/graphics/ilmbase/Makefile:1.23
--- pkgsrc/graphics/ilmbase/Makefile:1.22 Mon Jul 8 10:36:27 2019
+++ pkgsrc/graphics/ilmbase/Makefile Sat Sep 21 21:34:44 2019
@@ -1,31 +1,17 @@
-# $NetBSD: Makefile,v 1.22 2019/07/08 10:36:27 nia Exp $
+# $NetBSD: Makefile,v 1.23 2019/09/21 21:34:44 nia Exp $
-DISTNAME= ilmbase-2.3.0
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GITHUB:=openexr/}
-GITHUB_PROJECT= openexr
-GITHUB_RELEASE= v${PKGVERSION_NOREV}
-
-MAINTAINER= adam%NetBSD.org@localhost
-HOMEPAGE= https://www.openexr.com/
-COMMENT= High dynamic-range (HDR) image file format library and tools
-LICENSE= modified-bsd
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_TOOLS+= bash gmake
-GNU_CONFIGURE= yes
-GCC_REQD+= 6
-TEST_TARGET= check
-LIBS.SunOS= -lm
-CONFIG_SHELL= bash
+.include "../../graphics/openexr/Makefile.common"
+
+PKGNAME= ${DISTNAME:S/openexr/ilmbase/}
+
+CONFIGURE_DIRS= IlmBase
+BUILD_DIRS= IlmBase
PKGCONFIG_OVERRIDE= IlmBase.pc.in
-PTHREAD_OPTS= require
CONFLICTS= openexr<1.6
-BUILDLINK_TRANSFORM+= rm:-Wno-long-double
+pre-configure:
+ cd ${WRKSRC}/IlmBase && ./bootstrap
-.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/ilmbase/PLIST
diff -u pkgsrc/graphics/ilmbase/PLIST:1.4 pkgsrc/graphics/ilmbase/PLIST:1.5
--- pkgsrc/graphics/ilmbase/PLIST:1.4 Mon Dec 9 11:39:20 2013
+++ pkgsrc/graphics/ilmbase/PLIST Sat Sep 21 21:34:44 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/12/09 11:39:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/09/21 21:34:44 nia Exp $
include/OpenEXR/Iex.h
include/OpenEXR/IexBaseExc.h
include/OpenEXR/IexErrnoExc.h
@@ -12,6 +12,7 @@ include/OpenEXR/IexMathIeeeExc.h
include/OpenEXR/IexNamespace.h
include/OpenEXR/IexThrowErrnoExc.h
include/OpenEXR/IlmBaseConfig.h
+include/OpenEXR/IlmBaseConfigInternal.h
include/OpenEXR/IlmThread.h
include/OpenEXR/IlmThreadExport.h
include/OpenEXR/IlmThreadForward.h
Index: pkgsrc/graphics/ilmbase/distinfo
diff -u pkgsrc/graphics/ilmbase/distinfo:1.16 pkgsrc/graphics/ilmbase/distinfo:1.17
--- pkgsrc/graphics/ilmbase/distinfo:1.16 Tue Oct 2 12:05:35 2018
+++ pkgsrc/graphics/ilmbase/distinfo Sat Sep 21 21:34:44 2019
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.16 2018/10/02 12:05:35 adam Exp $
+$NetBSD: distinfo,v 1.17 2019/09/21 21:34:44 nia Exp $
-SHA1 (ilmbase-2.3.0.tar.gz) = 1cddb28b14b60025b1e1604d5616540ed038cb16
-RMD160 (ilmbase-2.3.0.tar.gz) = bd60ebfdc114e186db87f8c8b92c4f031b17e0d9
-SHA512 (ilmbase-2.3.0.tar.gz) = db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-Size (ilmbase-2.3.0.tar.gz) = 595490 bytes
-SHA1 (patch-Iex_IexBaseExc.cpp) = 5bf551e1eacffa8dc3ec1c5643e5bfd5f8fc5701
-SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71
-SHA1 (patch-Imath_ImathFun.h) = 79ab60ada8cecd52e5b16fadbded82492d79a1df
-SHA1 (patch-bootstrap) = 16e655c408fdb0d275d8da8f77b83cebca132637
-SHA1 (patch-configure) = 5f20c43310a099b3ce888db7f39cdc33127b4d24
+SHA1 (openexr-2.4.0.tar.gz) = 0b9a24b8fa6b3f7f1d8813e91234308d3e43d10f
+RMD160 (openexr-2.4.0.tar.gz) = 5e7c5612c3b4a7d40d2fc9c3d45f0a46ebc738f9
+SHA512 (openexr-2.4.0.tar.gz) = b544b1fc9d785cad029f35388894d1e9dae278dfda3c80d5615280386206f2af5c94b72c17e1e1d1514f73a7151b5be0f166a4be5b74abefc2f27fdf0500dfe8
+Size (openexr-2.4.0.tar.gz) = 26806627 bytes
+SHA1 (patch-IlmBase_configure.ac) = 02d03927d37703c4e9919b445afa8245b0c2da85
Index: pkgsrc/graphics/openexr/Makefile
diff -u pkgsrc/graphics/openexr/Makefile:1.39 pkgsrc/graphics/openexr/Makefile:1.40
--- pkgsrc/graphics/openexr/Makefile:1.39 Tue Nov 20 08:59:29 2018
+++ pkgsrc/graphics/openexr/Makefile Sat Sep 21 21:34:44 2019
@@ -1,34 +1,20 @@
-# $NetBSD: Makefile,v 1.39 2018/11/20 08:59:29 maya Exp $
+# $NetBSD: Makefile,v 1.40 2019/09/21 21:34:44 nia Exp $
-DISTNAME= openexr-2.3.0
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GITHUB:=openexr/}
-GITHUB_RELEASE= v${PKGVERSION_NOREV}
-
-MAINTAINER= adam%NetBSD.org@localhost
-HOMEPAGE= http://www.openexr.com/
-COMMENT= High dynamic-range (HDR) image file format library and tools
-LICENSE= modified-bsd
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake pkg-config
-GNU_CONFIGURE= yes
-GCC_REQD+= 6
-PKGCONFIG_OVERRIDE= OpenEXR.pc.in
-TEST_TARGET= check
+.include "Makefile.common"
+CONFIGURE_DIRS= OpenEXR
+BUILD_DIRS= OpenEXR
-.include "../../mk/bsd.prefs.mk"
+USE_TOOLS+= pkg-config
-PTHREAD_OPTS+= require
LIBS.IRIX+= -lmx
-LIBS.SunOS+= -lm
-BUILDLINK_TRANSFORM+= rm:-Wno-long-double
+PKGCONFIG_OVERRIDE= OpenEXR.pc.in
+
+pre-configure:
+ cd ${WRKSRC}/OpenEXR && ./bootstrap
.include "../../devel/zlib/buildlink3.mk"
BUILDLINK_API_DEPENDS.ilmbase+= ilmbase>=1.0.2nb1
.include "../../graphics/ilmbase/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/openexr/PLIST
diff -u pkgsrc/graphics/openexr/PLIST:1.12 pkgsrc/graphics/openexr/PLIST:1.13
--- pkgsrc/graphics/openexr/PLIST:1.12 Tue Oct 2 12:05:35 2018
+++ pkgsrc/graphics/openexr/PLIST Sat Sep 21 21:34:44 2019
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2018/10/02 12:05:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/09/21 21:34:44 nia Exp $
+bin/exr2aces
bin/exrenvmap
bin/exrheader
bin/exrmakepreview
@@ -37,6 +38,7 @@ include/OpenEXR/ImfEnvmap.h
include/OpenEXR/ImfEnvmapAttribute.h
include/OpenEXR/ImfExport.h
include/OpenEXR/ImfFloatAttribute.h
+include/OpenEXR/ImfFloatVectorAttribute.h
include/OpenEXR/ImfForward.h
include/OpenEXR/ImfFrameBuffer.h
include/OpenEXR/ImfFramesPerSecond.h
@@ -94,6 +96,7 @@ include/OpenEXR/ImfVersion.h
include/OpenEXR/ImfWav.h
include/OpenEXR/ImfXdr.h
include/OpenEXR/OpenEXRConfig.h
+include/OpenEXR/OpenEXRConfigInternal.h
lib/libIlmImf.la
lib/libIlmImfUtil.la
lib/pkgconfig/OpenEXR.pc
Index: pkgsrc/graphics/openexr/distinfo
diff -u pkgsrc/graphics/openexr/distinfo:1.31 pkgsrc/graphics/openexr/distinfo:1.32
--- pkgsrc/graphics/openexr/distinfo:1.31 Tue Oct 2 12:05:35 2018
+++ pkgsrc/graphics/openexr/distinfo Sat Sep 21 21:34:44 2019
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.31 2018/10/02 12:05:35 adam Exp $
+$NetBSD: distinfo,v 1.32 2019/09/21 21:34:44 nia Exp $
-SHA1 (openexr-2.3.0.tar.gz) = 67c4f9c2b4ab7c5922671536f93827ecb966969f
-RMD160 (openexr-2.3.0.tar.gz) = 3444fe1aa647be9ab2e6ea1638e27ea97c3f6688
-SHA512 (openexr-2.3.0.tar.gz) = 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
-Size (openexr-2.3.0.tar.gz) = 18412067 bytes
-SHA1 (patch-IlmImf_ImfSystemSpecific.cpp) = 79bf644181650fa7dc13c04dfeb68142bde6a2b6
-SHA1 (patch-IlmImf_ImfSystemSpecific.h) = 25671307ed19503039fe6fc5ef7cc45ce7d523f1
-SHA1 (patch-bootstrap) = 9e8718727c571f48df9f213a016fe24ea3141c21
-SHA1 (patch-configure) = f46aeb70c0dc85b07be5608ffc923c7bda9f1a66
+SHA1 (openexr-2.4.0.tar.gz) = 0b9a24b8fa6b3f7f1d8813e91234308d3e43d10f
+RMD160 (openexr-2.4.0.tar.gz) = 5e7c5612c3b4a7d40d2fc9c3d45f0a46ebc738f9
+SHA512 (openexr-2.4.0.tar.gz) = b544b1fc9d785cad029f35388894d1e9dae278dfda3c80d5615280386206f2af5c94b72c17e1e1d1514f73a7151b5be0f166a4be5b74abefc2f27fdf0500dfe8
+Size (openexr-2.4.0.tar.gz) = 26806627 bytes
+SHA1 (patch-OpenEXR_IlmImf_ImfSystemSpecific.h) = a07e8ba50084e642a2f53371cdc53738b3e75995
Added files:
Index: pkgsrc/graphics/openexr/Makefile.common
diff -u /dev/null pkgsrc/graphics/openexr/Makefile.common:1.1
--- /dev/null Sat Sep 21 21:34:44 2019
+++ pkgsrc/graphics/openexr/Makefile.common Sat Sep 21 21:34:44 2019
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile.common,v 1.1 2019/09/21 21:34:44 nia Exp $
+# used by graphics/ilmbase/Makefile
+# used by graphics/opencv/Makefile
+
+DISTNAME= openexr-2.4.0
+CATEGORIES= graphics
+MASTER_SITES= ${MASTER_SITE_GITHUB:=openexr/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
+
+MAINTAINER= adam%NetBSD.org@localhost
+HOMEPAGE= https://www.openexr.com/
+COMMENT= High dynamic-range (HDR) image file format library and tools
+LICENSE= modified-bsd
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
+USE_TOOLS+= autoconf automake aclocal
+GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++14
+USE_LIBTOOL= yes
+TEST_TARGET= check
+
+# C++14
+GCC_REQD+= 6
+
+LIBS.SunOS+= -lm
+
+PTHREAD_OPTS= require
+
+# Compatibility
+CONFIGURE_ARGS+= --disable-namespaceversioning
+
+BUILDLINK_TRANSFORM+= rm:-Wno-long-double
+
+CHECK_PORTABILITY_SKIP+= Contrib/DtexToExr/bootstrap
+
+.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/graphics/openexr/patches/patch-OpenEXR_IlmImf_ImfSystemSpecific.h
diff -u /dev/null pkgsrc/graphics/openexr/patches/patch-OpenEXR_IlmImf_ImfSystemSpecific.h:1.1
--- /dev/null Sat Sep 21 21:34:44 2019
+++ pkgsrc/graphics/openexr/patches/patch-OpenEXR_IlmImf_ImfSystemSpecific.h Sat Sep 21 21:34:44 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-OpenEXR_IlmImf_ImfSystemSpecific.h,v 1.1 2019/09/21 21:34:44 nia Exp $
+
+Work around lack of posix_memalign() on (some?) Solaris, from PR 47867.
+
+--- OpenEXR/IlmImf/ImfSystemSpecific.h.orig 2019-09-18 01:02:06.000000000 +0000
++++ OpenEXR/IlmImf/ImfSystemSpecific.h
+@@ -59,6 +59,8 @@ EXRAllocAligned (size_t size, size_t ali
+ return _aligned_malloc (size, alignment);
+ #elif defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)
+ return _mm_malloc (size, alignment);
++#elif defined(__sun)
++ return memalign(alignment, size);
+ #elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L)
+ void* ptr = 0;
+ // With fortify_source on, just doing the (void) cast trick
Home |
Main Index |
Thread Index |
Old Index