From 55f95de5e74e22cfab0d73726fd323859924f6d7 Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Wed, 10 May 2023 13:17:08 -0700 Subject: user/assimp: bump { 5.1.5 --> 5.2.5 }. fixes #492. --- user/assimp/APKBUILD | 8 +++----- user/assimp/built | 0 user/assimp/restore-pbrmaterial-glossy-macro.patch | 12 ------------ 3 files changed, 3 insertions(+), 17 deletions(-) create mode 100644 user/assimp/built delete mode 100644 user/assimp/restore-pbrmaterial-glossy-macro.patch (limited to 'user') diff --git a/user/assimp/APKBUILD b/user/assimp/APKBUILD index 0473daa58..8d65667ee 100644 --- a/user/assimp/APKBUILD +++ b/user/assimp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Russ Webber # Maintainer: Zach van Rijn pkgname=assimp -pkgver=5.1.5 +pkgver=5.2.5 pkgrel=0 pkgdesc="Open Asset Import Library imports and exports 3D model formats" url="http://www.assimp.org/" @@ -13,7 +13,6 @@ subpackages="$pkgname-dev" source="https://github.com/assimp/assimp/archive/v$pkgver/assimp-v$pkgver.tar.gz 01-rm-revision-test.patch 05-remove-failing-x86-test.patch - restore-pbrmaterial-glossy-macro.patch " build() { @@ -34,7 +33,6 @@ package() { make -C build DESTDIR="$pkgdir" install rm -vf "$pkgdir"/usr/lib/libIrrXML.a } -sha512sums="07e39de36340e5651c00f4b4363abd27dae5c3b5cdc4aba7a294e360a5724a3574975fb856e60c185f06d8510648ac3c0ed8d03ed03727ec3725f796c17aeafa assimp-v5.1.5.tar.gz +sha512sums="ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb assimp-v5.2.5.tar.gz 535a80c5899a2994735e7b17b4e3fdb3ff2b53e64c09ec8fcab1dbcea2ad696fed50aeb1667a3c4e00a8a3ddf411d33ec1d36fcb256e26f02cf951f0e2c83a73 01-rm-revision-test.patch -bfb321b8493b2ef8c35ab0627173d0f1754519e9bae6f6c59cc164aaf91a07d8ae382fbc92550cfab6f52502565390ba22b7478efa5bba008eec0aa075c5e7d1 05-remove-failing-x86-test.patch -d582ccbf645e0ac133cdc27a47da7b281202b1615c014e32c823dace03f2a58658434e5d93409151f19f45ea304e28b1a22477cdc566375c82b32cf046a6bb9d restore-pbrmaterial-glossy-macro.patch" +bfb321b8493b2ef8c35ab0627173d0f1754519e9bae6f6c59cc164aaf91a07d8ae382fbc92550cfab6f52502565390ba22b7478efa5bba008eec0aa075c5e7d1 05-remove-failing-x86-test.patch" diff --git a/user/assimp/built b/user/assimp/built new file mode 100644 index 000000000..e69de29bb diff --git a/user/assimp/restore-pbrmaterial-glossy-macro.patch b/user/assimp/restore-pbrmaterial-glossy-macro.patch deleted file mode 100644 index b1e634c3e..000000000 --- a/user/assimp/restore-pbrmaterial-glossy-macro.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/include/assimp/pbrmaterial.h b/include/assimp/pbrmaterial.h ---- a/include/assimp/pbrmaterial.h 2022-02-03 21:09:18.050000000 +0000 -+++ b/include/assimp/pbrmaterial.h 2022-02-03 21:09:44.930000000 +0000 -@@ -61,7 +61,7 @@ - #define AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLIC_FACTOR AI_MATKEY_METALLIC_FACTOR - #define AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_ROUGHNESS_FACTOR AI_MATKEY_ROUGHNESS_FACTOR - --//#define AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS "$mat.gltf.pbrSpecularGlossiness", 0, 0 -+#define AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS "$mat.gltf.pbrSpecularGlossiness", 0, 0 - #define AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_GLOSSINESS_FACTOR AI_MATKEY_GLOSSINESS_FACTOR - - // Use AI_MATKEY_SHADING_MODEL == aiShadingMode_Unlit instead -- cgit v1.2.3-60-g2f50