mesa: Changes to 'debian-experimental'
debian/changelog | 49 +++++++++++++++++++++++++--
debian/control | 9 +++-
debian/libegl1-mesa-dev.install.in | 2 +
debian/libegl1-mesa-drivers.install.in | 2 +
debian/libegl1-mesa.symbols | 1
debian/patches/10-hurd-configure-tweaks.diff | 14 +++++++
debian/patches/series | 1
debian/rules | 39 +++++++++++++--------
8 files changed, 98 insertions(+), 19 deletions(-)
New commits:
commit b903348cfe3b728c088deb63d76b17af697140bc
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 19:02:30 2011 +0200
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index ddb351a..1f50c5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.11~0-1) UNRELEASED; urgency=low
+mesa (7.11~0-1) experimental; urgency=low
* New upstream snapshot, from the master branch (up to 2fe39b46e7).
* Drop 05_hurd-ftbfs.diff, merged upstream (as 758561786c).
@@ -48,7 +48,7 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
libwayland-egl.so.1* in libegl1-mesa-drivers.
* Update libegl1-mesa.symbols with new wl_drm_interface symbol.
- -- Cyril Brulebois <kibi@debian.org> Wed, 15 Jun 2011 14:10:03 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 19:01:52 +0200
mesa (7.10.3-3) unstable; urgency=low
commit a73cb252bf9bebc193300145400053052e65c592
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 18:42:53 2011 +0200
Also pass --disable-gallium-r300 on Hurd.
Thanks to Pino Toscano for the check.
diff --git a/debian/rules b/debian/rules
index 93221be..f4a0a70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,7 +70,7 @@ DRI_DRIVERS = swrast
ifeq ($(DEB_HOST_ARCH_OS), hurd)
confflags_DIRECT_RENDERING = --disable-driglx-direct
confflags_EGL = --disable-egl
- confflags_GALLIUM = --disable-gallium
+ confflags_GALLIUM = --disable-gallium --disable-gallium-r300
else
EGL_DISPLAYS = x11
GALLIUM_DRIVERS = swrast
commit ab9fbcbf4728834ae11b87310b6ee72bd2615281
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 17:31:22 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index f874f05..b615536 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10.3-3) UNRELEASED; urgency=low
+mesa (7.10.3-3) unstable; urgency=low
* Update the “Breaks: xserver-xorg-core” from “(<= 2:1.10.2-1)” to
“(<< 2:1.10.2-2)”. The first binNMU migrated to testing too soon,
@@ -7,7 +7,7 @@ mesa (7.10.3-3) UNRELEASED; urgency=low
a server built against a pre-multiarch mesa.
* Merge upstream 7.10 branch up to 1ad06c7a25.
- -- Cyril Brulebois <kibi@debian.org> Sat, 18 Jun 2011 00:29:34 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sun, 19 Jun 2011 17:31:17 +0200
mesa (7.10.3-2) unstable; urgency=low
commit c508c1e6a5d721811cb5e9003fc8afd1ab59290d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 17:31:04 2011 +0200
Mention the upstream merge.
diff --git a/debian/changelog b/debian/changelog
index 53507a4..f874f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mesa (7.10.3-3) UNRELEASED; urgency=low
so it was needed to rebuild it again, in testing. Updating the
Breaks makes sure that a multiarch mesa doesn't get installed with
a server built against a pre-multiarch mesa.
+ * Merge upstream 7.10 branch up to 1ad06c7a25.
-- Cyril Brulebois <kibi@debian.org> Sat, 18 Jun 2011 00:29:34 +0200
commit a18599a76de50f4397fd08b581293a8445aa241b
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 17:19:16 2011 +0200
Add 10-hurd-configure-tweaks.diff to enable x86 assembler on Hurd.
Thanks to Pino Toscano.
diff --git a/debian/changelog b/debian/changelog
index 53955c3..843597e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
* Drop 05_hurd-ftbfs.diff, merged upstream (as 758561786c).
* Refresh 06_kfreebsd-ftbfs.diff (due to 8fd8de3995).
* Refresh 08-kfreebsd-gallium.diff (adjust offsets).
+ * Add 10-hurd-configure-tweaks.diff to enable x86 assembler on Hurd,
+ thanks to Pino Toscano.
* Refresh 11-hurd-ftbfs-again.diff (adjust offsets and drop the
src/gallium/auxiliary/os/os_time.c hunk, which should be OK since
PIPE_OS_UNIX is used there, and should happily replace the use of
diff --git a/debian/patches/10-hurd-configure-tweaks.diff b/debian/patches/10-hurd-configure-tweaks.diff
new file mode 100644
index 0000000..60b0518
--- /dev/null
+++ b/debian/patches/10-hurd-configure-tweaks.diff
@@ -0,0 +1,14 @@
+Enable x86 assembler on Hurd.
+
+Thanks to Pino Toscano.
+--- a/configure.ac
++++ b/configure.ac
+@@ -419,7 +419,7 @@ if test "x$enable_asm" = xyes; then
+ case "$host_cpu" in
+ i?86)
+ case "$host_os" in
+- linux* | *freebsd* | dragonfly* | *netbsd*)
++ linux* | *freebsd* | dragonfly* | *netbsd* | gnu*)
+ test "x$enable_64bit" = xyes && asm_arch=x86_64 || asm_arch=x86
+ ;;
+ esac
diff --git a/debian/patches/series b/debian/patches/series
index 81ed3ad..ccaf55f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
04_osmesa_version.diff
06_kfreebsd-ftbfs.diff
08-kfreebsd-gallium.diff
+10-hurd-configure-tweaks.diff
11-hurd-ftbfs-again.diff
12-llvm-config-check.diff
13-llvm-config-pick-a-version.diff
commit ed6cd088bf04dc2048b27fb2c0cce527f51ed5a3
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 16:39:05 2011 +0200
Do not override confflags_GALLIUM.
It might have been set to disable r300g.
diff --git a/debian/rules b/debian/rules
index 9ef8f62..91e366e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -100,7 +100,7 @@ else
confflags_DIRECT_RENDERING = --enable-driglx-direct
confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
- confflags_GALLIUM = $(addprefix --enable-gallium-,$(GALLIUM_DRIVERS))
+ confflags_GALLIUM += $(addprefix --enable-gallium-,$(GALLIUM_DRIVERS))
confflags_GLES = --enable-gles1 --enable-gles2
confflags_STATE_TRACKERS = --with-state-trackers="$(GALLIUM_STATE_TRACKERS)"
endif
commit e3e4cde22d4c6eedaf183103e22fca9b63fefa6c
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 16:06:28 2011 +0200
Restrict r300g to amd64 and i386.
diff --git a/debian/changelog b/debian/changelog
index e2c956b..53955c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,7 +34,10 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
* Replace radeon with r300 in GALLIUM_DRIVERS to match upstream renaming
(5722286be2).
* Build r300 classic (through DRI_DRIVERS) everywhere, since r300g comes
- with a few additional requirements.
+ with a few additional requirements: LLVM is needed for this driver,
+ and apparently only works fine on x86 platform. As a consequence, only
+ build r300g on amd and i386, and add llvm-2.9-dev build-dep on those
+ platforms accordingly. Disable it explicitly on other platforms.
* Stop building i915g at all, it's apparently never going to be a
suitable replacement for i915c.
diff --git a/debian/control b/debian/control
index ed61a52..caacf17 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
+ llvm-2.9-dev [amd64 i386],
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/
diff --git a/debian/rules b/debian/rules
index e17a0f1..9ef8f62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,7 @@ else
ifeq ($(DEB_HOST_ARCH_OS), linux)
# Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux
- GALLIUM_DRIVERS += nouveau r300 r600
+ GALLIUM_DRIVERS += nouveau r600
# Although the KMS egl drivers will probably build on kfreebsd & hurd
# only linux actually has KMS drivers implemented at this point.
EGL_DISPLAYS += drm
@@ -91,6 +91,13 @@ else
DRI_DRIVERS += i915 i965 sis unichrome
endif
+ # LLVM is required for r300g, and x86-ish:
+ ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
+ GALLIUM_DRIVERS += r300
+ else
+ confflags_GALLIUM = --disable-gallium-r300
+ endif
+
confflags_DIRECT_RENDERING = --enable-driglx-direct
confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)"
confflags_GALLIUM = $(addprefix --enable-gallium-,$(GALLIUM_DRIVERS))
commit 7d332507bbffa1fdb59723808ef39b9e50983e16
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 15:37:18 2011 +0200
Stop building i915g at all.
It's apparently never going to be a suitable replacement for i915c.
diff --git a/debian/changelog b/debian/changelog
index e84316a..e2c956b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
(5722286be2).
* Build r300 classic (through DRI_DRIVERS) everywhere, since r300g comes
with a few additional requirements.
+ * Stop building i915g at all, it's apparently never going to be a
+ suitable replacement for i915c.
-- Cyril Brulebois <kibi@debian.org> Wed, 15 Jun 2011 14:10:03 +0200
diff --git a/debian/rules b/debian/rules
index ddb4e79..e17a0f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,10 +87,8 @@ else
endif
ifeq ($(DEB_HOST_ARCH_CPU), i386)
DRI_DRIVERS += i810 i915 i965 sis unichrome
- GALLIUM_DRIVERS += i915
else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
DRI_DRIVERS += i915 i965 sis unichrome
- GALLIUM_DRIVERS += i915
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
@@ -205,9 +203,6 @@ $(QUILT_STAMPFN): $(STAMP_DIR)/stamp
build: build-stamp
build-stamp: $(BUILD_STAMPS)
-# Remove gallium drivers which replace existing classic drivers.
-# Intel gallium is significantly behind the classic mesa drivers...
- rm -f build/dri/lib/$(DEB_HOST_MULTIARCH)/gallium/i915_dri.so
>$@
$(STAMP)-build-%: configure
commit 5b0f4c4362d444a4028bd492dd97bdc63a2822b5
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 15:11:52 2011 +0200
Build r300 classic (through DRI_DRIVERS) everywhere, since r300g comes with a few additional requirements.
diff --git a/debian/changelog b/debian/changelog
index 93a8372..e84316a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
library…” in the description of the libglu1-mesa* packages.
* Replace radeon with r300 in GALLIUM_DRIVERS to match upstream renaming
(5722286be2).
+ * Build r300 classic (through DRI_DRIVERS) everywhere, since r300g comes
+ with a few additional requirements.
-- Cyril Brulebois <kibi@debian.org> Wed, 15 Jun 2011 14:10:03 +0200
diff --git a/debian/rules b/debian/rules
index 70f4c05..ddb4e79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ else
endif
ifneq ($(DEB_HOST_ARCH), s390)
- DRI_DRIVERS += mach64 mga r128 r200 r600 radeon savage tdfx
+ DRI_DRIVERS += mach64 mga r128 r200 r300 r600 radeon savage tdfx
endif
ifeq ($(DEB_HOST_ARCH_CPU), i386)
DRI_DRIVERS += i810 i915 i965 sis unichrome
commit 1b202ca1a3f620aefafb19b18db4fcd0a57cbd19
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Jun 19 14:11:45 2011 +0200
Replace radeon with r300 in GALLIUM_DRIVERS to match upstream changes.
diff --git a/debian/changelog b/debian/changelog
index dac6d80..93a8372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
* Add a gentarball target, to generate tarballs for git snapshots.
* Replace “The OpenGL utility library…” with “Mesa OpenGL utility
library…” in the description of the libglu1-mesa* packages.
+ * Replace radeon with r300 in GALLIUM_DRIVERS to match upstream renaming
+ (5722286be2).
-- Cyril Brulebois <kibi@debian.org> Wed, 15 Jun 2011 14:10:03 +0200
diff --git a/debian/rules b/debian/rules
index 987dd34..70f4c05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,7 @@ else
ifeq ($(DEB_HOST_ARCH_OS), linux)
# Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux
- GALLIUM_DRIVERS += nouveau radeon r600
+ GALLIUM_DRIVERS += nouveau r300 r600
# Although the KMS egl drivers will probably build on kfreebsd & hurd
# only linux actually has KMS drivers implemented at this point.
EGL_DISPLAYS += drm
commit 1ad06c7a2573d2e3a946c8340ce2530c076c5f0b
Author: Marek Olšák <maraeo@gmail.com>
Date: Sat Jun 18 22:11:16 2011 +0200
r300g: fix handling PREP_* options
This should fix rendering >65532 vertices using draw_arrays on r300-r400.
NOTE: This is a candidate for the 7.10 branch.
(cherry picked from commit 7df7eaf8453bbc7bfd8d23b7808c92d30c62bf55)
Conflicts:
src/gallium/drivers/r300/r300_render.c
diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index bb06d3d..f5a084c 100644
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -184,23 +184,22 @@ static boolean r300_reserve_cs_dwords(struct r300_context *r300,
unsigned cs_dwords)
{
boolean flushed = FALSE;
- boolean first_draw = flags & PREP_FIRST_DRAW;
- boolean emit_aos = flags & PREP_EMIT_AOS;
- boolean emit_aos_swtcl = flags & PREP_EMIT_AOS_SWTCL;
+ boolean emit_states = flags & PREP_FIRST_DRAW;
+ boolean emit_vertex_arrays = flags & PREP_EMIT_AOS;
+ boolean emit_vertex_arrays_swtcl = flags & PREP_EMIT_AOS_SWTCL;
/* Add dirty state, index offset, and AOS. */
- if (first_draw) {
+ if (emit_states)
cs_dwords += r300_get_num_dirty_dwords(r300);
- if (r300->screen->caps.index_bias_supported)
- cs_dwords += 2; /* emit_index_offset */
+ if (r300->screen->caps.index_bias_supported)
+ cs_dwords += 2; /* emit_index_offset */
- if (emit_aos)
- cs_dwords += 55; /* emit_aos */
+ if (emit_vertex_arrays)
+ cs_dwords += 55; /* emit_vertex_arrays */
- if (emit_aos_swtcl)
- cs_dwords += 7; /* emit_aos_swtcl */
- }
+ if (emit_vertex_arrays_swtcl)
+ cs_dwords += 7; /* emit_vertex_arrays_swtcl */
cs_dwords += r300_get_num_cs_end_dwords(r300);
@@ -228,14 +227,13 @@ static boolean r300_emit_states(struct r300_context *r300,
int aos_offset,
int index_bias)
{
- boolean first_draw = flags & PREP_FIRST_DRAW;
- boolean emit_aos = flags & PREP_EMIT_AOS;
- boolean emit_aos_swtcl = flags & PREP_EMIT_AOS_SWTCL;
+ boolean emit_states = flags & PREP_FIRST_DRAW;
+ boolean emit_vertex_arrays = flags & PREP_EMIT_AOS;
+ boolean emit_vertex_arrays_swtcl = flags & PREP_EMIT_AOS_SWTCL;
boolean indexed = flags & PREP_INDEXED;
boolean validate_vbos = flags & PREP_VALIDATE_VBOS;
- /* Validate buffers and emit dirty state if needed. */
- if (first_draw) {
+ if (emit_states) {
/* upload buffers first */
if (r300->screen->caps.has_tcl && r300->any_user_vbs) {
r300_upload_user_buffers(r300);
@@ -257,20 +255,21 @@ static boolean r300_emit_states(struct r300_context *r300,
}
r300_emit_dirty_state(r300);
- if (r300->screen->caps.index_bias_supported) {
- if (r300->screen->caps.has_tcl)
- r500_emit_index_bias(r300, index_bias);
- else
- r500_emit_index_bias(r300, 0);
- }
-
- if (emit_aos)
- r300_emit_aos(r300, aos_offset, indexed);
+ }
- if (emit_aos_swtcl)
- r300_emit_aos_swtcl(r300, indexed);
+ if (r300->screen->caps.index_bias_supported) {
+ if (r300->screen->caps.has_tcl)
+ r500_emit_index_bias(r300, index_bias);
+ else
+ r500_emit_index_bias(r300, 0);
}
+ if (emit_vertex_arrays)
+ r300_emit_aos(r300, aos_offset, indexed);
+
+ if (emit_vertex_arrays_swtcl)
+ r300_emit_aos_swtcl(r300, indexed);
+
return TRUE;
}
commit f3021417e2896515fe6cd3685b0d79e3ea144299
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jun 15 23:42:30 2011 +0200
Update libegl1-mesa.symbols with new wl_drm_interface symbol.
diff --git a/debian/changelog b/debian/changelog
index 3a835da..3c14e11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
* Add wayland to EGL_DISPLAYS on Linux.
* Ship wayland-egl.pc and libwayland-egl.so in libegl1-mesa-dev; and ship
libwayland-egl.so.1* in libegl1-mesa-drivers.
+ * Update libegl1-mesa.symbols with new wl_drm_interface symbol.
-- Cyril Brulebois <kibi@debian.org> Wed, 15 Jun 2011 14:10:03 +0200
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index bb4fa43..6d56af4 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -62,3 +62,4 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
eglWaitClient@Base 7.8.1
eglWaitGL@Base 7.8.1
eglWaitNative@Base 7.8.1
+ wl_drm_interface@Base 7.11~0
commit 06feda205e993dbf6f055092d1b8e1d867dc4ef1
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jun 15 23:40:03 2011 +0200
Ship wayland-egl.pc and libwayland-egl.so in libegl1-mesa-dev; and ship libwayland-egl.so.1* in libegl1-mesa-drivers.
diff --git a/debian/changelog b/debian/changelog
index 9df32d5..3a835da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
and _glthread_GetID) moved to libglapi-mesa.
* Add libwayland-dev build-dep.
* Add wayland to EGL_DISPLAYS on Linux.
+ * Ship wayland-egl.pc and libwayland-egl.so in libegl1-mesa-dev; and ship
+ libwayland-egl.so.1* in libegl1-mesa-drivers.
-- Cyril Brulebois <kibi@debian.org> Wed, 15 Jun 2011 14:10:03 +0200
diff --git a/debian/libegl1-mesa-dev.install.in b/debian/libegl1-mesa-dev.install.in
index 2b04928..b6f8614 100644
--- a/debian/libegl1-mesa-dev.install.in
+++ b/debian/libegl1-mesa-dev.install.in
@@ -1,4 +1,6 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so usr/lib/${DEB_HOST_MULTIARCH}
dri/usr/include/EGL usr/include
dri/usr/include/KHR usr/include
dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libegl1-mesa-drivers.install.in b/debian/libegl1-mesa-drivers.install.in
index 32e361af..f591401 100644
--- a/debian/libegl1-mesa-drivers.install.in
+++ b/debian/libegl1-mesa-drivers.install.in
@@ -1,2 +1,4 @@
dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so usr/lib/${DEB_HOST_MULTIARCH}/egl
dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/pipe_*.so usr/lib/${DEB_HOST_MULTIARCH}/egl
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0 usr/lib/${DEB_HOST_MULTIARCH}
commit 614747196a94a4a5d222a98ad02313d77e29f017
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jun 15 22:54:48 2011 +0200
Add wayland to EGL_DISPLAYS on Linux.
diff --git a/debian/changelog b/debian/changelog
index 722a4b7..9df32d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
* Update libgles{1,2}-mesa.symbols now that internal symbols (_glapi_*
and _glthread_GetID) moved to libglapi-mesa.
* Add libwayland-dev build-dep.
+ * Add wayland to EGL_DISPLAYS on Linux.
-- Cyril Brulebois <kibi@debian.org> Wed, 15 Jun 2011 14:10:03 +0200
diff --git a/debian/rules b/debian/rules
index 8efc302..81027fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ else
GALLIUM_DRIVERS += nouveau radeon r600
# Although the KMS egl drivers will probably build on kfreebsd & hurd
# only linux actually has KMS drivers implemented at this point.
- EGL_DISPLAYS += drm
+ EGL_DISPLAYS += drm wayland
# Nouveau requires KMS, so even the classic DRI driver only works on linux
DRI_DRIVERS += nouveau
endif
commit f781753f1db6453245a5bea9829596b708d8db70
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Jun 15 22:54:06 2011 +0200
Add libwayland-dev build-dep.
diff --git a/debian/changelog b/debian/changelog
index e439fca..722a4b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ mesa (7.11~0-1) UNRELEASED; urgency=low
* Update libegl1-mesa.symbols with new symbols.
* Update libgles{1,2}-mesa.symbols now that internal symbols (_glapi_*
and _glthread_GetID) moved to libglapi-mesa.
+ * Add libwayland-dev build-dep.
-- Cyril Brulebois <kibi@debian.org> Wed, 15 Jun 2011 14:10:03 +0200
diff --git a/debian/control b/debian/control
index c2b664c..40fad7d 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
+ libwayland-dev,
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/
commit 0136b9db4736bcc9dc7e6bce92d8cd421e625f0e
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jun 18 00:35:01 2011 +0200
Update the “Breaks: xserver-xorg-core”.
From “(<= 2:1.10.2-1)” to “(<< 2:1.10.2-2)”: The first binNMU migrated
to testing too soon, so it was needed to rebuild it again, in testing.
Updating the Breaks makes sure that a multiarch mesa doesn't get
installed with a server built against a pre-multiarch mesa.
diff --git a/debian/changelog b/debian/changelog
index 034383f..53507a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (7.10.3-3) UNRELEASED; urgency=low
+
+ * Update the “Breaks: xserver-xorg-core” from “(<= 2:1.10.2-1)” to
+ “(<< 2:1.10.2-2)”. The first binNMU migrated to testing too soon,
+ so it was needed to rebuild it again, in testing. Updating the
+ Breaks makes sure that a multiarch mesa doesn't get installed with
+ a server built against a pre-multiarch mesa.
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 18 Jun 2011 00:29:34 +0200
+
mesa (7.10.3-2) unstable; urgency=low
[ Cyril Brulebois ]
diff --git a/debian/control b/debian/control
index b37337d..27f0447 100644
--- a/debian/control
+++ b/debian/control
@@ -475,7 +475,7 @@ Depends:
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0)
-Breaks: xserver-xorg-core (<= 2:1.10.2-1), libgl1-mesa-glx (<< 7.10.2-4)
+Breaks: xserver-xorg-core (<< 2:1.10.2-2), libgl1-mesa-glx (<< 7.10.2-4)
Multi-Arch: same
Description: free implementation of the OpenGL API -- DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -517,7 +517,7 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
-Breaks: xserver-xorg-core (<= 2:1.10.2-1), libgl1-mesa-glx (<< 7.10.2-4)
+Breaks: xserver-xorg-core (<< 2:1.10.2-2), libgl1-mesa-glx (<< 7.10.2-4)
Multi-Arch: same
Description: free implementation of the OpenGL API -- Extra DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
commit a40b70e15c5a758d19c8af891edf18c2c49a7879
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 17 11:46:23 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 22874c7..034383f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10.3-2) UNRELEASED; urgency=low
+mesa (7.10.3-2) unstable; urgency=low
[ Cyril Brulebois ]
* Add Breaks against nvidia and fglrx packages, since they are also
@@ -14,7 +14,7 @@ mesa (7.10.3-2) UNRELEASED; urgency=low
works for libGL, but not for egl_dri2.so (which lives in /usr/lib/*/egl/).
Thanks to Michel Dänzer for the heads-up!
- -- Cyril Brulebois <kibi@debian.org> Fri, 17 Jun 2011 11:09:10 +0200
+ -- Cyril Brulebois <kibi@debian.org> Fri, 17 Jun 2011 11:46:20 +0200
mesa (7.10.3-1) unstable; urgency=low
commit e35a4e00e85b39e23034cc7f27559c3c0d6bf71e
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jun 17 11:37:22 2011 +0200
Prepend the multiarch dir to the dri driver search path.
${ORIGIN}/dri works for libGL, but not for egl_dri2.so (which lives in
/usr/lib/*/egl/). Thanks to Michel Dänzer for the heads-up!
diff --git a/debian/changelog b/debian/changelog
index 57e410d..22874c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
mesa (7.10.3-2) UNRELEASED; urgency=low
+ [ Cyril Brulebois ]
* Add Breaks against nvidia and fglrx packages, since they are also
affected by the multiarch changes, and need fixing. Until fixed
packages reach the archive, nvidia and fglrx users should stick to
@@ -8,6 +9,11 @@ mesa (7.10.3-2) UNRELEASED; urgency=low
* Set CXXFLAGS along with CFLAGS (Closes: #630602). Thanks for the
report and the patch, Fabio Pedretti!
+ [ Julien Cristau ]
+ * Prepend the multiarch dir to the dri driver search path. ${ORIGIN}/dri
+ works for libGL, but not for egl_dri2.so (which lives in /usr/lib/*/egl/).
+ Thanks to Michel Dänzer for the heads-up!
+
-- Cyril Brulebois <kibi@debian.org> Fri, 17 Jun 2011 11:09:10 +0200
mesa (7.10.3-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 843c4bf..cedef45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ confflags-dri = \
--with-driver=dri \
--with-dri-drivers="$(DRI_DRIVERS)" \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
- --with-dri-searchpath='\$$$${ORIGIN}/dri:/usr/lib/dri' \
+ --with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri' \
--enable-glx-tls \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
commit 5971e1c999009b51cc7baa72fe869def8bea7e5c
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 17 11:24:32 2011 +0200
Add bug closure (#630710).
diff --git a/debian/changelog b/debian/changelog
index 0e97eea..57e410d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ mesa (7.10.3-2) UNRELEASED; urgency=low
* Add Breaks against nvidia and fglrx packages, since they are also
affected by the multiarch changes, and need fixing. Until fixed
packages reach the archive, nvidia and fglrx users should stick to
- mesa 7.10.2-3 packages, currently available in testing.
+ mesa 7.10.2-3 packages, currently available in testing. Thanks to
+ Andreas and Patrick for the version strings (Closes: #630710).
* Set CXXFLAGS along with CFLAGS (Closes: #630602). Thanks for the
report and the patch, Fabio Pedretti!
commit 0aab0d719bad882e9cb55125ee33554fe433b9df
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 17 11:22:25 2011 +0200
Set CXXFLAGS along with CFLAGS (Closes: #630602). Thanks for the report and the patch, Fabio Pedretti!
diff --git a/debian/changelog b/debian/changelog
index 8354ddb..0e97eea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (7.10.3-2) UNRELEASED; urgency=low
affected by the multiarch changes, and need fixing. Until fixed
packages reach the archive, nvidia and fglrx users should stick to
mesa 7.10.2-3 packages, currently available in testing.
+ * Set CXXFLAGS along with CFLAGS (Closes: #630602). Thanks for the
+ report and the patch, Fabio Pedretti!
-- Cyril Brulebois <kibi@debian.org> Fri, 17 Jun 2011 11:09:10 +0200
diff --git a/debian/rules b/debian/rules
index a10a792..843c4bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,13 @@
#export DH_VERBOSE=1
CFLAGS = -Wall -g
+CXXFLAGS = -Wall -g
ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
+ CXXFLAGS += -O0
else
CFLAGS += -O2
+ CXXFLAGS += -O2
endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -58,7 +61,8 @@ confflags-common = \
--disable-glu \
--disable-glut \
--disable-glw \
- CFLAGS="$(CFLAGS)"
+ CFLAGS="$(CFLAGS)" \
+ CXXFLAGS="$(CXXFLAGS)"
DRI_DRIVERS = swrast
@@ -164,7 +168,8 @@ confflags-swx11+glu = \
--disable-egl \
--disable-glut \
--enable-motif \
- CFLAGS="$(CFLAGS)"
+ CFLAGS="$(CFLAGS)" \
+ CXXFLAGS="$(CXXFLAGS)"
confflags-swx11+glu-static = \
--disable-egl \
@@ -175,7 +180,8 @@ confflags-swx11+glu-static = \
--disable-egl \
--disable-glut \
--enable-motif \
- CFLAGS="$(CFLAGS)"
+ CFLAGS="$(CFLAGS)" \
+ CXXFLAGS="$(CXXFLAGS)"
confflags-swx11+glu-i386-i686 = \
--disable-egl \
@@ -186,7 +192,8 @@ confflags-swx11+glu-i386-i686 = \
--disable-egl \
--enable-motif \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
- CFLAGS="$(CFLAGS) -march=i686"
+ CFLAGS="$(CFLAGS) -march=i686" \
+ CXXFLAGS="$(CXXFLAGS) -march=i686"
configure: $(QUILT_STAMPFN) configure.ac
autoreconf -vfi
commit 3707424038f425fbcd1a529ff892231523022f6e
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jun 17 11:18:04 2011 +0200
Add Breaks against nvidia and fglrx packages.
They are also affected by the multiarch changes, and need fixing. Until
fixed packages reach the archive, nvidia and fglrx users should stick to
mesa 7.10.2-3 packages, currently available in testing.
diff --git a/debian/changelog b/debian/changelog
index 7b7e6f5..8354ddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (7.10.3-2) UNRELEASED; urgency=low
+
+ * Add Breaks against nvidia and fglrx packages, since they are also
+ affected by the multiarch changes, and need fixing. Until fixed
+ packages reach the archive, nvidia and fglrx users should stick to
+ mesa 7.10.2-3 packages, currently available in testing.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 17 Jun 2011 11:09:10 +0200
+
mesa (7.10.3-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 950b438..b37337d 100644
--- a/debian/control
+++ b/debian/control
@@ -406,6 +406,9 @@ Recommends: libgl1-mesa-dri (>= 7.2)
Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
Provides: libgl1
+Breaks:
+ libgl1-nvidia-alternatives (<= 275.09.07-1),
+ fglrx-glx (<< 1:11-6-1),
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the OpenGL API -- GLX runtime
commit bdc518e341ed5342f9a75da5a52033d63fc5e80c
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Tue Jun 14 18:47:11 2011 -0400
r600c: add tiling support for evergreen+
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 6a49b0e..d829cdd 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -1640,52 +1640,102 @@ radeonCreateScreen2(__DRIscreen *sPriv)
screen->group_bytes = 512;
else
screen->group_bytes = 256;
- if (IS_R600_CLASS(screen) && (sPriv->drm_version.minor >= 6) &&
- (screen->chip_family < CHIP_FAMILY_CEDAR)) {
- ret = radeonGetParam(sPriv, RADEON_INFO_TILE_CONFIG, &temp);
- if (ret)
- fprintf(stderr, "failed to get tiling info\n");
- else {
- screen->tile_config = temp;
- screen->r7xx_bank_op = 0;
- switch((screen->tile_config & 0xe) >> 1) {
- case 0:
- screen->num_channels = 1;
- break;
- case 1:
- screen->num_channels = 2;
- break;
- case 2:
- screen->num_channels = 4;
- break;
- case 3:
- screen->num_channels = 8;
- break;
- default:
- fprintf(stderr, "bad channels\n");
- break;
+ if (IS_R600_CLASS(screen)) {
+ if ((sPriv->drm_version.minor >= 6) &&
+ (screen->chip_family < CHIP_FAMILY_CEDAR)) {
+ ret = radeonGetParam(sPriv, RADEON_INFO_TILE_CONFIG, &temp);
+ if (ret)
+ fprintf(stderr, "failed to get tiling info\n");
+ else {
+ screen->tile_config = temp;
+ screen->r7xx_bank_op = 0;
+ switch ((screen->tile_config & 0xe) >> 1) {
+ case 0:
+ screen->num_channels = 1;
+ break;
+ case 1:
+ screen->num_channels = 2;
+ break;
+ case 2:
+ screen->num_channels = 4;
+ break;
+ case 3:
+ screen->num_channels = 8;
+ break;
+ default:
+ fprintf(stderr, "bad channels\n");
+ break;
+ }
+ switch ((screen->tile_config & 0x30) >> 4) {
+ case 0:
+ screen->num_banks = 4;
+ break;
+ case 1:
+ screen->num_banks = 8;
+ break;
+ default:
+ fprintf(stderr, "bad banks\n");
+ break;
+ }
+ switch ((screen->tile_config & 0xc0) >> 6) {
+ case 0:
+ screen->group_bytes = 256;
+ break;
+ case 1:
+ screen->group_bytes = 512;
+ break;
+ default:
+ fprintf(stderr, "bad group_bytes\n");
+ break;
+ }
}
- switch((screen->tile_config & 0x30) >> 4) {
- case 0:
- screen->num_banks = 4;
- break;
- case 1:
- screen->num_banks = 8;
- break;
- default:
- fprintf(stderr, "bad banks\n");
- break;
- }
- switch((screen->tile_config & 0xc0) >> 6) {
- case 0:
- screen->group_bytes = 256;
- break;
- case 1:
- screen->group_bytes = 512;
- break;
- default:
- fprintf(stderr, "bad group_bytes\n");
- break;
+ } else if ((sPriv->drm_version.minor >= 7) &&
+ (screen->chip_family >= CHIP_FAMILY_CEDAR)) {
+ ret = radeonGetParam(sPriv, RADEON_INFO_TILE_CONFIG, &temp);
+ if (ret)
+ fprintf(stderr, "failed to get tiling info\n");
+ else {
+ screen->tile_config = temp;
+ screen->r7xx_bank_op = 0;
+ switch (screen->tile_config & 0xf) {
+ case 0:
+ screen->num_channels = 1;
+ break;
+ case 1:
+ screen->num_channels = 2;
+ break;
+ case 2:
+ screen->num_channels = 4;
+ break;
+ case 3:
+ screen->num_channels = 8;
+ break;
+ default:
+ fprintf(stderr, "bad channels\n");
+ break;
+ }
+ switch ((screen->tile_config & 0xf0) >> 4) {
+ case 0:
+ screen->num_banks = 4;
+ break;
+ case 1:
+ screen->num_banks = 8;
+ break;
+ default:
Reply to: