From dbc2bd723d19e0b85cb033551f3c92ca3701ae00 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Jul 01 2016 18:20:47 +0000 Subject: - Fix build on big endian platforms --- diff --git a/assimp-3.1.1-bigendian.patch b/assimp-3.1.1-bigendian.patch deleted file mode 100644 index 6e25d79..0000000 --- a/assimp-3.1.1-bigendian.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up ./code/Bitmap.cpp.bigendian ./code/Bitmap.cpp ---- ./code/Bitmap.cpp.bigendian 2014-06-14 19:00:10.000000000 -0400 -+++ ./code/Bitmap.cpp 2015-07-19 15:26:36.384612134 -0400 -@@ -82,7 +82,9 @@ namespace Assimp { - - template - inline std::size_t Copy(uint8_t* data, T& field) { -- std::memcpy(data, &AI_BE(field), sizeof(field)); return sizeof(field); -+ T field_be = AI_BE(field); -+ std::memcpy(data, &field_be, sizeof(field_be)); -+ return sizeof(field_be); - } - - void Bitmap::WriteHeader(Header& header, IOStream* file) { diff --git a/assimp-3.2.0-bigendian.patch b/assimp-3.2.0-bigendian.patch new file mode 100644 index 0000000..19a2f81 --- /dev/null +++ b/assimp-3.2.0-bigendian.patch @@ -0,0 +1,12 @@ +diff -up assimp-c318d648ff73aa2e32b783709d69740ac3e8c072/code/Bitmap.cpp.bigendian assimp-c318d648ff73aa2e32b783709d69740ac3e8c072/code/Bitmap.cpp +--- assimp-c318d648ff73aa2e32b783709d69740ac3e8c072/code/Bitmap.cpp.bigendian 2016-07-01 14:03:42.244067838 -0400 ++++ assimp-c318d648ff73aa2e32b783709d69740ac3e8c072/code/Bitmap.cpp 2016-07-01 14:05:31.284067838 -0400 +@@ -84,7 +84,7 @@ namespace Assimp { + + template + inline std::size_t Copy(uint8_t* data, T& field) { +- std::memcpy(data, &AI_BE(field), sizeof(field)); return sizeof(field); ++ T val = AI_BE(field); std::memcpy(data, &val, sizeof(field)); return sizeof(field); + } + + void Bitmap::WriteHeader(Header& header, IOStream* file) { diff --git a/assimp.spec b/assimp.spec index 816ade4..23ea47e 100644 --- a/assimp.spec +++ b/assimp.spec @@ -3,7 +3,7 @@ Name: assimp Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library to import various 3D model formats into applications Group: Development/Libraries @@ -24,6 +24,8 @@ Patch4: %{name}-3.2.0-pythonpath.patch # Fix library and include paths in assimp-config.cmake # Fixes rhbz#1263698, not submitted upstream Patch5: %{name}-3.2.0-cmakefix.patch +# Fix big endian platforms +Patch6: %{name}-3.2.0-bigendian.patch BuildRequires: boost-devel BuildRequires: cmake @@ -94,6 +96,7 @@ rm -rf contrib/poly2tri %patch1 -p1 -b .docfix %patch4 -p1 -b .pythonpath %patch5 -p0 -b .cmakefix +%patch6 -p1 -b .bigendian %build mkdir build @@ -159,6 +162,9 @@ rm -rf %{buildroot} %{python3_sitelib}/pyassimp %changelog +* Fri Jul 01 2016 Dan Horák - 3.2.0-3 +- Fix build on big endian platforms + * Fri Jun 03 2016 Rich Mattes - 3.2.0-2 - Fix pkgconfig and cmake files (rhbz#1340656)