Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: da684d5f27d9
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 72120dff8bae
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 26, 2021

  1. Copy the full SHA
    72120df View commit details
Showing with 27 additions and 0 deletions.
  1. +27 −0 media-libs/assimp/patches/assimp-5.0.1.patchset
27 changes: 27 additions & 0 deletions media-libs/assimp/patches/assimp-5.0.1.patchset
Original file line number Diff line number Diff line change
@@ -143,3 +143,30 @@ index c659e19..c1a567a 100644
--
2.30.0


From 07804ae559a567a759219fce6f83d1a40a5fadfb Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 26 May 2021 10:22:33 +0200
Subject: remove debug info for StepFileGen1.cpp for x86 where memory is
limited


diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 55538d9..04d0acf 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -832,6 +832,11 @@ if ((CMAKE_COMPILER_IS_MINGW) AND (CMAKE_BUILD_TYPE MATCHES Debug))
SET_SOURCE_FILES_PROPERTIES(Importer/StepFile/StepFileGen1.cpp PROPERTIES STATIC_LIBRARY_FLAGS -Os )
endif()

+if (HAIKU)
+ message("-- Applying Haiku StepFileGen1.cpp Workaround for 2G Memory exhaustion")
+ SET_SOURCE_FILES_PROPERTIES(Importer/StepFile/StepFileGen1.cpp PROPERTIES COMPILE_FLAGS -g0 )
+endif()
+
ADD_ASSIMP_IMPORTER( STEP
Step/STEPFile.h
Importer/StepFile/StepFileImporter.h
--
2.30.0