8 Commits
Author SHA1 Message Date
Xisco Fauli 6d66c2d8ba box2d: fix wasm build
it fails with
In file included from /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/UnpackedTarball/box2d/src/contact_solver.c:527:
/home/tdf/lode/emsdk/upstream/emscripten/cache/sysroot/include/compat/emmintrin.h:11:2: error: "SSE2 instruction set not enabled"
   11 | #error "SSE2 instruction set not enabled"
      |  ^
In file included from /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/UnpackedTarball/box2d/src/contact_solver.c:527:
In file included from /home/tdf/lode/emsdk/upstream/emscripten/cache/sysroot/include/compat/emmintrin.h:14:
/home/tdf/lode/emsdk/upstream/emscripten/cache/sysroot/include/compat/xmmintrin.h:17:2: error: "SSE instruction set not enabled"
   17 | #error "SSE instruction set not enabled"
      |  ^
2 errors generated.

Change-Id: Ie5f32b7f3a2062e041ed3a14fc2f8d3cf3a2dcc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204968
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2026-05-09 12:45:28 +02:00
Xisco Fauli aaf7a2286a box2d: upgrade to 3.1.0
Downloaded https://github.com/erincatto/box2d/archive/refs/tags/v3.1.0.tar.gz

Change-Id: I21bf8d3e26cf2601607f586a3bc1010a32b78a06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204848
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2026-05-06 13:50:34 +02:00
Xisco Fauli 4b6a3b9352 box2d: upgrade to 3.0.0
Add android.patch to fix

In file included from /home/tdf/jenkins/workspace/android_arm/workdir/UnpackedTarball/box2d/src/allocate.c:6:
/home/tdf/jenkins/workspace/android_arm/workdir/UnpackedTarball/box2d/src/core.h:50:3: error: Unsupported CPU
   50 |         #error Unsupported CPU
      |          ^
/home/tdf/jenkins/workspace/android_arm/workdir/UnpackedTarball/box2d/src/allocate.c:71:14: error: call to undeclared library function 'aligned_alloc' with type 'void *(unsigned int, unsigned int)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
   71 |         void* ptr = aligned_alloc( B2_ALIGNMENT, size32 );
      |

Downloaded from https://github.com/erincatto/box2d/archive/refs/tags/v3.0.0.tar.gz

Change-Id: I8fa42a5e0317cf0cd7a62bbe9bcfe71c1405184d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183724
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins
2026-05-06 08:50:02 +02:00
Xisco Fauli 3709789a58 gbuild: set default patchlevel to 1
Change-Id: I195dbafff63e21a22edf438f5b9ed5beee4dac03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183784
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2025-04-08 09:24:08 +02:00
Christian Lohmaier 875a1bf2e1 makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo)
…by a simple/static $(gb_UnpackedTarball_workdir)/foo
see also 0c4c84a14b

Change-Id: I8e6aa55c85534c4446556548910c950ddbe7c6fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
2024-05-06 11:40:45 +02:00
Caolán McNamara 9c27377389 upgrade to box2d 2.4.1
Change-Id: I618467eb37ea578c17dab0810f0ed5ad160f1552
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128789
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-01-24 09:58:45 +01:00
Sarper Akdemir a46ab778d9 box2d: fix strict aliasing error and ignore -Wshadow
Adding two patches to static external library box2d
getting rid of strict aliasing error and ignoring
-Wshadow in b2Draw.h to get rid of errors while building.

Change-Id: I5752eb484d6aafe057c9102b1ed87aaf31d6555c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96559
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-20 01:41:37 +02:00
Sarper Akdemir a7f2239e64 external: bundle box2d
Bundled box2d with the build system of LO as a static library.
If --with-system-box2d was specified checks for instance box2d in
the system, defines SYSTEM_BOX2D and uses the library from the system.

Change-Id: Ifb05912f2acaff273b25abebafc5af1cac3afec4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94103
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-05-17 02:21:54 +02:00