summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.top2
-rw-r--r--Module_tail_build.mk1
-rw-r--r--RepositoryExternal.mk17
-rw-r--r--RepositoryModule_ooo.mk1
-rw-r--r--basebmp/Library_basebmp.mk2
-rw-r--r--basebmp/prj/build.lst2
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.in3
-rw-r--r--ooo.lst.in2
-rw-r--r--tail_build/prj/build.lst2
-rw-r--r--vigra/Makefile7
-rw-r--r--vigra/Module_vigra.mk20
-rw-r--r--vigra/UnpackedTarball_vigra.mk21
-rw-r--r--vigra/makefile.mk80
-rw-r--r--vigra/prj/d.lst3
-rw-r--r--vigra/prj/dmake0
16 files changed, 76 insertions, 88 deletions
diff --git a/Makefile.top b/Makefile.top
index 9c650466e821..643bcbbf5930 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -158,6 +158,7 @@ ure\
uui\
vbahelper\
vcl\
+vigra\
wizards\
writerfilter\
writerperfect\
@@ -245,7 +246,6 @@ stax\
stlport\
sysui\
tomcat\
-vigra\
xpdf\
xsltml\
zlib\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ec8e709893df..b3c2424f3b5f 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -141,6 +141,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
uui \
vbahelper \
vcl \
+ vigra \
wizards \
writerfilter \
writerperfect \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a2f165efa7a9..cf41f69e40cc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -92,6 +92,23 @@ endef
endif
+ifeq ($(SYSTEM_VIGRA),YES)
+
+gb_LinkTarget__use_vigra_headers :=
+
+else
+
+define gb_LinkTarget__use_vigra_headers
+$(call gb_LinkTarget_use_unpacked,$(1),vigra)
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,vigra/include) \
+ $$(INCLUDE) \
+)
+
+endef
+
+endif
+
# External libraries
ifeq ($(SYSTEM_CPPUNIT),YES)
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 52c5b8c993da..3a41413d2f07 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -157,6 +157,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
uui \
vbahelper \
vcl \
+ vigra \
wizards \
writerfilter \
writerperfect \
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 756840bbc2d1..95230ba646a5 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_Library_use_package,basebmp,basebmp_inc))
$(eval $(call gb_Library_use_sdk_api,basebmp))
+$(eval $(call gb_Library_use_external,basebmp,vigra_headers))
+
$(eval $(call gb_Library_use_libraries,basebmp,\
basegfx \
sal \
diff --git a/basebmp/prj/build.lst b/basebmp/prj/build.lst
index 2b0fa1e0f72a..6da46bb739fc 100644
--- a/basebmp/prj/build.lst
+++ b/basebmp/prj/build.lst
@@ -1,2 +1,2 @@
-bx basebmp : sal VIGRA:vigra basegfx BOOST:boost NULL
+bx basebmp : sal vigra basegfx BOOST:boost NULL
bx basebmp\prj nmake - all bx_prj NULL
diff --git a/config_host.mk.in b/config_host.mk.in
index 2653e31b756c..c6ffc88da76f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -573,6 +573,7 @@ export UUIDGEN=@UUIDGEN@
export VALGRIND_CFLAGS=@VALGRIND_CFLAGS@
export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@
export VERBOSE=@VERBOSE@
+export VIGRA_TARBALL=@VIGRA_TARBALL@
export VISIO_CFLAGS=@VISIO_CFLAGS@
export VISIO_LIBS=@VISIO_LIBS@
export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
diff --git a/configure.in b/configure.in
index 1cd763e5710a..fa2427974da5 100644
--- a/configure.in
+++ b/configure.in
@@ -7738,10 +7738,11 @@ if test "$with_system_vigra" = "yes"; then
AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
- BUILD_TYPE="$BUILD_TYPE VIGRA"
+ VIGRA_TARBALL=ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
SYSTEM_VIGRA=NO
fi
AC_SUBST(SYSTEM_VIGRA)
+AC_SUBST(VIGRA_TARBALL)
dnl ===================================================================
dnl Check for system odbc
diff --git a/ooo.lst.in b/ooo.lst.in
index 17e6842db654..93a03950120f 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -46,7 +46,7 @@ e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
-ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
+@VIGRA_TARBALL@
dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 7fc74f22ea44..ffca1aaa6618 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/vigra/Makefile b/vigra/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/vigra/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/vigra/Module_vigra.mk b/vigra/Module_vigra.mk
new file mode 100644
index 000000000000..af2369f31323
--- /dev/null
+++ b/vigra/Module_vigra.mk
@@ -0,0 +1,20 @@
+# -*- 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_Module_Module,vigra))
+
+ifeq ($(SYSTEM_VIGRA),NO)
+
+$(eval $(call gb_Module_add_targets,vigra,\
+ UnpackedTarball_vigra \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/vigra/UnpackedTarball_vigra.mk b/vigra/UnpackedTarball_vigra.mk
new file mode 100644
index 000000000000..72e6209253af
--- /dev/null
+++ b/vigra/UnpackedTarball_vigra.mk
@@ -0,0 +1,21 @@
+# -*- 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.4.0.patch \
+ $(if $(filter GCC,$(COM)), \
+ vigra/vigra1.4.0-unused-parameters.patch) \
+ vigra/vigra1.4.0-enumwarn.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vigra/makefile.mk b/vigra/makefile.mk
deleted file mode 100644
index ff351732fd87..000000000000
--- a/vigra/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# dmake create_clean -- just unpacks
-# dmake patch -- unpacks and applies patch file
-# dmake create_patch -- creates a patch file
-
-PRJ=.
-
-PRJNAME=vigra
-TARGET=vigra
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_VIGRA)" == "YES"
-all:
- @echo "An already available installation of vigra should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
-.ELSE
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=vigra1.4.0
-TARFILE_MD5=ea91f2fb4212a21d708aced277e6e85a
-PATCH_FILES=$(TARFILE_NAME).patch
-
-# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
-.IF "$(COM)" == "GCC"
-PATCH_FILES += vigra1.4.0-unused-parameters.patch
-.END
-
-# At least GCC 4.7 treats more correctly now the type of enumerators prior to
-# the closing brace of the enum-specifier (see [dcl.enum] in the C++ 2003
-# Standard), leading to "comparison between <enum1> and <enum2> [-Werror=enum-
-# compare]" and "enumeral mismatch in conditional expression [-Werror]"
-# warnings (included upstream as <https://github.com/ukoethe/vigra/commit/
-# e0dcd31c76bb13c98920e21544b309ca47bb3c5c> "added explicit cast (gcc 4.7
-# compatibility patch by Stephan Bergmann)"):
-PATCH_FILES += vigra1.4.0-enumwarn.patch
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-
-BUILD_DIR=
-BUILD_ACTION=
-BUILD_FLAGS=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.ENDIF
diff --git a/vigra/prj/d.lst b/vigra/prj/d.lst
index ddf8fafb24a1..e69de29bb2d1 100644
--- a/vigra/prj/d.lst
+++ b/vigra/prj/d.lst
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\vigra
-
-..\%__SRC%\misc\build\vigra1.4.0\include\vigra\*.hxx %_DEST%\inc\vigra\*.hxx
diff --git a/vigra/prj/dmake b/vigra/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/vigra/prj/dmake
+++ /dev/null
generated by cgit (git 2.34.1) at 2024-07-17 03:13:22 +0000