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 764836cb.

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

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) \

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 \

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)
 

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 \

external/clcc/Library_clew.mk → clew/Library_clew.mk

@@ -28,8 +28,8 @@ $(eval $(call gb_Library_add_libs,clew,\
 ))
 endif
 
-$(eval $(call gb_Library_add_generated_cobjects,clew,\
-    UnpackedTarball/clcc/src/clew \
+$(eval $(call gb_Library_add_cobjects,clew,\
+    clew/source/clew \
 ))
 
 # vim: set noet sw=4 ts=4:

external/clcc/Makefile → 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:

external/clcc/Module_clcc.mk → clew/Module_clew.mk

@@ -7,11 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Module_Module,clcc))
+$(eval $(call gb_Module_Module,clew))
 
-$(eval $(call gb_Module_add_targets,clcc,\
+$(eval $(call gb_Module_add_targets,clew,\
 	Library_clew \
-	UnpackedTarball_clcc \
 ))
 
 # vim: set noet sw=4 ts=4:

configure.ac

@@ -1096,10 +1096,6 @@ AC_ARG_ENABLE(cairo-canvas,
                           platforms where Cairo is available.
 ])
 
-AC_ARG_ENABLE(opencl,
-    AS_HELP_STRING([--disable-opencl],
-        [Determines whether to build with OpenCL support.]))
-
 AC_ARG_ENABLE(dbus,
     AS_HELP_STRING([--disable-dbus],
         [Determines whether to enable features that depend on dbus.
@@ -10267,21 +10263,12 @@ dnl =================================================
 dnl Check whether to build with OpenCL support.
 dnl =================================================
 
-AC_MSG_CHECKING([whether to build with the OpenCL support.])
-ENABLE_OPENCL=
-
-if test $_os != iOS -a $_os != Android -a "x$enable_opencl" != "xno"; then
-    AC_MSG_RESULT([yes])
-    # CLCC in BUILD_TYPE tells that we are building a bundled clcc (just the clew part), OPENCL in
-    # BUILD_TYPE tells that OpenCL is potentially available on the platform (optional at run-time,
+if test $_os != iOS -a $_os != Android; then
+    # OPENCL in BUILD_TYPE tells that OpenCL is potentially available on the platform (optional at run-time,
     # used through clew).
-    BUILD_TYPE="$BUILD_TYPE CLCC OPENCL"
-    ENABLE_OPENCL=TRUE
+    BUILD_TYPE="$BUILD_TYPE OPENCL"
     AC_DEFINE(HAVE_FEATURE_OPENCL)
-else
-    AC_MSG_RESULT([no])
 fi
-AC_SUBST(ENABLE_OPENCL)
 
 dnl ===================================================================
 dnl Check whether to enable glTF support

cui/Library_cui.mk

@@ -34,6 +34,8 @@ $(eval $(call gb_Library_use_sdk_api,cui))
 $(eval $(call gb_Library_use_libraries,cui,\
 	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
+	$(call gb_Helper_optional,OPENCL,\
+		clew) \
     comphelper \
     cppu \
     cppuhelper \
@@ -66,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,cui,\
 
 $(eval $(call gb_Library_use_externals,cui,\
 	boost_headers \
-	$(call gb_Helper_optional,OPENCL,\
-		clew) \
     icuuc \
     icu_headers \
 ))

download.lst

@@ -20,8 +20,6 @@ export BSH_TARBALL := ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
 export CAIRO_TARBALL := f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
 export CDR_MD5SUM := b33fd0be3befdd1b37777e08ce058bd9
 export CDR_TARBALL := libcdr-0.1.1.tar.bz2
-export CLCC_TARBALL := clcc-0.3.0-25-src.zip
-export CLCC_MD5SUM := 7ec003cc775d1cd06e789fb054c1d695
 export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 export CMIS_TARBALL := 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
 export COINMP_MD5SUM := 1cce53bf4b40ae29790d2c5c9f8b1129

external/Module_external.mk

@@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,BSH,beanshell) \
 	$(call gb_Helper_optional,CAIRO,cairo) \
 	$(call gb_Helper_optional,CDR,libcdr) \
-	$(call gb_Helper_optional,CLCC,clcc) \
 	$(call gb_Helper_optional,CLUCENE,clucene) \
 	$(call gb_Helper_optional,CMIS,libcmis) \
 	$(call gb_Helper_optional,COINMP,coinmp) \

external/clcc/UnpackedTarball_clcc.mk

-# -*- 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,clcc))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,clcc,$(CLCC_TARBALL),0))
-
-$(eval $(call gb_UnpackedTarball_set_patchlevel,clcc,0))
-
-$(eval $(call gb_UnpackedTarball_fix_end_of_line,clcc,\
-	src/clew.c \
-	src/clew.h \
-))
-
-$(eval $(call gb_UnpackedTarball_add_patches,clcc,\
-	external/clcc/clew-non-static.patch \
-))
-
-# vim: set noet sw=4 ts=4:

external/clcc/clew-non-static.patch

---- src/clew.h
-+++ src/clew.h
-@@ -1141,25 +1141,28 @@
- // calling the returned function address.
- //
- typedef CL_API_ENTRY void * (CL_API_CALL * PFNCLGETEXTENSIONFUNCTIONADDRESS)(const char * /* func_name */) CL_API_SUFFIX__VERSION_1_0;
--
--
--#define CLEW_STATIC
- 
- #ifdef CLEW_STATIC
- #  define CLEWAPI extern
- #else
- #  ifdef CLEW_BUILD
--#    define CLEWAPI extern __declspec(dllexport)
-+#    if defined(_WIN32)
-+#      define CLEWAPI extern __declspec(dllexport)
-+#    elif defined(HAVE_GCC_VISIBILITY_FEATURE)
-+#      define CLEWAPI extern __attribute__ ((visibility("default")))
-+#    else
-+#      define CLEWAPI extern
-+#    endif
- #  else
--#    define CLEWAPI extern __declspec(dllimport)
-+#    if defined(_WIN32)
-+#      define CLEWAPI extern __declspec(dllimport)
-+#    else
-+#      define CLEWAPI extern
-+#    endif
- #  endif
- #endif
- 
--#if defined(_WIN32)
--#define CLEW_FUN_EXPORT extern
--#else
- #define CLEW_FUN_EXPORT CLEWAPI
--#endif
- 
- #define CLEW_GET_FUN(x) x
- 
-@@ -1305,9 +1305,9 @@
- #define CLEW_ERROR_IMPORT_FAILED    -3      //!<    Error code for failing to import a named function from the dll
- 
- //! \brief Load OpenCL dynamic library and set function entry points
--int         clewInit        (const char*);
-+CLEW_FUN_EXPORT int         clewInit        (const char*);
- //! \brief Convert an OpenCL error code to its string equivalent
--const char* clewErrorString (cl_int error);
-+CLEW_FUN_EXPORT const char* clewErrorString (cl_int error);
- 
- #ifdef __cplusplus
- }

include/opencl/openclwrapper.hxx

@@ -16,7 +16,7 @@
 #include <vector>
 
 #include <boost/shared_ptr.hpp>
-#include <clew.h>
+#include <clew/clew.h>
 
 #include <sal/detail/log.h>
 #include <opencl/opencldllapi.h>

include/opencl/platforminfo.hxx

@@ -13,7 +13,7 @@
 #include <ostream>
 #include <vector>
 
-#include <clew.h>
+#include <clew/clew.h>
 
 #include <opencl/opencldllapi.h>
 #include <rtl/ustring.hxx>

opencl/Library_opencl.mk

@@ -20,7 +20,6 @@ $(eval $(call gb_Library_add_defs,opencl,\
 
 $(eval $(call gb_Library_use_externals,opencl,\
     boost_headers \
-    clew \
     icu_headers \
     icui18n \
     icuuc \
@@ -33,6 +32,7 @@ $(eval $(call gb_Library_use_custom_headers,opencl,\
 $(eval $(call gb_Library_use_sdk_api,opencl))
 
 $(eval $(call gb_Library_use_libraries,opencl,\
+    clew \
     configmgr \
     comphelper \
     cppu \

opencl/inc/opencl_device_selection.h

@@ -17,7 +17,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <clew.h>
+
+#include <clew/clew.h>
 
 #define DS_DEVICE_NAME_LENGTH 256
 

sc/CppunitTest_sc_opencl_test.mk

@@ -15,7 +15,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_opencl_test, \
 
 $(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \
 	boost_headers \
-	$(call gb_Helper_optional,OPENCL,clew) \
 	mdds_headers \
 	orcus \
 	orcus-parser \
@@ -23,6 +22,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
     basegfx \
+	clew \
     comphelper \
     cppu \
     cppuhelper \

sc/CppunitTest_sc_ucalc.mk

@@ -31,7 +31,6 @@ endif
 
 $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
 	boost_headers \
-    $(call gb_Helper_optional,OPENCL,clew) \
     icu_headers \
     icui18n \
     icuuc \
@@ -44,6 +43,8 @@ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
 $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
 	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
+    $(call gb_Helper_optional,OPENCL, \
+        clew) \
     comphelper \
     cppu \
     cppuhelper \

sc/Library_sc.mk

@@ -37,7 +37,6 @@ $(eval $(call gb_Library_use_sdk_api,sc))
 
 $(eval $(call gb_Library_use_externals,sc,\
     boost_headers \
-    $(call gb_Helper_optional,OPENCL,clew) \
     icu_headers \
     icui18n \
     icuuc \
@@ -63,6 +62,8 @@ endif
 $(eval $(call gb_Library_use_libraries,sc,\
     $(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
+    $(call gb_Helper_optional,OPENCL, \
+        clew) \
     comphelper \
     cppu \
     cppuhelper \

sc/Library_scui.mk

@@ -24,11 +24,12 @@ $(eval $(call gb_Library_use_sdk_api,scui))
 
 $(eval $(call gb_Library_use_externals,scui,\
 	boost_headers \
-	$(call gb_Helper_optional,OPENCL,clew) \
 	mdds_headers \
 ))
 
 $(eval $(call gb_Library_use_libraries,scui,\
+	$(call gb_Helper_optional,OPENCL, \
+		clew) \
 	comphelper \
 	cppu \
 	cppuhelper \

sc/Module_sc.mk

@@ -54,7 +54,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \
     CppunitTest_sc_subsequent_filters_test \
     CppunitTest_sc_subsequent_export_test \
     CppunitTest_sc_html_export_test \
-    $(call gb_Helper_optional,OPENCL,CppunitTest_sc_opencl_test) \
+    CppunitTest_sc_opencl_test \
 ))
 
 # Disabled to allow the check tinderbox execute the sd tests

sc/source/core/opencl/opbase.hxx

@@ -12,7 +12,7 @@
 
 #include <sal/log.hxx>
 
-#include <clew.h>
+#include <clew/clew.h>
 
 #include <formula/token.hxx>
 #include <formula/vectortoken.hxx>

sc/source/ui/optdlg/calcoptionsdlg.hxx

@@ -64,10 +64,8 @@ private:
     OUString toString(sal_Int32 nVal) const;
     SvTreeListEntry *createItem(const OUString &rCaption, const OUString& sValue) const;
     void     setValueAt(size_t nPos, const OUString &rString);
-#if HAVE_FEATURE_OPENCL
     OpenCLConfig::ImplMatcherSet& CurrentWhiteOrBlackList();
     const OpenCLConfig::ImplMatcher& CurrentWhiteOrBlackListEntry();
-#endif
 
 private:
     SvxCheckListBox* mpLbSettings;

sc/workben/opencl/platform_detect.cxx

@@ -3,7 +3,7 @@
 #include <vector>
 #include <string>
 
-#include "clew.h"
+#include <clew/clew.h>
 
 using namespace std;