[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#717500: mesa: Please add support for OpenCL/GalliumCompute



Hi,

> in upstream git (which will sooner or later become Mesa 10.0), there
> now is OpenCL ICD support. So I attached a patch, which adds a
> package for that, instead of building a libOpenCL.so. This should
> eliminate Vincent Danjean concerns.
there was a small problem with the first patch, that is fixed with the
attached new one.


Best regards,
Julian
>From 2b658d6577df5c2fdb5c3e84b14c064f399c28c1 Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollrath@web.de>
Date: Tue, 20 Aug 2013 15:34:40 -0400
Subject: [PATCH] Add OpenCL support

---
 debian/control                    | 32 ++++++++++++++++++++++++++++++++
 debian/libopencl1-mesa.install.in |  2 ++
 debian/not-installed              |  9 ++++++++-
 debian/rules                      |  1 +
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 debian/libopencl1-mesa.install.in

diff --git a/debian/control b/debian/control
index d0631eb..cd36dea 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,8 @@ Build-Depends:
  llvm-3.3-dev (>= 1:3.3-4) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
  libwayland-dev (>= 1.0.2) [linux-any],
+ libclang-3.3-dev [linux-any],
+ libclc-dev [linux-any],
  libvdpau-dev [linux-any],
  libxvmc-dev [linux-any],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
@@ -749,6 +751,36 @@ Description: Developer documentation for Mesa
  extensions, the complete set of release notes and the development header
  files common to all Mesa packages.
 
+Package: libopencl1-mesa
+Section: libs
+Architecture: linux-any
+Provides: libopencl1
+Depends:
+ libclc-r600,
+ ocl-icd-libopencl1,
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: free implementation of the OpenCL API -- ICD runtime
+ This package contains the mesa implementation of the OpenCL (Open Compute
+ Language) library, which is intended for use with an ICD loader. OpenCL
+ provides a standardized interface for computational analysis on graphical
+ processing units.
+
+Package: libopencl1-mesa-dbg
+Section: debug
+Architecture: linux-any
+Depends:
+ libopencl1-mesa (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: free implementation of the OpenCL API -- debugging symbols
+ This package contains the mesa implementation of the OpenCL (Open Compute
+ Language) library, which is intended for use with an ICD loader. OpenCL
+ provides a standardized interface for computational analysis on graphical
+ processing units.
+ .
+ This package contains the debugging symbols for the mesa OpenCL ICD library.
+
 Package: libosmesa6
 Section: libs
 Architecture: any
diff --git a/debian/libopencl1-mesa.install.in b/debian/libopencl1-mesa.install.in
new file mode 100644
index 0000000..867081c
--- /dev/null
+++ b/debian/libopencl1-mesa.install.in
@@ -0,0 +1,2 @@
+dri/etc/OpenCL/vendors/mesa.icd etc/OpenCL/vendors
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libMesaOpenCL* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/not-installed b/debian/not-installed
index 03e3006..0236e1c 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -12,7 +12,14 @@ NOT_INSTALLED := \
 	usr/include/GL/glx_mangle.h \
 	usr/include/GL/osmesa.h \
 	usr/include/GL/wglext.h \
-	usr/include/GL/wmesa.h
+	usr/include/GL/wmesa.h \
+	usr/include/CL/cl_ext.h \
+	usr/include/CL/cl_gl_ext.h \
+	usr/include/CL/cl_gl.h \
+	usr/include/CL/cl.h \
+	usr/include/CL/cl.hpp \
+	usr/include/CL/cl_platform.h \
+	usr/include/CL/opencl.h
 
 # Architecture-specific additional files:
 NOT_INSTALLED_i386 = \
diff --git a/debian/rules b/debian/rules
index 696678d..50ecfa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -109,6 +109,7 @@ confflags-dri = \
 	--with-dri-drivers="$(DRI_DRIVERS)" \
 	--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
 	--with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
+	--enable-opencl --enable-opencl-icd \
 	--enable-osmesa \
 	--enable-glx-tls \
 	--enable-shared-glapi \
-- 
1.8.4.rc3


Reply to: