Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cad/kicad-devel: Update to latest commit
- Loading branch information
Michael Reifenberger
authored and
Michael Reifenberger
committed
Jun 10, 2021
1 parent
b08a739
commit ed15487
Showing
8 changed files
with
58 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| GIT_SRC_HASH= f88be65825d8f23379b55f333a2b7054bea01c58 | ||
| GIT_SRC_DATE= 20210215215911 | ||
| GIT_SRC_HASH= 1c3df973d6a480277f0853caad0e7e255981c929 | ||
| GIT_SRC_DATE= 20210610134502 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1617884322 | ||
| SHA256 (kicad/kicad/code-kicad-f88be65825d8f23379b55f333a2b7054bea01c58_GL0.tar.gz) = e15acbc8730f779ab5736bb69117558a3da283b2001b0720b2e30b4b94a15e90 | ||
| SIZE (kicad/kicad/code-kicad-f88be65825d8f23379b55f333a2b7054bea01c58_GL0.tar.gz) = 33377789 | ||
| TIMESTAMP = 1623329556 | ||
| SHA256 (kicad/kicad/code-kicad-1c3df973d6a480277f0853caad0e7e255981c929_GL0.tar.gz) = 7b7e5bcd537ba0e854d32ddc2461eee25c2ce14dcd526c820dc7ac51e462fbbc | ||
| SIZE (kicad/kicad/code-kicad-1c3df973d6a480277f0853caad0e7e255981c929_GL0.tar.gz) = 35907193 |
11 changes: 11 additions & 0 deletions
11
cad/kicad-devel/files/patch-3d-viewer_3d__rendering_legacy_3d__model.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- 3d-viewer/3d_rendering/legacy/3d_model.cpp.orig 2021-06-08 11:48:08 UTC | ||
| +++ 3d-viewer/3d_rendering/legacy/3d_model.cpp | ||
| @@ -488,7 +488,7 @@ void MODEL_3D::DrawBbox() const | ||
| reinterpret_cast<const void*>( offsetof( VERTEX, m_color ) ) ); | ||
|
|
||
| glDrawElements( GL_LINES, bbox_idx_count, m_bbox_index_buffer_type, | ||
| - reinterpret_cast<const void*>( NULL ) ); | ||
| + reinterpret_cast<const void*>( 0 ) ); | ||
| } | ||
|
|
||
|
|
This file was deleted.
Oops, something went wrong.
8 changes: 5 additions & 3 deletions
8
cad/kicad-devel/files/patch-include-gal-graphics_abstraction_layer.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| --- include/gal/graphics_abstraction_layer.h.orig 2016-04-16 13:14:32.003824016 +0200 | ||
| +++ include/gal/graphics_abstraction_layer.h 2016-04-16 13:15:06.143789160 +0200 | ||
| @@ -31,4 +31,5 @@ | ||
| --- include/gal/graphics_abstraction_layer.h.orig 2021-06-08 00:34:09 UTC | ||
| +++ include/gal/graphics_abstraction_layer.h | ||
| @@ -30,6 +30,7 @@ | ||
| #include <deque> | ||
| #include <stack> | ||
| #include <limits> | ||
| +#include <cmath> | ||
|
|
||
| #include <math/matrix3x3.h> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| --- include/kiway.h.orig 2015-01-10 18:11:39.000000000 +0000 | ||
| +++ include/kiway.h 2015-01-11 10:51:52.458174797 +0000 | ||
| @@ -115,5 +115,5 @@ | ||
| --- include/kiway.h.orig 2021-06-08 00:34:09 UTC | ||
| +++ include/kiway.h | ||
| @@ -113,7 +113,7 @@ | ||
| #define KIFACE_INSTANCE_NAME_AND_VERSION "KIFACE_1" | ||
|
|
||
| #ifndef SWIG | ||
| -#if defined(__linux__) || defined(__FreeBSD__) | ||
| +#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) | ||
| #define LIB_ENV_VAR wxT( "LD_LIBRARY_PATH" ) | ||
| #elif defined(__WXMAC__) | ||
| #define LIB_ENV_VAR wxT( "DYLD_LIBRARY_PATH" ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters