Date: Thu, 22 Jul 2021 09:23:32 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ee38e2fa7a0e - main - math/Imath: update to v3.1.1, waiving local patch Message-ID: <202107220923.16M9NWgA062111@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee38e2fa7a0e04a1e69647dd2c44e27e24fdab53 commit ee38e2fa7a0e04a1e69647dd2c44e27e24fdab53 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2021-07-22 08:59:01 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2021-07-22 09:21:15 +0000 math/Imath: update to v3.1.1, waiving local patch files/patch-eabc884d079d26afcead5128f7b093978d239ada.diff is no longer needed - it is the sole change from v3.1.0 and I had previously cherry- picked it from the upstream Git repo. --- math/Imath/Makefile | 4 ++-- math/Imath/distinfo | 6 +++--- .../patch-eabc884d079d26afcead5128f7b093978d239ada.diff | 13 ------------- math/Imath/pkg-plist | 4 ++-- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/math/Imath/Makefile b/math/Imath/Makefile index 4bce7a75402f..0012f39a2294 100644 --- a/math/Imath/Makefile +++ b/math/Imath/Makefile @@ -1,7 +1,7 @@ # Based on the graphics/ilmbase port that was done by: nork@FreeBSD.org PORTNAME= Imath -PORTVERSION= 3.1.0 +PORTVERSION= 3.1.1 CATEGORIES= math devel graphics MAINTAINER= mandree@FreeBSD.org @@ -41,7 +41,7 @@ PYTHON_CMAKE_BOOL= PYTHON _MAJORVER= 3_1 _VER= 29 -_MINVER= 0 +_MINVER= 1 _PLVER= 0 post-install: diff --git a/math/Imath/distinfo b/math/Imath/distinfo index c6e81765f58d..4250b0d63223 100644 --- a/math/Imath/distinfo +++ b/math/Imath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626453375 -SHA256 (AcademySoftwareFoundation-Imath-3.1.0-v3.1.0_GH0.tar.gz) = 211c907ab26d10bd01e446da42f073ee7381e1913d8fa48084444bc4e1b4ef87 -SIZE (AcademySoftwareFoundation-Imath-3.1.0-v3.1.0_GH0.tar.gz) = 566048 +TIMESTAMP = 1626943451 +SHA256 (AcademySoftwareFoundation-Imath-3.1.1-v3.1.1_GH0.tar.gz) = a63fe91d8d0917acdc31b0c9344b1d7dbc74bf42de3e3ef5ec982386324b9ea4 +SIZE (AcademySoftwareFoundation-Imath-3.1.1-v3.1.1_GH0.tar.gz) = 568231 diff --git a/math/Imath/files/patch-eabc884d079d26afcead5128f7b093978d239ada.diff b/math/Imath/files/patch-eabc884d079d26afcead5128f7b093978d239ada.diff deleted file mode 100644 index e7732e008c32..000000000000 --- a/math/Imath/files/patch-eabc884d079d26afcead5128f7b093978d239ada.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Imath/half.h b/src/Imath/half.h -index 6b0c7dc..c4a1b03 100644 ---- a/src/Imath/half.h -+++ b/src/Imath/half.h -@@ -177,7 +177,7 @@ - /// floats in question. - /// - --#if defined(__has_include) -+#if defined(__has_include) && defined(__x86_64__) - # if __has_include(<x86intrin.h>) - # include <x86intrin.h> - # elif __has_include(<intrin.h>) diff --git a/math/Imath/pkg-plist b/math/Imath/pkg-plist index 44b2dd139b1f..1d659bd820a1 100644 --- a/math/Imath/pkg-plist +++ b/math/Imath/pkg-plist @@ -39,7 +39,7 @@ lib/cmake/Imath/ImathTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Imath/ImathTargets.cmake lib/libImath-%%MAJORVER%%.so lib/libImath-%%MAJORVER%%.so.%%VER%% -lib/libImath-%%MAJORVER%%.so.%%VER%%.0.%%PLVER%% +lib/libImath-%%MAJORVER%%.so.%%VER%%.%%MINVER%%.%%PLVER%% lib/libImath.so libdata/pkgconfig/Imath.pc %%PYTHON%%include/Imath/PyImath.h @@ -88,7 +88,7 @@ libdata/pkgconfig/Imath.pc %%PYTHON%%lib/cmake/Imath/ImathConfig-%%CMAKE_BUILD_TYPE%%.cmake %%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so %%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so.%%VER%% -%%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so.%%VER%%.0.%%PLVER%% +%%PYTHON%%lib/libPyImath_Python%%PYVER%%-%%MAJORVER%%.so.%%VER%%.%%MINVER%%.%%PLVER%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/imath.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/imathnumpy.so %%PYTHON%%libdata/pkgconfig/PyImath.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107220923.16M9NWgA062111>