[Git][debian-gis-team/otb][master] 3 commits: Disable SSE on i386. (closes: #912594)

Bas Couwenberg gitlab at salsa.debian.org
Fri Nov 2 09:57:13 GMT 2018 

Bas Couwenberg pushed to branch master at Debian GIS Project / otb


Commits:
e6793ad8 by Bas Couwenberg at 2018-11-01T20:35:43Z
Disable SSE on i386. (closes: #912594)

- - - - -
e3dc2a01 by Bas Couwenberg at 2018-11-02T08:17:41Z
Update symbols for amd64.

- - - - -
57820b29 by Bas Couwenberg at 2018-11-02T08:17:41Z
Set distribution to unstable.

- - - - -


9 changed files:

- debian/changelog
- debian/libotbcarto-6.6-1.symbols
- debian/libotbcommandline-6.6-1.symbols
- debian/libotbice-6.6-1.symbols
- debian/libotbmonteverdicore-6.6-1.symbols
- debian/libotbossimplugins-6.6-1.symbols
- debian/libotbsiftfast-6.6-1.symbols
- debian/libotbvectordatabase-6.6-1.symbols
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,11 @@
-otb (6.6.0+dfsg-4) UNRELEASED; urgency=medium
+otb (6.6.0+dfsg-4) unstable; urgency=medium
 
   * Add Build-Depends-Package field to symbols file.
+  * Disable SSE on i386.
+    (closes: #912594)
+  * Update symbols for amd64 & i386.
 
- -- Bas Couwenberg <sebastic at debian.org>  Tue, 23 Oct 2018 12:42:39 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 01 Nov 2018 21:08:31 +0100
 
 otb (6.6.0+dfsg-3) unstable; urgency=medium
 


=====================================
debian/libotbcarto-6.6-1.symbols
=====================================
@@ -354,9 +354,9 @@ libOTBCarto-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev at Base 6.6.0~rc1
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev at Base 6.6.0~rc1
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev at Base 6.6.0~rc1
- (optional=templinst|arch=amd64 i386)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE16_M_insert_uniqueIRS6_IS5_SA_EEES6_ISt17_Rb_tree_iteratorISB_EbEOT_ at Base 5.6.1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE17_M_emplace_uniqueIJRS6_IS5_SA_EEEES6_ISt17_Rb_tree_iteratorISB_EbEDpOT_ at Base 6.6.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E at Base 5.2.0
- (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKiN3itk15ContinuousIndexIdLj2EEEESt10_Select1stIS5_ESt4lessIiESaIS5_EE16_M_insert_uniqueIRS0_IiS4_EEES0_ISt17_Rb_tree_iteratorIS5_EbEOT_ at Base 6.2.0
+ (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKiN3itk15ContinuousIndexIdLj2EEEESt10_Select1stIS5_ESt4lessIiESaIS5_EE17_M_emplace_uniqueIJRS0_IiS4_EEEES0_ISt17_Rb_tree_iteratorIS5_EbEDpOT_ at Base 6.6.0
  (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKiN3itk15ContinuousIndexIdLj2EEEESt10_Select1stIS5_ESt4lessIiESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E at Base 6.2.0
  _ZTIN3itk10Statistics37MersenneTwisterRandomVariateGeneratorE at Base 5.2.0
  _ZTIN3itk12TreeAddEventINS_13TreeContainerINS_12SmartPointerIN3otb8DataNodeIdLj2EdEEEEEEEE at Base 6.2.0


=====================================
debian/libotbcommandline-6.6-1.symbols
=====================================
@@ -82,7 +82,7 @@ libOTBCommandLine-6.6.so.1 #PACKAGE# #MINVER#
  _ZNK3otb7Wrapper22AddProcessToWatchEvent21GetProcessDescriptionB5cxx11Ev at Base 5.2.0
  _ZNK3otb7Wrapper9Parameter7GetRoleEv at Base 5.2.0
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc at Base 5.2.0
- (optional=templinst|arch=amd64)_ZNSt6vectorIN6itksys6StringESaIS1_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE at Base 6.6.0
+ (optional=templinst)_ZNSt6vectorIN6itksys6StringESaIS1_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS1_S3_EE at Base 6.6.0
  (optional=templinst)_ZNSt6vectorIN6itksys6StringESaIS1_EED1Ev at Base 5.2.0
  (optional=templinst)_ZNSt6vectorIN6itksys6StringESaIS1_EED2Ev at Base 5.2.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJRKS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_ at Base 6.2.0


=====================================
debian/libotbice-6.6-1.symbols
=====================================
@@ -885,8 +885,8 @@ libOTBIce-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst|arch=amd64)_ZN3otb16StreamingManagerINS_5ImageIN3itk8RGBPixelIhEELj2EEEE32EstimateOptimalNumberOfDivisionsEPNS2_10DataObjectERKNS2_11ImageRegionILj2EEEmd at Base 6.2.0
  (optional=templinst|arch=i386)_ZN3otb16StreamingManagerINS_5ImageIN3itk8RGBPixelIhEELj2EEEE32EstimateOptimalNumberOfDivisionsEPNS2_10DataObjectERKNS2_11ImageRegionILj2EEEyd at Base 6.2.0
  (optional=templinst)_ZN3otb16StreamingManagerINS_5ImageIN3itk8RGBPixelIhEELj2EEEE8GetSplitEj at Base 6.2.0
- (optional=templinst|arch=amd64)_ZN3otb16StreamingManagerINS_5ImageIN3itk8RGBPixelIhEELj2EEEEC1Ev at Base 6.6.0
- (optional=templinst|arch=amd64)_ZN3otb16StreamingManagerINS_5ImageIN3itk8RGBPixelIhEELj2EEEEC2Ev at Base 6.6.0
+ (optional=templinst)_ZN3otb16StreamingManagerINS_5ImageIN3itk8RGBPixelIhEELj2EEEEC1Ev at Base 6.6.0
+ (optional=templinst)_ZN3otb16StreamingManagerINS_5ImageIN3itk8RGBPixelIhEELj2EEEEC2Ev at Base 6.6.0
  (optional=templinst)_ZN3otb17ImportImageFilterINS_5ImageIN3itk8RGBPixelIhEELj2EEEE10SetSpacingEPKd at Base 6.2.0
  (optional=templinst)_ZN3otb17ImportImageFilterINS_5ImageIN3itk8RGBPixelIhEELj2EEEE10SetSpacingEPKf at Base 6.2.0
  (optional=templinst)_ZN3otb17ImportImageFilterINS_5ImageIN3itk8RGBPixelIhEELj2EEEE12GenerateDataEv at Base 6.2.0


=====================================
debian/libotbmonteverdicore-6.6-1.symbols
=====================================
@@ -1484,6 +1484,7 @@ libOTBMonteverdiCore-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst|arch=amd64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS7_ at Base 5.8.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E at Base 5.8.0
  (optional=templinst|arch=amd64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE16_M_insert_uniqueIRS6_IS5_SA_EEES6_ISt17_Rb_tree_iteratorISB_EbEOT_ at Base 6.6.0
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE17_M_emplace_uniqueIJRS6_IS5_SA_EEEES6_ISt17_Rb_tree_iteratorISB_EbEDpOT_ at Base 6.6.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E at Base 5.8.0
  (optional=templinst)_ZSt13binary_searchIPKccEbT_S2_RKT0_ at Base 6.6.0
  _ZTI10vnl_vectorIdE at Base 6.0.0


=====================================
debian/libotbossimplugins-6.6-1.symbols
=====================================
@@ -2239,7 +2239,7 @@ libotbossimplugins-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN12ossimplugins17EnvisatAsarRecordEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE24_M_get_insert_unique_posERS7_ at Base 5.2.0
  (optional=templinst|arch=amd64)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN12ossimplugins17EnvisatAsarRecordEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISB_ERS7_ at Base 6.6.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_PN12ossimplugins17EnvisatAsarRecordEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E at Base 5.2.0
- (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE16_M_insert_uniqueIS6_IS5_S5_EEES6_ISt17_Rb_tree_iteratorIS8_EbEOT_ at Base 5.6.1
+ (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE17_M_emplace_uniqueIJS6_IS5_S5_EEEES6_ISt17_Rb_tree_iteratorIS8_EbEDpOT_ at Base 6.6.0
  (optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_S5_ESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE8_M_eraseEPSt13_Rb_tree_nodeIS8_E at Base 5.2.0
  (optional=templinst|arch=amd64 i386)_ZNSt8_Rb_treeIiSt4pairIKiPN12ossimplugins12ErsSarRecordEESt10_Select1stIS5_ESt4lessIiESaIS5_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS5_ERS1_ at Base 5.2.0
  (optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKiPN12ossimplugins12ErsSarRecordEESt10_Select1stIS5_ESt4lessIiESaIS5_EE8_M_eraseEPSt13_Rb_tree_nodeIS5_E at Base 5.2.0


=====================================
debian/libotbsiftfast-6.6-1.symbols
=====================================
@@ -1,13 +1,13 @@
-# SymbolsHelper-Confirmed: 6.6.0~rc2 amd64
+# SymbolsHelper-Confirmed: 6.6.0 amd64 i386
 libotbsiftfast-6.6.so.1 #PACKAGE# #MINVER#
 * Build-Depends-Package: libotb-dev
  AddSample at Base 5.2.0
  AssignOriHist at Base 5.2.0
  ConvBuffer at Base 5.2.0
  ConvHorizontal at Base 5.2.0
- ConvHorizontalFast at Base 5.2.0
+ (arch=amd64)ConvHorizontalFast at Base 6.6.0
  ConvVertical at Base 5.2.0
- ConvVerticalFast at Base 5.2.0
+ (arch=amd64)ConvVerticalFast at Base 6.6.0
  CreateImage at Base 5.2.0
  CreateImageFromMatlabData at Base 5.2.0
  DestroyAllImages at Base 5.2.0
@@ -19,7 +19,7 @@ libotbsiftfast-6.6.so.1 #PACKAGE# #MINVER#
  GaussianBlur at Base 5.2.0
  GetKeypoints at Base 5.2.0
  GradOriImages at Base 5.2.0
- GradOriImagesFast at Base 5.2.0
+ (arch=amd64)GradOriImagesFast at Base 6.6.0
  HalfImageSize at Base 5.2.0
  InitSigma at Base 5.2.0
  InterpKeyPoint at Base 5.2.0
@@ -42,9 +42,9 @@ libotbsiftfast-6.6.so.1 #PACKAGE# #MINVER#
  _Z17sift_aligned_freePv at Base 5.2.0
  (optional=templinst)_ZNSt3mapIfPfSt4lessIfESaISt4pairIKfS0_EEED1Ev at Base 5.2.0
  (optional=templinst)_ZNSt3mapIfPfSt4lessIfESaISt4pairIKfS0_EEED2Ev at Base 5.2.0
- (optional=templinst)_ZNSt6vectorIPfSaIS0_EE17_M_realloc_insertIJRKS0_EEEvN9__gnu_cxx17__normal_iteratorIPS0_S2_EEDpOT_ at Base 6.6.0~rc2
- (optional=templinst)_ZNSt6vectorIPfSaIS0_EED1Ev at Base 5.2.0
- (optional=templinst)_ZNSt6vectorIPfSaIS0_EED2Ev at Base 5.2.0
+ (optional=templinst|arch=amd64)_ZNSt6vectorIPfSaIS0_EE17_M_realloc_insertIJRKS0_EEEvN9__gnu_cxx17__normal_iteratorIPS0_S2_EEDpOT_ at Base 6.6.0
+ (optional=templinst|arch=amd64)_ZNSt6vectorIPfSaIS0_EED1Ev at Base 6.6.0
+ (optional=templinst|arch=amd64)_ZNSt6vectorIPfSaIS0_EED2Ev at Base 6.6.0
  (optional=templinst|arch=i386)_ZNSt6vectorIfSaIfEE17_M_default_appendEj at Base 5.6.1
  (optional=templinst|arch=amd64)_ZNSt6vectorIfSaIfEE17_M_default_appendEm at Base 5.8.0
  (optional=templinst)_ZNSt6vectorIfSaIfEED1Ev at Base 5.2.0


=====================================
debian/libotbvectordatabase-6.6-1.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 6.6.0 amd64
+# SymbolsHelper-Confirmed: 6.6.0 amd64 i386
 libOTBVectorDataBase-6.6.so.1 #PACKAGE# #MINVER#
 * Build-Depends-Package: libotb-dev
  _ZN3itk18LightProcessObject11SetProgressEf at Base 6.2.0
@@ -57,6 +57,7 @@ libOTBVectorDataBase-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc at Base 6.2.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_ at Base 6.2.0
  (optional=templinst)_ZNSt6vectorISt4pairIP12OGRFieldDefn8OGRFieldESaIS4_EE17_M_realloc_insertIJRKS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_ at Base 6.2.0
+ (optional=templinst|arch=i386)_ZNSt6vectorISt4pairIP12OGRFieldDefn8OGRFieldESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_ at Base 6.6.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev at Base 6.2.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev at Base 6.2.0
  (optional=templinst)_ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev at Base 6.2.0


=====================================
debian/rules
=====================================
@@ -14,6 +14,7 @@ export DEB_LDFLAGS_MAINT_APPEND = "-Wl,--as-needed"
 
 include /usr/share/dpkg/pkg-info.mk
 
+DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifndef PKGVERSION
@@ -30,6 +31,11 @@ OTB_VERSION_FULL   = $(OTB_VERSION_MAJOR).$(OTB_VERSION_MINOR).$(OTB_VERSION_PAT
 
 UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 
+OTB_USE_SSE_FLAGS=ON
+ifneq (,$(filter $(DEB_BUILD_ARCH),i386))
+	OTB_USE_SSE_FLAGS=OFF
+endif
+
 CMAKE_FLAGS = \
 	-DBUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
@@ -53,6 +59,7 @@ CMAKE_FLAGS = \
 	-DOTB_USE_QT:BOOL=ON \
 	-DOTB_USE_QWT:BOOL=ON \
 	-DOTB_USE_SHARK:BOOL=ON \
+	-DOTB_USE_SSE_FLAGS:BOOL=$(OTB_USE_SSE_FLAGS) \
 	-DOTB_WRAP_PYTHON:BOOL=ON \
 	-DOTB_WRAP_PYTHON3:BOOL=ON
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/compare/67b24cacecc0a421318be1d22cacef1251e9e0a8...57820b29c3b174f8f592a2b2ef08744a931d5786

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/compare/67b24cacecc0a421318be1d22cacef1251e9e0a8...57820b29c3b174f8f592a2b2ef08744a931d5786
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181102/492b68e4/attachment-0001.html>

More information about the Pkg-grass-devel mailing list