This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit f460f84ebaaf41b8586c4cf54bd145930834e229 Author: Rene Engelhard <[email protected]> Date: Tue Mar 29 18:37:45 2016 +0200 fix OPENCL_DLL_NAME --- changelog | 5 ++++- patches/OPENCL_DLL_NAME.diff | 30 ++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index 3a88b92..79738ba 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,8 @@ libreoffice (1:5.1.2~rc1-2) UNRELEASED; urgency=medium + * debian/patches/OPENCL_DLL_NAME.diff: backport from master, use .so.1, + not .so + * debian/control*in: add loads of ${misc:Pre-Depends} to packages having .maintscripts calling dir_to_symlink to get proper dpkg Pre-Dependency. Needed e.g. to fix wheezy+wheezy-backports -> jessie+jessie-backports @@ -7,7 +10,7 @@ libreoffice (1:5.1.2~rc1-2) UNRELEASED; urgency=medium * debian/control[,.subsequentcheckbase}.in: remove hardcoded Java depends, use ${java:Depends} - -- Rene Engelhard <[email protected]> Fri, 25 Mar 2016 18:53:37 +0100 + -- Rene Engelhard <[email protected]> Tue, 29 Mar 2016 18:36:24 +0200 libreoffice (1:5.1.2~rc1-1) unstable; urgency=medium diff --git a/patches/OPENCL_DLL_NAME.diff b/patches/OPENCL_DLL_NAME.diff new file mode 100644 index 0000000..8e88f06 --- /dev/null +++ b/patches/OPENCL_DLL_NAME.diff @@ -0,0 +1,30 @@ +From d739811038c54081ea4039a939af8f320b31378b Mon Sep 17 00:00:00 2001 +From: Tor Lillqvist <[email protected]> +Date: Tue, 29 Mar 2016 14:02:02 +0300 +Subject: The OpenCL shared library is called libOpenCL.so.1 on Linux + +libOpenCL.so is just the symbolic link to it, typically from +a development package. (On Fedora, from ocl-icd-devel.) + +(Sure, libOpenCL.so.1 is also a symbolic link on Fedora, to +libOpenCL.so.1.0.0. But anyway, libOpenCL.so.1 is not from a +development package, but from ocl-icd.) + +Change-Id: I18ca2e52e025001f709b1b57e12cd01d5b52d08e + +diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx +index 7bbcb2c..74a925b 100644 +--- a/opencl/source/openclwrapper.cxx ++++ b/opencl/source/openclwrapper.cxx +@@ -38,7 +38,7 @@ + #elif defined(MACOSX) + #define OPENCL_DLL_NAME nullptr + #else +-#define OPENCL_DLL_NAME "libOpenCL.so" ++#define OPENCL_DLL_NAME "libOpenCL.so.1" + #endif + + #define DEVICE_NAME_LENGTH 1024 +-- +cgit v0.10.2 + diff --git a/patches/series b/patches/series index 491df35..29bbc5a 100644 --- a/patches/series +++ b/patches/series @@ -33,3 +33,4 @@ disable-npapi-plugin-support.diff gcc-6.diff GCC-6-PR69273-workaround.diff bash-completion-dir.diff +OPENCL_DLL_NAME.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
