pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Update oce to 0.17.1.



Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Wed Feb 17 13:50:07 2016 +0000
Changeset:	506a29df17257b424c708df990aca3d6636f1dd9

Modified Files:
	oce/Makefile
	oce/distinfo
	oce/patches/patch-CMakeLists.txt
	oce/patches/patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx

Log Message:
Update oce to 0.17.1.

This version is binary compatible with 0CE 0.17.

- Mingw64 (5.2.0) and Mingw32 (4.8.1, 4.9.3) fixes
- OCE_USE_STATIC_MSVC_RUNTIME advanced option to use static version
  of the MSVC run-time library
- Revert change in HLR inverted flag
- Fix nmake build
- Patch from setting correct tolerance.
- Replace gp_Ax1 reference with direct value. Fixes #559
- VS2015 fix
- Fix for static building on MSVC
- New oce-win-bundle handling
- ppc64le fix
- Build OCE and run tests on appveyor.com service.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=506a29df17257b424c708df990aca3d6636f1dd9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 oce/Makefile                                            |  2 +-
 oce/distinfo                                            | 11 ++++++-----
 oce/patches/patch-CMakeLists.txt                        | 17 ++++++++++++-----
 oce/patches/patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx | 12 ++++++------
 4 files changed, 25 insertions(+), 17 deletions(-)

diffs:
diff --git a/oce/Makefile b/oce/Makefile
index 463988e..66993a0 100644
--- a/oce/Makefile
+++ b/oce/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.2 2015/06/25 12:41:09 fhajny Exp $
 
-DISTNAME=	OCE-0.17
+DISTNAME=	OCE-0.17.1
 PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tpaviot/}
diff --git a/oce/distinfo b/oce/distinfo
index b2820ec..77543d0 100644
--- a/oce/distinfo
+++ b/oce/distinfo
@@ -1,11 +1,12 @@
 $NetBSD: distinfo,v 1.2 2015/06/25 12:41:09 fhajny Exp $
 
-SHA1 (OCE-0.17.tar.gz) = 4d5a7fd6e074e2a3c56e083b82fc0bb1aff1c998
-RMD160 (OCE-0.17.tar.gz) = 5580bf57b6534a31809644a673ddb7008a001c1b
-Size (OCE-0.17.tar.gz) = 24382694 bytes
-SHA1 (patch-CMakeLists.txt) = 35c51b9a3f9620bb1caa121cc2fd251daab2dccc
+SHA1 (OCE-0.17.1.tar.gz) = bce3edb75cc9b8fcd9e2845b215b1c240a6d3af8
+RMD160 (OCE-0.17.1.tar.gz) = 3a616f187c94494b750228c4df35e77bde24f50e
+SHA512 (OCE-0.17.1.tar.gz) = e8f612fd0848d7da66381f493648e516ce6b20dc931dfc6ce18addcd7e5dc2d0cb3ab192c70010e47385b758e1471e20c4729305eef47d5ff9c1ceab39a91d2a
+Size (OCE-0.17.1.tar.gz) = 24391146 bytes
+SHA1 (patch-CMakeLists.txt) = 2af5bffb315578ee8554cc9dfa9e51b48121df70
 SHA1 (patch-adm_cmake_TKernel_CMakeLists.txt) = 40752a95ba115a4869c6ff4c3ef906d70a34ff43
-SHA1 (patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx) = d3974c716e7243f667ad3e026320dadd70c47db7
+SHA1 (patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx) = 599e553edb1075887ee47c7bd7098d16ef76dc0a
 SHA1 (patch-src_OSD_OSD__signal.cxx) = 74f1291aae6872543a52b3202fa90432f6d328c6
 SHA1 (patch-src_OpenGl_OpenGl__Context.hxx) = f5654287a239c8885923f36f0a34699788b0fdad
 SHA1 (patch-src_Standard_Standard__Mutex.hxx) = ffea6f4a7a4b01663f71643276f9f94a94a5ab70
diff --git a/oce/patches/patch-CMakeLists.txt b/oce/patches/patch-CMakeLists.txt
index 6bad99c..987d08a 100644
--- a/oce/patches/patch-CMakeLists.txt
+++ b/oce/patches/patch-CMakeLists.txt
@@ -1,18 +1,18 @@
 $NetBSD: patch-CMakeLists.txt,v 1.1 2014/05/30 11:21:00 fhajny Exp $
 
 Do not version lib and share subdirs.
---- CMakeLists.txt.orig	2014-02-12 20:06:33.000000000 +0000
+--- CMakeLists.txt.orig	2016-01-02 05:11:52.000000000 +0000
 +++ CMakeLists.txt
-@@ -1005,7 +1005,7 @@ if(MSVC)
+@@ -847,7 +847,7 @@ if(MSVC OR (MINGW AND OCE_INSTALL_PRIVAT
  	endif(NOT DEFINED OCE_INSTALL_PACKAGE_LIB_DIR)
  else(MSVC)
  	if(NOT DEFINED OCE_INSTALL_PACKAGE_LIB_DIR)
 -		set(OCE_INSTALL_PACKAGE_LIB_DIR ${OCE_INSTALL_LIB_DIR}/oce-${OCE_VERSION})
 +		set(OCE_INSTALL_PACKAGE_LIB_DIR ${OCE_INSTALL_LIB_DIR}/oce)
  	endif(NOT DEFINED OCE_INSTALL_PACKAGE_LIB_DIR)
- endif(MSVC)
+ endif()
  
-@@ -1035,7 +1035,7 @@ endif(NOT DEFINED OCE_INSTALL_SCRIPT_DIR
+@@ -877,7 +877,7 @@ endif(NOT DEFINED OCE_INSTALL_SCRIPT_DIR
  # Data
  if(NOT DEFINED OCE_INSTALL_DATA_DIR)
  	if(NOT MSVC)
@@ -21,7 +21,7 @@ Do not version lib and share subdirs.
  	else ()
  		set(OCE_INSTALL_DATA_DIR "share/oce")
  	endif(NOT MSVC)
-@@ -1060,7 +1060,7 @@ if(NOT DEFINED OCE_INSTALL_CMAKE_DATA_DI
+@@ -902,7 +902,7 @@ if(NOT DEFINED OCE_INSTALL_CMAKE_DATA_DI
  				OCE.framework/Versions/${OCE_VERSION}/Resources)
  		else(APPLE)
  			set(OCE_INSTALL_CMAKE_DATA_DIR
@@ -30,3 +30,10 @@ Do not version lib and share subdirs.
  		endif(APPLE)
  	endif(WIN32)
  endif(NOT DEFINED OCE_INSTALL_CMAKE_DATA_DIR)
+@@ -1363,4 +1363,4 @@ add_custom_target(uninstall
+ # Final bundle step for dependencies
+ if(OCE_USE_BUNDLE)
+ 	include(oce-win-bundle/depends.cmake)
+-endif()
+\ No newline at end of file
++endif()
diff --git a/oce/patches/patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx b/oce/patches/patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx
index 6eafdce..f5356c5 100644
--- a/oce/patches/patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx
+++ b/oce/patches/patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx
@@ -1,16 +1,16 @@
 $NetBSD: patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx,v 1.1 2015/06/25 12:41:09 fhajny Exp $
 
 SunOS needs alloca.h.
---- src/MeshVS/MeshVS_MeshPrsBuilder.cxx.orig	2015-03-08 22:19:42.000000000 +0000
+--- src/MeshVS/MeshVS_MeshPrsBuilder.cxx.orig	2016-01-02 05:11:52.000000000 +0000
 +++ src/MeshVS/MeshVS_MeshPrsBuilder.cxx
-@@ -56,6 +56,10 @@
- #include <NCollection_Map.hxx>
- #include <NCollection_Vector.hxx>
- 
+@@ -61,6 +61,10 @@
+   #define alloca __builtin_alloca 
+   #endif
+ #endif
++
 +#if defined(__sun)
 +#include <alloca.h>
 +#endif
-+
  //================================================================
  // Function : Constructor MeshVS_MeshPrsBuilder
  // Purpose  :


Home | Main Index | Thread Index | Old Index