Commit Graph

573 Commits

Author SHA1 Message Date
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
7e4708739d care for Java 1.5 support in external packages
apache commons-lang 3.3.1 and commons-codec 1.9 are for use
only with JDK 1.6 and higher

see commits:
  1731f6e692bb0a07a2bca4b1b190163f209d2b9e "bump apache-commons-lang to 3.3.1"
  3dad9b1019bebcc6db63a424afa146e007f768d2 "bump apache-commons-codec to 1.9"

Change-Id: I3e71f6474becafe6c91836bbac5c6a8b7ca3442c
Reviewed-on: https://gerrit.libreoffice.org/9312
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-21 07:57:55 -05:00
2dec067928 fdo#78857 jars aren't built without java
Change-Id: Ide604ea90fb1b26e5e2a72f5eb273fd1686d27c5
2014-05-19 10:29:09 +02:00
d575917016 Introduce Collada2gltf external library
Change-Id: I157f175ee6ea719e98ba45133f53cb4d2c3045bb
2014-05-13 16:34:49 +02:00
aa5fe7958d Introduce OpenCollada external library
Change-Id: I08a806b9319f7cb55be3b38a3bb9370799f6752b
2014-05-13 16:34:49 +02:00
b4b10fc873 Upgrade libgltf
Change-Id: Ib7bc9562602d1d8da4082987302834ac2486d78a
2014-05-06 17:25:16 +02:00
32cd12c8a7 YES -> TRUE
Change-Id: I8d6764d555c50923af5bdc6672753b5e84230144
2014-04-26 19:46:40 +02:00
2a71e15589 specify linking opts for jawt centrally
Change-Id: Idb8d97d44b16bbe41372d97c46199ec786c38218
2014-04-26 16:50:37 +02:00
943dedc59c mingw: fix use of jawt
Change-Id: I47b4a1f5ca5b8ce3cde11d4db599d6afb54a2886
2014-04-26 16:50:36 +02:00
fe5dbe3847 libgltf: Make it link with freetype on Windows.
Change-Id: I57dcde58bb017ab087908154bc4a1af6d5d152b9
2014-04-22 01:17:10 +02:00
c1baaddd8f avmediaogl: load all needed files into buffers for gltf rendering
Change-Id: I00fe209f3b0061dd67240eb1a490fb62530ffb55
2014-04-20 10:27:24 +02:00
dbac8f5a07 restore deps on bins from bundled projects used during build
Change-Id: Ibd97268e4aaa61ec896135bf780173a18536101d
2014-04-18 18:36:07 +02:00
9b9f1a5f06 Fix android build: fix condition
Change-Id: I5e20375791f038b38ef079712204a1afed07c39c
2014-04-18 13:24:28 +02:00
62fd63050c Integrate libgltf for rendering gltf models
Change-Id: I7c30dbcf276052c01bb15f3b8c77a2406260aa7b
2014-04-18 12:56:11 +02:00
b6cbb15026 Freetype is needed by libgltf on all platforms
Change-Id: I042cbc5f4cabfa7ec387594189e2f86be6ec7fbf
2014-04-18 11:19:26 +02:00
65b27f8d1c We now build GLEW always (unless a system one is used)
So its headers are always there in workdir.

Change-Id: I513b49da52c1f393c02b24c5bcf0f415e22e79d2
2014-04-08 14:45:48 +03:00
81e7f75f47 Use condition from Module_chart2.mk for external glew.
I wonder what's best to use here.

Change-Id: Icf641dcf640a12832ea86782414357fa9f71829c
2014-04-08 11:10:13 +02:00
532e8ccd8b Better to use dependency on package here.
Change-Id: I697a2bd24d80ac236f7336e318a338cde788c7d4
2014-04-08 10:31:15 +02:00
cddbec75d4 Fix Windows build(external/coinmp)
This patch fixes the problem that a linker misses CoinMP.dll.
The problem will occurs when we use --enable-dbgutil option.

Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a
Reviewed-on: https://gerrit.libreoffice.org/8854
Reviewed-by: Matúš Kukan <matus.kukan@collabora.com>
Tested-by: Matúš Kukan <matus.kukan@collabora.com>
2014-04-05 01:01:13 -05:00
077bdc73f2 sccomp: Share common code and have only one library.
And use constructor feature for UNO implementations.

Change-Id: I42b6a6f417049cc8e2d44b74c7adc552680b1f2d
2014-04-03 11:42:12 +02:00
8dc394d5c5 Revert "Allow to build lpsolver based on CoinMP library."
This reverts commit 4f7b96886ec2e98f270a9ec3c3509cd523fce7cc.

Conflicts:
	configure.ac
	scp2/InstallModule_ooo.mk

Change-Id: I5621496d70a2c493eb964c1138d310c68fa6d660
2014-04-01 11:04:32 +02:00