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

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



> >> > > 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
> >> > 
> >> > Why does that belong in /etc?  It doesn't smell like something
> >> > users should need to configure.
> >> It belongs there, because the ICD loader looks for the *.icd config
> >> files under /etc/OpenCL/vendors. Other packages (e.g.
> >> amd-opencl-icd, beignet, ...) put their *.icd files in to that
> >> directory too.
> >> 
> > That doesn't follow.  If the ICD loader needs to be fixed, we can
> > fix it.
> 
> Can you propose a better approach and do it?
It would be just a matter of changing line 52 in the ICD loader source
code file (see [0]) but I do not know, were else it should be put.

Anyways, I attached an updated patch which applies on top of the
debian-experimental branch in git.

Cheers,
Julian

[0] http://sources.debian.net/src/ocl-icd/2.1.0-1/ocl_icd_loader.c#L52
>From 2537460c5a083589f6b9315d0ad2061d73dff71c Mon Sep 17 00:00:00 2001
From: Julian Wollrath <jwollrath@web.de>
Date: Fri, 8 Nov 2013 19:33:23 +0100
Subject: [PATCH] Add OpenCL support

---
 debian/changelog |  3 +++
 debian/control   | 31 +++++++++++++++++++++++++++++++
 debian/rules     |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 91f544eef451..b9f169f729c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ mesa (10.0.0~rc2-1) UNRELEASED; urgency=low
   * Cherry pick commit to hide some gbm symbols.
   * Manually install *_dri.so to preserve mega-driver hardlinks.
 
+  [ Julian Wollrath ]
+  * Enable OpenCL support.
+
  -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 27 Oct 2013 20:49:30 +0100
 
 mesa (9.2.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 6e156f0f7c56..df6b03726a9f 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],
 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
 Homepage: http://mesa3d.sourceforge.net/
@@ -748,6 +750,35 @@ 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
+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/rules b/debian/rules
index af5ae4e557f4..ad80fa7b5f69 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.4


Reply to: