diff options
| author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2014-09-16 07:05:28 +0000 |
|---|---|---|
| committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2014-09-16 07:05:28 +0000 |
| commit | 7373fd9b08fa07ecda437ac4f03a8b088cbe2346 (patch) | |
| tree | f65e7ca6e3440ab6bd87779ba290801258dcee28 | |
| parent | - Remove unnecessary ${ARCH} wrappers around OPTIONS_DEFAULT_{i386|amd64} (diff) | |
Update devel/tbb to 4.3.0 and bump dependent ports' revisions
PR: 193214
Submitted by: Oleksii Tsai <oleksii.tsai@googlemail.com>
| -rw-r--r-- | archivers/par2cmdline-tbb/Makefile | 2 | ||||
| -rw-r--r-- | cad/opencascade/Makefile | 2 | ||||
| -rw-r--r-- | devel/tbb/Makefile | 4 | ||||
| -rw-r--r-- | devel/tbb/distinfo | 4 | ||||
| -rw-r--r-- | devel/tbb/files/patch-build-FreeBSD.inc | 4 | ||||
| -rw-r--r-- | devel/tbb/files/patch-include-tbb-tbb_config.h | 13 | ||||
| -rw-r--r-- | devel/tbb/pkg-plist | 3 | ||||
| -rw-r--r-- | graphics/opencv/Makefile | 2 |
8 files changed, 24 insertions, 10 deletions
diff --git a/archivers/par2cmdline-tbb/Makefile b/archivers/par2cmdline-tbb/Makefile index cf97e7924325..fe15a762de1f 100644 --- a/archivers/par2cmdline-tbb/Makefile +++ b/archivers/par2cmdline-tbb/Makefile @@ -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} diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index 108bcf1afef8..8c9005204cf3 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -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/ diff --git a/devel/tbb/Makefile b/devel/tbb/Makefile index 91f341cec1bf..6d6c3249e15e 100644 --- a/devel/tbb/Makefile +++ b/devel/tbb/Makefile @@ -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@FreeBSD.org COMMENT= Library that provides thread building blocks diff --git a/devel/tbb/distinfo b/devel/tbb/distinfo index e4780cdbcdba..ef40a3db1c73 100644 --- a/devel/tbb/distinfo +++ b/devel/tbb/distinfo @@ -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 diff --git a/devel/tbb/files/patch-build-FreeBSD.inc b/devel/tbb/files/patch-build-FreeBSD.inc index 462bc22715bc..dd0ad5fb0dad 100644 --- a/devel/tbb/files/patch-build-FreeBSD.inc +++ b/devel/tbb/files/patch-build-FreeBSD.inc @@ -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 diff --git a/devel/tbb/files/patch-include-tbb-tbb_config.h b/devel/tbb/files/patch-include-tbb-tbb_config.h new file mode 100644 index 000000000000..18b9fda12ab3 --- /dev/null +++ b/devel/tbb/files/patch-include-tbb-tbb_config.h @@ -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 diff --git a/devel/tbb/pkg-plist b/devel/tbb/pkg-plist index 27b034519a9e..ac7c69a6429e 100644 --- a/devel/tbb/pkg-plist +++ b/devel/tbb/pkg-plist @@ -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 diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 1eb963a60e64..cb0eace26a33 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -3,7 +3,7 @@ PORTNAME?= opencv PORTVERSION= 2.4.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}library/${PORTNAME}-unix/${PORTVERSION} |
