assimp 3.1.1

1 files changed, 3 insertions, 46 deletions

diff --git a/Library/Formula/assimp.rb b/Library/Formula/assimp.rb
index 9697ce93d..6b1d716f1 100644
--- a/Library/Formula/assimp.rb
+++ b/Library/Formula/assimp.rb
@@ -2,17 +2,9 @@ require 'formula'
 
 class Assimp < Formula
   homepage 'http://assimp.sourceforge.net/'
-
-  stable do
-    url "https://downloads.sourceforge.net/project/assimp/assimp-3.0/assimp--3.0.1270-source-only.zip"
-    sha1 "e80a3a4326b649ed6585c0ce312ed6dd68942834"
-
-    # makes assimp3 compile with clang
-    # Reported upstream http://sourceforge.net/p/assimp/discussion/817654/thread/381fa18a
-    # and http://sourceforge.net/p/assimp/patches/43/
-    # Committed in R1339, so when building HEAD no need for this patch
-    patch :DATA
-  end
+  url "https://downloads.sourceforge.net/project/assimp/assimp-3.1/assimp-3.1.1_no_test_models.zip"
+  sha1 "d7bc1d12b01d5c7908d85ec9ff6b2d972e565e2d"
+  version "3.1.1"
 
   head 'https://github.com/assimp/assimp.git'
 
@@ -24,38 +16,3 @@ class Assimp < Formula
     system "make install"
   end
 end
-
-__END__
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d5833e..d0cdd7c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,7 +2,7 @@ cmake_minimum_required( VERSION 2.6 )
- PROJECT( Assimp )
- 
- # Define here the needed parameters
--set (ASSIMP_SV_REVISION 1264)
-+set (ASSIMP_SV_REVISION 255)
- set (ASSIMP_VERSION_MAJOR 3)
- set (ASSIMP_VERSION_MINOR 0)
- set (ASSIMP_VERSION_PATCH ${ASSIMP_SV_REVISION}) # subversion revision?
-diff --git a/code/STEPFile.h b/code/STEPFile.h
-index f958956..510e051 100644
---- a/code/STEPFile.h
-+++ b/code/STEPFile.h
-@@ -195,13 +195,13 @@ namespace STEP {
- 			// conversion support.

- 			template <typename T>

- 			const T& ResolveSelect(const DB& db) const {

--				return Couple<T>(db).MustGetObject(To<EXPRESS::ENTITY>())->To<T>();

-+				return Couple<T>(db).MustGetObject(To<EXPRESS::ENTITY>())->template To<T>();

- 			}

- 

- 			template <typename T>

- 			const T* ResolveSelectPtr(const DB& db) const {

- 				const EXPRESS::ENTITY* e = ToPtr<EXPRESS::ENTITY>();

--				return e?Couple<T>(db).MustGetObject(*e)->ToPtr<T>():(const T*)0;

-+				return e?Couple<T>(db).MustGetObject(*e)->template ToPtr<T>():(const T*)0;

- 			}

- 

- 		public: