mesa: Changes to 'ubuntu'

2012-08-21 Thread Steve Langasek 
 debian/changelog   |   12 
 debian/control |1 +
 debian/libgl1-mesa-dri.install.in  |3 +--
 debian/libgl1-mesa-dri.install.kfreebsd.in |6 --
 debian/libgl1-mesa-dri.install.linux.in|   11 ---
 debian/rules   |   17 +
 6 files changed, 19 insertions(+), 31 deletions(-)

New commits:
commit 1ec38e0dd1982017d62b4b44c88a00ceafacd632
Author: Steve Langasek 
Date:   Tue Aug 21 22:27:59 2012 -0700

Add Pre-Depends on multiarch-support to libgl1-mesa-dri, since we're 
shipping a shared library in the package; not an issue in practice since this 
is all post-wheezy / post-precise, but it's an archive reject error in Debian 
right now so let's just be complete.

diff --git a/debian/changelog b/debian/changelog
index e95b86f..bf412c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,10 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
 avoids rpath problems with libtool linking to in-tree convenience
 libraries.
   * debian/rules: don't install libdricore*.so, this isn't a public library.
+  * Add Pre-Depends on multiarch-support to libgl1-mesa-dri, since we're
+shipping a shared library in the package; not an issue in practice since
+this is all post-wheezy / post-precise, but it's an archive reject error
+in Debian right now so let's just be complete.
 
  -- Julien Cristau   Fri, 03 Aug 2012 23:17:16 +0200
 
diff --git a/debian/control b/debian/control
index 4619749..581df44 100644
--- a/debian/control
+++ b/debian/control
@@ -601,6 +601,7 @@ Package: libgl1-mesa-dri
 Section: libs
 Priority: optional
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}

commit 8a64f759e2d89c0b78e4a6bb34db5c6fa5f4786f
Author: Steve Langasek 
Date:   Tue Aug 21 22:26:07 2012 -0700

debian/rules: don't install libdricore*.so, this isn't a public library.

diff --git a/debian/changelog b/debian/changelog
index 1298789..e95b86f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
 already that we're only building drivers that we want to ship, and
 avoids rpath problems with libtool linking to in-tree convenience
 libraries.
+  * debian/rules: don't install libdricore*.so, this isn't a public library.
 
  -- Julien Cristau   Fri, 03 Aug 2012 23:17:16 +0200
 
diff --git a/debian/rules b/debian/rules
index dc82df9..23e6d44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -253,8 +253,9 @@ binary-arch: install
set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
# Files only in git, not in tarballs, OK to use rm -f here:
set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f 
debian/tmp/$$file; done
-   # No need for this .so, libglapi is just a convenience library:
+   # No need for these .so, they're just convenience libraries:
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
+   rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so
# purge .la files
find debian/tmp/ -name '*.la' -exec rm '{}' ';'
 

commit ac89b1de473e794963e9a0d36bda6641915b3ed2
Author: Steve Langasek 
Date:   Tue Aug 21 22:21:19 2012 -0700

Install all dri drivers from the DESTDIR tree, instead of copying them from 
the build tree; this simplifies the install rules since we know already that 
we're only building drivers that we want to ship, and avoids rpath problems 
with libtool linking to in-tree convenience libraries.

diff --git a/debian/changelog b/debian/changelog
index f973a3d..1298789 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,13 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
   * Added 15-fix-llvmpipe-test-linking.diff: Fix link failure when building
 llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.
 
+  [ Steve Langasek ]
+  * Install all dri drivers from the DESTDIR tree, instead of copying them
+from the build tree; this simplifies the install rules since we know
+already that we're only building drivers that we want to ship, and
+avoids rpath problems with libtool linking to in-tree convenience
+libraries.
+
  -- Julien Cristau   Fri, 03 Aug 2012 23:17:16 +0200
 
 mesa (8.0.4-1) unstable; urgency=low
diff --git a/debian/libgl1-mesa-dri.install.in 
b/debian/libgl1-mesa-dri.install.in
index 31a01bb..5eda011 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,3 +1,2 @@
-# If this part gets modified, make sure to update .install.$os as well:
-build/dri/${DEB_HOST_MULTIARCH}/*_dri.so  usr/lib/${DEB_HOST_MULTIARCH}/dri
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so 
usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* 
usr/lib/${DEB_HOST_MU

mesa: Changes to 'debian-experimental'

2012-08-21 Thread Steve Langasek 
 debian/changelog   |   12 
 debian/control |1 +
 debian/libgl1-mesa-dri.install.in  |5 ++---
 debian/libgl1-mesa-dri.install.kfreebsd.in |6 --
 debian/libgl1-mesa-dri.install.linux.in|   10 --
 debian/rules   |   14 ++
 6 files changed, 17 insertions(+), 31 deletions(-)

New commits:
commit 1ec38e0dd1982017d62b4b44c88a00ceafacd632
Author: Steve Langasek 
Date:   Tue Aug 21 22:27:59 2012 -0700

Add Pre-Depends on multiarch-support to libgl1-mesa-dri, since we're 
shipping a shared library in the package; not an issue in practice since this 
is all post-wheezy / post-precise, but it's an archive reject error in Debian 
right now so let's just be complete.

diff --git a/debian/changelog b/debian/changelog
index e95b86f..bf412c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,10 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
 avoids rpath problems with libtool linking to in-tree convenience
 libraries.
   * debian/rules: don't install libdricore*.so, this isn't a public library.
+  * Add Pre-Depends on multiarch-support to libgl1-mesa-dri, since we're
+shipping a shared library in the package; not an issue in practice since
+this is all post-wheezy / post-precise, but it's an archive reject error
+in Debian right now so let's just be complete.
 
  -- Julien Cristau   Fri, 03 Aug 2012 23:17:16 +0200
 
diff --git a/debian/control b/debian/control
index 4619749..581df44 100644
--- a/debian/control
+++ b/debian/control
@@ -601,6 +601,7 @@ Package: libgl1-mesa-dri
 Section: libs
 Priority: optional
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}

commit 8a64f759e2d89c0b78e4a6bb34db5c6fa5f4786f
Author: Steve Langasek 
Date:   Tue Aug 21 22:26:07 2012 -0700

debian/rules: don't install libdricore*.so, this isn't a public library.

diff --git a/debian/changelog b/debian/changelog
index 1298789..e95b86f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
 already that we're only building drivers that we want to ship, and
 avoids rpath problems with libtool linking to in-tree convenience
 libraries.
+  * debian/rules: don't install libdricore*.so, this isn't a public library.
 
  -- Julien Cristau   Fri, 03 Aug 2012 23:17:16 +0200
 
diff --git a/debian/rules b/debian/rules
index dc82df9..23e6d44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -253,8 +253,9 @@ binary-arch: install
set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
# Files only in git, not in tarballs, OK to use rm -f here:
set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f 
debian/tmp/$$file; done
-   # No need for this .so, libglapi is just a convenience library:
+   # No need for these .so, they're just convenience libraries:
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
+   rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so
# purge .la files
find debian/tmp/ -name '*.la' -exec rm '{}' ';'
 

commit ac89b1de473e794963e9a0d36bda6641915b3ed2
Author: Steve Langasek 
Date:   Tue Aug 21 22:21:19 2012 -0700

Install all dri drivers from the DESTDIR tree, instead of copying them from 
the build tree; this simplifies the install rules since we know already that 
we're only building drivers that we want to ship, and avoids rpath problems 
with libtool linking to in-tree convenience libraries.

diff --git a/debian/changelog b/debian/changelog
index f973a3d..1298789 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,13 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
   * Added 15-fix-llvmpipe-test-linking.diff: Fix link failure when building
 llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.
 
+  [ Steve Langasek ]
+  * Install all dri drivers from the DESTDIR tree, instead of copying them
+from the build tree; this simplifies the install rules since we know
+already that we're only building drivers that we want to ship, and
+avoids rpath problems with libtool linking to in-tree convenience
+libraries.
+
  -- Julien Cristau   Fri, 03 Aug 2012 23:17:16 +0200
 
 mesa (8.0.4-1) unstable; urgency=low
diff --git a/debian/libgl1-mesa-dri.install.in 
b/debian/libgl1-mesa-dri.install.in
index 31a01bb..5eda011 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,3 +1,2 @@
-# If this part gets modified, make sure to update .install.$os as well:
-build/dri/${DEB_HOST_MULTIARCH}/*_dri.so  usr/lib/${DEB_HOST_MULTIARCH}/dri
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so 
usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* 
usr/lib/${DEB_HOST_MULT

mesa: Changes to 'debian-experimental'

2012-08-21 Thread Steve Langasek 
 debian/rules |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1729a0a1da8f55b943b41c4d283d2c55f62a486d
Author: Steve Langasek 
Date:   Tue Aug 21 20:15:46 2012 -0700

Make sure we aren't trying to ship radeonsi_dri.so on archs where we haven't
built it

diff --git a/debian/rules b/debian/rules
index a75ddbe..6176288 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,6 +86,8 @@ else
# Radeonsi needs LLVM, so only build it on the subset of archs
# where we have LLVM enabled.
GALLIUM_DRIVERS += radeonsi
+else
+   EXTRA_SED=-e"/radeonsi_dri.so/ s/^/\#/"
 endif
   endif
 
@@ -202,6 +204,7 @@ install: build
for file in debian/*.in; \
do \
sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \
+   $(EXTRA_SED) \
$${file} > $${file%%.in}; \
done
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t41q9-0002yw...@vasks.debian.org

mesa: Changes to 'ubuntu'

2012-08-21 Thread Steve Langasek 
 debian/rules |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0ee1925e861e10e63c3b55568a157c6429f3b449
Author: Steve Langasek 
Date:   Tue Aug 21 15:26:59 2012 -0700

Meh, add radeonsi to the right driver list

diff --git a/debian/rules b/debian/rules
index c23711c..a75ddbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,10 +81,11 @@ else
 ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += r200 radeon nouveau
 endif
-# Radeonsi needs LLVM, so only build it on the subset of archs where we
-# have LLVM enabled.
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386))
-   DRI_DRIVERS += i915 i965 radeonsi
+   DRI_DRIVERS += i915 i965
+   # Radeonsi needs LLVM, so only build it on the subset of archs
+   # where we have LLVM enabled.
+   GALLIUM_DRIVERS += radeonsi
 endif
   endif
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3wwi-0006dm...@vasks.debian.org

mesa: Changes to 'debian-experimental'

2012-08-21 Thread Steve Langasek 
 debian/rules |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0ee1925e861e10e63c3b55568a157c6429f3b449
Author: Steve Langasek 
Date:   Tue Aug 21 15:26:59 2012 -0700

Meh, add radeonsi to the right driver list

diff --git a/debian/rules b/debian/rules
index c23711c..a75ddbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,10 +81,11 @@ else
 ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += r200 radeon nouveau
 endif
-# Radeonsi needs LLVM, so only build it on the subset of archs where we
-# have LLVM enabled.
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386))
-   DRI_DRIVERS += i915 i965 radeonsi
+   DRI_DRIVERS += i915 i965
+   # Radeonsi needs LLVM, so only build it on the subset of archs
+   # where we have LLVM enabled.
+   GALLIUM_DRIVERS += radeonsi
 endif
   endif
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3wue-0006zb...@vasks.debian.org

mesa: Changes to 'ubuntu'

2012-08-21 Thread Steve Langasek 
 debian/rules |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7d41f37dfef5a5fec275902590daf25b718eb608
Author: Steve Langasek 
Date:   Tue Aug 21 15:01:19 2012 -0700

The radeonsi driver requires gallium llvm, so only build it on amd64 and 
i386
where we have llvm enabled.

diff --git a/debian/rules b/debian/rules
index 2473750..c23711c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,8 @@ else
 
   ifeq ($(DEB_HOST_ARCH_OS), linux)
 # Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux
-   GALLIUM_DRIVERS += nouveau r600 r300 radeonsi svga
+   GALLIUM_DRIVERS += nouveau r600 r300 svga
+#
 # Although the KMS egl drivers will probably build on kfreebsd & hurd
 # only linux actually has KMS drivers implemented at this point.
EGL_DISPLAYS += drm
@@ -80,8 +81,10 @@ else
 ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += r200 radeon nouveau
 endif
+# Radeonsi needs LLVM, so only build it on the subset of archs where we
+# have LLVM enabled.
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386))
-   DRI_DRIVERS += i915 i965
+   DRI_DRIVERS += i915 i965 radeonsi
 endif
   endif
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3wwi-0001cp...@vasks.debian.org

mesa: Changes to 'debian-experimental'

2012-08-21 Thread Steve Langasek 
 debian/rules |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7d41f37dfef5a5fec275902590daf25b718eb608
Author: Steve Langasek 
Date:   Tue Aug 21 15:01:19 2012 -0700

The radeonsi driver requires gallium llvm, so only build it on amd64 and 
i386
where we have llvm enabled.

diff --git a/debian/rules b/debian/rules
index 2473750..c23711c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,8 @@ else
 
   ifeq ($(DEB_HOST_ARCH_OS), linux)
 # Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux
-   GALLIUM_DRIVERS += nouveau r600 r300 radeonsi svga
+   GALLIUM_DRIVERS += nouveau r600 r300 svga
+#
 # Although the KMS egl drivers will probably build on kfreebsd & hurd
 # only linux actually has KMS drivers implemented at this point.
EGL_DISPLAYS += drm
@@ -80,8 +81,10 @@ else
 ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += r200 radeon nouveau
 endif
+# Radeonsi needs LLVM, so only build it on the subset of archs where we
+# have LLVM enabled.
 ifneq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386))
-   DRI_DRIVERS += i915 i965
+   DRI_DRIVERS += i915 i965 radeonsi
 endif
   endif
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3wwa-ak...@vasks.debian.org

mesa: Changes to 'ubuntu'

2012-08-21 Thread Timo Aaltonen 
 debian/changelog|7 
 debian/control  |   45 
 debian/libgl1-mesa-dev.install.in   |2 -
 debian/libgl1-mesa-dri.install.in   |2 -
 debian/libgl1-mesa-dri.install.linux.in |4 +-
 debian/libglu1-mesa-dev.install.in  |   10 +++
 debian/libglu1-mesa.install.in  |2 -
 debian/libosmesa6-dev.install.in|6 ++--
 debian/libosmesa6.install.in|2 -
 debian/rules|5 +--
 10 files changed, 57 insertions(+), 28 deletions(-)

New commits:
commit a3f7fcf341b9d07650fd6884af086bccbbb90474
Author: Timo Aaltonen 
Date:   Wed Aug 22 00:15:28 2012 +0300

add installation target paths where needed

diff --git a/debian/libgl1-mesa-dev.install.in 
b/debian/libgl1-mesa-dev.install.in
index aa05ba6..69099f8 100644
--- a/debian/libgl1-mesa-dev.install.in
+++ b/debian/libgl1-mesa-dev.install.in
@@ -1,2 +1,2 @@
 dri/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so usr/lib/${DEB_HOST_MULTIARCH}/mesa
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc 
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
diff --git a/debian/libgl1-mesa-dri.install.in 
b/debian/libgl1-mesa-dri.install.in
index 31a01bb..8f4de07 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,3 +1,3 @@
 # If this part gets modified, make sure to update .install.$os as well:
 build/dri/${DEB_HOST_MULTIARCH}/*_dri.so  usr/lib/${DEB_HOST_MULTIARCH}/dri
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* 
usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libgl1-mesa-dri.install.linux.in 
b/debian/libgl1-mesa-dri.install.linux.in
index aee0994..08b6e72 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -1,6 +1,6 @@
 # Keep this part in sync with libgl1-mesa-dri.install:
 build/dri/${DEB_HOST_MULTIARCH}/*_dri.so  usr/lib/${DEB_HOST_MULTIARCH}/dri
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* 
usr/lib/${DEB_HOST_MULTIARCH}/
 
 # This part is Linux-specific:
 #build/dri/${DEB_HOST_MULTIARCH}/libgallium.so 
usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/libglu1-mesa-dev.install.in 
b/debian/libglu1-mesa-dev.install.in
index 9c15fbd..b74bfa2 100644
--- a/debian/libglu1-mesa-dev.install.in
+++ b/debian/libglu1-mesa-dev.install.in
@@ -1,5 +1,5 @@
-dri/usr/include/GL/glu.h
-dri/usr/include/GL/glu_mangle.h
-#dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.a
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glu.pc
+dri/usr/include/GL/glu.h usr/include/GL/
+dri/usr/include/GL/glu_mangle.h usr/include/GL/
+#dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.a usr/lib/${DEB_HOST_MULTIARCH}/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so usr/lib/${DEB_HOST_MULTIARCH}/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glu.pc 
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
diff --git a/debian/libglu1-mesa.install.in b/debian/libglu1-mesa.install.in
index a52dd59..d078272 100644
--- a/debian/libglu1-mesa.install.in
+++ b/debian/libglu1-mesa.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so.*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLU.so.* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libosmesa6-dev.install.in b/debian/libosmesa6-dev.install.in
index cef6cac..4499bff 100644
--- a/debian/libosmesa6-dev.install.in
+++ b/debian/libosmesa6-dev.install.in
@@ -1,3 +1,3 @@
-dri/usr/include/GL/osmesa.h
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so
-dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc
+dri/usr/include/GL/osmesa.h usr/include/GL/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so usr/lib/${DEB_HOST_MULTIARCH}/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc 
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
diff --git a/debian/libosmesa6.install.in b/debian/libosmesa6.install.in
index 6289c66..4abf5b1 100644
--- a/debian/libosmesa6.install.in
+++ b/debian/libosmesa6.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.* usr/lib/${DEB_HOST_MULTIARCH}/

commit 480680dfe4bbe642d1a240288598809d7597be2e
Author: Timo Aaltonen 
Date:   Wed Aug 22 00:14:26 2012 +0300

control: Add Pre-Depends on dpkg-dev due to the binaries using xz 
compression.

diff --git a/debian/changelog b/debian/changelog
index 64d4d74..03b7990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ mesa (9.0~git20120821.c1114c61-0ubuntu1) UNRELEASED; 
urgency=low
   * rules: Enable llvmpipe on armhf to see if it works or not.
   * rules: Remove bin/install-sh on clean, and don't create a symlink for
 it.
+  * control: Add Pre-Depends on dpkg-dev due to the binaries using xz
+compression.
 
  -- Timo Aaltonen   Fri, 17 Aug 2012 11:08:47 +0300
 
diff --git a/debian/control b/debian/c

xorg: Changes to 'ubuntu'

2012-08-21 Thread Timo Aaltonen 
 debian/changelog  |8 
 debian/scripts/vars.amd64 |1 -
 debian/scripts/vars.i386  |1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 9c804c057e536cdae78f860cefe8ad6824a2b044
Author: Timo Aaltonen 
Date:   Tue Aug 21 21:08:48 2012 +0300

release to quantal

diff --git a/debian/changelog b/debian/changelog
index 5908444..038b967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.7+1ubuntu2) UNRELEASED; urgency=low
+xorg (1:7.7+1ubuntu2) quantal; urgency=low
 
   * scripts/vars.{amd64,i386}: Add xserver-xorg-video-modesetting to
-XSERVER_XORG_VIDEO_DEPENDS.
+XSERVER_XORG_VIDEO_DEPENDS. (LP: #1039648)
 
- -- Timo Aaltonen   Thu, 09 Aug 2012 09:15:08 +0300
+ -- Timo Aaltonen   Tue, 21 Aug 2012 21:08:18 +0300
 
 xorg (1:7.7+1ubuntu1) quantal; urgency=low
 

commit f533735442a758a748316d5000fc3ac9270e2a21
Author: Timo Aaltonen 
Date:   Tue Aug 21 21:07:42 2012 +0300

displaylink is obsolete, drop it

diff --git a/debian/changelog b/debian/changelog
index 4d5a8bf..5908444 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xorg (1:7.7+1ubuntu2) UNRELEASED; urgency=low
 
-  * scripts/vars.{amd64,i386}: Add -displaylink and -modesetting to
+  * scripts/vars.{amd64,i386}: Add xserver-xorg-video-modesetting to
 XSERVER_XORG_VIDEO_DEPENDS.
 
  -- Timo Aaltonen   Thu, 09 Aug 2012 09:15:08 +0300
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index 60b6f62..f2be7c4 100644
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -6,7 +6,6 @@
 XSERVER_XORG_VIDEO_DEPENDS=" \
xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
-   xserver-xorg-video-displaylink, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 27ee486..1390f3b 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -6,7 +6,6 @@
 XSERVER_XORG_VIDEO_DEPENDS=" \
xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
-   xserver-xorg-video-displaylink \
xserver-xorg-video-fbdev, \
xserver-xorg-video-geode, \
xserver-xorg-video-intel, \


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3suq-0003st...@vasks.debian.org

mesa: Changes to 'ubuntu'

2012-08-21 Thread Maarten Lankhorst 
 debian/patches/111_export_searchdirs_in_dripc.diff |   24 -
 debian/patches/117-static-gallium-hack.patch   |  443 +
 2 files changed, 443 insertions(+), 24 deletions(-)

New commits:
commit 2aafce0c28f049d1a1b9dbbeb07c9c263dd94a89
Author: Maarten Lankhorst 
Date:   Tue Aug 21 17:48:05 2012 +0200

Add stash commit

Just so I don't lose it, dri-swrast appears to be the only one
failing to build.

diff --git a/debian/patches/117-static-gallium-hack.patch 
b/debian/patches/117-static-gallium-hack.patch
new file mode 100644
index 000..423daa3
--- /dev/null
+++ b/debian/patches/117-static-gallium-hack.patch
@@ -0,0 +1,443 @@
+diff --git a/configs/current.in b/configs/current.in
+index c490842..73d08be 100644
+--- a/configs/current.in
 b/configs/current.in
+@@ -13,6 +13,7 @@ PIC_FLAGS = @PIC_FLAGS@
+ DEFINES = @DEFINES@
+ API_DEFINES = @API_DEFINES@
+ SHARED_GLAPI = @SHARED_GLAPI@
++SHARED_GALLIUM = @SHARED_GALLIUM@
+ CFLAGS_NOVISIBILITY = @CPPFLAGS@ @CFLAGS@ \
+   $(PIC_FLAGS) $(DEFINES)
+ CXXFLAGS_NOVISIBILITY = @CPPFLAGS@ @CXXFLAGS@ \
+@@ -112,7 +113,11 @@ GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@
+ GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@
+ GALLIUM_TARGET_DIRS = @GALLIUM_TARGET_DIRS@
+ GALLIUM_STATE_TRACKERS_DIRS = @GALLIUM_STATE_TRACKERS_DIRS@
+-GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
++ifeq (@SHARED_GALLIUM@,1)
++GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/.libs/libgallium.so
++else
++GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/.libs/libgallium.a
++endif
+ GALLIUM_DRIVERS = $(foreach 
DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
+ 
+ # Driver specific build vars
+diff --git a/configure.ac b/configure.ac
+index 7dac091..be21c4a 100644
+--- a/configure.ac
 b/configure.ac
+@@ -698,6 +698,19 @@ fi
+ AC_SUBST([SHARED_GLAPI])
+ AM_CONDITIONAL(HAVE_SHARED_GLAPI, test $SHARED_GLAPI = 1)
+ 
++AC_ARG_ENABLE([shared-gallium],
++[AS_HELP_STRING([--enable-shared-gallium],
++[Enable shared gallium core @<:@default=yes@:>@])],
++[enable_shared_gallium="$enableval"],
++[enable_shared_gallium=yes])
++
++SHARED_GALLIUM="0"
++if test "x$enable_shared_gallium" = xyes; then
++SHARED_GALLIUM="1"
++fi
++AC_SUBST([SHARED_GALLIUM])
++AM_CONDITIONAL(HAVE_SHARED_GALLIUM, test $SHARED_GALLIUM = 1)
++
+ dnl
+ dnl Driver configuration. Options are xlib, dri and osmesa right now.
+ dnl More later: fbdev, ...
+@@ -1810,6 +1823,7 @@ if test "x$enable_gallium_llvm" = xyes; then
+ else
+ MESA_LLVM=0
+ fi
++AM_CONDITIONAL(HAVE_MESA_LLVM, test "x$MESA_LLVM" = x1)
+ 
+ dnl Directory for XVMC libs
+ AC_ARG_WITH([xvmc-libdir],
+@@ -2070,6 +2084,7 @@ AC_CONFIG_FILES([configs/current
+   Makefile
+   src/Makefile
+   src/gallium/Makefile
++  src/gallium/auxiliary/Makefile
+   src/gallium/auxiliary/pipe-loader/Makefile
+   src/gallium/state_trackers/clover/Makefile
+   src/gallium/drivers/Makefile
+diff --git a/debian/patches/15-fix-llvmpipe-test-linking.diff 
b/debian/patches/15-fix-llvmpipe-test-linking.diff
+index 92893a3..4c4a86d 100644
+--- a/debian/patches/15-fix-llvmpipe-test-linking.diff
 b/debian/patches/15-fix-llvmpipe-test-linking.diff
+@@ -16,11 +16,11 @@ Bugzilla: 
https://bugs.freedesktop.org/show_bug.cgi?id=52167
+  src/gallium/state_trackers/d3d1x/gd3d1x/Makefile | 3 ++-
+  3 files changed, 5 insertions(+), 3 deletions(-)
+ 
+-diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
+-index 036c119..c30477a 100644
+ a/src/gallium/Makefile.template
+-+++ b/src/gallium/Makefile.template
+-@@ -41,7 +41,7 @@ depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) 
$(SYMLINKS) $(GENERATED_SOURC
++Index: mesa/src/gallium/Makefile.template
++===
++--- mesa.orig/src/gallium/Makefile.template   2012-08-21 14:40:03.449673454 
+
+ mesa/src/gallium/Makefile.template2012-08-21 14:40:04.020675436 
+
++@@ -41,7 +41,7 @@
+   $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(CPP_SOURCES) 
$(ASM_SOURCES) $(GENERATED_SOURCES) 2> /dev/null
+  
+  $(PROGS): % : %.o $(PROGS_DEPS)
+@@ -29,25 +29,30 @@ index 036c119..c30477a 100644
+  
+  # Emacs tags
+  tags:
+-diff --git a/src/gallium/drivers/llvmpipe/Makefile 
b/src/gallium/drivers/llvmpipe/Makefile
+-index ef16fc7..35f8fe8 100644
+ a/src/gallium/drivers/llvmpipe/Makefile
+-+++ b/src/gallium/drivers/llvmpipe/Makefile
+-@@ -68,7 +68,8 @@ lp_tile_soa.c: lp_tile_soa.py 
../../auxiliary/util/u_format_parse.py ../../auxil
++Index: mesa/src/gallium/drivers/llvmpipe/Makefile
++===
++--- mesa.orig/src/gallium/drivers/llvmpipe/Makefile   2012-08-21 
14:40:03.449673454 +
+ mesa/src/gallium/drivers/llvmpipe/Makefile2012-08-21 
14:49:20.395606825 +
++@@ -68,7 +68,13 @@
+   $(

Bug#685458: xterm: Segmentation fault with -t option specified

2012-08-21 Thread antonio.giorgi...@fastwebnet.it 
Thank you a lot for your quick and fully satisfactory reply.  Now it works as it
 was used in the past.

Antonio Giorgilli


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/13547656.214951345562161369.JavaMail.defaultUser@defaultHost

Bug#685458: xterm: Segmentation fault with -t option specified

2012-08-21 Thread Marco Sansottera 
Thanks a lot, now it works!


Marco



-- 
"No! No different! Only different in your mind. You must unlearn what
you have learned." Yoda


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: 
http://lists.debian.org/CAN1s8OFhECQ9fUUZ8K+dAo1=jjnn8xterjlevw2vu1z6dop...@mail.gmail.com

Bug#684931: /usr/share/x11/xkb/symbols/fi: AltGr problem

2012-08-21 Thread Troy Korjuslommi 
I would focus on the input method handling in gnome. 
If you set xim as IM in gnome, things work.
Therefore, the logical starting point for debugging is the default IM
gnome uses. 

I didn't make it clear, but the bugs I filed a couple of years back were
gnome bugs. I am not in front of the right machine right now, but as I
recall the effort didn't produce any results. It might even be that I
never got replies other than "this is not the right place to file a bug.
Please file at XXX," and at XXX I was told to file at YYY. I might be
mistaken, since it's a while back, but I do remember feeling frustrated
at the process.

Troy
  

On Mon, 2012-08-20 at 17:08 +0300, Martin-Éric Racine wrote:
> 2012/8/20 Troy Korjuslommi :
> > I actually filed the same bug a couple of years ago, as I recall. The
> > behavior is the same, so no change seems to have taken place.
> >
> > Some debugging notes first. Always try X11 apps first, to see if the
> > problem is with X11. If X11 works, then the problem is with something on
> > top of X11, usually GTK or KDE.
> >
> > The problem with X11 can be with a number of things such as the key
> > symbols .h file, the Compose file, or the actual file for the specific
> > keyboard.
> >
> > In this case, I tried entering U+0111 (Altgr-§-d) with xkb-data version
> > 1.8-2 on debian stable, and xkb-data version 2.5-1ubuntu1.3 on the
> > latest desktop ubuntu. I got the same results on both.
> >
> > If you try X11 (xterm, xev) everything works. Same for KDE (kaffeine et
> > al).
> >
> > If you open gnome-terminal or some other gnome app, you will first get
> > only a plain d. To rule out font problems, paste § to the gnome app. It
> > should show up just fine.
> >
> > The solution is to change to the XIM input method. You can do this from
> > the right mouse button for some apps, but for others you have to fiddle
> > with the input settings globally. Once XIM is set as the input method,
> > you get your Islandic đ.
> >
> > The behavior is obviously still wrong. GTK apps should work without the
> > users having to fiddle with their input method settings. All input
> > methods (at least the default one) should understand all correct input.
> > However, I hope the above demonstrated conclusively that the problem is
> > not with X11 or its configurations. The problem lies with input methods
> > other than XIM when using GTK.
> 
> I'm begining to wonder if GTK3 or GNOME3 maintain their own
> (presumably outdated) copies of the xkb-data keymaps? At least, what
> is shown whenever selecting "Show keyboard map" from the keyboard
> applet in gnome-shell doesn't quite match what I'm supposed to be
> using (fi-Kotoistus keymap), which might explain other problems such
> as this unability to generate D-slash or L-slash using only compose
> sequences from the Kotoistus keymap within GNOME applications.
> 
> Martin-Éric


--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/1345550460.2410.7.ca...@uno11.loco

mesa: Changes to 'upstream-experimental'

2012-08-21 Thread Timo Aaltonen 
 configs/current.in |   23 
 configs/default|   18 
 configure.ac   |   91 -
 scons/custom.py|   25 
 src/gallium/auxiliary/cso_cache/cso_context.c  |2 
 src/gallium/auxiliary/draw/draw_context.c  |   49 
 src/gallium/auxiliary/draw/draw_context.h  |3 
 src/gallium/auxiliary/draw/draw_gs.c   |   22 
 src/gallium/auxiliary/draw/draw_llvm.c |   20 
 src/gallium/auxiliary/draw/draw_llvm.h |4 
 src/gallium/auxiliary/draw/draw_llvm_sample.c  |6 
 src/gallium/auxiliary/draw/draw_private.h  |   34 
 src/gallium/auxiliary/draw/draw_vs.c   |6 
 src/gallium/auxiliary/draw/draw_vs_exec.c  |6 
 src/gallium/auxiliary/util/u_upload_mgr.h  |7 
 src/gallium/drivers/galahad/glhd_context.c |   98 -
 src/gallium/drivers/i915/i915_context.h|6 
 src/gallium/drivers/i915/i915_screen.c |2 
 src/gallium/drivers/i915/i915_state.c  |   15 
 src/gallium/drivers/identity/id_context.c  |   94 -
 src/gallium/drivers/llvmpipe/lp_context.c  |4 
 src/gallium/drivers/llvmpipe/lp_context.h  |2 
 src/gallium/drivers/llvmpipe/lp_screen.c   |4 
 src/gallium/drivers/llvmpipe/lp_state_sampler.c|   92 -
 src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp |2 
 src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp |2 
 src/gallium/drivers/r600/compute_memory_pool.c |6 
 src/gallium/drivers/r600/evergreen_compute.c   |   23 
 src/gallium/drivers/r600/evergreen_compute_internal.c  |   14 
 src/gallium/drivers/r600/evergreen_state.c |  381 ++--
 src/gallium/drivers/r600/r600_blit.c   |  109 -
 src/gallium/drivers/r600/r600_pipe.h   |   16 
 src/gallium/drivers/r600/r600_resource.h   |   14 
 src/gallium/drivers/r600/r600_shader.c |2 
 src/gallium/drivers/r600/r600_state.c  |   15 
 src/gallium/drivers/r600/r600_state_common.c   |   58 
 src/gallium/drivers/r600/r600_texture.c|   70 
 src/gallium/drivers/radeon/R600ISelLowering.cpp|   86 -
 src/gallium/drivers/radeon/R600ISelLowering.h  |7 
 src/gallium/drivers/radeon/R600Instructions.td |   18 
 src/gallium/drivers/radeon/radeon_llvm_emit.cpp|   15 
 src/gallium/drivers/radeonsi/r600.h|   10 
 src/gallium/drivers/radeonsi/r600_blit.c   |   10 
 src/gallium/drivers/radeonsi/r600_buffer.c |8 
 src/gallium/drivers/radeonsi/r600_hw_context.c |   21 
 src/gallium/drivers/radeonsi/r600_resource.c   |6 
 src/gallium/drivers/radeonsi/r600_resource.h   |   20 
 src/gallium/drivers/radeonsi/r600_texture.c|  414 ++---
 src/gallium/drivers/radeonsi/radeonsi_pipe.c   |   10 
 src/gallium/drivers/radeonsi/radeonsi_pipe.h   |   22 
 src/gallium/drivers/radeonsi/radeonsi_shader.c |1 
 src/gallium/drivers/radeonsi/si_state.c|   23 
 src/gallium/drivers/radeonsi/si_state_draw.c   |4 
 src/gallium/drivers/rbug/rbug_context.c|  113 -
 src/gallium/drivers/rbug/rbug_context.h|   17 
 src/gallium/drivers/rbug/rbug_core.c   |   17 
 src/gallium/drivers/softpipe/sp_context.c  |8 
 src/gallium/drivers/softpipe/sp_context.h  |2 
 src/gallium/drivers/softpipe/sp_screen.c   |4 
 src/gallium/drivers/softpipe/sp_state_derived.c|2 
 src/gallium/drivers/softpipe/sp_state_sampler.c|   88 -
 src/gallium/drivers/svga/svga_cmd.c|5 
 src/gallium/drivers/svga/svga_pipe_sampler.c   |   89 -
 src/gallium/drivers/svga/svga_state.c  |4 
 src/gallium/drivers/svga/svga_state.h  |4 
 src/gallium/drivers/svga/svga_state_constants.c|   58 
 src/gallium/drivers/trace/tr_context.c |  142 +
 src/gallium/include/pipe/p_state.h |2 
 src/gallium/state_trackers/egl/wayland/native_drm.c|5 
 src/gallium/targets/Makefile.va|2 
 src/gallium/targets/Makefile.vdpau |2 
 src/gallium/targets/Makefile.xvmc  |2 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c  |   92 -
 src/mesa/SConscript|2 
 src/mesa/drivers/common/meta.c |2 
 src/mesa/drivers/dri/i965/brw_vs_constval.c|4 
 src/mesa/drivers/osmesa/Makefile.am|2 
 src/mesa/main/APIspec.xml

mesa: Changes to 'debian-experimental'

2012-08-21 Thread Timo Aaltonen 
 debian/changelog |2 
 debian/patches/15-fix-llvmpipe-test-linking.diff |   61 +++
 debian/patches/series|1 
 3 files changed, 64 insertions(+)

New commits:
commit fae28bc1fff4147046b9dc095f4f5e92f85f2306
Author: Timo Aaltonen 
Date:   Tue Aug 21 12:49:12 2012 +0300

Added 15-fix-llvmpipe-test-linking.diff: Fix link failure when building 
llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.

diff --git a/debian/changelog b/debian/changelog
index e07943e..f973a3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
   * control: Add new dependencies to libgl1-mesa-dev.
   * rules, libgl1-mesa-dri.install.linux.in: Add support for radeonsi.
   * rules: Build llvm shared libs on platforms that support llvm.
+  * Added 15-fix-llvmpipe-test-linking.diff: Fix link failure when building
+llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.
 
  -- Julien Cristau   Fri, 03 Aug 2012 23:17:16 +0200
 
diff --git a/debian/patches/15-fix-llvmpipe-test-linking.diff 
b/debian/patches/15-fix-llvmpipe-test-linking.diff
new file mode 100644
index 000..92893a3
--- /dev/null
+++ b/debian/patches/15-fix-llvmpipe-test-linking.diff
@@ -0,0 +1,61 @@
+From 7e2e29c67f8fc8ec72c2dc8544428fdd86b21353 Mon Sep 17 00:00:00 2001
+From: Olivier Blin 
+Date: Sat, 4 Aug 2012 00:29:45 +0200
+Subject: [PATCH] gallium: only link static archives between ld start/end group 
options
+
+llvmpipe test programs failed to link with --as-needed ld option,
+since dynamic libraries were mixed with static libraries between the
+ld --start-group and --end-group options.
+
+gd3d1x likely had the same issue.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=52167
+---
+ src/gallium/Makefile.template| 2 +-
+ src/gallium/drivers/llvmpipe/Makefile| 3 ++-
+ src/gallium/state_trackers/d3d1x/gd3d1x/Makefile | 3 ++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
+index 036c119..c30477a 100644
+--- a/src/gallium/Makefile.template
 b/src/gallium/Makefile.template
+@@ -41,7 +41,7 @@ depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) 
$(SYMLINKS) $(GENERATED_SOURC
+   $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(CPP_SOURCES) 
$(ASM_SOURCES) $(GENERATED_SOURCES) 2> /dev/null
+ 
+ $(PROGS): % : %.o $(PROGS_DEPS)
+-  $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) 
-Wl,--end-group
++  $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) 
-Wl,--end-group $(LDADD)
+ 
+ # Emacs tags
+ tags:
+diff --git a/src/gallium/drivers/llvmpipe/Makefile 
b/src/gallium/drivers/llvmpipe/Makefile
+index ef16fc7..35f8fe8 100644
+--- a/src/gallium/drivers/llvmpipe/Makefile
 b/src/gallium/drivers/llvmpipe/Makefile
+@@ -68,7 +68,8 @@ lp_tile_soa.c: lp_tile_soa.py 
../../auxiliary/util/u_format_parse.py ../../auxil
+   $(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py 
../../auxiliary/util/u_format.csv > $@
+ 
+ LDFLAGS += $(LLVM_LDFLAGS)
+-LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
++LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a
++LDADD += $(LLVM_LIBS) $(GL_LIB_DEPS)
+ LD=$(CXX)
+ 
+ $(PROGS): lp_test_main.o libllvmpipe.a
+diff --git a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile 
b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
+index 32d2956..f9cad05 100644
+--- a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
 b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
+@@ -3,5 +3,6 @@ CPP_SOURCES=$(wildcard *.cpp)
+ LIBRARY_INCLUDES=-Iinclude -I../gd3dapi -I../d3dapi -I../w32api 
-I../d3d1xstutil/include -I../d3d1xshader/include -I../../../include 
-I../../../auxiliary -I../../../state_trackers/egl/common
+ PROGS=tools/dxbc2tgsi
+ PROGS_DEPS=libgd3d1x.a ../d3d1xshader/libd3d1xshader.a 
../d3d1xstutil/libd3d1xstutil.a ../../../auxiliary/libgallium.a
+-LIBS=$(PROGS_DEPS) -ldl
++LIBS=$(PROGS_DEPS)
++LDADD=-ldl
+ include ../Makefile.inc
+-- 
+1.7.11.4
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 1dd2780..0d68a36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 #11-hurd-ftbfs-again.diff
 13-llvm-config-pick-a-version.diff
 14-fix-osmesa-build.diff
+15-fix-llvmpipe-test-linking.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3lff-0004gs...@vasks.debian.org

mesa: Changes to 'ubuntu'

2012-08-21 Thread Timo Aaltonen 
 debian/changelog |4 +
 debian/libgl1-mesa-dev.install.in|4 -
 debian/patches/15-fix-llvmpipe-test-linking.diff |   61 +++
 debian/patches/series|3 -
 4 files changed, 69 insertions(+), 3 deletions(-)

New commits:
commit 7c7b25505214c13b92d4e42f56d931167f4ce59a
Author: Timo Aaltonen 
Date:   Tue Aug 21 13:26:46 2012 +0300

libgl1-mesa-dev.install.in: Fix the source file paths to match the build 
target.

diff --git a/debian/changelog b/debian/changelog
index aaa6111..2f1acfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ mesa (9.0~git20120821.c1114c61-0ubuntu1) UNRELEASED; 
urgency=low
 on the dri target.
   * libglu*install.in: Fix the source file paths to match the build target.
 Drop the static lib from -dev since only shared libs get built.
+  * libgl1-mesa-dev.install.in: Fix the source file paths to match the
+build target.
 
  -- Timo Aaltonen   Fri, 17 Aug 2012 11:08:47 +0300
 
diff --git a/debian/libgl1-mesa-dev.install.in 
b/debian/libgl1-mesa-dev.install.in
index 5934ec4..aa05ba6 100644
--- a/debian/libgl1-mesa-dev.install.in
+++ b/debian/libgl1-mesa-dev.install.in
@@ -1,2 +1,2 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libGL.so usr/lib/${DEB_HOST_MULTIARCH}/mesa
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so usr/lib/${DEB_HOST_MULTIARCH}/mesa
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc

commit fae28bc1fff4147046b9dc095f4f5e92f85f2306
Author: Timo Aaltonen 
Date:   Tue Aug 21 12:49:12 2012 +0300

Added 15-fix-llvmpipe-test-linking.diff: Fix link failure when building 
llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.

diff --git a/debian/changelog b/debian/changelog
index e07943e..f973a3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
   * control: Add new dependencies to libgl1-mesa-dev.
   * rules, libgl1-mesa-dri.install.linux.in: Add support for radeonsi.
   * rules: Build llvm shared libs on platforms that support llvm.
+  * Added 15-fix-llvmpipe-test-linking.diff: Fix link failure when building
+llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.
 
  -- Julien Cristau   Fri, 03 Aug 2012 23:17:16 +0200
 
diff --git a/debian/patches/15-fix-llvmpipe-test-linking.diff 
b/debian/patches/15-fix-llvmpipe-test-linking.diff
new file mode 100644
index 000..92893a3
--- /dev/null
+++ b/debian/patches/15-fix-llvmpipe-test-linking.diff
@@ -0,0 +1,61 @@
+From 7e2e29c67f8fc8ec72c2dc8544428fdd86b21353 Mon Sep 17 00:00:00 2001
+From: Olivier Blin 
+Date: Sat, 4 Aug 2012 00:29:45 +0200
+Subject: [PATCH] gallium: only link static archives between ld start/end group 
options
+
+llvmpipe test programs failed to link with --as-needed ld option,
+since dynamic libraries were mixed with static libraries between the
+ld --start-group and --end-group options.
+
+gd3d1x likely had the same issue.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=52167
+---
+ src/gallium/Makefile.template| 2 +-
+ src/gallium/drivers/llvmpipe/Makefile| 3 ++-
+ src/gallium/state_trackers/d3d1x/gd3d1x/Makefile | 3 ++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
+index 036c119..c30477a 100644
+--- a/src/gallium/Makefile.template
 b/src/gallium/Makefile.template
+@@ -41,7 +41,7 @@ depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) 
$(SYMLINKS) $(GENERATED_SOURC
+   $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(CPP_SOURCES) 
$(ASM_SOURCES) $(GENERATED_SOURCES) 2> /dev/null
+ 
+ $(PROGS): % : %.o $(PROGS_DEPS)
+-  $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) 
-Wl,--end-group
++  $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) 
-Wl,--end-group $(LDADD)
+ 
+ # Emacs tags
+ tags:
+diff --git a/src/gallium/drivers/llvmpipe/Makefile 
b/src/gallium/drivers/llvmpipe/Makefile
+index ef16fc7..35f8fe8 100644
+--- a/src/gallium/drivers/llvmpipe/Makefile
 b/src/gallium/drivers/llvmpipe/Makefile
+@@ -68,7 +68,8 @@ lp_tile_soa.c: lp_tile_soa.py 
../../auxiliary/util/u_format_parse.py ../../auxil
+   $(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py 
../../auxiliary/util/u_format.csv > $@
+ 
+ LDFLAGS += $(LLVM_LDFLAGS)
+-LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
++LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a
++LDADD += $(LLVM_LIBS) $(GL_LIB_DEPS)
+ LD=$(CXX)
+ 
+ $(PROGS): lp_test_main.o libllvmpipe.a
+diff --git a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile 
b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
+index 32d2956..f9cad05 100644
+--- a/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
 b/src/gallium/state_trackers/d3d1x/gd3d1x/Makefile
+@@ -3,5 +3,6 @@ CPP_SOURCES=$(wildcard *.cpp)
+ LIBRARY_INCLUDES

mesa: Changes to 'ubuntu'

2012-08-21 Thread Timo Aaltonen 
 configs/current.in |   23 
 configs/default|   18 
 configure.ac   |   91 -
 debian/changelog   |   31 
 debian/control |9 
 debian/libgl1-mesa-dri.install.linux.in|1 
 debian/rules   |3 
 scons/custom.py|   25 
 src/gallium/auxiliary/cso_cache/cso_context.c  |2 
 src/gallium/auxiliary/draw/draw_context.c  |   49 
 src/gallium/auxiliary/draw/draw_context.h  |3 
 src/gallium/auxiliary/draw/draw_gs.c   |   22 
 src/gallium/auxiliary/draw/draw_llvm.c |   20 
 src/gallium/auxiliary/draw/draw_llvm.h |4 
 src/gallium/auxiliary/draw/draw_llvm_sample.c  |6 
 src/gallium/auxiliary/draw/draw_private.h  |   34 
 src/gallium/auxiliary/draw/draw_vs.c   |6 
 src/gallium/auxiliary/draw/draw_vs_exec.c  |6 
 src/gallium/auxiliary/util/u_upload_mgr.h  |7 
 src/gallium/drivers/galahad/glhd_context.c |   98 -
 src/gallium/drivers/i915/i915_context.h|6 
 src/gallium/drivers/i915/i915_screen.c |2 
 src/gallium/drivers/i915/i915_state.c  |   15 
 src/gallium/drivers/identity/id_context.c  |   94 -
 src/gallium/drivers/llvmpipe/lp_context.c  |4 
 src/gallium/drivers/llvmpipe/lp_context.h  |2 
 src/gallium/drivers/llvmpipe/lp_screen.c   |4 
 src/gallium/drivers/llvmpipe/lp_state_sampler.c|   92 -
 src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp |2 
 src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp |2 
 src/gallium/drivers/r600/compute_memory_pool.c |6 
 src/gallium/drivers/r600/evergreen_compute.c   |   23 
 src/gallium/drivers/r600/evergreen_compute_internal.c  |   14 
 src/gallium/drivers/r600/evergreen_state.c |  381 ++--
 src/gallium/drivers/r600/r600_blit.c   |  109 -
 src/gallium/drivers/r600/r600_pipe.h   |   16 
 src/gallium/drivers/r600/r600_resource.h   |   14 
 src/gallium/drivers/r600/r600_shader.c |2 
 src/gallium/drivers/r600/r600_state.c  |   15 
 src/gallium/drivers/r600/r600_state_common.c   |   58 
 src/gallium/drivers/r600/r600_texture.c|   70 
 src/gallium/drivers/radeon/R600ISelLowering.cpp|   86 -
 src/gallium/drivers/radeon/R600ISelLowering.h  |7 
 src/gallium/drivers/radeon/R600Instructions.td |   18 
 src/gallium/drivers/radeon/radeon_llvm_emit.cpp|   15 
 src/gallium/drivers/radeonsi/r600.h|   10 
 src/gallium/drivers/radeonsi/r600_blit.c   |   10 
 src/gallium/drivers/radeonsi/r600_buffer.c |8 
 src/gallium/drivers/radeonsi/r600_hw_context.c |   21 
 src/gallium/drivers/radeonsi/r600_resource.c   |6 
 src/gallium/drivers/radeonsi/r600_resource.h   |   20 
 src/gallium/drivers/radeonsi/r600_texture.c|  414 ++---
 src/gallium/drivers/radeonsi/radeonsi_pipe.c   |   10 
 src/gallium/drivers/radeonsi/radeonsi_pipe.h   |   22 
 src/gallium/drivers/radeonsi/radeonsi_shader.c |1 
 src/gallium/drivers/radeonsi/si_state.c|   23 
 src/gallium/drivers/radeonsi/si_state_draw.c   |4 
 src/gallium/drivers/rbug/rbug_context.c|  113 -
 src/gallium/drivers/rbug/rbug_context.h|   17 
 src/gallium/drivers/rbug/rbug_core.c   |   17 
 src/gallium/drivers/softpipe/sp_context.c  |8 
 src/gallium/drivers/softpipe/sp_context.h  |2 
 src/gallium/drivers/softpipe/sp_screen.c   |4 
 src/gallium/drivers/softpipe/sp_state_derived.c|2 
 src/gallium/drivers/softpipe/sp_state_sampler.c|   88 -
 src/gallium/drivers/svga/svga_cmd.c|5 
 src/gallium/drivers/svga/svga_pipe_sampler.c   |   89 -
 src/gallium/drivers/svga/svga_state.c  |4 
 src/gallium/drivers/svga/svga_state.h  |4 
 src/gallium/drivers/svga/svga_state_constants.c|   58 
 src/gallium/drivers/trace/tr_context.c |  142 +
 src/gallium/include/pipe/p_state.h |2 
 src/gallium/state_trackers/egl/wayland/native_drm.c|5 
 src/gallium/targets/Makefile.va|2 
 src/gallium/targets/Makefile.vdpau |2 
 src/gallium/targets/Makefile.xvmc  |2 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c  |   92 -
 src/mesa/SConscript

mesa: Changes to 'debian-experimental'

2012-08-21 Thread Timo Aaltonen 
 configs/current.in |   23 
 configs/default|   18 
 configure.ac   |   91 -
 debian/changelog   |5 
 debian/control |9 
 debian/libgl1-mesa-dri.install.linux.in|1 
 debian/rules   |3 
 scons/custom.py|   25 
 src/gallium/auxiliary/cso_cache/cso_context.c  |2 
 src/gallium/auxiliary/draw/draw_context.c  |   49 
 src/gallium/auxiliary/draw/draw_context.h  |3 
 src/gallium/auxiliary/draw/draw_gs.c   |   22 
 src/gallium/auxiliary/draw/draw_llvm.c |   20 
 src/gallium/auxiliary/draw/draw_llvm.h |4 
 src/gallium/auxiliary/draw/draw_llvm_sample.c  |6 
 src/gallium/auxiliary/draw/draw_private.h  |   34 
 src/gallium/auxiliary/draw/draw_vs.c   |6 
 src/gallium/auxiliary/draw/draw_vs_exec.c  |6 
 src/gallium/auxiliary/util/u_upload_mgr.h  |7 
 src/gallium/drivers/galahad/glhd_context.c |   98 -
 src/gallium/drivers/i915/i915_context.h|6 
 src/gallium/drivers/i915/i915_screen.c |2 
 src/gallium/drivers/i915/i915_state.c  |   15 
 src/gallium/drivers/identity/id_context.c  |   94 -
 src/gallium/drivers/llvmpipe/lp_context.c  |4 
 src/gallium/drivers/llvmpipe/lp_context.h  |2 
 src/gallium/drivers/llvmpipe/lp_screen.c   |4 
 src/gallium/drivers/llvmpipe/lp_state_sampler.c|   92 -
 src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp |2 
 src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp |2 
 src/gallium/drivers/r600/compute_memory_pool.c |6 
 src/gallium/drivers/r600/evergreen_compute.c   |   23 
 src/gallium/drivers/r600/evergreen_compute_internal.c  |   14 
 src/gallium/drivers/r600/evergreen_state.c |  381 ++--
 src/gallium/drivers/r600/r600_blit.c   |  109 -
 src/gallium/drivers/r600/r600_pipe.h   |   16 
 src/gallium/drivers/r600/r600_resource.h   |   14 
 src/gallium/drivers/r600/r600_shader.c |2 
 src/gallium/drivers/r600/r600_state.c  |   15 
 src/gallium/drivers/r600/r600_state_common.c   |   58 
 src/gallium/drivers/r600/r600_texture.c|   70 
 src/gallium/drivers/radeon/R600ISelLowering.cpp|   86 -
 src/gallium/drivers/radeon/R600ISelLowering.h  |7 
 src/gallium/drivers/radeon/R600Instructions.td |   18 
 src/gallium/drivers/radeon/radeon_llvm_emit.cpp|   15 
 src/gallium/drivers/radeonsi/r600.h|   10 
 src/gallium/drivers/radeonsi/r600_blit.c   |   10 
 src/gallium/drivers/radeonsi/r600_buffer.c |8 
 src/gallium/drivers/radeonsi/r600_hw_context.c |   21 
 src/gallium/drivers/radeonsi/r600_resource.c   |6 
 src/gallium/drivers/radeonsi/r600_resource.h   |   20 
 src/gallium/drivers/radeonsi/r600_texture.c|  414 ++---
 src/gallium/drivers/radeonsi/radeonsi_pipe.c   |   10 
 src/gallium/drivers/radeonsi/radeonsi_pipe.h   |   22 
 src/gallium/drivers/radeonsi/radeonsi_shader.c |1 
 src/gallium/drivers/radeonsi/si_state.c|   23 
 src/gallium/drivers/radeonsi/si_state_draw.c   |4 
 src/gallium/drivers/rbug/rbug_context.c|  113 -
 src/gallium/drivers/rbug/rbug_context.h|   17 
 src/gallium/drivers/rbug/rbug_core.c   |   17 
 src/gallium/drivers/softpipe/sp_context.c  |8 
 src/gallium/drivers/softpipe/sp_context.h  |2 
 src/gallium/drivers/softpipe/sp_screen.c   |4 
 src/gallium/drivers/softpipe/sp_state_derived.c|2 
 src/gallium/drivers/softpipe/sp_state_sampler.c|   88 -
 src/gallium/drivers/svga/svga_cmd.c|5 
 src/gallium/drivers/svga/svga_pipe_sampler.c   |   89 -
 src/gallium/drivers/svga/svga_state.c  |4 
 src/gallium/drivers/svga/svga_state.h  |4 
 src/gallium/drivers/svga/svga_state_constants.c|   58 
 src/gallium/drivers/trace/tr_context.c |  142 +
 src/gallium/include/pipe/p_state.h |2 
 src/gallium/state_trackers/egl/wayland/native_drm.c|5 
 src/gallium/targets/Makefile.va|2 
 src/gallium/targets/Makefile.vdpau |2 
 src/gallium/targets/Makefile.xvmc  |2 
 src/gallium/winsys/radeon/drm/radeon_drm_bo.c  |   92 -
 src/mesa/SConscript

xorg-server: Changes to 'ubuntu'

2012-08-21 Thread Christopher Halse Rogers 
 debian/changelog |9 +++--
 debian/control   |2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit df92c59df45ff452a3c834c451ab2fb4f89edeef
Author: Christopher James Halse Rogers 
Date:   Tue Aug 21 16:07:34 2012 +1000

Rebuild against new libdrm to pick up correct -udeb dependencies

diff --git a/debian/changelog b/debian/changelog
index 3659ead..7d25cbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
-xorg-server (2:1.12.99.904-0ubuntu2) UNRELEASED; urgency=low
+xorg-server (2:1.12.99.904-0ubuntu2) quantal; urgency=low
 
+  [ Maarten Lankhorst ]
   * Remove disabled and unwanted patches
 - 13_debian_add_xkbpath_env_variable.diff
 - 200_randr-null.patch
 - 217_revert_bgnonevisitwindow.patch
 - 219_fedora-pointer-barriers.diff
 
- -- Maarten Lankhorst   Mon, 20 Aug 2012 
22:48:13 +0200
+  [ Christopher James Halse Rogers ]
+  * Bump build-dep on libdrm to 2.4.38-0ubuntu2 and rebuild to pick up correct
+libdrm2-udeb dependencies on xserver-xorg-core-udeb
+
+ -- Christopher James Halse Rogers   Tue, 21 Aug 2012 
16:07:00 +1000
 
 xorg-server (2:1.12.99.904-0ubuntu1) quantal-proposed; urgency=low
 
diff --git a/debian/control b/debian/control
index 1114d49..e9f19fd 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Build-Depends:
  libudev-dev (>= 151-3),
  libselinux1-dev (>= 2.0.80),
  x11proto-xf86dri-dev (>= 2.1.0),
- libdrm-dev (>= 2.4.3) [!hurd-i386],
+ libdrm-dev (>= 2.4.38-0ubuntu2~) [!hurd-i386],
  x11proto-gl-dev (>= 1.4.16),
  mesa-common-dev (>= 7.10.3-0ubuntu1),
  libgl1-mesa-dev (>= 7.8),


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3iod-00059z...@vasks.debian.org

xorg-server: Changes to 'pristine-tar'

2012-08-21 Thread Christopher Halse Rogers 
 xorg-server_1.12.99.902.orig.tar.gz.delta |binary
 xorg-server_1.12.99.902.orig.tar.gz.id|1 +
 2 files changed, 1 insertion(+)

New commits:
commit 90979789686043a3204b3e2ef98c54ae4c60b964
Author: Christopher James Halse Rogers 
Date:   Wed Jul 25 16:59:27 2012 +1000

pristine-tar data for xorg-server_1.12.99.902.orig.tar.gz

diff --git a/xorg-server_1.12.99.902.orig.tar.gz.delta 
b/xorg-server_1.12.99.902.orig.tar.gz.delta
new file mode 100644
index 000..377238f
Binary files /dev/null and b/xorg-server_1.12.99.902.orig.tar.gz.delta differ
diff --git a/xorg-server_1.12.99.902.orig.tar.gz.id 
b/xorg-server_1.12.99.902.orig.tar.gz.id
new file mode 100644
index 000..e5be6e3
--- /dev/null
+++ b/xorg-server_1.12.99.902.orig.tar.gz.id
@@ -0,0 +1 @@
+1576669adc76235c7c25c19ceb593e53f3fce889


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3ioc-00059k...@vasks.debian.org

mesa: Changes to 'ubuntu'

2012-08-21 Thread Timo Aaltonen 
 debian/changelog|3 +--
 debian/libgl1-mesa-dri.install.in   |2 +-
 debian/libgl1-mesa-dri.install.linux.in |2 +-
 debian/patches/14-fix-osmesa-build.diff |   17 +++--
 4 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit 2f64e67568942a15b779c5f7951f7a9c084a82d3
Author: Timo Aaltonen 
Date:   Tue Aug 21 09:43:01 2012 +0300

refresh patch 14 to actually apply

diff --git a/debian/patches/14-fix-osmesa-build.diff 
b/debian/patches/14-fix-osmesa-build.diff
index 8699c49..61823ab 100644
--- a/debian/patches/14-fix-osmesa-build.diff
+++ b/debian/patches/14-fix-osmesa-build.diff
@@ -1,13 +1,10 @@
-diff --git a/src/mesa/drivers/osmesa/Makefile.am 
b/src/mesa/drivers/osmesa/Makefile.am
-index dbee925..0afc1c7 100644
 --- a/src/mesa/drivers/osmesa/Makefile.am
 +++ b/src/mesa/drivers/osmesa/Makefile.am
-@@ -28,6 +28,7 @@ AM_CFLAGS = \
--I$(top_srcdir)/include \
--I$(top_srcdir)/src/mapi \
--I$(top_srcdir)/src/mesa/ \
-+   -I$(top_builddir)/src/mapi \
-$(DEFINES) \
-$(API_DEFINES)
+@@ -28,6 +28,7 @@
+   -I$(top_srcdir)/include \
+   -I$(top_srcdir)/src/mapi \
+   -I$(top_srcdir)/src/mesa/ \
++  -I$(top_builddir)/src/mapi \
+   $(DEFINES) \
+   $(API_DEFINES)
  
-

commit 5657ef9c482c14a30473c9d3069706ae2ff6a826
Author: Timo Aaltonen 
Date:   Tue Aug 21 09:28:17 2012 +0300

libgl1-mesa-dri.install*.in: Add libdricore.

diff --git a/debian/changelog b/debian/changelog
index c46..115532b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ mesa (8.1~git20120816.1597176f-1) UNRELEASED; urgency=low
   * Update symbols.
   * Added 14-fix-osmesa-build.diff, fixes glapi includes with out-of-tree
 builds.
+  * libgl1-mesa-dri.install*.in: Add libdricore.
 
  -- Julien Cristau   Fri, 03 Aug 2012 23:17:16 +0200
 
diff --git a/debian/libgl1-mesa-dri.install.in 
b/debian/libgl1-mesa-dri.install.in
index 4a66df4..31a01bb 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,2 +1,3 @@
 # If this part gets modified, make sure to update .install.$os as well:
 build/dri/${DEB_HOST_MULTIARCH}/*_dri.so  usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
diff --git a/debian/libgl1-mesa-dri.install.linux.in 
b/debian/libgl1-mesa-dri.install.linux.in
index ee1acd8..0d9ca03 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -1,5 +1,6 @@
 # Keep this part in sync with libgl1-mesa-dri.install:
 build/dri/${DEB_HOST_MULTIARCH}/*_dri.so  usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
 
 # This part is Linux-specific:
 build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so 
usr/lib/${DEB_HOST_MULTIARCH}/dri


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3iby-0002vt...@vasks.debian.org

mesa: Changes to 'debian-experimental'

2012-08-21 Thread Timo Aaltonen 
 debian/changelog|1 +
 debian/libgl1-mesa-dri.install.in   |1 +
 debian/libgl1-mesa-dri.install.linux.in |1 +
 debian/patches/14-fix-osmesa-build.diff |   17 +++--
 4 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 2f64e67568942a15b779c5f7951f7a9c084a82d3
Author: Timo Aaltonen 
Date:   Tue Aug 21 09:43:01 2012 +0300

refresh patch 14 to actually apply

diff --git a/debian/patches/14-fix-osmesa-build.diff 
b/debian/patches/14-fix-osmesa-build.diff
index 8699c49..61823ab 100644
--- a/debian/patches/14-fix-osmesa-build.diff
+++ b/debian/patches/14-fix-osmesa-build.diff
@@ -1,13 +1,10 @@
-diff --git a/src/mesa/drivers/osmesa/Makefile.am 
b/src/mesa/drivers/osmesa/Makefile.am
-index dbee925..0afc1c7 100644
 --- a/src/mesa/drivers/osmesa/Makefile.am
 +++ b/src/mesa/drivers/osmesa/Makefile.am
-@@ -28,6 +28,7 @@ AM_CFLAGS = \
--I$(top_srcdir)/include \
--I$(top_srcdir)/src/mapi \
--I$(top_srcdir)/src/mesa/ \
-+   -I$(top_builddir)/src/mapi \
-$(DEFINES) \
-$(API_DEFINES)
+@@ -28,6 +28,7 @@
+   -I$(top_srcdir)/include \
+   -I$(top_srcdir)/src/mapi \
+   -I$(top_srcdir)/src/mesa/ \
++  -I$(top_builddir)/src/mapi \
+   $(DEFINES) \
+   $(API_DEFINES)
  
-

commit 5657ef9c482c14a30473c9d3069706ae2ff6a826
Author: Timo Aaltonen 
Date:   Tue Aug 21 09:28:17 2012 +0300

libgl1-mesa-dri.install*.in: Add libdricore.

diff --git a/debian/changelog b/debian/changelog
index c46..115532b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ mesa (8.1~git20120816.1597176f-1) UNRELEASED; urgency=low
   * Update symbols.
   * Added 14-fix-osmesa-build.diff, fixes glapi includes with out-of-tree
 builds.
+  * libgl1-mesa-dri.install*.in: Add libdricore.
 
  -- Julien Cristau   Fri, 03 Aug 2012 23:17:16 +0200
 
diff --git a/debian/libgl1-mesa-dri.install.in 
b/debian/libgl1-mesa-dri.install.in
index 4a66df4..31a01bb 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,2 +1,3 @@
 # If this part gets modified, make sure to update .install.$os as well:
 build/dri/${DEB_HOST_MULTIARCH}/*_dri.so  usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
diff --git a/debian/libgl1-mesa-dri.install.linux.in 
b/debian/libgl1-mesa-dri.install.linux.in
index ee1acd8..0d9ca03 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -1,5 +1,6 @@
 # Keep this part in sync with libgl1-mesa-dri.install:
 build/dri/${DEB_HOST_MULTIARCH}/*_dri.so  usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
 
 # This part is Linux-specific:
 build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so 
usr/lib/${DEB_HOST_MULTIARCH}/dri


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t3iby-0002ve...@vasks.debian.org