debian/changelog | 4 ++--
debian/control | 32 ++++++++++++++++++++++++++++++++
debian/mesa-opencl-icd.install.in | 2 ++
debian/rules | 3 +++
4 files changed, 39 insertions(+), 2 deletions(-)
New commits:
commit 0260251c1e4ea26e6bf6d597cef90fafae422ee4
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Mar 7 22:40:23 2014 +0100
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index a78dd52..c34f774 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.1.0-1) UNRELEASED; urgency=low
+mesa (10.1.0-1) experimental; urgency=low
[ Andreas Boll ]
* Disable dri3 on !linux
@@ -10,7 +10,7 @@ mesa (10.1.0-1) UNRELEASED; urgency=low
[ Sven Joachim ]
* Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri.
- -- Andreas Boll <andreas.boll....@gmail.com> Mon, 03 Mar 2014 12:39:45 +0100
+ -- Julien Cristau <jcris...@debian.org> Fri, 07 Mar 2014 22:16:32 +0100
mesa (10.1.0~rc2-1) experimental; urgency=medium
commit 7f57081a8e1e7152f1480eccb60cffdf1c1c3e83
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Mar 7 22:16:20 2014 +0100
Disable opencl on kfreebsd per aboll
diff --git a/debian/control b/debian/control
index c280496..ed08431 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,8 @@ Build-Depends:
llvm-3.4-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libwayland-dev (>= 1.2.0) [linux-any],
- libclang-3.4-dev [linux-any kfreebsd-any],
- libclc-dev [linux-any kfreebsd-any],
+ libclang-3.4-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/
@@ -789,7 +789,7 @@ Description: Debugging symbols for the Mesa VDPAU video
acceleration drivers
Package: mesa-opencl-icd
Section: libs
-Architecture: linux-any kfreebsd-any
+Architecture: linux-any
Depends:
libclc-r600,
ocl-icd-libopencl1,
@@ -805,7 +805,7 @@ Description: free implementation of the OpenCL API -- ICD
runtime
Package: mesa-opencl-icd-dbg
Section: debug
Priority: extra
-Architecture: linux-any kfreebsd-any
+Architecture: linux-any
Depends:
mesa-opencl-icd (= ${binary:Version}),
${misc:Depends},
diff --git a/debian/rules b/debian/rules
index 4dac588..481ea7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,9 @@ else
EGL_DISPLAYS += drm
# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
EGL_DISPLAYS += wayland
+# < aboll> opencl needs gallium-pipe-loader which needs udev
+# so no opencl for kbsd
+ confflags_GALLIUM += --enable-opencl --enable-opencl-icd
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += nouveau
endif
@@ -106,7 +109,6 @@ else
confflags_DIRECT_RENDERING = --enable-driglx-direct
confflags_OPENVG = --enable-openvg --enable-gallium-egl
confflags_GALLIUM += --enable-vdpau
- confflags_GALLIUM += --enable-opencl --enable-opencl-icd
endif
confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
confflags_GLES = --enable-gles1 --enable-gles2
commit d637474b442df21f6e2b5bf4d642bf3649b1a23c
Author: Julian Wollrath <jwollr...@web.de>
Date: Wed Mar 5 19:14:58 2014 +0100
Bug#717500: [PATCH] Enable OpenCL support
v2: Add "Provides: opencl-icd"
v3: Andreas Boll <andreas.boll....@gmail.com>
- Add "Priority: extra" to debug package
- Enable build on kfreebsd
- Rename package to mesa-opencl-icd
- Fix rules/confflags to disable building on hurd
Signed-off-by: Andreas Boll <andreas.boll....@gmail.com>
diff --git a/debian/control b/debian/control
index c49cd58..c280496 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,8 @@ Build-Depends:
llvm-3.4-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libwayland-dev (>= 1.2.0) [linux-any],
+ libclang-3.4-dev [linux-any kfreebsd-any],
+ libclc-dev [linux-any kfreebsd-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/
@@ -785,4 +787,34 @@ Description: Debugging symbols for the Mesa VDPAU video
acceleration drivers
.
This package contains the debugging symbols for the VDPAU drivers.
+Package: mesa-opencl-icd
+Section: libs
+Architecture: linux-any kfreebsd-any
+Depends:
+ libclc-r600,
+ ocl-icd-libopencl1,
+ ${shlibs:Depends},
+ ${misc:Depends},
+Provides: opencl-icd
+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: mesa-opencl-icd-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any kfreebsd-any
+Depends:
+ mesa-opencl-icd (= ${binary:Version}),
+ ${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.
+
# vim: tw=0
diff --git a/debian/mesa-opencl-icd.install.in
b/debian/mesa-opencl-icd.install.in
new file mode 100644
index 0000000..867081c
--- /dev/null
+++ b/debian/mesa-opencl-icd.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/rules b/debian/rules
index 2ba8af0..4dac588 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,6 +106,7 @@ else
confflags_DIRECT_RENDERING = --enable-driglx-direct
confflags_OPENVG = --enable-openvg --enable-gallium-egl
confflags_GALLIUM += --enable-vdpau
+ confflags_GALLIUM += --enable-opencl --enable-opencl-icd
endif
confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
confflags_GLES = --enable-gles1 --enable-gles2
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wm2vv-00042s...@moszumanska.debian.org
