svn commit: r368296 - in head: archivers/par2cmdline-tbb cad/opencascade devel/tbb devel/tbb/files graphics/opencv
Jason E. Hale
jhale at freebsd.org
Tue Sep 16 09:41:07 UTC 2014
On 9/16/14, Ganael LAPLANCHE <martymac at freebsd.org> wrote:
> Author: martymac
> Date: Tue Sep 16 07:05:28 2014
> New Revision: 368296
> URL: http://svnweb.freebsd.org/changeset/ports/368296
> QAT: https://qat.redports.org/buildarchive/r368296/
>
> Log:
> Update devel/tbb to 4.3.0 and bump dependent ports' revisions
>
> PR: 193214
> Submitted by: Oleksii Tsai <oleksii.tsai at googlemail.com>
>
> Added:
> head/devel/tbb/files/patch-include-tbb-tbb_config.h (contents, props
> changed)
> Modified:
> head/archivers/par2cmdline-tbb/Makefile
> head/cad/opencascade/Makefile
> head/devel/tbb/Makefile
> head/devel/tbb/distinfo
> head/devel/tbb/files/patch-build-FreeBSD.inc
> head/devel/tbb/pkg-plist
> head/graphics/opencv/Makefile
>
> Modified: head/archivers/par2cmdline-tbb/Makefile
> ==============================================================================
> --- head/archivers/par2cmdline-tbb/Makefile Tue Sep 16 05:59:07
> 2014 (r368295)
> +++ head/archivers/par2cmdline-tbb/Makefile Tue Sep 16 07:05:28
> 2014 (r368296)
> @@ -3,7 +3,7 @@
>
> PORTNAME= par2cmdline-tbb
> PORTVERSION= 20100203
> -PORTREVISION= 9
> +PORTREVISION= 10
> CATEGORIES= archivers
> MASTER_SITES= http://chuchusoft.com/par2_tbb/
> DISTNAME= par2cmdline-0.4-tbb-${PORTVERSION}
>
> Modified: head/cad/opencascade/Makefile
> ==============================================================================
> --- head/cad/opencascade/Makefile Tue Sep 16 05:59:07 2014 (r368295)
> +++ head/cad/opencascade/Makefile Tue Sep 16 07:05:28 2014 (r368296)
> @@ -3,7 +3,7 @@
>
> PORTNAME= opencascade
> PORTVERSION= 6.7.1
> -PORTREVISION= 2
> +PORTREVISION= 3
> CATEGORIES= cad science
> MASTER_SITES= http://files.opencascade.com/OCCT/OCC_${PORTVERSION}_release/
>
>
> Modified: head/devel/tbb/Makefile
> ==============================================================================
> --- head/devel/tbb/Makefile Tue Sep 16 05:59:07 2014 (r368295)
> +++ head/devel/tbb/Makefile Tue Sep 16 07:05:28 2014 (r368296)
> @@ -2,11 +2,11 @@
> # $FreeBSD$
>
> PORTNAME= tbb
> -PORTVERSION= 4.2.2
> +PORTVERSION= 4.3.0
> CATEGORIES= devel
> MASTER_SITES= http://threadingbuildingblocks.org/sites/default/files/software_releases/source/
> \
> LOCAL/martymac
> -DISTNAME= ${PORTNAME}${PORTVERSION:R:S/.//g}_20131118oss_src
> +DISTNAME= ${PORTNAME}${PORTVERSION:R:S/.//g}_20140724oss_src
>
> MAINTAINER= martymac at FreeBSD.org
> COMMENT= Library that provides thread building blocks
>
> Modified: head/devel/tbb/distinfo
> ==============================================================================
> --- head/devel/tbb/distinfo Tue Sep 16 05:59:07 2014 (r368295)
> +++ head/devel/tbb/distinfo Tue Sep 16 07:05:28 2014 (r368296)
> @@ -1,2 +1,2 @@
> -SHA256 (tbb42_20131118oss_src.tgz) =
> d95b816ac1618f5047d9ac4db1709d1f8bbeafaed597ce1ee7862b9577680882
> -SIZE (tbb42_20131118oss_src.tgz) = 3134290
> +SHA256 (tbb43_20140724oss_src.tgz) =
> fc15e84befe1acadad3589e7f2a461443bef77cc699038875ef2692e1ceb0bb4
> +SIZE (tbb43_20140724oss_src.tgz) = 2790795
>
> Modified: head/devel/tbb/files/patch-build-FreeBSD.inc
> ==============================================================================
> --- head/devel/tbb/files/patch-build-FreeBSD.inc Tue Sep 16 05:59:07
> 2014 (r368295)
> +++ head/devel/tbb/files/patch-build-FreeBSD.inc Tue Sep 16 07:05:28
> 2014 (r368296)
> @@ -22,8 +22,8 @@
> MD?=mkdir -p
> NUL= /dev/null
> SLASH=/
> --MAKE_VERSIONS=sh $(tbb_root)/build/version_info_linux.sh $(CPLUS)
> $(CPLUS_FLAGS) $(INCLUDES) >version_string.ver
> -+MAKE_VERSIONS=sh $(tbb_root)/build/version_info_FreeBSD.sh $(CPLUS)
> $(CPLUS_FLAGS) $(INCLUDES) >version_string.ver
> +-MAKE_VERSIONS=sh $(tbb_root)/build/version_info_linux.sh $(VERSION_FLAGS)
>>version_string.ver
> ++MAKE_VERSIONS=sh $(tbb_root)/build/version_info_FreeBSD.sh
> $(VERSION_FLAGS) >version_string.ver
> MAKE_TBBVARS=sh $(tbb_root)/build/generate_tbbvars.sh
>
> ifdef LD_LIBRARY_PATH
>
> Added: head/devel/tbb/files/patch-include-tbb-tbb_config.h
> ==============================================================================
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/devel/tbb/files/patch-include-tbb-tbb_config.h Tue Sep 16 07:05:28
> 2014 (r368296)
> @@ -0,0 +1,13 @@
> +--- include/tbb/tbb_config.h.orig 2014-08-26 13:28:59.000000000 +0200
> ++++ include/tbb/tbb_config.h 2014-09-10 20:19:15.000000000 +0200
> +@@ -481,6 +481,10 @@
> + However these functions are not defined anywhere. It seems that
> this problem was fixed later on
> + and RHEL got an updated version of gcc 4.1.2. **/
> + #define __TBB_GCC_64BIT_ATOMIC_BUILTINS_BROKEN 1
> ++#elif __TBB_x86_32 && __TBB_GCC_VERSION == 40201 && !__clang__ &&
> __FreeBSD__
> ++ /** Symbol '__sync_val_compare_and_swap_8' not defined
> ++ on FreeBSD 8.4/i386 and 9.2/i386 with base gcc **/
> ++ #define __TBB_GCC_64BIT_ATOMIC_BUILTINS_BROKEN 1
> + #endif
> +
> + #if __GNUC__ && __TBB_x86_64 && __INTEL_COMPILER == 1200
>
> Modified: head/devel/tbb/pkg-plist
> ==============================================================================
> --- head/devel/tbb/pkg-plist Tue Sep 16 05:59:07 2014 (r368295)
> +++ head/devel/tbb/pkg-plist Tue Sep 16 07:05:28 2014 (r368296)
> @@ -25,14 +25,15 @@ include/tbb/internal/_aggregator_impl.h
> include/tbb/internal/_concurrent_queue_impl.h
> include/tbb/internal/_concurrent_unordered_impl.h
> include/tbb/internal/_flow_graph_impl.h
> +include/tbb/internal/_flow_graph_indexer_impl.h
> include/tbb/internal/_flow_graph_item_buffer_impl.h
> include/tbb/internal/_flow_graph_join_impl.h
> include/tbb/internal/_flow_graph_node_impl.h
> -include/tbb/internal/_flow_graph_or_impl.h
> include/tbb/internal/_flow_graph_tagged_buffer_impl.h
> include/tbb/internal/_flow_graph_trace_impl.h
> include/tbb/internal/_flow_graph_types_impl.h
> include/tbb/internal/_mutex_padding.h
> +include/tbb/internal/_range_iterator.h
> include/tbb/internal/_tbb_strings.h
> include/tbb/internal/_tbb_windef.h
> include/tbb/internal/_x86_eliding_mutex_impl.h
>
> Modified: head/graphics/opencv/Makefile
> ==============================================================================
> --- head/graphics/opencv/Makefile Tue Sep 16 05:59:07 2014 (r368295)
> +++ head/graphics/opencv/Makefile Tue Sep 16 07:05:28 2014 (r368296)
> @@ -3,7 +3,7 @@
>
> PORTNAME?= opencv
> PORTVERSION= 2.4.9
> -PORTREVISION?= 0
> +PORTREVISION?= 1
> CATEGORIES= graphics
> MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION}
>
Please bump PORTREVISION on the opencv slave ports as well:
graphics/opencv-core
graphics/opencv-java
graphics/py-opencv
More information about the svn-ports-head
mailing list