[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0_rc2-1-17-gbc8880d
The following commit has been merged in the debian-experimental-4.2 branch:
commit 043be286e468338763a8cdccf332020bf61fa764
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 8 22:43:16 2013 +0200
git update; add opencl conditional (will that ever work with ocl-icd-opencl-dev?)
diff --git a/changelog b/changelog
index 8317097..2b34afa 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.2.0~alpha0~git20130701-1) UNRELEASED; urgency=low
+libreoffice (1:4.2.0~alpha0~git20130708-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/control b/control
index 9648998..d1585cf 100644
--- a/control
+++ b/control
@@ -109,6 +109,7 @@ Build-Depends: ant (>= 1.7.0),
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
+ ocl-icd-opencl-dev,
openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel],
openjdk-7-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc],
pkg-config,
@@ -145,7 +146,8 @@ Build-Depends-Indep: bsh (>= 2.0b4),
libservlet3.0-java,
libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
xml-core
-Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
+Build-Conflicts: amd-libopencl1,
+ ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64],
flex (= 2.5.34-1) [amd64],
@@ -164,6 +166,7 @@ Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
+ nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
XS-Python-Version: current
@@ -4558,6 +4561,7 @@ Depends: ant (>= 1.7.0),
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
+ ocl-icd-opencl-dev,
openjdk-6-jdk (>= 6b23~pre8-2),
pkg-config,
python (>= 2.6.6-3+squeeze4),
diff --git a/control.in b/control.in
index df62b0b..1ae7012 100644
--- a/control.in
+++ b/control.in
@@ -23,7 +23,9 @@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
- qt3-dev-tools
+ qt3-dev-tools,
+ amd-libopencl1,
+ nvidia-libopencl1
Standards-Version: 3.9.4
XS-Python-Version: @PYTHON2_VERSION@
XS-Python3-Version: @PYTHON_VERSION_CONTROL@
diff --git a/patches/opencl-multiarch.diff b/patches/opencl-multiarch.diff
new file mode 100644
index 0000000..6d11587
--- /dev/null
+++ b/patches/opencl-multiarch.diff
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 69479c3..2a60133 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9841,7 +9841,7 @@ else
+ OPENCL_LIBS="-LIBPATH:$formatted_path/lib/x86 OpenCL.lib"
+ else
+ OPENCL_CFLAGS="-I$with_opencl_sdk/include"
+- OPENCL_LIBS="-L$with_opencl_sdk/lib/x86 -lOpenCL"
++ OPENCL_LIBS="-L$with_opencl_sdk/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` -lOpenCL"
+ fi
+ AC_MSG_RESULT([found at path $with_opencl_sdk])
+ AC_DEFINE(HAVE_FEATURE_OPENCL)
diff --git a/patches/pyuno-copy-for-python2.diff b/patches/pyuno-copy-for-python2.diff
index 5d24281..854e7c3 100644
--- a/patches/pyuno-copy-for-python2.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -54,7 +54,7 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+# vim:set noet sw=4 ts=4:
--- /dev/null 2012-11-27 20:03:56.000000000 +0100
+++ py2uno/Library_py2uno_wrapper.mk 2012-11-27 17:57:31.000000000 +0100
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
@@ -85,9 +85,10 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+# libs (loaded though RTLD_GLOBAL libpyuno.so) may resolve that symbol to e.g.
+# cppu, because they happen to see that before libstdc++; so the requirement has
+# always been that RTLD_LOCAL-loaded pyuno.so wrapper implicitly load into the
-+# process as little as possible:
-+$(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
-+$(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
++# process as little as possible.
++# To ensure that pyuno.so does not link against libstdc++ the dynamic link
++# command invokes gcc and not g++ if there are only C objects, so
++# don't add any C++ objects here!
+
+ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
+
@@ -244,7 +245,7 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-# vim:set noet sw=4 ts=4:
--- pyuno/Library_pyuno_wrapper.mk 2012-11-27 17:57:31.000000000 +0100
+++ /dev/null 2012-11-27 20:03:56.000000000 +0100
-@@ -1,47 +0,0 @@
+@@ -1,48 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
@@ -275,9 +276,10 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-# libs (loaded though RTLD_GLOBAL libpyuno.so) may resolve that symbol to e.g.
-# cppu, because they happen to see that before libstdc++; so the requirement has
-# always been that RTLD_LOCAL-loaded pyuno.so wrapper implicitly load into the
--# process as little as possible:
--$(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
--$(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
+-# process as little as possible.
+-# To ensure that pyuno.so does not link against libstdc++ the dynamic link
+-# command invokes gcc and not g++ if there are only C objects, so
+-# don't add any C++ objects here!
-
-ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
-
diff --git a/patches/series b/patches/series
index 55af955..d81fff2 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,4 @@ wheezy-backports-python.diff
fix-internal-hsqldb-build.diff
javadoc-optional.diff
show-the-startcenter.diff
+opencl-multiarch.diff
diff --git a/rules b/rules
index 9bb5bba..975068e 100755
--- a/rules
+++ b/rules
@@ -373,6 +373,7 @@ ifeq "$(USE_UCPP)" "y"
endif
ENABLE_MERGELIBS=n
PACKAGE_LIBLIBREOFFICE=n
+USE_OPENCL=y
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@ -643,6 +644,10 @@ ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
BUILD_DEPS += , libssl-dev
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so | cut -d"." -f3,4,5)-dbg
endif
+ifeq "$(USE_OPENCL)" "y"
+ BUILD_DEPS += , ocl-icd-opencl-dev
+ CONFIGURE_FLAGS += --with-opencl-sdk=/usr
+endif
ifeq "$(BUILD_DBG_PACKAGE)" "y"
ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
--
LibreOffice packaging repository
Reply to: