debian/changelog | 7 ++++
debian/clean | 15 ++++++++++
debian/control | 37 +++++++++++++++++++++++--
debian/libegl1-mesa-dev.install | 4 --
debian/libegl1-mesa-dev.install.in | 4 ++
debian/libegl1-mesa-drivers.install | 2 -
debian/libegl1-mesa-drivers.install.in | 2 +
debian/libegl1-mesa.install | 4 --
debian/libegl1-mesa.install.in | 4 ++
debian/libgl1-mesa-dev.install | 4 +-
debian/libgl1-mesa-dri-experimental.install | 2 -
debian/libgl1-mesa-dri-experimental.install.in | 3 ++
debian/libgl1-mesa-dri-i686.install | 2 -
debian/libgl1-mesa-dri.install | 2 -
debian/libgl1-mesa-dri.install.in | 2 +
debian/libgl1-mesa-dri.install.linux | 6 ----
debian/libgl1-mesa-dri.install.linux.in | 6 ++++
debian/libgl1-mesa-glx-i686.install | 1
debian/libgl1-mesa-glx-i686.install.in | 1
debian/libgl1-mesa-glx.install | 1
debian/libgl1-mesa-glx.install.in | 1
debian/libgl1-mesa-swx11-dev.install | 4 +-
debian/libgl1-mesa-swx11-i686.install | 2 -
debian/libgl1-mesa-swx11.install | 2 -
debian/libgles1-mesa-dev.install | 3 --
debian/libgles1-mesa-dev.install.in | 3 ++
debian/libgles1-mesa.install | 2 -
debian/libgles1-mesa.install.in | 2 +
debian/libgles2-mesa-dev.install | 3 --
debian/libgles2-mesa-dev.install.in | 3 ++
debian/libgles2-mesa.install | 2 -
debian/libgles2-mesa.install.in | 2 +
debian/libglu1-mesa-dev.install | 6 ++--
debian/libglu1-mesa.install | 2 -
debian/libglw1-mesa-dev.install | 6 ++--
debian/libglw1-mesa.install | 2 -
debian/libopenvg1-mesa-dev.install | 3 --
debian/libopenvg1-mesa-dev.install.in | 3 ++
debian/libopenvg1-mesa.install | 2 -
debian/libopenvg1-mesa.install.in | 2 +
debian/libosmesa6-dev.install | 14 ++++-----
debian/libosmesa6.install | 6 ++--
debian/mesa-common-dev.install | 8 -----
debian/mesa-common-dev.install.in | 8 +++++
debian/not-installed | 24 ++++++++--------
debian/rules | 26 +++++++++++++----
46 files changed, 160 insertions(+), 90 deletions(-)
New commits:
commit 3a2adc77d98d96f0144429f4a61a0209bd776a1c
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 12 17:51:59 2011 +0200
Update Breaks now that multiarch is merged; restore ${ORIGIN}/dri search
path
diff --git a/debian/control b/debian/control
index e440081..0c15837 100644
--- a/debian/control
+++ b/debian/control
@@ -454,7 +454,7 @@ Depends:
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0)
-Breaks: xserver-xorg-core (<< 2:1.9.99.903-3), libgl1-mesa-glx (<< 7.10-6)
+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
@@ -496,7 +496,7 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
-Breaks: xserver-xorg-core (<< 2:1.9.99.903-3), libgl1-mesa-glx (<< 7.10-6)
+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
diff --git a/debian/rules b/debian/rules
index 3c182a8..a10a792 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,7 @@ confflags-dri = \
--with-driver=dri \
--with-dri-drivers="$(DRI_DRIVERS)" \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
- --with-dri-searchpath=/usr/lib/$(DEB_HOST_MULTIARCH)/dri:/usr/lib/dri \
+ --with-dri-searchpath='\$$$${ORIGIN}/dri:/usr/lib/dri' \
--enable-glx-tls \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
commit 51acc37040b7452b170d3f5a42fd1af28773e8fb
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Jun 12 17:49:27 2011 +0200
Add changelog entry for multiarch
diff --git a/debian/changelog b/debian/changelog
index c9a03d1..561d45a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.10.2-4) UNRELEASED; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 12 Jun 2011 17:49:06 +0200
+
mesa (7.10.2-3) unstable; urgency=low
* Merge upstream 7.10 branch up to eaadbacb5c.
commit 23b3623c40629a44d6b3e91a9b58ee0121b66704
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Sun Mar 27 16:30:54 2011 -0700
multiarch DRI path compatibility
Set a DRI search path that includes both multiarch and pre-multiarch
directories, and have the new libgl1-mesa-dri* Break: the old
libgl1-mesa-glx and xserver-xorg-core that only know to look in the old
directory. (Using projected version numbers for the versions of these
packages that will enter the archive with multiarch support; fix this with
the real version numbers once known)
diff --git a/debian/control b/debian/control
index 0be7bbd..605f4fe 100644
--- a/debian/control
+++ b/debian/control
@@ -454,7 +454,7 @@ Depends:
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0)
-Breaks: xserver-xorg-core (<< 2:1.5), libgl1-mesa-glx (<< 7.2)
+Breaks: xserver-xorg-core (<< 2:1.9.99.903-3), libgl1-mesa-glx (<< 7.10-6)
Multi-Arch: same
Description: A free implementation of the OpenGL API -- DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
@@ -496,6 +496,7 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
+Breaks: xserver-xorg-core (<< 2:1.9.99.903-3), libgl1-mesa-glx (<< 7.10-6)
Multi-Arch: same
Description: A free implementation of the OpenGL API -- Extra DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
diff --git a/debian/rules b/debian/rules
index dde256d..fbb1e6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,7 +102,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' \
+ --with-dri-searchpath=/usr/lib/$(DEB_HOST_MULTIARCH)/dri:/usr/lib/dri \
--enable-glx-tls \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
commit c8ab2a0a5c57aaed79407177e7fa6436050ec3ac
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Sun Mar 27 12:18:42 2011 -0700
further fixes to multiarch paths in the package
diff --git a/debian/rules b/debian/rules
index 417f743..dde256d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -101,7 +101,7 @@ endif
confflags-dri = \
--with-driver=dri \
--with-dri-drivers="$(DRI_DRIVERS)" \
- --with-dri-driverdir=/usr/lib/dri \
+ --with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
--with-dri-searchpath='\$$$${ORIGIN}/dri' \
--enable-glx-tls \
$(confflags_DIRECT_RENDERING) \
@@ -205,9 +205,9 @@ 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/gallium/i915_dri.so
+ rm -f build/dri/lib/$(DEB_HOST_MULTIARCH)/gallium/i915_dri.so
# r600g is not yet in a fit state to ship
- rm -f build/dri/lib/gallium/r600_dri.so
+ rm -f build/dri/lib/$(DEB_HOST_MULTIARCH)/gallium/r600_dri.so
>$@
$(STAMP)-build-%: configure
@@ -280,7 +280,7 @@ binary-arch: install
# Classic DRI and Gallium DRI are mixed up together here
# Remove the whole tree to avoid false-positives in --list-missing, and
# install the right files manually.
- rm -r debian/tmp/dri/usr/lib/dri
+ rm -r debian/tmp/dri/usr/lib/$(DEB_HOST_MULTIARCH)/dri
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
commit 4dd54c372a7aae0e0cf121d90e63dbe3843580d1
Author: Steve Langasek <steve.langa...@ubuntu.com>
Date: Sat Mar 26 21:03:30 2011 -0700
build for multiarch
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f8a01aa
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,15 @@
+debian/mesa-common-dev.install
+debian/libopenvg1-mesa.install
+debian/libopenvg1-mesa-dev.install
+debian/libgles2-mesa.install
+debian/libgles2-mesa-dev.install
+debian/libgles1-mesa.install
+debian/libgles1-mesa-dev.install
+debian/libgl1-mesa-glx.install
+debian/libgl1-mesa-glx-i686.install
+debian/libgl1-mesa-dri.install
+debian/libgl1-mesa-dri.install.linux
+debian/libgl1-mesa-dri-experimental.install
+debian/libegl1-mesa.install
+debian/libegl1-mesa-drivers.install
+debian/libegl1-mesa-dev.install
diff --git a/debian/control b/debian/control
index 2cd81cd..0be7bbd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Brice Goglin
<bgog...@debian.org>, Cyril Brulebois <k...@debian.org>
Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7.2.7), quilt (>= 0.40), pkg-config,
+Build-Depends: debhelper (>= 8.1.3), quilt (>= 0.40), pkg-config,
libdrm-dev (>= 2.4.23) [!hurd-i386], libx11-dev, xutils-dev,
x11proto-gl-dev (>= 1.4.11), libxxf86vm-dev,
libexpat1-dev, lesstif2-dev, dpkg-dev (>= 1.15.6), libxfixes-dev,
@@ -27,6 +27,8 @@ Depends:
Conflicts: mesag3-glide, mesag3-glide2, mesag3+ggi, libgl1, nvidia-glx,
mesag3, libgl1-mesa-swrast
Provides: libgl1, mesag3, libgl1-mesa-swrast
Replaces: libgl1, mesag3, libgl1-mesa-swrast
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: A free implementation of the OpenGL API -- runtime
Mesa is a 3-D graphics library with an API which is very similar to
that of OpenGL. To the extent that Mesa utilizes the OpenGL command
@@ -51,6 +53,7 @@ Depends:
Conflicts: libgl1-mesa-swrast-dbg
Provides: libgl1-mesa-swrast-dbg
Replaces: libgl1-mesa-swrast-dbg
+Multi-Arch: same
Description: A free implementation of the OpenGL API -- debugging symbols
Mesa is a 3-D graphics library with an API which is very similar to
that of OpenGL. To the extent that Mesa utilizes the OpenGL command
@@ -76,6 +79,8 @@ Depends:
libgl1-mesa-swx11 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Mesa OpenGL runtime [i686 optimized]
Mesa is a 3-D graphics library with an API which is very similar to
that of OpenGL. To the extent that Mesa utilizes the OpenGL command
@@ -127,6 +132,8 @@ Recommends: libegl1-mesa-drivers
Provides: libegl1-x11
Conflicts: libegl1-x11
Replaces: libegl1-x11
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: A free implementation of the EGL API -- runtime
This package contains the EGL native platform graphics interface library.
EGL provides a platform-agnostic mechanism for creating rendering surfaces
@@ -143,6 +150,7 @@ Architecture: linux-any kfreebsd-any
Depends:
libegl1-mesa (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: A free implementation of the EGL API -- debugging symbols
This package contains the EGL native platform graphics interface library.
EGL provides a platform-agnostic mechanism for creating rendering surfaces
@@ -180,6 +188,7 @@ Depends:
${shlibs:Depends},
${misc:Depends},
libegl1-mesa (= ${binary:Version}),
+Multi-Arch: same
Description: A free implementation of the EGL API -- hardware drivers
This package contains the EGL native platform graphics interface library.
EGL provides a platform-agnostic mechanism for creating rendering surfaces
@@ -195,6 +204,7 @@ Architecture: linux-any kfreebsd-any
Depends:
libegl1-mesa-drivers (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: A free implementation of the EGL API -- driver debugging symbols
This package contains the EGL native platform graphics interface library.
EGL provides a platform-agnostic mechanism for creating rendering surfaces
@@ -212,6 +222,8 @@ Depends:
Provides: libopenvg1
Conflicts: libopenvg1
Replaces: libopenvg1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: A free implementation of the OpenVG API -- runtime
This package contains the mesa implementation of the OpenVG 2D acceleration
library. OpenVG provides a device independent and vendor-neutral interface
@@ -226,6 +238,7 @@ Architecture: linux-any kfreebsd-any
Depends:
libopenvg1-mesa (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: A free implementation of the OpenVG API -- debugging symbols
This package contains the mesa implementation of the OpenVG 2D acceleration
library. OpenVG provides a device independent and vendor-neutral interface
@@ -261,6 +274,8 @@ Depends:
Provides: libgles1
Conflicts: libgles1
Replaces: libgles1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: A free implementation of the OpenGL|ES 1.x API -- runtime
OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
embedded systems - including consoles, phones, appliances and vehicles.
@@ -276,6 +291,7 @@ Architecture: linux-any kfreebsd-any
Depends:
libgles1-mesa (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: A free implementation of the OpenGL|ES 1.x API -- debugging
symbols
OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
embedded systems - including consoles, phones, appliances and vehicles.
@@ -313,6 +329,8 @@ Depends:
Provides: libgles2
Conflicts: libgles2
Replaces: libgles2
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: A free implementation of the OpenGL|ES 2.x API -- runtime
OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
embedded systems - including consoles, phones, appliances and vehicles.
@@ -329,6 +347,7 @@ Architecture: linux-any kfreebsd-any
Depends:
libgles2-mesa (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: A free implementation of the OpenGL|ES 2.x API -- debugging
symbols
OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
embedded systems - including consoles, phones, appliances and vehicles.
@@ -369,6 +388,8 @@ Recommends: libgl1-mesa-dri (>= 7.2)
Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
Provides: libgl1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: A free implementation of the OpenGL API -- GLX runtime
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
@@ -387,6 +408,7 @@ Architecture: any
Depends:
libgl1-mesa-glx (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: Debugging symbols for the Mesa GLX runtime
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
@@ -433,6 +455,7 @@ Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0)
Breaks: xserver-xorg-core (<< 2:1.5), libgl1-mesa-glx (<< 7.2)
+Multi-Arch: same
Description: A free implementation of the OpenGL API -- DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
@@ -453,6 +476,7 @@ Architecture: any
Depends:
libgl1-mesa-dri (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: Debugging symbols for the Mesa DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
@@ -472,6 +496,7 @@ Architecture: linux-any
Depends:
${shlibs:Depends},
${misc:Depends},
+Multi-Arch: same
Description: A free implementation of the OpenGL API -- Extra DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
@@ -492,6 +517,7 @@ Architecture: linux-any
Depends:
libgl1-mesa-dri-experimental (= ${binary:Version}),
${misc:Depends},
+Multi-Arch: same
Description: Debugging symbols for the experimental Mesa DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
both direct and indirect rendering. For direct rendering, it can use DRI
@@ -567,6 +593,8 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Replaces: libgl1-mesa-swx11 (<< 6.5.2)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: Mesa Off-screen rendering extension
OSmesa is a Mesa extension that allows programs to render to an
off-screen buffer using the OpenGL API without having to create a
@@ -600,6 +628,8 @@ Depends:
Provides: libglu1
Conflicts: mesag3 (<< 5.0.0-1), xlibmesa3, libglu1
Replaces: libglu1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: The OpenGL utility library (GLU)
GLU offers simple interfaces for building mipmaps; checking for the
presence of extensions in the OpenGL (or other libraries which follow
@@ -637,6 +667,8 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Provides: libglw1
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Description: A free implementation of the OpenGL API -- runtime
Mesa is a 3-D graphics library with an API which is very similar to
that of OpenGL. To the extent that Mesa utilizes the OpenGL command
diff --git a/debian/libegl1-mesa-dev.install b/debian/libegl1-mesa-dev.install
deleted file mode 100644
index 108d307..0000000
--- a/debian/libegl1-mesa-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-dri/usr/lib/libEGL.so usr/lib
-dri/usr/include/EGL usr/include
-dri/usr/include/KHR usr/include
-dri/usr/lib/pkgconfig/egl.pc usr/lib/pkgconfig
diff --git a/debian/libegl1-mesa-dev.install.in
b/debian/libegl1-mesa-dev.install.in
new file mode 100644
index 0000000..2b04928
--- /dev/null
+++ b/debian/libegl1-mesa-dev.install.in
@@ -0,0 +1,4 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.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
diff --git a/debian/libegl1-mesa-drivers.install
b/debian/libegl1-mesa-drivers.install
deleted file mode 100644
index 2e17878..0000000
--- a/debian/libegl1-mesa-drivers.install
+++ /dev/null
@@ -1,2 +0,0 @@
-dri/usr/lib/egl/egl_gallium.so usr/lib/egl
-dri/usr/lib/egl/pipe_*.so usr/lib/egl
diff --git a/debian/libegl1-mesa-drivers.install.in
b/debian/libegl1-mesa-drivers.install.in
new file mode 100644
index 0000000..32e361af
--- /dev/null
+++ b/debian/libegl1-mesa-drivers.install.in
@@ -0,0 +1,2 @@
+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
diff --git a/debian/libegl1-mesa.install b/debian/libegl1-mesa.install
deleted file mode 100644
index 6dbe565..0000000
--- a/debian/libegl1-mesa.install
+++ /dev/null
@@ -1,4 +0,0 @@
-dri/usr/lib/libEGL.so.1* usr/lib
-dri/usr/lib/egl/egl_dri2.so usr/lib/egl
-dri/usr/lib/egl/egl_glx.so usr/lib/egl
-dri/usr/lib/egl/st_GL.so usr/lib/egl
diff --git a/debian/libegl1-mesa.install.in b/debian/libegl1-mesa.install.in
new file mode 100644
index 0000000..2237ed0
--- /dev/null
+++ b/debian/libegl1-mesa.install.in
@@ -0,0 +1,4 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1* usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_dri2.so
usr/lib/${DEB_HOST_MULTIARCH}/egl
+dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_glx.so
usr/lib/${DEB_HOST_MULTIARCH}/egl
+dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/st_GL.so
usr/lib/${DEB_HOST_MULTIARCH}/egl
diff --git a/debian/libgl1-mesa-dev.install b/debian/libgl1-mesa-dev.install
index dac5ebd..a8c371e 100644
--- a/debian/libgl1-mesa-dev.install
+++ b/debian/libgl1-mesa-dev.install
@@ -1,2 +1,2 @@
-usr/lib/libGL.so
-usr/lib/pkgconfig/gl.pc
+usr/lib/*/libGL.so
+usr/lib/*/pkgconfig/gl.pc
diff --git a/debian/libgl1-mesa-dri-experimental.install
b/debian/libgl1-mesa-dri-experimental.install
deleted file mode 100644
index d6170b8..0000000
--- a/debian/libgl1-mesa-dri-experimental.install
+++ /dev/null
@@ -1 +0,0 @@
-build/dri/lib/gallium/nouveau_dri.so usr/lib/dri
diff --git a/debian/libgl1-mesa-dri-experimental.install.in
b/debian/libgl1-mesa-dri-experimental.install.in
new file mode 100644
index 0000000..705604e
--- /dev/null
+++ b/debian/libgl1-mesa-dri-experimental.install.in
@@ -0,0 +1 @@
+build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/libgl1-mesa-dri-i686.install
b/debian/libgl1-mesa-dri-i686.install
index 847043c..ab0baef 100644
--- a/debian/libgl1-mesa-dri-i686.install
+++ b/debian/libgl1-mesa-dri-i686.install
@@ -1 +1 @@
-dri/usr/lib/dri/i686/cmov/*.so
+dri/usr/lib/*/dri/i686/cmov/*.so
diff --git a/debian/libgl1-mesa-dri.install b/debian/libgl1-mesa-dri.install
deleted file mode 100644
index a470396..0000000
--- a/debian/libgl1-mesa-dri.install
+++ /dev/null
@@ -1,2 +0,0 @@
-# If this part gets modified, make sure to update .install.$os as well:
-build/dri/lib/*_dri.so usr/lib/dri
diff --git a/debian/libgl1-mesa-dri.install.in
b/debian/libgl1-mesa-dri.install.in
new file mode 100644
index 0000000..4a66df4
--- /dev/null
+++ b/debian/libgl1-mesa-dri.install.in
@@ -0,0 +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
diff --git a/debian/libgl1-mesa-dri.install.linux
b/debian/libgl1-mesa-dri.install.linux
deleted file mode 100644
index d724d6d..0000000
--- a/debian/libgl1-mesa-dri.install.linux
+++ /dev/null
@@ -1,5 +0,0 @@
-# Keep this part in sync with libgl1-mesa-dri.install:
-build/dri/lib/*_dri.so usr/lib/dri
-
-# This part is Linux-specific:
-build/dri/lib/gallium/r300_dri.so usr/lib/dri
diff --git a/debian/libgl1-mesa-dri.install.linux.in
b/debian/libgl1-mesa-dri.install.linux.in
new file mode 100644
index 0000000..75ea9bd
--- /dev/null
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -0,0 +1,5 @@
+# Keep this part in sync with libgl1-mesa-dri.install:
+build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+
+# This part is Linux-specific:
+build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/libgl1-mesa-glx-i686.install
b/debian/libgl1-mesa-glx-i686.install
deleted file mode 100644
index 6742252..0000000
--- a/debian/libgl1-mesa-glx-i686.install
+++ /dev/null
@@ -1 +0,0 @@
-dri/usr/lib/i686/cmov/libGL.so.* usr/lib/i686/cmov
diff --git a/debian/libgl1-mesa-glx-i686.install.in
b/debian/libgl1-mesa-glx-i686.install.in
new file mode 100644
index 0000000..f43b6ad
--- /dev/null
+++ b/debian/libgl1-mesa-glx-i686.install.in
@@ -0,0 +1 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/i686/cmov/libGL.so.*
usr/lib/${DEB_HOST_MULTIARCH}/i686/cmov
diff --git a/debian/libgl1-mesa-glx.install b/debian/libgl1-mesa-glx.install
deleted file mode 100644
index 870ee94..0000000
--- a/debian/libgl1-mesa-glx.install
+++ /dev/null
@@ -1 +0,0 @@
-dri/usr/lib/libGL.so.* usr/lib
diff --git a/debian/libgl1-mesa-glx.install.in
b/debian/libgl1-mesa-glx.install.in
new file mode 100644
index 0000000..f5ffd7a
--- /dev/null
+++ b/debian/libgl1-mesa-glx.install.in
@@ -0,0 +1 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.* usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libgl1-mesa-swx11-dev.install
b/debian/libgl1-mesa-swx11-dev.install
index f353c59..09ddbae 100644
--- a/debian/libgl1-mesa-swx11-dev.install
+++ b/debian/libgl1-mesa-swx11-dev.install
@@ -1,2 +1,2 @@
-usr/lib/libGL.a
-usr/lib/libGL.so
+usr/lib/*/libGL.a
+usr/lib/*/libGL.so
diff --git a/debian/libgl1-mesa-swx11-i686.install
b/debian/libgl1-mesa-swx11-i686.install
index 2177b0c..05652a2 100644
--- a/debian/libgl1-mesa-swx11-i686.install
+++ b/debian/libgl1-mesa-swx11-i686.install
@@ -1 +1 @@
-usr/lib/i686/cmov/libGL.so.*
+usr/lib/*/i686/cmov/libGL.so.*
diff --git a/debian/libgl1-mesa-swx11.install b/debian/libgl1-mesa-swx11.install
index 6d70d0f..6fc3110 100644
--- a/debian/libgl1-mesa-swx11.install
+++ b/debian/libgl1-mesa-swx11.install
@@ -1 +1 @@
-usr/lib/libGL.so.*
+usr/lib/*/libGL.so.*
diff --git a/debian/libgles1-mesa-dev.install b/debian/libgles1-mesa-dev.install
deleted file mode 100644
index 55ee218..0000000
--- a/debian/libgles1-mesa-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-dri/usr/lib/libGLESv1_CM.so usr/lib
-dri/usr/include/GLES usr/include
-dri/usr/lib/pkgconfig/glesv1_cm.pc usr/lib/pkgconfig
diff --git a/debian/libgles1-mesa-dev.install.in
b/debian/libgles1-mesa-dev.install.in
new file mode 100644
index 0000000..0485b23
--- /dev/null
+++ b/debian/libgles1-mesa-dev.install.in
@@ -0,0 +1,3 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/include/GLES usr/include
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv1_cm.pc
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libgles1-mesa.install b/debian/libgles1-mesa.install
deleted file mode 100644
index 9cbd16c..0000000
--- a/debian/libgles1-mesa.install
+++ /dev/null
@@ -1,2 +0,0 @@
-dri/usr/lib/libGLESv1_CM.so.1* usr/lib
-dri/usr/lib/egl/st_GLESv1_CM.so usr/lib/egl
diff --git a/debian/libgles1-mesa.install.in b/debian/libgles1-mesa.install.in
new file mode 100644
index 0000000..c2fc842
--- /dev/null
+++ b/debian/libgles1-mesa.install.in
@@ -0,0 +1,2 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so.1*
usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/st_GLESv1_CM.so
usr/lib/${DEB_HOST_MULTIARCH}/egl
diff --git a/debian/libgles2-mesa-dev.install b/debian/libgles2-mesa-dev.install
deleted file mode 100644
index fb2f51b..0000000
--- a/debian/libgles2-mesa-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-dri/usr/lib/libGLESv2.so usr/lib
-dri/usr/include/GLES2 usr/include
-dri/usr/lib/pkgconfig/glesv2.pc usr/lib/pkgconfig
diff --git a/debian/libgles2-mesa-dev.install.in
b/debian/libgles2-mesa-dev.install.in
new file mode 100644
index 0000000..ae8fe70
--- /dev/null
+++ b/debian/libgles2-mesa-dev.install.in
@@ -0,0 +1,3 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/include/GLES2 usr/include
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv2.pc
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libgles2-mesa.install b/debian/libgles2-mesa.install
deleted file mode 100644
index d5f865a..0000000
--- a/debian/libgles2-mesa.install
+++ /dev/null
@@ -1,2 +0,0 @@
-dri/usr/lib/libGLESv2.so.2* usr/lib
-dri/usr/lib/egl/st_GLESv2.so usr/lib/egl
diff --git a/debian/libgles2-mesa.install.in b/debian/libgles2-mesa.install.in
new file mode 100644
index 0000000..e8bd537
--- /dev/null
+++ b/debian/libgles2-mesa.install.in
@@ -0,0 +1,2 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2* usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/st_GLESv2.so
usr/lib/${DEB_HOST_MULTIARCH}/egl
diff --git a/debian/libglu1-mesa-dev.install b/debian/libglu1-mesa-dev.install
index a3df1f9..5f24f2a 100644
--- a/debian/libglu1-mesa-dev.install
+++ b/debian/libglu1-mesa-dev.install
@@ -1,5 +1,5 @@
usr/include/GL/glu.h
usr/include/GL/glu_mangle.h
-usr/lib/libGLU.a
-usr/lib/libGLU.so
-usr/lib/pkgconfig/glu.pc
+usr/lib/*/libGLU.a
+usr/lib/*/libGLU.so
+usr/lib/*/pkgconfig/glu.pc
diff --git a/debian/libglu1-mesa.install b/debian/libglu1-mesa.install
index 9ad0953..aeb2775 100644
--- a/debian/libglu1-mesa.install
+++ b/debian/libglu1-mesa.install
@@ -1 +1 @@
-usr/lib/libGLU.so.*
+usr/lib/*/libGLU.so.*
diff --git a/debian/libglw1-mesa-dev.install b/debian/libglw1-mesa-dev.install
index c11a209..c0559e6 100644
--- a/debian/libglw1-mesa-dev.install
+++ b/debian/libglw1-mesa-dev.install
@@ -1,4 +1,4 @@
usr/include/GL/GLw*A.h
-usr/lib/libGLw.a
-usr/lib/libGLw.so
-usr/lib/pkgconfig/glw.pc
+usr/lib/*/libGLw.a
+usr/lib/*/libGLw.so
+usr/lib/*/pkgconfig/glw.pc
diff --git a/debian/libglw1-mesa.install b/debian/libglw1-mesa.install
index 9d299c8..dcd1d5a 100644
--- a/debian/libglw1-mesa.install
+++ b/debian/libglw1-mesa.install
@@ -1 +1 @@
-usr/lib/libGLw.so.*
+usr/lib/*/libGLw.so.*
diff --git a/debian/libopenvg1-mesa-dev.install
b/debian/libopenvg1-mesa-dev.install
deleted file mode 100644
index d8b1307..0000000
--- a/debian/libopenvg1-mesa-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-dri/usr/lib/libOpenVG.so usr/lib
-dri/usr/include/VG usr/include
-dri/usr/lib/pkgconfig/vg.pc usr/lib/pkgconfig
diff --git a/debian/libopenvg1-mesa-dev.install.in
b/debian/libopenvg1-mesa-dev.install.in
new file mode 100644
index 0000000..cd835a0
--- /dev/null
+++ b/debian/libopenvg1-mesa-dev.install.in
@@ -0,0 +1,3 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libOpenVG.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/include/VG usr/include
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/vg.pc
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libopenvg1-mesa.install b/debian/libopenvg1-mesa.install
deleted file mode 100644
index 4ad89f1..0000000
--- a/debian/libopenvg1-mesa.install
+++ /dev/null
@@ -1,2 +0,0 @@
-dri/usr/lib/libOpenVG.so.1* usr/lib
-dri/usr/lib/egl/st_OpenVG.so usr/lib/egl
diff --git a/debian/libopenvg1-mesa.install.in
b/debian/libopenvg1-mesa.install.in
new file mode 100644
index 0000000..20b4164
--- /dev/null
+++ b/debian/libopenvg1-mesa.install.in
@@ -0,0 +1,2 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libOpenVG.so.1* usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/st_OpenVG.so
usr/lib/${DEB_HOST_MULTIARCH}/egl
diff --git a/debian/libosmesa6-dev.install b/debian/libosmesa6-dev.install
index bea6492..c15fb4b 100644
--- a/debian/libosmesa6-dev.install
+++ b/debian/libosmesa6-dev.install
@@ -1,8 +1,8 @@
usr/include/GL/osmesa.h
-usr/lib/libOSMesa.a
-usr/lib/libOSMesa.so
-usr/lib/libOSMesa16.a
-usr/lib/libOSMesa16.so
-usr/lib/libOSMesa32.a
-usr/lib/libOSMesa32.so
-usr/lib/pkgconfig/osmesa.pc
+usr/lib/*/libOSMesa.a
+usr/lib/*/libOSMesa.so
+usr/lib/*/libOSMesa16.a
+usr/lib/*/libOSMesa16.so
+usr/lib/*/libOSMesa32.a
+usr/lib/*/libOSMesa32.so
+usr/lib/*/pkgconfig/osmesa.pc
diff --git a/debian/libosmesa6.install b/debian/libosmesa6.install
index d1e25b2..444cb13 100644
--- a/debian/libosmesa6.install
+++ b/debian/libosmesa6.install
@@ -1,3 +1,3 @@
-usr/lib/libOSMesa.so.*
-usr/lib/libOSMesa16.so.*
-usr/lib/libOSMesa32.so.*
+usr/lib/*/libOSMesa.so.*
+usr/lib/*/libOSMesa16.so.*
+usr/lib/*/libOSMesa32.so.*
diff --git a/debian/mesa-common-dev.install b/debian/mesa-common-dev.install
deleted file mode 100644
index f82a80f..0000000
--- a/debian/mesa-common-dev.install
+++ /dev/null
@@ -1,8 +0,0 @@
-dri/usr/include/GL/gl.h usr/include/GL
-dri/usr/include/GL/glext.h usr/include/GL
-dri/usr/include/GL/gl_mangle.h usr/include/GL
-dri/usr/include/GL/glx.h usr/include/GL
-dri/usr/include/GL/glxext.h usr/include/GL
-dri/usr/include/GL/glx_mangle.h usr/include/GL
-dri/usr/include/GL/internal/dri_interface.h usr/include/GL/internal
-dri/usr/lib/pkgconfig/dri.pc usr/lib/pkgconfig/
diff --git a/debian/mesa-common-dev.install.in
b/debian/mesa-common-dev.install.in
new file mode 100644
index 0000000..38ec3ef
--- /dev/null
+++ b/debian/mesa-common-dev.install.in
@@ -0,0 +1,8 @@
+dri/usr/include/GL/gl.h usr/include/GL
+dri/usr/include/GL/glext.h usr/include/GL
+dri/usr/include/GL/gl_mangle.h usr/include/GL
+dri/usr/include/GL/glx.h usr/include/GL
+dri/usr/include/GL/glxext.h usr/include/GL
+dri/usr/include/GL/glx_mangle.h usr/include/GL
+dri/usr/include/GL/internal/dri_interface.h usr/include/GL/internal
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/dri.pc
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
diff --git a/debian/not-installed b/debian/not-installed
index d53a45e..24f7e1e 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -10,8 +10,8 @@ NOT_INSTALLED := \
dri/usr/include/GL/vms_x_fix.h \
dri/usr/include/GL/wglext.h \
dri/usr/include/GL/wmesa.h \
- dri/usr/lib/libGL.so \
- dri/usr/lib/pkgconfig/gl.pc \
+ dri/usr/lib/*/libGL.so \
+ dri/usr/lib/*/pkgconfig/gl.pc \
usr/include/GL/glext.h \
usr/include/GL/glfbdev.h \
usr/include/GL/gl.h \
@@ -28,16 +28,16 @@ NOT_INSTALLED := \
# Architecture-specific additional files:
NOT_INSTALLED_i386 = \
- usr/lib/i686/cmov/libGL.so \
- usr/lib/i686/cmov/libGLU.so \
- usr/lib/i686/cmov/libGLU.so.1 \
- usr/lib/i686/cmov/libGLU.so.1.* \
- usr/lib/i686/cmov/libGLw.so \
- usr/lib/i686/cmov/libGLw.so.1 \
- usr/lib/i686/cmov/libGLw.so.1.* \
- usr/lib/i686/cmov/pkgconfig/glw.pc \
- usr/lib/i686/cmov/pkgconfig/glu.pc \
- usr/lib/i686/cmov/pkgconfig/gl.pc
+ usr/lib/*/i686/cmov/libGL.so \
+ usr/lib/*/i686/cmov/libGLU.so \
+ usr/lib/*/i686/cmov/libGLU.so.1 \
+ usr/lib/*/i686/cmov/libGLU.so.1.* \
+ usr/lib/*/i686/cmov/libGLw.so \
+ usr/lib/*/i686/cmov/libGLw.so.1 \
+ usr/lib/*/i686/cmov/libGLw.so.1.* \
+ usr/lib/*/i686/cmov/pkgconfig/glw.pc \
+ usr/lib/*/i686/cmov/pkgconfig/glu.pc \
+ usr/lib/*/i686/cmov/pkgconfig/gl.pc
# Same for linux, kfreebsd, and hurd on i386:
NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386)
diff --git a/debian/rules b/debian/rules
index 483bd84..417f743 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -182,7 +183,7 @@ confflags-swx11+glu-i386-i686 = \
--disable-glut \
--disable-egl \
--enable-motif \
- --libdir=/usr/lib/i686/cmov \
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
CFLAGS="$(CFLAGS) -march=i686"
configure: $(QUILT_STAMPFN) configure.ac
@@ -218,6 +219,7 @@ $(STAMP)-build-%: configure
cd $(DEB_BUILD_DIR)/$* && \
../../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--localstatedir=/var $(confflags) $(confflags-$*)
cd $(DEB_BUILD_DIR)/$* && $(MAKE)
>$@
@@ -232,6 +234,18 @@ 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
+ for file in mesa-common-dev.install libopenvg1-mesa.install \
+ libopenvg1-mesa-dev.install libgles2-mesa.install \
+ libgles2-mesa-dev.install libgles1-mesa.install \
+ libgles1-mesa-dev.install libgl1-mesa-glx.install \
+ libgl1-mesa-glx-i686.install libgl1-mesa-dri.install \
+ libgl1-mesa-dri.install.linux libegl1-mesa.install \
+ libgl1-mesa-dri-experimental.install \
+ libegl1-mesa-drivers.install libegl1-mesa-dev.install; \
+ do \
+ sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \
+ debian/$${file}.in > debian/$$file; \
+ done
clean: unpatch
dh_testdir
--
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/e1qvmy1-0001r3...@vasks.debian.org
