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

Desktop / LibreOffice - Tor Lillqvist [collabora.com] - 8 December 2014 03:07 UTC

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

bf6544c Don't treat clew as part of an "external" clcc module
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(-)

Upstream: cgit.freedesktop.org

  • Share