diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-07-14 12:07:06 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-07-14 15:15:32 +0100 |
| commit | b3af0dbd159c251480dc761a7a00204a3ad74ecb (patch) | |
| tree | 24933285b2f040c23a646f4fe6934b13c9c19c58 /Makefile.fetch | |
| parent | 7aa2b94ac57b7c99e1e45d5f652a423ee603dd55 (diff) | |
Update libgltf: various fixes, memory usage optimization (second try)
Fixes in the new tarball (beside the upstreamed bug fixes):
- In walkthrough mode camera is moved relative to the current
camera position and not relative to the initial camera position.
- The right FPS numbers are displayed under Linux.
- Some memory optimization to avoid running out of memory
in case of huge models.
- Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250
Reviewed-on: https://gerrit.libreoffice.org/10274
Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
(cherry picked from commit 11b328103f9184b98a822577aaac18d1cdbc5868)
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Conflicts:
download.lst
external/libgltf/UnpackedTarball_libgltf.mk
Change-Id: Ie0f65be3312688196fcca634eb396c577f991073
Diffstat (limited to 'Makefile.fetch')
| -rw-r--r-- | Makefile.fetch | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.fetch b/Makefile.fetch index 204c8f89a953..ffb9d66ee350 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -156,7 +156,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ $(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \ - $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \ $(call fetch_Optional,LIBPNG,PNG_TARBALL) \ @@ -235,6 +234,8 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \ $(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \ ,$(call fetch_Download_item_unchecked,http://dev-www.libreoffice.org/mozilla,$(item))) + $(if $(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL) \ + , $(call fetch_Download_item,http://dev-www.libreoffice.org/src/libgltf,$(call fetch_Optional,LIBGLTF,LIBGLTF_TARBALL))) @mkdir -p $(dir $@) && touch $@ # vim: set noet sw=4 ts=4: |