* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/
@ 2016-01-21 19:47 Slawek Lis
0 siblings, 0 replies; 4+ messages in thread
From: Slawek Lis @ 2016-01-21 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 55c795d64b852717182f07668a5c5e8f370c0352
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 19:50:37 2016 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 19:50:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c795d6
added assimp test patch
Package-Manager: portage-2.2.26
media-libs/assimp/files/test-cmakelists.patch | 35 +++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/media-libs/assimp/files/test-cmakelists.patch b/media-libs/assimp/files/test-cmakelists.patch
new file mode 100644
index 0000000..9a3471b
--- /dev/null
+++ b/media-libs/assimp/files/test-cmakelists.patch
@@ -0,0 +1,35 @@
+--- test/CMakeLists.txt.old 2016-01-21 06:46:12.053363212 +0100
++++ test/CMakeLists.txt 2016-01-21 06:46:51.126697143 +0100
+@@ -1,7 +1,5 @@
+ cmake_minimum_required( VERSION 2.6 )
+
+-INCLUDE( AddGTest )
+-
+ INCLUDE_DIRECTORIES(
+ ${Assimp_SOURCE_DIR}/include
+ ${Assimp_SOURCE_DIR}/code
+@@ -47,7 +45,7 @@
+
+ SOURCE_GROUP( tests FILES ${TEST_SRCS} )
+
+-if(AddGTest_FOUND)
++if(BUILD_TESTS)
+ add_executable( unit
+ unit/CCompilerTest.c
+ unit/Main.cpp
+@@ -56,13 +54,12 @@
+ )
+
+ add_definitions(-DASSIMP_TEST_MODELS_DIR="${CMAKE_CURRENT_LIST_DIR}/models")
++target_link_libraries( unit gtest )
+
+ SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} )
+
+ add_dependencies( unit gtest )
+ target_link_libraries( unit assimp
+- debug ${GTEST_DEBUG_LIBRARIES}
+- optimized ${GTEST_RELEASE_LIBRARIES}
+ )
+-endif(AddGTest_FOUND)
++endif(BUILD_TESTS)
+ add_subdirectory(headercheck)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/
@ 2016-09-06 7:04 Slawek Lis
0 siblings, 0 replies; 4+ messages in thread
From: Slawek Lis @ 2016-09-06 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 9d10ad93c12eb3aff648c7eefd3363a15b9bc622
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 07:04:18 2016 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 07:04:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d10ad93
media-libs/assimp: included forgotten patch file
Package-Manager: portage-2.3.0
media-libs/assimp/files/findassimp.patch | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/media-libs/assimp/files/findassimp.patch b/media-libs/assimp/files/findassimp.patch
new file mode 100644
index 00000000..1b62e73
--- /dev/null
+++ b/media-libs/assimp/files/findassimp.patch
@@ -0,0 +1,18 @@
+--- cmake-modules/Findassimp.cmake.old 2016-09-06 08:26:35.107697600 +0200
++++ cmake-modules/Findassimp.cmake 2016-09-06 08:29:25.337696582 +0200
+@@ -1,13 +1,13 @@
+ FIND_PATH(
+ assimp_INCLUDE_DIRS
+ NAMES postprocess.h scene.h version.h config.h cimport.h
+- PATHS /usr/local/include/
++ PATHS /usr/include/
+ )
+
+ FIND_LIBRARY(
+ assimp_LIBRARIES
+ NAMES assimp
+- PATHS /usr/local/lib/
++ PATHS /usr/lib/
+ )
+
+ IF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/
@ 2019-10-10 19:13 Slawek Lis
0 siblings, 0 replies; 4+ messages in thread
From: Slawek Lis @ 2019-10-10 19:13 UTC (permalink / raw
To: gentoo-commits
commit: 9584c3e2852c1210d01dea97854b1f335ce579df
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 10 19:11:06 2019 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 19:13:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9584c3e2
media-libs/assimp: cmake findassimp patch corrected NAMES
As reported in bug: https://bugs.gentoo.org/696914
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Slawek Lis <slis <AT> gentoo.org>
media-libs/assimp/files/assimp-4.1.0-findassimp.patch | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
index c2a32307746..6056f4973c5 100644
--- a/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
+++ b/media-libs/assimp/files/assimp-4.1.0-findassimp.patch
@@ -1,8 +1,11 @@
--- a/cmake-modules/Findassimp.cmake 2019-10-08 08:08:29.025321121 +0200
+++ b/cmake-modules/Findassimp.cmake 2019-10-08 08:09:47.976323079 +0200
-@@ -56,12 +56,15 @@
+@@ -54,14 +54,17 @@
+
+ find_path(
assimp_INCLUDE_DIRS
- NAMES postprocess.h scene.h version.h config.h cimport.h
+- NAMES postprocess.h scene.h version.h config.h cimport.h
++ NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
PATHS /usr/local/include/
+ PATHS /usr/include/
)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/
@ 2022-04-29 2:22 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-04-29 2:22 UTC (permalink / raw
To: gentoo-commits
commit: 648c0c82276f7136d1cc466cc94610859eb9626e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 02:22:18 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 02:22:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=648c0c82
media-libs/assimp: add references to patchez
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch | 3 +++
.../assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch | 3 +++
2 files changed, 6 insertions(+)
diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
index 708f45ee3503..736757693774 100644
--- a/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
+++ b/media-libs/assimp/files/assimp-5.2.3-drop-Werror-gcc-option.patch
@@ -1,3 +1,6 @@
+https://bugs.gentoo.org/840616
+https://github.com/assimp/assimp/issues/4433
+
From dea8b4d8c533c131bd546c316f8df8af8897ac75 Mon Sep 17 00:00:00 2001
From: Bernd Waibel <waebbl-gentoo@posteo.net>
Date: Mon, 25 Apr 2022 17:39:33 +0200
diff --git a/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
index 4c4ea0486a2f..1de4f661fa55 100644
--- a/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
+++ b/media-libs/assimp/files/assimp-5.2.3-drop-failing-tests-for-abi_x86_32.patch
@@ -1,3 +1,6 @@
+https://bugs.gentoo.org/840767
+https://github.com/assimp/assimp/issues/4438
+
From f963a15bbbcfa1e3c4bd0c24173f90151e023469 Mon Sep 17 00:00:00 2001
From: Bernd Waibel <waebbl-gentoo@posteo.net>
Date: Thu, 28 Apr 2022 07:59:26 +0200
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-29 2:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-06 7:04 [gentoo-commits] repo/gentoo:master commit in: media-libs/assimp/files/ Slawek Lis
-- strict thread matches above, loose matches on Subject: below --
2022-04-29 2:22 Sam James
2019-10-10 19:13 Slawek Lis
2016-01-21 19:47 Slawek Lis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox