From 98bcc5d2fecc9dbfc24a3ecad1f79f7aff94cd7f Mon Sep 17 00:00:00 2001 From: Andrew Sun Date: Sat, 16 Jun 2018 14:14:40 -0400 Subject: [PATCH] alembic: update to 1.7.8 (#3959) This updates alembic to 1.7.8. --- ...001-alembic-1.7.8-fix-windows-build.patch} | 23 ++++++----- ...c_ver-and-fix-builtins-and-includes.patch} | 40 +++++++++---------- mingw-w64-alembic/PKGBUILD | 16 ++++---- 3 files changed, 42 insertions(+), 37 deletions(-) rename mingw-w64-alembic/{0001-alembic-1.7.3-fix-windows-build.patch => 0001-alembic-1.7.8-fix-windows-build.patch} (64%) rename mingw-w64-alembic/{0002-alembic-1.7.3-remove-msc_ver-and-fix-builtins-and-includes.patch => 0002-alembic-1.7.8-remove-msc_ver-and-fix-builtins-and-includes.patch} (81%) diff --git a/mingw-w64-alembic/0001-alembic-1.7.3-fix-windows-build.patch b/mingw-w64-alembic/0001-alembic-1.7.8-fix-windows-build.patch similarity index 64% rename from mingw-w64-alembic/0001-alembic-1.7.3-fix-windows-build.patch rename to mingw-w64-alembic/0001-alembic-1.7.8-fix-windows-build.patch index 7484bb4c36..293262ebee 100644 --- a/mingw-w64-alembic/0001-alembic-1.7.3-fix-windows-build.patch +++ b/mingw-w64-alembic/0001-alembic-1.7.8-fix-windows-build.patch @@ -1,5 +1,5 @@ ---- alembic-1.7.3/CMakeLists-orig.txt 2017-11-22 17:16:12.522707400 -0500 -+++ alembic-1.7.3/CMakeLists.txt 2017-11-22 17:24:17.098653700 -0500 +--- alembic-1.7.8.orig/CMakeLists.txt 2017-11-22 17:16:12.522707400 -0500 ++++ alembic-1.7.8/CMakeLists.txt 2017-11-22 17:24:17.098653700 -0500 @@ -79,7 +79,11 @@ # Set static/dynamic build options @@ -43,14 +43,19 @@ ADD_DEFINITIONS(-DPLATFORM_WINDOWS -DPLATFORM=WINDOWS) IF (NOT ALEMBIC_ILMBASE_LINK_STATIC) ADD_DEFINITIONS(-DOPENEXR_DLL) ---- alembic-1.7.3/lib/Alembic/CMakeLists-orig.txt 2017-11-23 07:15:19.707288300 -0500 -+++ alembic-1.7.3/lib/Alembic/CMakeLists.txt 2017-11-23 07:15:30.600079300 -0500 -@@ -88,7 +88,7 @@ +--- alembic-1.7.8.orig/lib/Alembic/CMakeLists.txt 2018-06-16 08:45:13.770381600 -0400 ++++ alembic-1.7.8/lib/Alembic/CMakeLists.txt 2018-06-16 08:47:07.822146500 -0400 +@@ -85,11 +85,12 @@ + ENDIF() + + SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs") ++SET( ALEMBIC_BIN_INSTALL_DIR bin CACHE PATH "Where to install the Alembic runtime") + INSTALL(TARGETS Alembic EXPORT AlembicTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -- RUNTIME DESTINATION lib) -+ RUNTIME DESTINATION bin) + LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${ALEMBIC_LIB_INSTALL_DIR} +- RUNTIME DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}) ++ RUNTIME DESTINATION ${ALEMBIC_BIN_INSTALL_DIR}) #-****************************************************************************** # PACKAGE EXPORTS diff --git a/mingw-w64-alembic/0002-alembic-1.7.3-remove-msc_ver-and-fix-builtins-and-includes.patch b/mingw-w64-alembic/0002-alembic-1.7.8-remove-msc_ver-and-fix-builtins-and-includes.patch similarity index 81% rename from mingw-w64-alembic/0002-alembic-1.7.3-remove-msc_ver-and-fix-builtins-and-includes.patch rename to mingw-w64-alembic/0002-alembic-1.7.8-remove-msc_ver-and-fix-builtins-and-includes.patch index 3216c7baa9..63ae6c3b14 100644 --- a/mingw-w64-alembic/0002-alembic-1.7.3-remove-msc_ver-and-fix-builtins-and-includes.patch +++ b/mingw-w64-alembic/0002-alembic-1.7.8-remove-msc_ver-and-fix-builtins-and-includes.patch @@ -1,6 +1,6 @@ unchanged: ---- alembic-1.7.3/bin/AbcLs/AbcLs-orig.cpp 2017-11-22 17:31:35.311295900 -0500 -+++ alembic-1.7.3/bin/AbcLs/AbcLs.cpp 2017-11-22 17:32:38.795878900 -0500 +--- alembic-1.7.8.orig/bin/AbcLs/AbcLs.cpp 2017-11-22 17:31:35.311295900 -0500 ++++ alembic-1.7.8/bin/AbcLs/AbcLs.cpp 2017-11-22 17:32:38.795878900 -0500 @@ -52,11 +52,11 @@ #include @@ -34,8 +34,8 @@ unchanged: #else #error No signal interface available unchanged: ---- alembic-1.7.3/bin/AbcTree/AbcTree-orig.cpp 2017-11-22 17:32:25.049315500 -0500 -+++ alembic-1.7.3/bin/AbcTree/AbcTree.cpp 2017-11-22 17:32:36.711572200 -0500 +--- alembic-1.7.8.orig/bin/AbcTree/AbcTree.cpp 2017-11-22 17:32:25.049315500 -0500 ++++ alembic-1.7.8/bin/AbcTree/AbcTree.cpp 2017-11-22 17:32:36.711572200 -0500 @@ -50,7 +50,7 @@ #include #include @@ -55,8 +55,8 @@ unchanged: namespace Abc = ::Alembic::Abc;; namespace AbcA = ::Alembic::AbcCoreAbstract; unchanged: ---- alembic-1.7.3/lib/Alembic/AbcCoreOgawa/ReadUtil-orig.cpp 2017-11-22 17:33:06.138899000 -0500 -+++ alembic-1.7.3/lib/Alembic/AbcCoreOgawa/ReadUtil.cpp 2017-11-22 17:33:13.326580900 -0500 +--- alembic-1.7.8.orig/lib/Alembic/AbcCoreOgawa/ReadUtil.cpp 2017-11-22 17:33:06.138899000 -0500 ++++ alembic-1.7.8/lib/Alembic/AbcCoreOgawa/ReadUtil.cpp 2017-11-22 17:33:13.326580900 -0500 @@ -36,7 +36,7 @@ #include @@ -67,8 +67,8 @@ unchanged: # undef max # endif unchanged: ---- alembic-1.7.3/lib/Alembic/AbcCoreOgawa/StreamManager-orig.cpp 2017-11-22 17:33:31.474869400 -0500 -+++ alembic-1.7.3/lib/Alembic/AbcCoreOgawa/StreamManager.cpp 2017-11-22 17:33:41.851965600 -0500 +--- alembic-1.7.8.orig/lib/Alembic/AbcCoreOgawa/StreamManager.cpp 2017-11-22 17:33:31.474869400 -0500 ++++ alembic-1.7.8/lib/Alembic/AbcCoreOgawa/StreamManager.cpp 2017-11-22 17:33:41.851965600 -0500 @@ -46,10 +46,10 @@ #if !defined( ALEMBIC_LIB_USES_TR1 ) && __cplusplus >= 201103L #define COMPARE_EXCHANGE( V, COMP, EXCH ) V.compare_exchange_weak( COMP, EXCH, std::memory_order_seq_cst, std::memory_order_seq_cst ) @@ -91,9 +91,9 @@ unchanged: if ( val == 0 ) { ---- alembic-1.7.3/lib/Alembic/Ogawa/IStreams-orig.cpp 2017-11-22 17:38:27.416649400 -0500 -+++ alembic-1.7.3/lib/Alembic/Ogawa/IStreams.cpp 2017-11-22 17:38:29.357176600 -0500 -@@ -36,12 +36,15 @@ +--- alembic-1.7.8.orig/lib/Alembic/Ogawa/IStreams.cpp 2018-06-16 08:45:13.786126900 -0400 ++++ alembic-1.7.8/lib/Alembic/Ogawa/IStreams.cpp 2018-06-16 08:59:16.662028200 -0400 +@@ -36,12 +36,14 @@ #include #include #include @@ -106,11 +106,10 @@ unchanged: #include +#include -+#include + #include Alembic::Util::int32_t OPENFILE(const char * iFileName, Alembic::Util::int32_t iFlag) - { -@@ -120,7 +123,7 @@ +@@ -121,7 +123,7 @@ Alembic::Util::uint64_t totalRead = 0; void * buf = oBuf; @@ -119,8 +118,9 @@ unchanged: HANDLE hFile = reinterpret_cast(_get_osfhandle(fd)); DWORD numRead = 0; ---- alembic-1.7.3/lib/Alembic/Util/Foundation-orig.h 2017-11-22 17:34:55.087664400 -0500 -+++ alembic-1.7.3/lib/Alembic/Util/Foundation.h 2017-11-22 17:35:13.763560700 -0500 + +--- alembic-1.7.8.orig/lib/Alembic/Util/Foundation.h 2017-11-22 17:34:55.087664400 -0500 ++++ alembic-1.7.8/lib/Alembic/Util/Foundation.h 2017-11-22 17:35:13.763560700 -0500 @@ -51,7 +51,6 @@ #include #include @@ -149,8 +149,8 @@ unchanged: { only in patch2: unchanged: ---- alembic-1.7.3/lib/Alembic/Util/Murmur3-orig.cpp 2017-11-22 17:29:38.884989700 -0500 -+++ alembic-1.7.3/lib/Alembic/Util/Murmur3.cpp 2017-11-22 17:31:11.520244300 -0500 +--- alembic-1.7.8.orig/lib/Alembic/Util/Murmur3.cpp 2017-11-22 17:29:38.884989700 -0500 ++++ alembic-1.7.8/lib/Alembic/Util/Murmur3.cpp 2017-11-22 17:31:11.520244300 -0500 @@ -41,7 +41,7 @@ #ifdef __APPLE__ @@ -180,8 +180,8 @@ unchanged: h1 ^= h1 >> 33; only in patch2: unchanged: ---- alembic-1.7.3/lib/Alembic/Util/PlainOldDataType-orig.h 2017-08-09 12:34:56.000000000 -0400 -+++ alembic-1.7.3/lib/Alembic/Util/PlainOldDataType.h 2017-11-22 17:56:53.623902600 -0500 +--- alembic-1.7.8.orig/lib/Alembic/Util/PlainOldDataType.h 2017-08-09 12:34:56.000000000 -0400 ++++ alembic-1.7.8/lib/Alembic/Util/PlainOldDataType.h 2017-11-22 17:56:53.623902600 -0500 @@ -40,10 +40,7 @@ #include #include diff --git a/mingw-w64-alembic/PKGBUILD b/mingw-w64-alembic/PKGBUILD index 7687fb7faa..98179e892f 100644 --- a/mingw-w64-alembic/PKGBUILD +++ b/mingw-w64-alembic/PKGBUILD @@ -3,7 +3,7 @@ _realname=alembic pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.7.3 +pkgver=1.7.8 pkgrel=1 pkgdesc="A open framework for storing and sharing scene data (mingw-w64)" arch=('any') @@ -15,16 +15,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-openexr" "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-boost") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/alembic/${_realname}/archive/${pkgver}.tar.gz" - "0001-alembic-1.7.3-fix-windows-build.patch" - "0002-alembic-1.7.3-remove-msc_ver-and-fix-builtins-and-includes.patch") -sha512sums=('ed5c0c041722d4fcbc17cbe43b06930ab22f98b1402d35715ddef7118a5871399efefd78c07872e73478f38802c7fd7d36aed13939caf3579f2e0304b8e73e9b' - 'e21b405c39b832fb3f28b5226388dbdc94f950610478072fda32219880b48da7f2318a97d5b0cd4209e9f511155ecb9ff80138dbbdb5d91c336125c9596a6bba' - '04921d0ad8e9c0cf97f5ae73e2ac1ab8997b2fa73acc183502bce5aa5fbe998817cc16039c74b36a1587de623fd66b65636d2e1b2fb46a5b1aca113f48e0e33b') + "0001-alembic-1.7.8-fix-windows-build.patch" + "0002-alembic-1.7.8-remove-msc_ver-and-fix-builtins-and-includes.patch") +sha512sums=('bc36e30d1aecd67da16247365a973c462e9716309d090fefe36f625c8d2ab2d517fe8ac694a9188cd6eeb623a3217f59f461c82fcfec43d0a60a07381526983a' + 'ed3bea46beaa6027fe2c7335e6f55c6a38029834ccd4564530cacb1868275e0730158261585dfa6a9275a067b415b6e1b2a203ca0bee3d07b1cb094cfa3642ea' + '8859c7e5064085a87c1f9c4f2c04282974e4e922ac3c75d35d1186526cae30aa5e8a4cfb3252fd5df91a76ae815e986fe5cb4c329b309b0ca9c01efe56fe1f83') prepare() { cd "${srcdir}"/${_realname}-${pkgver} - patch -Np1 -i "${srcdir}/0001-alembic-1.7.3-fix-windows-build.patch" - patch -Np1 -i "${srcdir}/0002-alembic-1.7.3-remove-msc_ver-and-fix-builtins-and-includes.patch" + patch -Np1 -i "${srcdir}/0001-alembic-1.7.8-fix-windows-build.patch" + patch -Np1 -i "${srcdir}/0002-alembic-1.7.8-remove-msc_ver-and-fix-builtins-and-includes.patch" } build() {