-
Notifications
You must be signed in to change notification settings - Fork 742
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 the latest commit
- Loading branch information
Michael Reifenberger
authored and
Michael Reifenberger
committed
Jan 8, 2023
1 parent
259e3fe
commit 27c2e64
Showing
7 changed files
with
64 additions
and
21 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= 4a66203493fcc58ac607449b04f9ba88c6c80cbc | ||
GIT_SRC_DATE= 20221009002759 | ||
GIT_SRC_HASH= 063478b3dc2257641a43fa9830902fcdd89976d5 | ||
GIT_SRC_DATE= 20230108153438 |
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 = 1665327758 | ||
SHA256 (kicad/kicad/code-kicad-4a66203493fcc58ac607449b04f9ba88c6c80cbc_GL0.tar.gz) = cc9010995f71bbaca4e6dc8eb4d951f736fe6a6613cbd5321da88c716a5edaa4 | ||
SIZE (kicad/kicad/code-kicad-4a66203493fcc58ac607449b04f9ba88c6c80cbc_GL0.tar.gz) = 54098837 | ||
TIMESTAMP = 1673190180 | ||
SHA256 (kicad/kicad/code-kicad-063478b3dc2257641a43fa9830902fcdd89976d5_GL0.tar.gz) = cc4f560965f6b4001ac825e4d3a0e4a3dfa472a413a948d50aa6a7ecafb78576 | ||
SIZE (kicad/kicad/code-kicad-063478b3dc2257641a43fa9830902fcdd89976d5_GL0.tar.gz) = 55179322 |
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
32 changes: 32 additions & 0 deletions
32
cad/kicad-devel/files/patch-pcbnew_import_gfx_dxf_import_plugin.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,32 @@ | ||
--- pcbnew/import_gfx/dxf_import_plugin.cpp.orig 2023-01-08 16:40:34.270267000 +0100 | ||
+++ pcbnew/import_gfx/dxf_import_plugin.cpp 2023-01-08 16:40:37.228586000 +0100 | ||
@@ -581,5 +581,5 @@ | ||
|
||
VECTOR2D center( mapX( centerCoords.x ), mapY( centerCoords.y ) ); | ||
- VECTOR2D major( mapX( majorCoords.x ), mapY( majorCoords.y ) ); | ||
+ VECTOR2D _major( mapX( majorCoords.x ), mapY( majorCoords.y ) ); | ||
|
||
// DXF elliptical arcs store their angles in radians (unlike circular arcs which use degrees) | ||
@@ -599,5 +599,5 @@ | ||
if( aData.ratio == 1.0 ) | ||
{ | ||
- double radius = major.EuclideanNorm(); | ||
+ double radius = _major.EuclideanNorm(); | ||
|
||
if( startAngle == endAngle ) | ||
@@ -617,5 +617,5 @@ | ||
|
||
std::vector<BEZIER<double>> splines; | ||
- ELLIPSE<double> ellipse( center, major, aData.ratio, startAngle, endAngle ); | ||
+ ELLIPSE<double> ellipse( center, _major, aData.ratio, startAngle, endAngle ); | ||
|
||
TransformEllipseToBeziers( ellipse, splines ); | ||
@@ -631,6 +631,6 @@ | ||
|
||
// Naive bounding | ||
- updateImageLimits( center + major ); | ||
- updateImageLimits( center - major ); | ||
+ updateImageLimits( center + _major ); | ||
+ updateImageLimits( center - _major ); | ||
} | ||
|
10 changes: 10 additions & 0 deletions
10
cad/kicad-devel/files/patch-thirdparty_glew_CMakeLists.txt
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,10 @@ | ||
--- thirdparty/glew/CMakeLists.txt.orig 2022-05-07 15:44:23 +0200 | ||
+++ thirdparty/glew/CMakeLists.txt | ||
@@ -5,6 +5,7 @@ | ||
# The actual include directories will be added to the global include paths as | ||
# system headers | ||
target_include_directories( glew PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" ) | ||
+target_include_directories( glew SYSTEM PRIVATE "${CMAKE_INSTALL_PREFIX}/include" ) | ||
|
||
# Definitions for compiling GLEW staticly for EGL (extracted from the main GLEW CMakeLists.txt file) | ||
add_definitions( -DGLEW_STATIC ) |
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