mesa: Changes to 'ubuntu-maverick'
debian/changelog | 17 +
debian/control | 6
debian/libgl1-mesa-dri-experimental.install | 2
debian/patches/04_osmesa_version.diff | 4
debian/rules | 36 +-
src/gallium/tests/graw/fragment-shader | 1
src/gallium/tests/graw/vertex-shader | 1
src/glut/glx/glut_init.c | 393 ----------------------------
8 files changed, 44 insertions(+), 416 deletions(-)
New commits:
commit d2d604dd7eab6f9f1fdedc095ee9a94f3f5a3805
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Sep 10 08:33:07 2010 +1000
Add lots of closed bugs to the changelog
diff --git a/debian/changelog b/debian/changelog
index 337bbfa..ac47d76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,19 @@ mesa (7.9~git20100907-0ubuntu1) maverick; urgency=low
libgl1-mesa-dri-experimental
* debian/patches/04_osmesa_version.diff:
- Refresh for new upstream
-
- -- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 01 Sep 2010 10:23:15 +1000
+ * New upstream version...
+ - Fixes severe rendering corruption in Unity on radeon (LP: #628727,
+ LP: #596292, LP: #599741, LP: #630315, LP: #613694).
+ - Also fixes rendering in gnome-shell (LP: #578619).
+ - Flickering in OpenGL apps on radeon (LP: #626943, LP: #610541).
+ - Corruption in KWin desktop effects on intel (LP: #628930).
+ - Provides preliminary support for new intel chips (LP: #601052)
+ * debian/rules:
+ - Update configure flags to match upstream reshuffling.
+ - Explicitly remove gallium DRI drivers that we don't want to ship.
+ - Add classic nouveau driver to libgl1-mesa-dri-experimental
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 10 Sep 2010 08:32:47 +1000
mesa (7.8.2-2ubuntu2) maverick; urgency=low
commit 7d3660bf3dc9f92bb727113d9864267e6e17a0b8
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Sep 7 15:50:42 2010 +1000
Remove two symlinks, unrepresentable in the diff
diff --git a/src/gallium/tests/graw/fragment-shader b/src/gallium/tests/graw/fragment-shader
deleted file mode 120000
index c7dd0b7..0000000
--- a/src/gallium/tests/graw/fragment-shader
+++ /dev/null
@@ -1 +0,0 @@
-../python/tests/regress/fragment-shader
\ No newline at end of file
diff --git a/src/gallium/tests/graw/vertex-shader b/src/gallium/tests/graw/vertex-shader
deleted file mode 120000
index 7b216e8..0000000
--- a/src/gallium/tests/graw/vertex-shader
+++ /dev/null
@@ -1 +0,0 @@
-../python/tests/regress/vertex-shader
\ No newline at end of file
commit e6d16f72cdb1ec6cb919de414b8482a5ef3b8623
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Sep 7 15:37:16 2010 +1000
Update changelog
diff --git a/debian/changelog b/debian/changelog
index 8134125..337bbfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-mesa (7.9~git20100902-0ubuntu1) maverick; urgency=low
+mesa (7.9~git20100907-0ubuntu1) maverick; urgency=low
[ Robert Hooker ]
- * New upstream git snapshot up to commit 9b075cb9.
+ * New upstream git snapshot up to commit 09782c72.
- Remove pre-generated .pc's, use the ones generated at build time
instead.
- Remove all references to mesa-utils now that its shipped as a
commit 3935b3ad26049fe3a99748176993366967f3619c
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Sep 7 15:32:31 2010 +1000
Remove gallium DRI drivers that duplicate the classic DRI drivers we ship.
This should be revisited at UDS
diff --git a/debian/rules b/debian/rules
index fd7615b..1ca05e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -204,6 +204,24 @@ $(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...
+ifeq (i915,$(findstring i915, $(GALLIUM_DRIVERS)))
+ rm build/dri/lib/gallium/i915_dri.so
+endif
+ifeq (i965,$(findstring i965, $(GALLIUM_DRIVERS)))
+ rm build/dri/lib/gallium/i965_dri.so
+endif
+# We should switch to r300g soon, but it won't support UMS. Stick
+# with r300c for now
+ifeq (radeon,$(findstring radeon, $(GALLIUM_DRIVERS)))
+ rm build/dri/lib/gallium/r300_dri.so
+endif
+# r600g is not yet in a fit state to ship, and the same caveats apply
+# as for r300g
+ifeq (r600,$(findstring r600, $(GALLIUM_DRIVERS)))
+ rm build/dri/lib/gallium/r600_dri.so
+endif
>$@
$(STAMP)-build-%: configure
@@ -229,27 +247,6 @@ install: build
$(MAKE) -C $(DEB_BUILD_DIR)/$$config DESTDIR=$(CURDIR)/debian/tmp install; \
done
$(MAKE) -C $(DEB_BUILD_DIR)/dri DESTDIR=$(CURDIR)/debian/tmp/dri install
-# Install nouveau_vieux in the libgl1-mesa-dri-experimental package,
-# not with the rest of the stock DRI modules.
- mv build/dri/lib/nouveau_vieux_dri.so build/dri/lib/gallium/
-# Remove gallium drivers which replace existing classic drivers.
-# Intel gallium is significantly behind the classic mesa drivers...
-ifeq (i915,$(findstring i915, $(GALLIUM_DRIVERS)))
- rm build/dri/lib/gallium/i915_dri.so
-endif
-ifeq (i965,$(findstring i965, $(GALLIUM_DRIVERS)))
- rm build/dri/lib/gallium/i965_dri.so
-endif
-# We should switch to r300g soon, but it won't support UMS. Stick
-# with r300c for now
-ifeq (radeon,$(findstring radeon, $(GALLIUM_DRIVERS)))
- rm build/dri/lib/gallium/r300_dri.so
-endif
-# r600g is not yet in a fit state to ship, and the same caveats apply
-# as for r300g
-ifeq (r600,$(findstring r600, $(GALLIUM_DRIVERS)))
- rm build/dri/lib/gallium/r600_dri.so
-endif
clean: unpatch
dh_testdir
@@ -286,6 +283,10 @@ binary-arch: install
# install the right files manually.
rm -r debian/tmp/dri/usr/lib/dri
+# Install nouveau_vieux in the libgl1-mesa-dri-experimental package,
+# not with the rest of the stock DRI modules.
+ mv build/dri/lib/nouveau_vieux_dri.so build/dri/lib/gallium/
+
dh_install -s --list-missing
# Create an ld.so.conf which says where to find libGL from Mesa
commit 91b6f3c51cc5d04ed65b22499d30ac9dd8b4163b
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Sep 7 15:23:14 2010 +1000
Fix spelling in changelog
diff --git a/debian/changelog b/debian/changelog
index 4ba47e8..8134125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ mesa (7.9~git20100902-0ubuntu1) maverick; urgency=low
- Remove pre-generated .pc's, use the ones generated at build time
instead.
- Remove all references to mesa-utils now that its shipped as a
- seperate package.
+ separate package.
[ Christopher James Halse Rogers ]
* Build nouveau-vieux driver for nv04-nv30 cards and install in
commit 2124add7fd90ba67bbdbc892dc7ec955db97265e
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Sep 2 16:02:29 2010 +1000
Update snapshot date
diff --git a/debian/changelog b/debian/changelog
index 629f164..4ba47e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.9~git20100901-0ubuntu1) maverick; urgency=low
+mesa (7.9~git20100902-0ubuntu1) maverick; urgency=low
[ Robert Hooker ]
* New upstream git snapshot up to commit 9b075cb9.
commit b6f7c73f92f7da6191aa16a7cf0392030f11a537
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Sep 1 15:59:53 2010 +1000
Enable r600g: this works OK for GL|ES and OpenVG
diff --git a/debian/rules b/debian/rules
index 7881aa3..fd7615b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,7 @@ else
ifeq ($(DEB_HOST_ARCH_OS), linux)
# Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux
- GALLIUM_DRIVERS += nouveau radeon
+ 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 += kms
commit b8c9b48f36ab211ac840c6b6f005912db3fd1c4b
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Sep 1 15:59:23 2010 +1000
Kill undesirable gallium DRI drivers in the install target
diff --git a/debian/rules b/debian/rules
index c8df1c5..7881aa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -204,9 +204,6 @@ $(QUILT_STAMPFN): $(STAMP_DIR)/stamp
build: build-stamp
build-stamp: $(BUILD_STAMPS)
-# Install nouveau_vieux in the libgl1-mesa-dri-experimental package,
-# not with the rest of the stock DRI modules.
- mv build/dri/lib/nouveau_vieux_dri.so build/dri/lib/gallium/
>$@
$(STAMP)-build-%: configure
@@ -232,6 +229,27 @@ install: build
$(MAKE) -C $(DEB_BUILD_DIR)/$$config DESTDIR=$(CURDIR)/debian/tmp install; \
done
$(MAKE) -C $(DEB_BUILD_DIR)/dri DESTDIR=$(CURDIR)/debian/tmp/dri install
+# Install nouveau_vieux in the libgl1-mesa-dri-experimental package,
+# not with the rest of the stock DRI modules.
+ mv build/dri/lib/nouveau_vieux_dri.so build/dri/lib/gallium/
+# Remove gallium drivers which replace existing classic drivers.
+# Intel gallium is significantly behind the classic mesa drivers...
+ifeq (i915,$(findstring i915, $(GALLIUM_DRIVERS)))
+ rm build/dri/lib/gallium/i915_dri.so
+endif
+ifeq (i965,$(findstring i965, $(GALLIUM_DRIVERS)))
+ rm build/dri/lib/gallium/i965_dri.so
+endif
+# We should switch to r300g soon, but it won't support UMS. Stick
+# with r300c for now
+ifeq (radeon,$(findstring radeon, $(GALLIUM_DRIVERS)))
+ rm build/dri/lib/gallium/r300_dri.so
+endif
+# r600g is not yet in a fit state to ship, and the same caveats apply
+# as for r300g
+ifeq (r600,$(findstring r600, $(GALLIUM_DRIVERS)))
+ rm build/dri/lib/gallium/r600_dri.so
+endif
clean: unpatch
dh_testdir
commit 14d498d3f1deb8b6e4c7c1bd86e5e0de98675756
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Sep 1 15:53:01 2010 +1000
Remove reference to Gallium from libgl1-mesa-dri-experimental-dbg's description
diff --git a/debian/control b/debian/control
index d4864b9..6459928 100644
--- a/debian/control
+++ b/debian/control
@@ -504,7 +504,7 @@ Description: Debugging symbols for the experimental Mesa DRI modules
For a complete description of Mesa, please look at the
libgl1-mesa-swx11 package.
.
- This package contains debugging symbols for the Gallium DRI modules.
+ This package contains debugging symbols for the extra DRI modules.
#Package: libgl1-mesa-dri-i686
#Section: libs
commit 18e23762f661ebfb352495626e2782bd98d63387
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Sep 1 15:52:23 2010 +1000
Refresh 04_osmesa_version.diff for new upstream
diff --git a/debian/changelog b/debian/changelog
index 5a52e26..629f164 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-mesa (7.9~git20100825-0ubuntu1) maverick; urgency=low
+mesa (7.9~git20100901-0ubuntu1) maverick; urgency=low
- * New upstream git snapshot up to commit f81cec52a.
+ [ Robert Hooker ]
+ * New upstream git snapshot up to commit 9b075cb9.
- Remove pre-generated .pc's, use the ones generated at build time
instead.
- Remove all references to mesa-utils now that its shipped as a
seperate package.
- -- Robert Hooker <sarvatt@ubuntu.com> Wed, 25 Aug 2010 17:15:21 -0400
+ [ Christopher James Halse Rogers ]
+ * Build nouveau-vieux driver for nv04-nv30 cards and install in
+ libgl1-mesa-dri-experimental
+ * debian/patches/04_osmesa_version.diff:
+ - Refresh for new upstream
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 01 Sep 2010 10:23:15 +1000
mesa (7.8.2-2ubuntu2) maverick; urgency=low
diff --git a/debian/patches/04_osmesa_version.diff b/debian/patches/04_osmesa_version.diff
index 6745f66..4a520ee 100644
--- a/debian/patches/04_osmesa_version.diff
+++ b/debian/patches/04_osmesa_version.diff
@@ -4,14 +4,14 @@
Index: mesa/src/mesa/drivers/osmesa/Makefile
===================================================================
---- mesa.orig/src/mesa/drivers/osmesa/Makefile
-+++ mesa/src/mesa/drivers/osmesa/Makefile
+--- mesa.orig/src/mesa/drivers/osmesa/Makefile 2010-09-01 10:15:50.000000000 +1000
++++ mesa/src/mesa/drivers/osmesa/Makefile 2010-09-01 10:22:30.000000000 +1000
@@ -37,7 +37,7 @@
# -DCHAN_BITS=16/32.
$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
- $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+ $(MKLIB) -o $(OSMESA_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -major 6 -minor 5 -patch 3 \
- -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
+ -install $(TOP)/$(LIB_DIR) -cplusplus $(MKLIB_OPTIONS) \
-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
commit b46415b726aa5d1803f9076832545770f92ae11c
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Wed Sep 1 15:51:47 2010 +1000
Mesa 7.9 builds swrastg_dri; install it in libgl1-mesa-dri-experimental, making the package arch: any
diff --git a/debian/control b/debian/control
index 74e16bc..d4864b9 100644
--- a/debian/control
+++ b/debian/control
@@ -469,7 +469,7 @@ Description: Debugging symbols for the Mesa DRI modules
Package: libgl1-mesa-dri-experimental
Section: libs
-Architecture: linux-any
+Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -489,7 +489,7 @@ Description: A free implementation of the OpenGL API -- Extra DRI modules
Package: libgl1-mesa-dri-experimental-dbg
Section: debug
Priority: extra
-Architecture: linux-any
+Architecture: any
Depends:
libgl1-mesa-dri-experimental (= ${binary:Version}),
${misc:Depends},
diff --git a/debian/libgl1-mesa-dri-experimental.install b/debian/libgl1-mesa-dri-experimental.install
index 2856366..6ce2be8 100644
--- a/debian/libgl1-mesa-dri-experimental.install
+++ b/debian/libgl1-mesa-dri-experimental.install
@@ -1,2 +1 @@
-build/dri/lib/gallium/nouveau_dri.so usr/lib/dri
-build/dri/lib/gallium/nouveau_vieux_dri.so usr/lib/dri
+build/dri/lib/gallium/*_dri.so usr/lib/dri
diff --git a/debian/rules b/debian/rules
index 0d7765d..c8df1c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -294,11 +294,7 @@ endif
dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
-# Mesa 7.8 doesn't build a gallium swrast DRI driver
-# This is built in git, and will be built in 7.9
-ifneq ($(filter-out swrast, $(GALLIUM_DRIVERS)), )
dh_strip -plibgl1-mesa-dri-experimental --dbg-package=libgl1-mesa-dri-experimental-dbg
-endif
dh_strip -plibopenvg1-mesa --dbg-package=libopenvg1-mesa-dbg
dh_strip -plibegl1-mesa --dbg-package=libegl1-mesa-dbg
dh_strip -plibgles1-mesa --dbg-package=libgles1-mesa-dbg
commit 5f9f07c4f44069ad3762637705fe940be006169e
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Aug 30 13:25:31 2010 +1000
i965g still does nothing but cause GPU hangs for me; stop building it
diff --git a/debian/rules b/debian/rules
index ef3ef25..0d7765d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,15 +75,15 @@ else
ifeq ($(DEB_HOST_ARCH), lpia)
DRI_DRIVERS += i915 i965
- GALLIUM_DRIVERS += i915 i965
+ GALLIUM_DRIVERS += i915
else ifneq ($(DEB_HOST_ARCH), s390)
DRI_DRIVERS += mga nouveau r128 r200 r300 r600 radeon savage tdfx
ifeq ($(DEB_HOST_ARCH_CPU), i386)
DRI_DRIVERS += i810 i915 i965 sis unichrome
- GALLIUM_DRIVERS += i915 i965
+ GALLIUM_DRIVERS += i915
else ifeq ($(DEB_HOST_ARCH_CPU), amd64)
DRI_DRIVERS += i915 i965 sis unichrome
- GALLIUM_DRIVERS += i915 i965
+ GALLIUM_DRIVERS += i915
endif
endif
endif
@@ -204,13 +204,6 @@ $(QUILT_STAMPFN): $(STAMP_DIR)/stamp
build: build-stamp
build-stamp: $(BUILD_STAMPS)
-# ifeq ($(findstring intel, $(GALLIUM_DRIVERS)), intel)
-# # Intel i965 Gallium appears to do nothing more than generate GPU
-# # lockups. Kill it with fire. i915 is apparently useful.
-# rm build/dri/lib/gallium/i965_dri.so
-# rm build/dri/lib/egl/pipe_i965.so
-# endif
-
# Install nouveau_vieux in the libgl1-mesa-dri-experimental package,
# not with the rest of the stock DRI modules.
mv build/dri/lib/nouveau_vieux_dri.so build/dri/lib/gallium/
commit e4c05ea97b5881510be4eead2b2f149ece7cbe9d
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Aug 30 13:22:34 2010 +1000
Install nouveau_vieux to libgl1-mesa-dri-experimental
diff --git a/debian/libgl1-mesa-dri-experimental.install b/debian/libgl1-mesa-dri-experimental.install
index d6170b8..2856366 100644
--- a/debian/libgl1-mesa-dri-experimental.install
+++ b/debian/libgl1-mesa-dri-experimental.install
@@ -1 +1,2 @@
build/dri/lib/gallium/nouveau_dri.so usr/lib/dri
+build/dri/lib/gallium/nouveau_vieux_dri.so usr/lib/dri
diff --git a/debian/rules b/debian/rules
index 59e863b..ef3ef25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -210,6 +210,10 @@ build-stamp: $(BUILD_STAMPS)
# rm build/dri/lib/gallium/i965_dri.so
# rm build/dri/lib/egl/pipe_i965.so
# endif
+
+# Install nouveau_vieux in the libgl1-mesa-dri-experimental package,
+# not with the rest of the stock DRI modules.
+ mv build/dri/lib/nouveau_vieux_dri.so build/dri/lib/gallium/
>$@
$(STAMP)-build-%: configure
Reply to: