fdo#70393: move vigra to a subdir of external

Change-Id: I98e2ae25865c4ec38da19a24ba4347540d170e4f
Reviewed-on: https://gerrit.libreoffice.org/6554
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryModule_build.mk

@@ -78,7 +78,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 			ucb \
 			unoxml \
 			vcl \
-			$(call gb_Helper_optional,VIGRA,vigra) \
 			xmloff \
 			xmlscript \
 		) \

RepositoryModule_host.mk

@@ -144,7 +144,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	uui \
 	vbahelper \
 	vcl \
-	$(call gb_Helper_optional,VIGRA,vigra) \
 	wizards \
 	writerfilter \
 	writerperfect \

external/Module_external.mk

@@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,REDLAND,redland) \
 	$(call gb_Helper_optional,RHINO,rhino) \
 	$(call gb_Helper_optional,UCPP,ucpp) \
+	$(call gb_Helper_optional,VIGRA,vigra) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \
@@ -83,6 +84,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 			$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 			$(call gb_Helper_optional,LCMS2,lcms2) \
 			$(call gb_Helper_optional,NSS,nss) \
+			$(call gb_Helper_optional,VIGRA,vigra) \
 		) \
 	) \
 ))

external/vigra/Makefile

@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:

external/vigra/UnpackedTarball_vigra.mk

@@ -12,9 +12,9 @@ $(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 \
+	external/vigra/vigra1.6.0.patch \
 	$(if $(filter GCC,$(COM)), \
-		vigra/vigra1.6.0-unused-parameters.patch) \
+		external/vigra/vigra1.6.0-unused-parameters.patch) \
 ))
 
 # vim: set noet sw=4 ts=4: