summaryrefslogtreecommitdiff
path: root/Makefile.fetch
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-07-14 12:07:06 +0200
committerZolnai Tamás <zolnaitamas2000@gmail.com>2014-07-14 12:35:52 +0000
commit11b328103f9184b98a822577aaac18d1cdbc5868 (patch)
tree6764575d50038674ec6bb8d4db7ac7ac916908f5 /Makefile.fetch
parent2729671e358bf713048a393c1343054339876460 (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 Change-Id: Ie0f65be3312688196fcca634eb396c577f991073 Reviewed-on: https://gerrit.libreoffice.org/10274 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
Diffstat (limited to 'Makefile.fetch')
-rw-r--r--Makefile.fetch3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.fetch b/Makefile.fetch
index 1c0d53e9bf51..e8ccf5b5b1d8 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) \
@@ -236,6 +235,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: