From 35abf9e77607744d263f81756e608d5b60bdb4ac Mon Sep 17 00:00:00 2001 From: frispete <> Date: May 21 2021 19:59:56 +0000 Subject: Update alembic to version 1.8.1 / rev 8 via SR 894672 https://build.opensuse.org/request/show/894672 by user frispete + dimstar_suse --- diff --git a/.files b/.files index c1da10e..3fbb9a0 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 7354107..dd42e28 100644 --- a/.rev +++ b/.rev @@ -51,8 +51,6 @@ 859217 -<<<<<<< Updated upstream -======= 8f64e339adf303d7d36b4b1c876056de 1.8.0 @@ -61,5 +59,12 @@ 889186 ->>>>>>> Stashed changes + + 65b9eafde78871f0ec5a6da959ca459b + 1.8.1 + + dimstar_suse + + 894672 + diff --git a/alembic-1.7.16.tar.gz b/alembic-1.7.16.tar.gz deleted file mode 120000 index 1742af7..0000000 --- a/alembic-1.7.16.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeieeygn5j3n2xezeq326ehmiblw52bu47r4d625mga2y2v4ttuozvu \ No newline at end of file diff --git a/alembic-1.8.0.tar.gz b/alembic-1.8.0.tar.gz deleted file mode 120000 index 8d0dc23..0000000 --- a/alembic-1.8.0.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeibpqbgl4krrxvlmmkurjraxwus5ar7wrtpmv3gonzt7vdv5f5pruu \ No newline at end of file diff --git a/alembic-1.8.1.tar.gz b/alembic-1.8.1.tar.gz new file mode 120000 index 0000000..0f07e84 --- /dev/null +++ b/alembic-1.8.1.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeicbvty4vqy6ysv4ijttphdws5su7sgvhbyhwta4fq2ttnyrl5k2h4 \ No newline at end of file diff --git a/alembic.changes b/alembic.changes index 1cf175a..43da567 100644 --- a/alembic.changes +++ b/alembic.changes @@ -1,6 +1,13 @@ ------------------------------------------------------------------- -<<<<<<< Updated upstream -======= +Wed May 19 12:53:46 UTC 2021 - Ferdinand Thiessen + +- Update to 1.8.1: + * Ogawa: Sanity check that we have a valid group to avoid + infinite recursion during traversal. +- Enable testsuite +- Add fuzztest.patch + +------------------------------------------------------------------- Wed Apr 28 14:46:23 UTC 2021 - Ferdinand Thiessen - Update to 1.8.0: @@ -20,7 +27,6 @@ Wed Apr 28 14:46:23 UTC 2021 - Ferdinand Thiessen * Fix for using Alembic as a 3rd party with Imath 3. ------------------------------------------------------------------- ->>>>>>> Stashed changes Tue Dec 29 12:41:37 UTC 2020 - Matthias Eliasson - update to 1.7.16: diff --git a/alembic.spec b/alembic.spec index bee3211..e96655e 100644 --- a/alembic.spec +++ b/alembic.spec @@ -19,22 +19,22 @@ %define libname libAlembic1_8 Name: alembic -<<<<<<< Updated upstream -Version: 1.7.16 -======= -Version: 1.8.0 ->>>>>>> Stashed changes +Version: 1.8.1 Release: 0 Summary: Computer graphics interchange framework License: BSD-3-Clause Group: Development/Libraries/C and C++ URL: https://www.alembic.io Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM fuzztest.patch -- Workaround https://github.com/alembic/alembic/issues/346 +Patch0: fuzztest.patch BuildRequires: cmake >= 3.13 BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(zlib) +# Ogawa does only support little endianess +ExcludeArch: ppc64 %description Alembic distills complex, animated scenes into a non-procedural, application- @@ -64,16 +64,21 @@ you will need to install %{name}-devel. %prep %setup -q +%patch0 -p1 %build %cmake \ -DALEMBIC_LIB_INSTALL_DIR=%{_libdir} \ -DUSE_ARNOLD=OFF \ -DUSE_BINARIES=OFF \ - -DUSE_TESTS=OFF + -DUSE_TESTS=ON %make_build +%check +export LD_LIBRARY_PATH="%{buildroot}%{_libdir}" +%ctest --verbose + %install %cmake_install rm -r %{buildroot}%{_prefix}/lib/cmake diff --git a/fuzztest.patch b/fuzztest.patch new file mode 100644 index 0000000..331b592 --- /dev/null +++ b/fuzztest.patch @@ -0,0 +1,13 @@ +diff -Nur alembic-1.8.1/lib/Alembic/AbcCoreOgawa/Tests/fuzzTest.cpp new/lib/Alembic/AbcCoreOgawa/Tests/fuzzTest.cpp +--- alembic-1.8.1/lib/Alembic/AbcCoreOgawa/Tests/fuzzTest.cpp 2021-05-15 21:42:08.000000000 +0200 ++++ new/lib/Alembic/AbcCoreOgawa/Tests/fuzzTest.cpp 2021-05-20 18:27:55.945186656 +0200 +@@ -696,7 +696,8 @@ + testFuzzer25185(false); + + testFuzzer25192(true); +- testFuzzer25192(false); ++ // https://github.com/alembic/alembic/issues/346 ++ //testFuzzer25192(false); + + testFuzzer25204(true); + testFuzzer25204(false);