mesa: Changes to 'ubuntu'
debian/changelog | 7 +++
debian/control | 25 +++++++++++-
debian/patches/glibc2.23-pthreads-compat.patch | 52 -------------------------
debian/patches/series | 1
debian/rules | 2
5 files changed, 31 insertions(+), 56 deletions(-)
New commits:
commit 76d1c27c96f7b85be2c06c80b03798d7fb3ed370
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Apr 14 14:21:04 2016 +0300
release to xenial
diff --git a/debian/changelog b/debian/changelog
index b67c37a..443652b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (11.2.0-1ubuntu2) UNRELEASED; urgency=medium
+mesa (11.2.0-1ubuntu2) xenial; urgency=medium
* control, rules: Enable mesa-opencl-icd now that the archive reorg
allows to build-depend on packages from universe. (LP: #1319835)
- -- Timo Aaltonen <tjaalton@debian.org> Thu, 14 Apr 2016 14:08:04 +0300
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 14 Apr 2016 14:20:56 +0300
mesa (11.2.0-1ubuntu1) xenial; urgency=medium
commit 21ced314d3dc22f68e67de84e5bb97c48c71c4e3
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Apr 14 14:20:54 2016 +0300
control, rules: Enable mesa-opencl-icd now that the archive reorg allows to build-depend on packages from universe. (LP: #1319835)
diff --git a/debian/changelog b/debian/changelog
index add406c..b67c37a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (11.2.0-1ubuntu2) UNRELEASED; urgency=medium
+
+ * control, rules: Enable mesa-opencl-icd now that the archive reorg
+ allows to build-depend on packages from universe. (LP: #1319835)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 14 Apr 2016 14:08:04 +0300
+
mesa (11.2.0-1ubuntu1) xenial; urgency=medium
* Merge from debian. (LP: #1481832. #1548845)
diff --git a/debian/control b/debian/control
index f5edbb8..fcf8c94 100644
--- a/debian/control
+++ b/debian/control
@@ -45,8 +45,8 @@ Build-Depends:
llvm-3.8-dev (>= 1:3.8~) [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.7-dev (>= 1:3.7~+rc2) [amd64 i386 armhf],
-# libclc-dev [amd64 i386 armhf],
+ libclang-3.8-dev (>= 1:3.8~) [amd64 i386 armhf],
+ libclc-dev [amd64 i386 armhf],
mir-client-platform-mesa-dev,
libmirclient-dev,
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git
@@ -471,5 +471,26 @@ Description: Mesa VDPAU video acceleration drivers
.
This package enables support for VDPAU for some gallium drivers.
+Package: mesa-opencl-icd
+Section: libs
+Architecture: amd64 i386 armhf
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ libclc-r600 (>= 0.2.0+git20150813),
+ libclc-amdgcn,
+ ocl-icd-libopencl1 | libopencl1,
+ ${shlibs:Depends},
+ ${misc:Depends},
+Replaces:
+ libgl1-mesa-dri (<< 10.3.0-1),
+Breaks:
+ libgl1-mesa-dri (<< 10.3.0-1),
+Provides: opencl-icd
+Multi-Arch: same
+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.
# vim: tw=0
diff --git a/debian/rules b/debian/rules
index 43815a4..4772824 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ else
# so no opencl on kfreebsd.
# opencl needs LLVM and Clang, so only build it on the subset
# of arches where we have LLVM enabled.
-# confflags_GALLIUM += --enable-opencl --enable-opencl-icd
+ confflags_GALLIUM += --enable-opencl --enable-opencl-icd
endif
# LLVM is required for r300g, radeonsi and llvmpipe:
commit faff76fdf5fe7072eac84126b341f88cd6beac7f
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Apr 14 14:13:42 2016 +0300
drop an obsolete patch from 11.1.x
diff --git a/debian/patches/glibc2.23-pthreads-compat.patch b/debian/patches/glibc2.23-pthreads-compat.patch
deleted file mode 100644
index 9c8a984..0000000
--- a/debian/patches/glibc2.23-pthreads-compat.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: fix misuse of pthread_barrier API
- If we are not spawning any threads, it's incorrect to call
- pthread_barrier_init() with a count of zero. Guard the use of
- pipe_barrier_* so that we don't make API violating calls (SIGFPE on
- x86 with glibc 2.23 and above).
-Author: Steve Langasek <steve.langasek@ubuntu.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1559842
-
-Index: mesa-11.1.2/src/gallium/drivers/llvmpipe/lp_rast.c
-===================================================================
---- mesa-11.1.2.orig/src/gallium/drivers/llvmpipe/lp_rast.c
-+++ mesa-11.1.2/src/gallium/drivers/llvmpipe/lp_rast.c
-@@ -819,7 +819,8 @@
- /* Wait for all threads to get here so that threads[1+] don't
- * get a null rast->curr_scene pointer.
- */
-- pipe_barrier_wait( &rast->barrier );
-+ if (rast->num_threads > 0)
-+ pipe_barrier_wait( &rast->barrier );
-
- /* do work */
- if (debug)
-@@ -829,7 +830,8 @@
- rast->curr_scene);
-
- /* wait for all threads to finish with this scene */
-- pipe_barrier_wait( &rast->barrier );
-+ if (rast->num_threads > 0)
-+ pipe_barrier_wait( &rast->barrier );
-
- /* XXX: shouldn't be necessary:
- */
-@@ -910,7 +912,8 @@
- create_rast_threads(rast);
-
- /* for synchronizing rasterization threads */
-- pipe_barrier_init( &rast->barrier, rast->num_threads );
-+ if (num_threads > 0)
-+ pipe_barrier_init( &rast->barrier, rast->num_threads );
-
- memset(lp_dummy_tile, 0, sizeof lp_dummy_tile);
-
-@@ -967,7 +970,8 @@
- }
-
- /* for synchronizing rasterization threads */
-- pipe_barrier_destroy( &rast->barrier );
-+ if (rast->num_threads > 0)
-+ pipe_barrier_destroy( &rast->barrier );
-
- lp_scene_queue_destroy(rast->full_scenes);
-
diff --git a/debian/patches/series b/debian/patches/series
index d971c7b..64a40a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-glibc2.23-pthreads-compat.patch
07_gallium-fix-build-failure-on-powerpcspe.diff
Reply to: