strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade to box2d 2.4.1

Browse source 
Change-Id: I618467eb37ea578c17dab0810f0ed5ad160f1552
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128789
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2022-01-22 19:45:53 +00:00
parent c892b224be
commit 9c27377389
7 changed files with 51 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RepositoryExternal.mk
View file

@ -4121,7 +4121,7 @@ else # !SYSTEM_BOX2D
define gb_LinkTarget__use_box2d
$(call gb_LinkTarget_use_unpacked,$(1),box2d)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,box2d/Box2D/)\
-I$(call gb_UnpackedTarball_get_dir,box2d/include/)\
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\

2
config_host/config_box2d.h.in
View file

@ -2,6 +2,6 @@
#define CONFIG_BOX2D_H
/* Box2D/Box2D.h is 2.3, 2.4 has box2d/box2d.h */
#define BOX2D_HEADER <Box2D/Box2D.h>
#define BOX2D_HEADER <box2d/box2d.h>
#endif

4
download.lst
View file

@ -8,8 +8,8 @@ export ABW_TARBALL := libabw-0.1.3.tar.xz
# please repack the tarball using external/boost/repack_tarball.sh
export BOOST_SHA256SUM := 9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e
export BOOST_TARBALL := boost_1_77_0.tar.xz
export BOX2D_SHA256SUM := 58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c
export BOX2D_TARBALL := box2d-2.3.1.tar.gz
export BOX2D_SHA256SUM := d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2
export BOX2D_TARBALL := box2d-2.4.1.tar.gz
export BREAKPAD_SHA256SUM := c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91
export BREAKPAD_TARBALL := breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz
export BSH_SHA256SUM := 9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96

94
external/box2d/StaticLibrary_box2d.mk vendored
View file

@ -16,57 +16,57 @@ $(eval $(call gb_StaticLibrary_set_warnings_disabled,box2d))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,box2d,cpp))
$(eval $(call gb_StaticLibrary_set_include,box2d,\
-I$(call gb_UnpackedTarball_get_dir,box2d/Box2D/)\
-I$(call gb_UnpackedTarball_get_dir,box2d/include/)\
-I$(call gb_UnpackedTarball_get_dir,box2d/src/)\
$$(INCLUDE)\
))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,box2d,\
UnpackedTarball/box2d/Box2D/Box2D/Common/b2Timer \
UnpackedTarball/box2d/Box2D/Box2D/Common/b2StackAllocator \
UnpackedTarball/box2d/Box2D/Box2D/Common/b2Draw \
UnpackedTarball/box2d/Box2D/Box2D/Common/b2Math \
UnpackedTarball/box2d/Box2D/Box2D/Common/b2BlockAllocator \
UnpackedTarball/box2d/Box2D/Box2D/Common/b2Settings \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2Body \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2PolygonAndCircleContact \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2CircleContact \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2ContactSolver \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2PolygonContact \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2ChainAndPolygonContact \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2ChainAndCircleContact \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2Contact \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Contacts/b2EdgeAndCircleContact \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2RopeJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2WheelJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2FrictionJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2PrismaticJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2WeldJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2PulleyJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2MouseJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2MotorJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2DistanceJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2GearJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2Joint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/Joints/b2RevoluteJoint \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2WorldCallbacks \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2Fixture \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2ContactManager \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2Island \
UnpackedTarball/box2d/Box2D/Box2D/Dynamics/b2World \
UnpackedTarball/box2d/Box2D/Box2D/Rope/b2Rope \
UnpackedTarball/box2d/Box2D/Box2D/Collision/b2TimeOfImpact \
UnpackedTarball/box2d/Box2D/Box2D/Collision/b2CollidePolygon \
UnpackedTarball/box2d/Box2D/Box2D/Collision/b2Distance \
UnpackedTarball/box2d/Box2D/Box2D/Collision/b2Collision \
UnpackedTarball/box2d/Box2D/Box2D/Collision/b2CollideEdge \
UnpackedTarball/box2d/Box2D/Box2D/Collision/b2CollideCircle \
UnpackedTarball/box2d/Box2D/Box2D/Collision/b2BroadPhase \
UnpackedTarball/box2d/Box2D/Box2D/Collision/Shapes/b2EdgeShape \
UnpackedTarball/box2d/Box2D/Box2D/Collision/Shapes/b2CircleShape \
UnpackedTarball/box2d/Box2D/Box2D/Collision/Shapes/b2ChainShape \
UnpackedTarball/box2d/Box2D/Box2D/Collision/Shapes/b2PolygonShape \
UnpackedTarball/box2d/Box2D/Box2D/Collision/b2DynamicTree \
UnpackedTarball/box2d/src/common/b2_timer \
UnpackedTarball/box2d/src/common/b2_stack_allocator \
UnpackedTarball/box2d/src/common/b2_draw \
UnpackedTarball/box2d/src/common/b2_math \
UnpackedTarball/box2d/src/common/b2_block_allocator \
UnpackedTarball/box2d/src/common/b2_settings \
UnpackedTarball/box2d/src/dynamics/b2_body \
UnpackedTarball/box2d/src/dynamics/b2_polygon_circle_contact \
UnpackedTarball/box2d/src/dynamics/b2_circle_contact \
UnpackedTarball/box2d/src/dynamics/b2_contact_solver \
UnpackedTarball/box2d/src/dynamics/b2_polygon_contact \
UnpackedTarball/box2d/src/dynamics/b2_chain_polygon_contact \
UnpackedTarball/box2d/src/dynamics/b2_chain_circle_contact \
UnpackedTarball/box2d/src/dynamics/b2_contact \
UnpackedTarball/box2d/src/dynamics/b2_edge_polygon_contact \
UnpackedTarball/box2d/src/dynamics/b2_edge_circle_contact \
UnpackedTarball/box2d/src/dynamics/b2_wheel_joint \
UnpackedTarball/box2d/src/dynamics/b2_friction_joint \
UnpackedTarball/box2d/src/dynamics/b2_prismatic_joint \
UnpackedTarball/box2d/src/dynamics/b2_weld_joint \
UnpackedTarball/box2d/src/dynamics/b2_pulley_joint \
UnpackedTarball/box2d/src/dynamics/b2_mouse_joint \
UnpackedTarball/box2d/src/dynamics/b2_motor_joint \
UnpackedTarball/box2d/src/dynamics/b2_distance_joint \
UnpackedTarball/box2d/src/dynamics/b2_gear_joint \
UnpackedTarball/box2d/src/dynamics/b2_joint \
UnpackedTarball/box2d/src/dynamics/b2_revolute_joint \
UnpackedTarball/box2d/src/dynamics/b2_world_callbacks \
UnpackedTarball/box2d/src/dynamics/b2_fixture \
UnpackedTarball/box2d/src/dynamics/b2_contact_manager \
UnpackedTarball/box2d/src/dynamics/b2_island \
UnpackedTarball/box2d/src/dynamics/b2_world \
UnpackedTarball/box2d/src/rope/b2_rope \
UnpackedTarball/box2d/src/collision/b2_time_of_impact \
UnpackedTarball/box2d/src/collision/b2_collide_polygon \
UnpackedTarball/box2d/src/collision/b2_distance \
UnpackedTarball/box2d/src/collision/b2_collision \
UnpackedTarball/box2d/src/collision/b2_collide_edge \
UnpackedTarball/box2d/src/collision/b2_collide_circle \
UnpackedTarball/box2d/src/collision/b2_broad_phase \
UnpackedTarball/box2d/src/collision/b2_edge_shape \
UnpackedTarball/box2d/src/collision/b2_circle_shape \
UnpackedTarball/box2d/src/collision/b2_chain_shape \
UnpackedTarball/box2d/src/collision/b2_polygon_shape \
UnpackedTarball/box2d/src/collision/b2_dynamic_tree \
))
# vim: set noet sw=4 ts=4:

5
external/box2d/UnpackedTarball_box2d.mk vendored
View file

@ -13,9 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,box2d,$(BOX2D_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,box2d,1))
$(eval $(call gb_UnpackedTarball_add_patches,box2d, \
external/box2d/fix-strict-aliasing-error.patch \
external/box2d/disable-shadow-warning-for-drawh.patch \
))
# vim: set noet sw=4 ts=4:

18
external/box2d/disable-shadow-warning-for-drawh.patch vendored
View file

@ -1,18 +0,0 @@
diff -ur box2d/Box2D/Box2D/Box2D.h box2d_patched/Box2D/Box2D/Box2D.h
--- box2d/Box2D/Box2D/Box2D.h 2014-04-06 03:43:12.000000000 +0300
+++ box2d_patched/Box2D/Box2D/Box2D.h 2020-06-17 18:44:25.920658966 +0300
@@ -32,7 +32,14 @@
// These include files constitute the main Box2D API
#include <Box2D/Common/b2Settings.h>
+#if defined __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
#include <Box2D/Common/b2Draw.h>
+#if defined __GNUC__
+#pragma GCC diagnostic pop
+#endif
#include <Box2D/Common/b2Timer.h>
#include <Box2D/Collision/Shapes/b2CircleShape.h>

13
external/box2d/fix-strict-aliasing-error.patch vendored
View file

@ -1,13 +0,0 @@
diff -ru box2d/Box2D/Box2D/Common/b2Math.h box2d_patched/Box2D/Box2D/Common/b2Math.h
--- box2d/Box2D/Box2D/Common/b2Math.h 2014-04-06 03:43:12.000000000 +0300
+++ box2d_patched/Box2D/Box2D/Common/b2Math.h 2020-06-16 07:37:31.713248714 +0300
@@ -25,8 +25,7 @@
/// This function is used to ensure that a floating point number is not a NaN or infinity.
inline bool b2IsValid(float32 x)
{
- int32 ix = *reinterpret_cast<int32*>(&x);
- return (ix & 0x7f800000) != 0x7f800000;
+ return isfinite(x);
}
/// This is a approximate yet fast inverse square-root.