Commit Graph

593 Commits

Author SHA1 Message Date
861a86dfca Revert "update to liborcus 0.9.0"
This reverts commit a1280bd47fddd668f1ff224f18639c8d595ec6f7.

Change-Id: I2ad873f012ebae6858c8895c14ed695dbd881fc4
Reviewed-on: https://gerrit.libreoffice.org/15586
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-05-01 20:14:27 +00:00
a1280bd47f update to liborcus 0.9.0
Includes a lot of help from Norbert for finding the boost MSVC problem.

Change-Id: I5184bc40e2c3861883b8587784117b1c4558fa5f
Reviewed-on: https://gerrit.libreoffice.org/15453
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-05-01 18:12:20 +00:00
ae08fceafc RepositoryExternal.mk: gengal needs runtime dependency on unorc
Change-Id: I33f7592cf990f9298fec375d06a86c16ac4389b3
2015-04-28 13:32:49 +02:00
8840fd3226 tdf#82695 allow to build with system collada2gltf
Change-Id: I1179e20fd5fbdecd198633d5440621ed08a0465b
2015-04-13 16:43:35 +02:00
41c6631288 The 'svp' "plug-in" library is empty so don't build it at all
Its code is in the vcl library nowadays.

Change-Id: Idb659e541226724004660102f6641c38a2312c27
2015-03-20 17:55:08 +02:00
fa50edeb72 Remove references to unused GLU
(after removing the one remaining use of gluErrorString in a SAL_WARN call)

Change-Id: Ib94e346d73e508e69c07deafdc690e3ae0e23d4e
2015-03-02 20:23:57 +01:00
ac06ab2638 libgltf: Fix build on windows x64 bit
Change-Id: Ie467540f17b9c7240cada6b55daa96820c6c02a1
Reviewed-on: https://gerrit.libreoffice.org/14542
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-02-19 20:32:41 +00:00
b6ee5cf707 external/lib{odfgen,revenge}: Declare proper symbol visibility
...not only when building the libs themselves, but also when including their
header files from other code.  (Omission only becomes obvious with hidden
function type RTTI causing false positives from Clang -fsanitize=function.)  As
these external libs do not record the decision to enable visiblity in a config
header file that gets included, it appears easiest to hack that knowledge into
gbuild for now.  (Note that libodfgen internally uses librevenge.)

Change-Id: I6a3a722d561b8cbce6e5b1f27d7aa2d7602f3cdf
2015-01-26 15:17:30 +01:00
df54862ec6 fdo#85174 PDF Import: fix character positions without modifying poppler
Change-Id: I4ec6409e8fa13161c5cd37fcae2055b4bc5ecfd4
Reviewed-on: https://gerrit.libreoffice.org/14066
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-21 15:32:25 +00:00
37e4920a31 continue to implement drawChar for unpatched popplers without drawChar2 hack
Change-Id: Id4ad86f3f563d88777352722e397cd77cfad45e4
2015-01-20 15:48:05 +00:00
152e2a2eb7 coinmp: Don't hard code Win32 platform on Windows
Change-Id: I39eafa22b12e62c766a182c2ebc2b115084f4cef
Reviewed-on: https://gerrit.libreoffice.org/13231
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
2015-01-08 10:40:53 +00:00
c7b4aa22eb all deps for tools are expected to be at one place
Change-Id: Ie0d359f6607811cd76aefe4e19d0fb05379f1762
2014-12-24 18:30:53 +01:00
c868a0c772 build bundled libwpd and libwpg as shared libs
Change-Id: I7a00dfaa3252e2a0ab145ef8a4355f9bd14570da
2014-12-24 14:48:24 +01:00
801408c441 Define gb_LinkTarget__use_plc4 for Android build
Change-Id: Ib44177a27b58e1f11fc98bfe0852f381251e436e
2014-12-12 23:51:17 +02:00
bf6544c0ab Don't treat clew as part of an "external" clcc module
There is no obvious authoritative upstream for clew anyway, so it causes
philosophical problems for distros. For a while, we used to use a zip archive
from the "clcc" project on SourceForge that included clew.c and
clew.h. (Before that we also just had clew.c and clew.h in our source repo.)

So, drop the external/clcc module and have clew.c and clew.h in the source
repo again. But this time clew is in a module of its own, not in sc.

This re-introduces "No need to have OpenCL optional at configure-time"

This reverts commit 764836cb00e8e6dfd2ab48e080a166ec90359e01.

Change-Id: I413142f4f9f8399489f9c3e5327132822f07a454
Reviewed-on: https://gerrit.libreoffice.org/13368
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-12-08 09:07:27 +00:00
827430c8c0 Fold URE: Windows
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is
no longer necessary and loading of cppuhelper from the program dir cannot fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.

Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
2014-12-03 15:19:55 +01:00
2d6ee4ef81 WITH_JPEG_TURBO redundant with BUILD_TYPE JPEG_TURBO
Change-Id: If918b3083fcd8c2e2ea41c43cba53ded1a207196
2014-12-03 08:26:17 +01:00
982f199a98 Fold URE: Linux ure/share/misc/* -> program/
...and remove now unused ure-link symlink

Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-12-01 15:10:32 +01:00
a7a79ee92d Move clew into a library of its own
Change-Id: Ifb7e86b078bd549506a9cc1b9ce9fc22fffc5eec
2014-11-25 20:05:45 +02:00
71fae5db27 Add internal libjpeg-turbo library to be used instead of libjpeg
Unfortunately requires nasm - the netwide assembler -
http://www.nasm.us/

Upstream libjpeg-turbo is meant to be built with CMake on Windows but
thanks to our gcc-wrappers we are able to avoid that.

jpeg is kept mostly for platforms we are cross-compiling to. For now,
it's used also for Mac OS X because jpeg-turbo does not build there,
which should be fixed later.

Change-Id: Id87b7072a8acc2578c3abf7e82cb1499e5094dbf
2014-11-17 14:47:57 +01:00
f24c608705 allow to build with system opencollada
Change-Id: I6101099c57d429987e06bca0652c843f4a94f8cc
2014-10-20 14:47:58 +02:00
92f66c5813 add missing dep for saxparser
Change-Id: I93914949cbb20187c48d9771fd98d54602211c13
2014-10-14 17:56:22 +02:00
0d5cc8ce29 seem to need to link against pthreads on linux for poppler now
Change-Id: Ibca5ad9ff6a3ab28f24ac2554bd0534b0827a24e
2014-08-30 15:15:20 +01:00
a60cc58021 Upgrade libgltf to 0.0.1
News in this version:
- Solve some limitations of walkthrough mode (fdo#81425)
- Multisampling (better rendering quality, mainly at the edges)
- Better error handling (no crash in case of invalid input file)

Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794
Reviewed-on: https://gerrit.libreoffice.org/11179
Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com>
Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
2014-08-29 05:01:31 -05:00
d8a7f72bab Use COMMONS_LOGGING_VERSION vble
Change-Id: I0c76ec7e3f9b95166b4005dd1ad5349b3889c3e4
Reviewed-on: https://gerrit.libreoffice.org/10993
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-08-20 07:29:55 -05:00
439354a0b4 upgrade to apache-commons-1.2
Change-Id: Ic356c6a23f42b5fe37be1075e8508bb168eac9a1
Reviewed-on: https://gerrit.libreoffice.org/10927
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-08-16 21:56:35 -05:00
3442b004e6 Now that we build NSS, we can build libxmlsec and libxsec_xmlsec for iOS, too
Change-Id: I65ab8aad0744a2aa254fefc7732cd8130bb249fb
2014-08-12 17:03:31 +03:00
62101bcacb also move isystem parts to the includes
Change-Id: Ib88064744c7ae678d6c3dcce835a295de8fb274e
Reviewed-on: https://gerrit.libreoffice.org/10814
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2014-08-11 12:36:40 +00:00
191f0944fd Handle collada libraries seperately: --disable-collada
Depends on gltf support.

Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
2014-08-07 15:42:57 +02:00
d85f513934 implement --with-system-coinmp
Change-Id: I02928097f049e8f3cbefbc872b570b2d2b072658
2014-08-06 00:03:21 +02:00
97bda8e081 implement --with-system-gltf
Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82
2014-08-05 20:06:17 +02:00
e59420dd1e make sure image zips are done when gengal is run
... to avoid potential uncaught exception.

Change-Id: I454b9fbb5c35fd72757dfc21687b980982453465
2014-08-04 17:27:00 +02:00
5b66024c11 make sure ICU libs are available when needed
Change-Id: I56faa8f0b1567a4e45cafc8edff17423b1e29c35
2014-07-28 10:40:53 +02:00
057613c686 icu: un-break installation of Java extensions on Windows (rel. fdo#63756)
Linking libxml2 against ICU libraries has a nasty side effect:
The URE library javavm.dll links against URE libxml2.dll, which
is now linked against OOO icuuc53.dll; when a URE program, like
uno.exe, tries to load javavm.dll it fails because the OOO layer
"program" dir is not on PATH; this breaks the installation of Java
extensions.

Fix that by splitting up ICU libraries and putting the required ones
into URE layer.

(regression from 7515b1a90fac9e31733c0fdcc1156adadf0e6f99)

Change-Id: If98dd0357162cb632d9762cd2d20162de5eb1a52
2014-07-24 00:36:14 +02:00
7515b1a90f fdo#63756 build libxml2 with ICU support
Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab
2014-07-20 10:15:25 +02:00
89361fa68a fdo#72277: don't build and use nsspem when building against system curl
System CURL will know how to get the CA bundle from the system openSSL.
There is no need to have internal NSS CA database support.

Change-Id: Ie5074c78f7d78b2c2f452d4d4e11c98222529883
2014-07-17 10:39:35 +02:00
516fb340b1 integrate libpagemaker
Change-Id: I077d7c9a41793abdf5f001386f44ac407f94a6d3
2014-06-27 10:39:29 +02:00
6403f2b59b Update libgltf: new build system and various fixes
Building:
- The new tarball has reasonable build system so
build libgltf as external package instead of compiling
source files directly.
- Freetype dependancy is removed

Improvements comes with the new libgltf
- Can rotate the models too (orbit mode)
- Two camera handling mode: walkthrough and orbit
(press M to change).
- gltf_animation_set_time() works
- FPS can be displayed without freetype (press F)

Additional notes:
- There were some bugs/regressions which are fixed
during the integration (see patches).
- License files are uddated now.
- libgltf building is enabled only on those platforms
on which gltf support actually works (windows and linux)

Change-Id: Ia6c9c4da53a9b4fedba0d73aa5791489f8ad424b
Reviewed-on: https://gerrit.libreoffice.org/9895
Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-06-25 13:22:29 +00:00
548da05c53 curl: work around mysterious xcopy failure
When building with Win32 make, the xcopy at the end of the build fails
with "Invalid arguments" error, which is clearly wrong, since the
arguments are exactly the same as before, and furthermore curl is not
built with GNU make at all, but with nmake!  W-T-F?

Change-Id: Idc0b362202e1d14722573662bebeda0bc7070660
2014-06-09 17:05:51 +02:00
67b4b34cce coverity#1202902 Uncaught CoinError exception
Change-Id: I93488fa942f1975b9c32be6d37fc76ea955a2067
2014-06-06 14:56:28 +01:00
5cf2205387 ucb: move APR dependencies to gb_LinkTarget__use_apr
Change-Id: I6768e5f2400f3020d85c48b80d58e13a3f6f07e9
2014-06-05 13:35:14 +02:00
f85d10fdf6 build libwps as shared lib
Change-Id: Ic30d54461f799b745d0887b830445f00efeb6faa
2014-05-30 20:04:22 +02:00
79211c1abe build libmwaw as shared lib
Change-Id: I3c970cf3d15c2bd0072dccdf34bc3f0dae53c0b8
2014-05-30 20:04:22 +02:00
026dc56eb7 only def graphite external if --enable-graphite
Change-Id: I58271b5138b6dda4c448af63146a2f2171cb61a1
2014-05-30 19:51:15 +02:00
48c9d7ac7c rebase all import libs
Change-Id: I9e1fc613816c943f4fb1033185e34e3acf317f1d
2014-05-26 18:49:04 +02:00
0b7d0a82b2 always provide REDLAND_CFLAGS/LIBS to ext. projects
Change-Id: Iad1004503e91fbaf6251edc50b20d89ddbb15efa
2014-05-25 21:00:08 +02:00
7c9c779cfb fix deps for projects using librevenge
Change-Id: Icc6e2465d96cc95b229a1f7abc6d51362ae3d016
2014-05-25 21:00:07 +02:00
b421ce79e3 bundle librevenge
Change-Id: Ic36c1670866545db2cf2f29867de7e5b0ad2d57d
2014-05-25 12:48:09 +02:00
36c3f91426 build libodfgen as shared lib
Change-Id: I3a2c9f56e87ee6395bd3505a8fe372632e242312
2014-05-25 12:48:09 +02:00
40facc4ea8 don't unconditionally require bsh.jar and js.jar in RepositoryExternal.mk
... as they can be disabled and thus are not there at install

Change-Id: I197b5053971d2721114b2ebc7b3c31db36c3f58e
2014-05-23 08:18:08 +02:00