From b443ccfdb64162d273d71a40772263c767452d14 Mon Sep 17 00:00:00 2001
From: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
Date: Mon, 16 Jun 2014 18:05:32 +0700
Subject: [PATCH] libraries/assimp: Updated for version 3.1.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/assimp/assimp.SlackBuild | 12 +++++-------
 libraries/assimp/assimp.info       |  6 +++---
 libraries/assimp/assimp_x64.patch  | 22 +++++++++++-----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/libraries/assimp/assimp.SlackBuild b/libraries/assimp/assimp.SlackBuild
index 85ba243385..6a165aace5 100644
--- a/libraries/assimp/assimp.SlackBuild
+++ b/libraries/assimp/assimp.SlackBuild
@@ -23,10 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=assimp
-SRCNAM=assimp-
-SRCVER=${SRCVER:-3.0.1270-source-only}
-VERSION=$(echo $SRCVER | cut -c1-8)
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.1.1}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -61,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$SRCVER
-unzip $CWD/$SRCNAM-$SRCVER.zip
-cd $SRCNAM-$SRCVER
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/libraries/assimp/assimp.info b/libraries/assimp/assimp.info
index 532474abc0..81ff4bd45f 100644
--- a/libraries/assimp/assimp.info
+++ b/libraries/assimp/assimp.info
@@ -1,8 +1,8 @@
 PRGNAM="assimp"
-VERSION="3.0.1270"
+VERSION="3.1.1"
 HOMEPAGE="http://assimp.sourceforge.net/index.html"
-DOWNLOAD="http://downloads.sourceforge.net/project/assimp/assimp-3.0/assimp--3.0.1270-source-only.zip"
-MD5SUM="52aa4cf4e34e6b2a9c5f6c0b3c319af1"
+DOWNLOAD="https://github.com/assimp/assimp/archive/v3.1.1.tar.gz"
+MD5SUM="ab9977edf95e9b2910d7cca286926e85"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libminizip"
diff --git a/libraries/assimp/assimp_x64.patch b/libraries/assimp/assimp_x64.patch
index b2b7bff162..b59400adc8 100644
--- a/libraries/assimp/assimp_x64.patch
+++ b/libraries/assimp/assimp_x64.patch
@@ -1,19 +1,19 @@
---- assimp--3.0.1270-sdk/CMakeLists.original.txt	2014-03-23 08:22:28.393687604 +0200
-+++ assimp--3.0.1270-sdk/CMakeLists.txt	2014-03-23 08:23:05.041229447 +0200
-@@ -32,13 +32,13 @@
+--- assimp-3.1.1/CMakeLists.original.txt	2014-06-16 02:16:35.080910490 +0300
++++ assimp-3.1.1/CMakeLists.txt	2014-06-16 02:19:22.898812477 +0300
+@@ -64,13 +64,13 @@
  # source tree. During an out-of-source build, however, do not litter this
  # directory, since that is probably what the user wanted to avoid.
  IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
--	SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
--	SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
-+	SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib64 )
-+	SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib64 )
- 	SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin )
+-	SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib" )
+-	SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib" )
++	SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib64" )
++	SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib64" )
+ 	SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" )
  ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
  
  # Cache these to allow the user to override them manually.
--SET( LIB_INSTALL_DIR "lib" CACHE PATH
-+SET( LIB_INSTALL_DIR "lib64" CACHE PATH
+-SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE PATH
++SET( ASSIMP_LIB_INSTALL_DIR "lib64" CACHE PATH
  	"Path the built library files are installed to." )
- SET( INCLUDE_INSTALL_DIR "include" CACHE PATH
+ SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE PATH
  	"Path the header files are installed to." )