Update to 1.1.10 Fix: Patch attached with submission follows:
Is the change to thread.h supposed to work on non-amd64 FreeBSD? Has the patch been sent upstream?
On 12/05/2013 06:38, Raphael Kubo da Costa wrote: > Is the change to thread.h supposed to work on non-amd64 FreeBSD? Has > the patch been sent upstream? Short - yes and yes. Long - The patch originated with the discovery that i386 version crashed using tbb. The addition of arch=i586 to cflags enabled the use of gcc atomics. This was merged into the cmake files (src/cmake/platform.cmake) in 1.1.6 and taken out of the port makefile. 1.1.6 also included the removal of the freebsd condition in thread.h and by Larry Gritz's choice it was replaced with a test that left gcc atomics off if tbb was turned on. Disabling gcc atomics when tbb is on turned out to be a performance hit and 1.1.7 replaced the freebsd condition instead of removing the tbb test. I have submitted an issue for it (instead of a pull request) which seems to be the slow way of getting a change. While 1.1.8 appeared to be cli tools fixes and 1.1.9 was only docs, I don't want to drop behind so updating here with the patch.
On 12/05/2013 06:38, Raphael Kubo da Costa wrote: > Is the change to thread.h supposed to work on non-amd64 FreeBSD? Has > the patch been sent upstream? Short - yes and yes. Long - The patch originated with the discovery that i386 version crashed using tbb. The addition of arch=i586 to cflags enabled the use of gcc atomics. This was merged into the cmake files (src/cmake/platform.cmake) in 1.1.6 and taken out of the port makefile. 1.1.6 also included the removal of the freebsd condition in thread.h and by Larry Gritz's choice it was replaced with a test that left gcc atomics off if tbb was turned on. Disabling gcc atomics when tbb is on turned out to be a performance hit and 1.1.7 replaced the freebsd condition instead of removing the tbb test. I have submitted an issue for it (instead of a pull request) which seems to be the slow way of getting a change. While 1.1.8 appeared to be cli tools fixes and 1.1.9 was only docs, I don't want to drop behind so updating here with the patch. _______________________________________________ freebsd-ports-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@freebsd.org"
Shane Ambler <FreeBSD@ShaneWare.Biz> writes: > On 12/05/2013 06:38, Raphael Kubo da Costa wrote: >> Is the change to thread.h supposed to work on non-amd64 FreeBSD? Has >> the patch been sent upstream? > > Short - yes and yes. > > Long - > The patch originated with the discovery that i386 version crashed > using tbb. The addition of arch=i586 to cflags enabled the use of gcc > atomics. This was merged into the cmake files > (src/cmake/platform.cmake) in 1.1.6 and taken out of the port > makefile. > > 1.1.6 also included the removal of the freebsd condition in thread.h > and by Larry Gritz's choice it was replaced with a test that left gcc > atomics off if tbb was turned on. Disabling gcc atomics when tbb is on > turned out to be a performance hit and 1.1.7 replaced the freebsd > condition instead of removing the tbb test. > > I have submitted an issue for it (instead of a pull request) which > seems to be the slow way of getting a change. While 1.1.8 appeared to > be cli tools fixes and 1.1.9 was only docs, I don't want to drop > behind so updating here with the patch. Alright, thanks a lot for the clarification.
Author: rakuco Date: Sun May 12 08:38:48 2013 New Revision: 317935 URL: http://svnweb.freebsd.org/changeset/ports/317935 Log: Update to 1.1.10. The change to thread.h has been reported upstream in https://github.com/OpenImageIO/oiio/issues/529. PR: ports/178505 Submitted by: Shane Ambler <FreeBSD@Shaneware.biz> (maintainer) Added: head/graphics/openimageio/files/patch-include__thread.h (contents, props changed) Modified: head/graphics/openimageio/Makefile head/graphics/openimageio/distinfo head/graphics/openimageio/files/patch-include__fmath.h head/graphics/openimageio/pkg-plist Modified: head/graphics/openimageio/Makefile ============================================================================== --- head/graphics/openimageio/Makefile Sun May 12 08:06:32 2013 (r317934) +++ head/graphics/openimageio/Makefile Sun May 12 08:38:48 2013 (r317935) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= openimageio -PORTVERSION= 1.1.6 +PORTVERSION= 1.1.10 PORTREVISION?= 0 CATEGORIES?= graphics multimedia @@ -22,7 +22,7 @@ USE_GITHUB= yes GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio GH_TAGNAME= Release-${PORTVERSION} -GH_COMMIT= 5fcd523 +GH_COMMIT= f28f5c4 WRKSRC= ${WRKDIR}/OpenImageIO-oiio-${GH_COMMIT}/src # fbm also installs bin/idiff Modified: head/graphics/openimageio/distinfo ============================================================================== --- head/graphics/openimageio/distinfo Sun May 12 08:06:32 2013 (r317934) +++ head/graphics/openimageio/distinfo Sun May 12 08:38:48 2013 (r317935) @@ -1,2 +1,2 @@ -SHA256 (openimageio-1.1.6.tar.gz) = a4d8bf7cedade3b3177bc5f46c3f0bb45de9ba32720d273d6334c03c3dfa2815 -SIZE (openimageio-1.1.6.tar.gz) = 8300662 +SHA256 (openimageio-1.1.10.tar.gz) = 1510287790113f0c64421623be7bf5b9317a1c9cfd6e85125bae81bc6c07a275 +SIZE (openimageio-1.1.10.tar.gz) = 9501836 Modified: head/graphics/openimageio/files/patch-include__fmath.h ============================================================================== --- head/graphics/openimageio/files/patch-include__fmath.h Sun May 12 08:06:32 2013 (r317934) +++ head/graphics/openimageio/files/patch-include__fmath.h Sun May 12 08:38:48 2013 (r317935) @@ -1,6 +1,6 @@ --- include/fmath.h.orig 2013-01-21 11:39:43.845857535 +1030 +++ include/fmath.h 2013-01-21 11:39:52.142857433 +1030 -@@ -972,7 +972,7 @@ +@@ -976,7 +976,7 @@ // Functions missing from FreeBSD Added: head/graphics/openimageio/files/patch-include__thread.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/openimageio/files/patch-include__thread.h Sun May 12 08:38:48 2013 (r317935) @@ -0,0 +1,12 @@ +--- include/thread.h.orig 2013-03-01 21:46:47.380515836 +1030 ++++ include/thread.h 2013-03-01 21:46:56.456181119 +1030 +@@ -110,9 +110,7 @@ + #endif + + #if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)) +-#if !defined(__FreeBSD__) || defined(__x86_64__) + #define USE_GCC_ATOMICS +-#endif + #endif + + OIIO_NAMESPACE_ENTER Modified: head/graphics/openimageio/pkg-plist ============================================================================== --- head/graphics/openimageio/pkg-plist Sun May 12 08:06:32 2013 (r317934) +++ head/graphics/openimageio/pkg-plist Sun May 12 08:38:48 2013 (r317935) @@ -38,7 +38,7 @@ include/OpenImageIO/version.h lib/libOpenImageIO.so lib/libOpenImageIO.so.1 lib/libOpenImageIO.so.1.1 -lib/libOpenImageIO.so.1.1.6 +lib/libOpenImageIO.so.1.1.10 %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!