mesa: Changes to 'ubuntu'
debian/changelog | 14 +++
debian/libegl1-mesa-drivers.install.linux.in |4
debian/patches/fix-bsymbolic-madness.patch | 121 +++
debian/patches/series|1
4 files changed, 138 insertions(+), 2 deletions(-)
New commits:
commit ad600c7c13e8ff6f223123b1d6dfbe967861983d
Author: Maarten Lankhorst
Date: Wed Mar 5 14:20:59 2014 +0100
Add --dynamic-list to undo damage from -Bsymbolic-functions.
This fixes vdpau interop properly.
diff --git a/debian/changelog b/debian/changelog
index 48903a1..bac3357 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0~rc3-0ubuntu3) UNRELEASED; urgency=low
+
+ * Add --dynamic-list to undo damage from -Bsymbolic-functions.
+- This fixes vdpau interop properly.
+
+ -- Maarten Lankhorst Wed, 05 Mar 2014
14:19:17 +0100
+
mesa (10.1.0~rc3-0ubuntu2) trusty; urgency=medium
* Install libegl-wayland in /mesa-egl again.
diff --git a/debian/patches/fix-bsymbolic-madness.patch
b/debian/patches/fix-bsymbolic-madness.patch
new file mode 100644
index 000..0d4822f
--- /dev/null
+++ b/debian/patches/fix-bsymbolic-madness.patch
@@ -0,0 +1,121 @@
+diff --git a/src/gallium/targets/dri-nouveau/Makefile.am
b/src/gallium/targets/dri-nouveau/Makefile.am
+index 4bd4e21..f34acf8 100644
+--- a/src/gallium/targets/dri-nouveau/Makefile.am
b/src/gallium/targets/dri-nouveau/Makefile.am
+@@ -35,7 +35,9 @@ dri_LTLIBRARIES = nouveau_dri.la
+ nodist_EXTRA_nouveau_dri_la_SOURCES = dummy.cpp
+ nouveau_dri_la_SOURCES = target.c
+
+-nouveau_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
++nouveau_dri_la_LDFLAGS = \
++ $(GALLIUM_DRI_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/nouveau_dri.dyn
+
+ nouveau_dri_la_LIBADD = \
+ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
+diff --git a/src/gallium/targets/dri-nouveau/nouveau_dri.dyn
b/src/gallium/targets/dri-nouveau/nouveau_dri.dyn
+new file mode 100644
+index 000..a10356b
+--- /dev/null
b/src/gallium/targets/dri-nouveau/nouveau_dri.dyn
+@@ -0,0 +1,3 @@
++{
++ nouveau_drm_screen_create;
++};
+diff --git a/src/gallium/targets/r300/dri/Makefile.am
b/src/gallium/targets/r300/dri/Makefile.am
+index 4bd9ea4..e2becdb 100644
+--- a/src/gallium/targets/r300/dri/Makefile.am
b/src/gallium/targets/r300/dri/Makefile.am
+@@ -37,7 +37,9 @@ nodist_EXTRA_r300_dri_la_SOURCES = dummy.cpp
+ r300_dri_la_SOURCES = \
+ drm_target.c
+
+-r300_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
++r300_dri_la_LDFLAGS = \
++ $(GALLIUM_DRI_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/radeon.dyn
+
+ r300_dri_la_LIBADD = \
+ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
+diff --git a/src/gallium/targets/r300/dri/radeon.dyn
b/src/gallium/targets/r300/dri/radeon.dyn
+new file mode 100644
+index 000..8d243dc
+--- /dev/null
b/src/gallium/targets/r300/dri/radeon.dyn
+@@ -0,0 +1,3 @@
++{
++ radeon_drm_winsys_create;
++};
+diff --git a/src/gallium/targets/r600/dri/Makefile.am
b/src/gallium/targets/r600/dri/Makefile.am
+index 1f13b80..149106f 100644
+--- a/src/gallium/targets/r600/dri/Makefile.am
b/src/gallium/targets/r600/dri/Makefile.am
+@@ -36,7 +36,9 @@ dri_LTLIBRARIES = r600_dri.la
+ r600_dri_la_SOURCES = \
+ drm_target.c
+
+-r600_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
++r600_dri_la_LDFLAGS = \
++ $(GALLIUM_DRI_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
+
+ r600_dri_la_LIBADD = \
+ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
+diff --git a/src/gallium/targets/r600/vdpau/Makefile.am
b/src/gallium/targets/r600/vdpau/Makefile.am
+index 509b954..d1a528d 100644
+--- a/src/gallium/targets/r600/vdpau/Makefile.am
b/src/gallium/targets/r600/vdpau/Makefile.am
+@@ -35,7 +35,8 @@ libvdpau_r600_la_SOURCES = \
+ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
+
+ libvdpau_r600_la_LDFLAGS = \
+- $(GALLIUM_VDPAU_LINKER_FLAGS)
++ $(GALLIUM_VDPAU_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
+
+ libvdpau_r600_la_LIBADD = \
+ $(top_builddir)/src/gallium/drivers/r600/libr600.la \
+diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am
b/src/gallium/targets/radeonsi/dri/Makefile.am
+index eab28b5..a8db0a8 100644
+--- a/src/gallium/targets/radeonsi/dri/Makefile.am
b/src/gallium/targets/radeonsi/dri/Makefile.am
+@@ -37,7 +37,9 @@ nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp
+ radeonsi_dri_la_SOURCES = \
+ drm_target.c
+
+-radeonsi_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS)
++radeonsi_dri_la_LDFLAGS = \
++ $(GALLIUM_DRI_LINKER_FLAGS) \
++ -Wl,--dynamic-list=$(srcdir)/../../r300/dri/radeon.dyn
+
+ radeonsi_dri_la_LIBADD = \
+ $(top_builddir)/src/mesa/drivers/dri/common/libdricommon.la \
+diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am
b/src/gallium/targets/rad
xorg-server: Changes to 'ubuntu+1'
debian/patches/xmir.patch | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 0568033ae082d13d1bb6f1335f97ac09eac8336d
Author: Maarten Lankhorst
Date: Wed Mar 5 16:57:12 2014 +0100
refresh xmir harder
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index bf9b519..d8870de 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -816,7 +816,7 @@
+};
+
+static int
-+xmir_visit_set_window_pixmap(WindowPtr window, pointer data)
++xmir_visit_set_window_pixmap(WindowPtr window, void *data)
+{
+struct xmir_visit_set_pixmap_window *visit = data;
+
@@ -1147,7 +1147,7 @@
+static int pipefds[2];
+
+static void
-+xmir_wakeup_handler(pointer data, int err, pointer read_mask)
++xmir_wakeup_handler(void *data, int err, void *read_mask)
+{
+if (err >= 0 && FD_ISSET(pipefds[0], (fd_set *)read_mask))
+xmir_process_from_eventloop();
@@ -1801,8 +1801,8 @@
+
+_X_EXPORT XF86ModuleData xmirModuleData = { &VersRec, xMirSetup, xMirTeardown
};
+
-+static pointer
-+xMirSetup(pointer module, pointer opts, int *errmaj, int *errmin)
++static void *
++xMirSetup(void *module, void *opts, int *errmaj, int *errmin)
+{
+static Bool setupDone = FALSE;
+
@@ -1830,7 +1830,7 @@
+}
+
+static void
-+xMirTeardown(pointer module)
++xMirTeardown(void *module)
+{
+}
--- /dev/null
--
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/e1wlec7-000879...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu+1'
debian/control |5 - debian/rules |2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) New commits: commit e5fdae2e56fabf5ce8eee9a467ee19231edef2d4 Author: Maarten Lankhorst Date: Wed Mar 5 17:33:37 2014 +0100 bump depends, enable builtin glamor, conflict with glamor. For what good it will do, x11proto-core-dev and x11proto-fonts-dev still need a bump. diff --git a/debian/control b/debian/control index f3480dc..966d36d 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Build-Depends: x11proto-xf86vidmode-dev (>= 2.2.99.1), x11proto-present-dev, x11proto-dri3-dev, - xtrans-dev (>= 1.3.2), + xtrans-dev (>= 1.3.3), libxau-dev (>= 1:1.0.5-2), x11proto-input-dev (>= 2.3), x11proto-dri2-dev (>= 2.8), @@ -45,6 +45,7 @@ Build-Depends: libxkbfile-dev (>= 1:0.99.1), libpixman-1-dev (>= 0.27.2), libpciaccess-dev (>= 0.12.901), + libepoxy-dev, libgcrypt-dev, nettle-dev, libdbus-1-dev [kfreebsd-any], @@ -140,6 +141,8 @@ Breaks: unity (<< 7.0.2), libxfixes3 (<< 1:5.0.1), libxi6 (<< 2:1.7.1.901), + xserver-xorg-glamoregl, + xserver-xorg-video-glamoregl, Conflicts: xserver-xorg-input-evtouch, Provides: diff --git a/debian/rules b/debian/rules index 3db0592..cc3c94e 100755 --- a/debian/rules +++ b/debian/rules @@ -162,6 +162,7 @@ confflags_main = \ --enable-xnest \ --enable-kdrive \ --enable-xephyr \ + --enable-glamor \ $(build_xfbdev) \ $(build_xmir) \ --with-sha1=libgcrypt \ @@ -195,6 +196,7 @@ confflags_udeb = \ --disable-xnest \ --disable-kdrive \ --disable-xephyr \ + --disable-glamor \ --disable-xfbdev \ --disable-xmir \ --with-sha1=libnettle \ -- 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/e1wlemk-0006rr...@moszumanska.debian.org
mesa: Changes to 'debian-experimental'
VERSION |2 +- debian/changelog|5 ++--- debian/patches/01_hurd.diff | 20 debian/patches/series |1 - src/glx/dri2_query_renderer.c |5 + src/mesa/drivers/dri/i965/brw_draw.c|2 +- src/mesa/drivers/dri/i965/brw_program.h |6 +++--- src/mesa/drivers/dri/i965/brw_tex.c |2 +- 8 files changed, 13 insertions(+), 30 deletions(-) New commits: commit 6a6e73d41c653a96c26fcefb92f4ba7f595e6fdc Author: Andreas Boll Date: Wed Mar 5 17:34:52 2014 +0100 Drop 01-hurd.diff, upstream in 10.1.0 diff --git a/debian/changelog b/debian/changelog index 9e834a0..374ead5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ mesa (10.1.0-1) UNRELEASED; urgency=low * Disable dri3 on !linux * Enable building drivers for libvdpau1 (Closes: #705558). * New upstream release. + * Drop 01-hurd.diff, upstream in 10.1.0. -- Andreas Boll Mon, 03 Mar 2014 12:39:45 +0100 diff --git a/debian/patches/01_hurd.diff b/debian/patches/01_hurd.diff deleted file mode 100644 index 5d64cdf..000 --- a/debian/patches/01_hurd.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c -index b50a202..95560cb 100644 a/src/glx/dri2_query_renderer.c -+++ b/src/glx/dri2_query_renderer.c -@@ -20,6 +20,9 @@ - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -+ -+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) -+ - #include "glxclient.h" - #include "glx_error.h" - #include "xf86drm.h" -@@ -95,3 +98,5 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute, - -return psc->rendererQuery->queryString(psc->driScreen, dri_attribute, value); - } -+ -+#endif /* GLX_DIRECT_RENDERING */ diff --git a/debian/patches/series b/debian/patches/series index 148b20f..bc8e424 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -01_hurd.diff 02_gbm_no_undefined.diff 03_gbm_make_devices_static.diff 04_osmesa_version.diff commit 0829918fc0a1ffda46674ab03c0fd4484219d8c8 Author: Andreas Boll Date: Wed Mar 5 17:30:54 2014 +0100 New upstream release diff --git a/debian/changelog b/debian/changelog index 426da55..9e834a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,8 @@ -mesa (10.1.0~rc3-1) UNRELEASED; urgency=medium +mesa (10.1.0-1) UNRELEASED; urgency=low [ Andreas Boll ] * Disable dri3 on !linux * Enable building drivers for libvdpau1 (Closes: #705558). - - [ Maarten Lankhorst ] * New upstream release. -- Andreas Boll Mon, 03 Mar 2014 12:39:45 +0100 commit 4a86465f4754a0d79ed98f2d1ce425864854418b Author: Ian Romanick Date: Wed Mar 5 08:59:46 2014 +0200 mesa: Bump version to 10.1 (final) Signed-off-by: Ian Romanick diff --git a/VERSION b/VERSION index 4b9caf0..4149c39 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.1.0-rc3 +10.1.0 commit 03d0c9fd308db2124efbe240eda24a2a67eb67d2 Author: Julien Cristau Date: Sat Mar 1 10:11:11 2014 +0100 glx/dri2: fix build failure on HURD Patch from Debian package. Cc: "10.0 10.1" Reviewed-by: Ian Romanick (cherry picked from commit 6f0e2731e862d1c2d8d21927040bead5049a2d68) diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c index b50a202..95560cb 100644 --- a/src/glx/dri2_query_renderer.c +++ b/src/glx/dri2_query_renderer.c @@ -20,6 +20,9 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ + +#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) + #include "glxclient.h" #include "glx_error.h" #include "xf86drm.h" @@ -95,3 +98,5 @@ dri2_query_renderer_string(struct glx_screen *base, int attribute, return psc->rendererQuery->queryString(psc->driScreen, dri_attribute, value); } + +#endif /* GLX_DIRECT_RENDERING */ commit 4c0702b05ca002e42dbf05c6c4451113df0c3799 Author: Chris Forbes Date: Sat Feb 22 18:09:31 2014 +1300 i965: Validate (and resolve) all the bound textures. BRW_MAX_TEX_UNIT is the static limit on the number of textures we support per-stage, not in total. Core's `Unit` array is sized by MAX_COMBINED_TEXTURE_IMAGE_UNITS, which is significantly larger, and across the various shader stages, up to ctx->Const.MaxCombinedTextureImageUnits elements of it may be actually used. Fixes invisible bad behavior in piglit's max-samplers test (although this escalated to an assertion failure on HSW with texture_view, since non-immutable textures only have _Format set by validation.) Signed-off-by: Chris Forbes Cc: "9.2 10.0 10.1" Cc: Kenneth Graunke Reviewed-by: Kenneth Graunke (cherry picked from commit befbda56a246f77797bdf13fc005353441db2879) diff --git a/src/mesa/drivers/dri/i9
mesa: Changes to 'upstream-experimental'
VERSION |2 +-
src/glx/dri2_query_renderer.c |5 +
src/mesa/drivers/dri/i965/brw_draw.c|2 +-
src/mesa/drivers/dri/i965/brw_program.h |6 +++---
src/mesa/drivers/dri/i965/brw_tex.c |2 +-
5 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 4a86465f4754a0d79ed98f2d1ce425864854418b
Author: Ian Romanick
Date: Wed Mar 5 08:59:46 2014 +0200
mesa: Bump version to 10.1 (final)
Signed-off-by: Ian Romanick
diff --git a/VERSION b/VERSION
index 4b9caf0..4149c39 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.1.0-rc3
+10.1.0
commit 03d0c9fd308db2124efbe240eda24a2a67eb67d2
Author: Julien Cristau
Date: Sat Mar 1 10:11:11 2014 +0100
glx/dri2: fix build failure on HURD
Patch from Debian package.
Cc: "10.0 10.1"
Reviewed-by: Ian Romanick
(cherry picked from commit 6f0e2731e862d1c2d8d21927040bead5049a2d68)
diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c
index b50a202..95560cb 100644
--- a/src/glx/dri2_query_renderer.c
+++ b/src/glx/dri2_query_renderer.c
@@ -20,6 +20,9 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
+
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
+
#include "glxclient.h"
#include "glx_error.h"
#include "xf86drm.h"
@@ -95,3 +98,5 @@ dri2_query_renderer_string(struct glx_screen *base, int
attribute,
return psc->rendererQuery->queryString(psc->driScreen, dri_attribute,
value);
}
+
+#endif /* GLX_DIRECT_RENDERING */
commit 4c0702b05ca002e42dbf05c6c4451113df0c3799
Author: Chris Forbes
Date: Sat Feb 22 18:09:31 2014 +1300
i965: Validate (and resolve) all the bound textures.
BRW_MAX_TEX_UNIT is the static limit on the number of textures we
support per-stage, not in total.
Core's `Unit` array is sized by MAX_COMBINED_TEXTURE_IMAGE_UNITS, which
is significantly larger, and across the various shader stages, up to
ctx->Const.MaxCombinedTextureImageUnits elements of it may be actually
used.
Fixes invisible bad behavior in piglit's max-samplers test (although
this escalated to an assertion failure on HSW with texture_view, since
non-immutable textures only have _Format set by validation.)
Signed-off-by: Chris Forbes
Cc: "9.2 10.0 10.1"
Cc: Kenneth Graunke
Reviewed-by: Kenneth Graunke
(cherry picked from commit befbda56a246f77797bdf13fc005353441db2879)
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c
b/src/mesa/drivers/dri/i965/brw_draw.c
index 39da953..1e018bb 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -326,7 +326,7 @@ brw_predraw_resolve_buffers(struct brw_context *brw)
/* Resolve depth buffer of each enabled depth texture, and color buffer of
* each fast-clear-enabled color texture.
*/
- for (int i = 0; i < BRW_MAX_TEX_UNIT; i++) {
+ for (int i = 0; i < ctx->Const.MaxCombinedTextureImageUnits; i++) {
if (!ctx->Texture.Unit[i]._ReallyEnabled)
continue;
tex_obj = intel_texture_object(ctx->Texture.Unit[i]._Current);
diff --git a/src/mesa/drivers/dri/i965/brw_tex.c
b/src/mesa/drivers/dri/i965/brw_tex.c
index 9234e3a..b1f4de0 100644
--- a/src/mesa/drivers/dri/i965/brw_tex.c
+++ b/src/mesa/drivers/dri/i965/brw_tex.c
@@ -47,7 +47,7 @@ void brw_validate_textures( struct brw_context *brw )
struct gl_context *ctx = &brw->ctx;
int i;
- for (i = 0; i < BRW_MAX_TEX_UNIT; i++) {
+ for (i = 0; i < ctx->Const.MaxCombinedTextureImageUnits; i++) {
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
if (texUnit->_ReallyEnabled) {
commit 5fbd6494517be0bc2f2ead4d6966776fcb0d426d
Author: Chris Forbes
Date: Thu Feb 27 07:28:05 2014 +1300
i965: Widen sampler key bitfields for 32 samplers
Previously the `high` 16 samplers on Haswell+ would not get sampler
workarounds applied.
Don't bother widening YUV fields, since they're ignored and going away
soon anyway.
Signed-off-by: Chris Forbes
Cc: "10.1"
Cc: Kenneth Graunke
Reviewed-by: Kenneth Graunke
(cherry picked from commit 590920f93e227f1fb4258dd01b662e8bda8b3af4)
diff --git a/src/mesa/drivers/dri/i965/brw_program.h
b/src/mesa/drivers/dri/i965/brw_program.h
index 51182ea..f4dedf8 100644
--- a/src/mesa/drivers/dri/i965/brw_program.h
+++ b/src/mesa/drivers/dri/i965/brw_program.h
@@ -33,7 +33,7 @@ struct brw_sampler_prog_key_data {
*/
uint16_t swizzles[MAX_SAMPLERS];
- uint16_t gl_clamp_mask[3];
+ uint32_t gl_clamp_mask[3];
/**
* YUV conversions, needed for the GL_MESA_ycbcr extension.
@@ -44,12 +44,12 @@ struct brw_sampler_prog_key_data {
/**
* For RG32F, gather4's channel select is broken.
*/
- uint16_t gather_channel_quirk_mask;
+ uint32_t gather_channel_quirk_mask;
/**
* Whether this sample
mesa: Changes to 'debian-experimental'
debian/control |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 03bd5fad9c04a141fde04aa90495d3a3eb29bb1a
Author: Andreas Boll
Date: Wed Mar 5 18:46:26 2014 +0100
Fix typo
diff --git a/debian/control b/debian/control
index c63e630..7c760e2 100644
--- a/debian/control
+++ b/debian/control
@@ -776,7 +776,7 @@ Section: debug
Priority: extra
Architecture: linux-any kfreebsd-any
Depends:
- libvdpau1-mesa-drivers (= ${binary:Version}),
+ mesa-vdpau-drivers (= ${binary:Version}),
${misc:Depends},
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
--
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/e1wlfut-0005ij...@moszumanska.debian.org
Bug#717500: [PATCH] Enable OpenCL support
From: Julian Wollrath
v2: Add "Provides: opencl-icd"
v3: Andreas Boll
- 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
---
debian/control| 32
debian/mesa-opencl-icd.install.in | 2 ++
debian/rules | 1 +
3 files changed, 35 insertions(+)
create mode 100644 debian/mesa-opencl-icd.install.in
diff --git a/debian/control b/debian/control
index 7c760e2..fb6a806 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/
@@ -787,4 +789,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 000..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
--
1.9.0
--
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/1394043298-2340-1-git-send-email-andreas.boll@gmail.com
Bug#739269: Please move libwayland-egl out of libegl1-mesa-drivers
On 2014-02-17 11:48 +0100, Sjoerd Simons wrote: > Package: libegl1-mesa-drivers > Severity: normal > > libwayland-egl has been included in the libegl1-mesa-drivers, which seems a > bit > odd as it's an application library not a driver. > > Practically this causes an issue on systems where wayland is used but the > EGL/GL stack isn't provided by mesa as applications using libwayland-egl > depend > on libegl1-mesa-drivers which almost forcibly pulls in mesa. For the record, that last part is due to libegl1-mesa-drivers depending on libgl1-mesa-dri, a dependency that I have just removed in git. The reason why it was introduced (#714828) no longer applies. Cheers, Sven -- 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/87ob1kfkt5@turtle.gmx.de
mesa: Changes to 'debian-experimental'
debian/changelog |3 +++
debian/control |2 --
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 49e94de790cc1c345e2bd01dd148d56e5cd4
Author: Sven Joachim
Date: Wed Mar 5 21:27:08 2014 +0100
Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri
This was only necessary due to egl_gallium.so being linked against
libllvmradeon, and there is no shared llvmradeon library anymore.
diff --git a/debian/changelog b/debian/changelog
index 374ead5..8752e83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ mesa (10.1.0-1) UNRELEASED; urgency=low
* New upstream release.
* Drop 01-hurd.diff, upstream in 10.1.0.
+ [ Sven Joachim ]
+ * Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri.
+
-- Andreas Boll Mon, 03 Mar 2014 12:39:45 +0100
mesa (10.1.0~rc2-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 7c760e2..c49cd58 100644
--- a/debian/control
+++ b/debian/control
@@ -320,8 +320,6 @@ Depends:
${misc:Depends},
libegl1-mesa (= ${binary:Version}),
libglapi-mesa (= ${binary:Version}),
-# for libllvmradeon
- libgl1-mesa-dri (= ${binary:Version}) [any-i386 any-amd64],
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the EGL API -- hardware drivers
--
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/e1wlipx-00065g...@moszumanska.debian.org
