d5a3cf9389
Vigra 1.6.0 (Newer versions use Cmake)
* Adds a lot of functionality and includes improvements
for 64 bit compilers.
* Add explicit cast (gcc 4.7 compatibility patch by Stephan Bergmann)
e0dcd31c76
More information on the Vigra changes here:
http://hci.iwr.uni-heidelberg.de/vigra/doc/vigra/CreditsChangelog.html
(cherry picked from commit 0f94142a20861c18f60b5be6fc4163c7e8a69240)
Conflicts:
external_deps.lst
mdds/makefile.mk
mdds/prj/d.lst
vigra/makefile.mk
vigra/prj/d.lst
Change-Id: I05de88982b9dab7c851fab16811ca696207cd091
Vigra: add missing mathutil.hxx patch
(cherry picked from commit ba446263713f7ce1dcc47f78b97840280018af89)
Change-Id: I506f0c1c96cfaf278b4e72de34b24633a1e99431
fix vigra patch for BasicImage::resizeCopy()
"data_" is an actual data pointer but "data" is a member function
(since vigra-1.4). The method resizeCopy() seems to confuse data and data_
which the clang compiler was happy to point out. The OOo patch to vigra-1.4
already solved that problem but it was lost in the upgrade to vigra-1.6
(cherry picked from commit a71a282ae781b90c31e25eb631537f10fe842492)
Change-Id: Ifb031950c60efdda2d30e442990af95f557dd914
Build fix
(cherry picked from commit 6e6c057792a410dd36893674c59d452586733348)
Change-Id: Ide599665c78d377baf0b8f935274b41535749610
20 lines
635 B
Makefile
20 lines
635 B
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_UnpackedTarball_UnpackedTarball,vigra))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_tarball,vigra,$(VIGRA_TARBALL)))
|
|
|
|
$(eval $(call gb_UnpackedTarball_add_patches,vigra,\
|
|
vigra/vigra1.6.0.patch \
|
|
$(if $(filter GCC,$(COM)), \
|
|
vigra/vigra1.6.0-unused-parameters.patch) \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|