[Libreoffice-commits] core.git: clew/Library_clew.mk clew/Makefile clew/Module_clew.mk clew/source external/clew external/Module_external.mk RepositoryModule_host.mk

2016-03-21 Thread Michael Stahl 
 RepositoryModule_host.mk  |1 
 clew/Library_clew.mk  |   36 
 clew/Makefile |7 
 clew/Module_clew.mk   |   16 --
 clew/source/clew.c|  325 --
 external/Module_external.mk   |1 
 external/clew/Library_clew.mk |   36 
 external/clew/Makefile|7 
 external/clew/Module_clew.mk  |   16 ++
 external/clew/README  |5 
 external/clew/source/clew.c   |  325 ++
 11 files changed, 390 insertions(+), 385 deletions(-)

New commits:
commit 38cd1d9a5f00dc69ba0d60e2fe6957090c7a26d1
Author: Michael Stahl 
Date:   Wed Mar 9 13:59:35 2016 +0100

clew: move this foreign code to external/clew

... so that hopefully it won't be "cleaned up" and needlessly diverge
from any hypothetical future upstream.

Change-Id: I10503072f618ac6b74bc52d4d59c0d8951bd8d0d
Reviewed-on: https://gerrit.libreoffice.org/23075
Reviewed-by: David Ostrovsky 
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 4b654a2..d2f1d84 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
bridges \
canvas \
chart2 \
-   $(call gb_Helper_optional,OPENCL,clew) \
cli_ure \
$(call gb_Helper_optional,DESKTOP,codemaker) \
comphelper \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 2512b85..44280e3 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,BZIP2,bzip2) \
$(call gb_Helper_optional,CAIRO,cairo) \
$(call gb_Helper_optional,CDR,libcdr) \
+   $(call gb_Helper_optional,OPENCL,clew) \
$(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,CMIS,libcmis) \
$(call gb_Helper_optional,COINMP,coinmp) \
diff --git a/clew/Library_clew.mk b/external/clew/Library_clew.mk
similarity index 96%
rename from clew/Library_clew.mk
rename to external/clew/Library_clew.mk
index 91f4bce..31ef971 100644
--- a/clew/Library_clew.mk
+++ b/external/clew/Library_clew.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_Library_add_libs,clew,\
 endif
 
 $(eval $(call gb_Library_add_cobjects,clew,\
-clew/source/clew \
+external/clew/source/clew \
 ))
 
 # This is required for module-deps.pl to produce correct dependencies.
diff --git a/clew/Makefile b/external/clew/Makefile
similarity index 71%
rename from clew/Makefile
rename to external/clew/Makefile
index ccb1c85..e4968cf8 100644
--- a/clew/Makefile
+++ b/external/clew/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:
diff --git a/clew/Module_clew.mk b/external/clew/Module_clew.mk
similarity index 100%
rename from clew/Module_clew.mk
rename to external/clew/Module_clew.mk
diff --git a/external/clew/README b/external/clew/README
new file mode 100644
index 000..7a0d652
--- /dev/null
+++ b/external/clew/README
@@ -0,0 +1,5 @@
+CLEW is the OpenCL Extension Wrangler - similar to GLEW but for OpenCL
+
+This project doesn't appear to have an obvious upstream, so
+the source files are in our git repo and there is no option
+to use a system library.
diff --git a/clew/source/clew.c b/external/clew/source/clew.c
similarity index 100%
rename from clew/source/clew.c
rename to external/clew/source/clew.c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: clew/Library_clew.mk

2016-01-21 Thread Peter Foley 
 clew/Library_clew.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8c63bdc873fe549ea8d58ec2e31a95b309158f5a
Author: Peter Foley 
Date:   Tue Jan 19 10:06:45 2016 -0500

Fix module-deps with clew

Change-Id: Idb266e906915182d12f56a11feb21e11bdc95f76
Reviewed-on: https://gerrit.libreoffice.org/21607
Tested-by: Jenkins 
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/clew/Library_clew.mk b/clew/Library_clew.mk
index 014027c..91f4bce 100644
--- a/clew/Library_clew.mk
+++ b/clew/Library_clew.mk
@@ -30,4 +30,7 @@ $(eval $(call gb_Library_add_cobjects,clew,\
 clew/source/clew \
 ))
 
+# This is required for module-deps.pl to produce correct dependencies.
+$(eval $(call gb_Library_use_libraries,clew,))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: clew/Library_clew.mk clew/Makefile clew/Module_clew.mk clew/source configure.ac cui/Library_cui.mk download.lst external/clcc external/Module_external.mk include/clew i

2014-12-08 Thread Tor Lillqvist 
 Makefile.fetch |1 
 Repository.mk  |2 
 RepositoryExternal.mk  |   11 
 RepositoryModule_host.mk   |1 
 clew/Library_clew.mk   |   35 
 clew/Makefile  |7 
 clew/Module_clew.mk|   16 
 clew/source/clew.c |  326 
 configure.ac   |   19 
 cui/Library_cui.mk |4 
 download.lst   |2 
 external/Module_external.mk|1 
 external/clcc/Library_clew.mk  |   35 
 external/clcc/Makefile |7 
 external/clcc/Module_clcc.mk   |   17 
 external/clcc/UnpackedTarball_clcc.mk  |   25 
 external/clcc/clew-non-static.patch|   52 -
 include/clew/clew.h| 1320 +
 include/opencl/openclwrapper.hxx   |2 
 include/opencl/platforminfo.hxx|2 
 opencl/Library_opencl.mk   |2 
 opencl/inc/opencl_device_selection.h   |3 
 sc/CppunitTest_sc_opencl_test.mk   |2 
 sc/CppunitTest_sc_ucalc.mk |3 
 sc/Library_sc.mk   |3 
 sc/Library_scui.mk |3 
 sc/Module_sc.mk|2 
 sc/source/core/opencl/opbase.hxx   |2 
 sc/source/ui/optdlg/calcoptionsdlg.hxx |2 
 sc/workben/opencl/platform_detect.cxx  |2 
 30 files changed, 1726 insertions(+), 183 deletions(-)

New commits:
commit bf6544c0ab0625e5ce5918f6d861763d4fa87aba
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Dec 8 09:29:28 2014 +0200

Don't treat clew as part of an external clcc module

There is no obvious authoritative upstream for clew anyway, so it causes
philosophical problems for distros. For a while, we used to use a zip 
archive
from the clcc project on SourceForge that included clew.c and
clew.h. (Before that we also just had clew.c and clew.h in our source repo.)

So, drop the external/clcc module and have clew.c and clew.h in the source
repo again. But this time clew is in a module of its own, not in sc.

This re-introduces No need to have OpenCL optional at configure-time

This reverts commit 764836cb00e8e6dfd2ab48e080a166ec90359e01.

Change-Id: I413142f4f9f8399489f9c3e5327132822f07a454
Reviewed-on: https://gerrit.libreoffice.org/13368
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/Makefile.fetch b/Makefile.fetch
index 84e5f80..7aee66a 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -115,7 +115,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,CAIRO,CAIRO_TARBALL) \
$(call fetch_Optional,CAIRO,PIXMAN_TARBALL) \
$(call fetch_Optional,CDR,CDR_TARBALL) \
-   $(call fetch_Optional,CLCC,CLCC_TARBALL) \
$(call fetch_Optional,CLUCENE,CLUCENE_TARBALL) \
$(call fetch_Optional,CMIS,CMIS_TARBALL) \
$(call fetch_Optional,COINMP,COINMP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 2b9a179..b851dfd 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -316,7 +316,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
chartcore \
chartcontroller \
chartopengl \
-   $(call gb_Helper_optional,CLCC,clew) \
+   $(call gb_Helper_optional,OPENCL,clew) \
$(if $(filter $(OS),WNT),,cmdmail) \
cppcanvas \
configmgr \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c8f093e..b32b06d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -279,17 +279,6 @@ endef
 
 endif # SYSTEM_GLEW
 
-define gb_LinkTarget__use_clew
-$(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,clcc)/src \
-   $$(INCLUDE) \
-)
-$(call gb_LinkTarget_use_libraries,$(1),\
-   clew \
-)
-
-endef
-
 define gb_LinkTarget__use_iconv
 $(call gb_LinkTarget_add_libs,$(1),-liconv)
 
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 4ad30ff..a3567c4 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
bridges \
canvas \
chart2 \
+   $(call gb_Helper_optional,OPENCL,clew) \
cli_ure \
$(call gb_Helper_optional,DESKTOP,codemaker) \
comphelper \
diff --git a/external/clcc/Library_clew.mk b/clew/Library_clew.mk
similarity index 88%
rename from external/clcc/Library_clew.mk
rename to clew/Library_clew.mk
index 8841ab9..2e1ed6f 100644
--- a/external/clcc/Library_clew.mk
+++ b/clew/Library_clew.mk
@@ -28,8 +28,8 @@ $(eval $(call gb_Library_add_libs,clew,\
 ))
 endif
 
-$(eval $(call gb_Library_add_generated_cobjects,clew,\
-