mesa: Changes to 'debian-experimental'
debian/changelog | 11 +++++++++++
debian/control | 11 ++++++-----
debian/libgl1-mesa-dev.install.in | 2 +-
debian/libgl1-mesa-swx11-dev.install.in | 1 +
debian/not-installed | 1 -
debian/rules | 1 +
6 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 5aad2c32924dc806c2703b239af88b0805a793f3
Author: Jon Severinsson <jon@severinsson.net>
Date: Wed Aug 21 23:19:02 2013 +0200
rules: Add --disable-shared-glapi to the swx11-i386-i686 target.
Already explicitly disabled in the other swx11 builds.
diff --git a/debian/changelog b/debian/changelog
index 46e7541..9b51e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mesa (9.2~rc1-2) UNRELEASED; urgency=low
* control: Bump libdrm-dev build-dependency to 2.4.45.
* control: Add versioned libglapi-mesa dependency to libosmesa6.
* libgl1-mesa(-swx11)-dev.install.in: Install the correct pkgconfig/gl.pc files.
+ * rules: Add --disable-shared-glapi to the swx11-i386-i686 target.
-- Jon Severinsson <jon@severinsson.net> Tue, 20 Aug 2013 18:00:00 +0200
diff --git a/debian/rules b/debian/rules
index 11267ba..d7564d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,6 +147,7 @@ confflags-swx11-i386-i686 = \
--with-gallium-drivers= \
--enable-xlib-glx \
--disable-egl \
+ --disable-shared-glapi \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
$(buildflags-i686)
commit 22f172cba8ef32c7d0611710868877a42a1aead7
Author: Jon Severinsson <jon@severinsson.net>
Date: Wed Aug 21 23:19:01 2013 +0200
libgl1-mesa(-swx11)-dev.install.in: Install the correct pkgconfig/gl.pc files.
Previously the swx11 file was installed in dri dev package, and no pc file was installed in the swx11 dev package.
diff --git a/debian/changelog b/debian/changelog
index 95bd5b3..46e7541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mesa (9.2~rc1-2) UNRELEASED; urgency=low
* control: Recommend libtxc-dxtn-s2tc0 | libtxc-dxtn0, not just the virtual libtxc-dxtn0.
* control: Bump libdrm-dev build-dependency to 2.4.45.
* control: Add versioned libglapi-mesa dependency to libosmesa6.
+ * libgl1-mesa(-swx11)-dev.install.in: Install the correct pkgconfig/gl.pc files.
-- Jon Severinsson <jon@severinsson.net> Tue, 20 Aug 2013 18:00:00 +0200
diff --git a/debian/libgl1-mesa-dev.install.in b/debian/libgl1-mesa-dev.install.in
index 6c9b794..1eebcc9 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}
-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-swx11-dev.install.in b/debian/libgl1-mesa-swx11-dev.install.in
index 8318ac8..e925ddd 100644
--- a/debian/libgl1-mesa-swx11-dev.install.in
+++ b/debian/libgl1-mesa-swx11-dev.install.in
@@ -1,2 +1,3 @@
usr/lib/${DEB_HOST_MULTIARCH}/libGL.a
usr/lib/${DEB_HOST_MULTIARCH}/libGL.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc
diff --git a/debian/not-installed b/debian/not-installed
index e9eb46d..03e3006 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -4,7 +4,6 @@
NOT_INSTALLED := \
dri/usr/include/GL/wglext.h \
dri/usr/include/GL/wmesa.h \
- dri/usr/lib/*/pkgconfig/gl.pc \
usr/include/GL/glext.h \
usr/include/GL/gl.h \
usr/include/GL/gl_mangle.h \
commit 1d54b6cd35e879e07516e95054bb37021f42f4b3
Author: Jon Severinsson <jon@severinsson.net>
Date: Wed Aug 21 23:19:00 2013 +0200
control: Add versioned libglapi-mesa dependency to libosmesa6.
libglapi is not ABI-stable and ${shlibs:Depends} only adds an unversioned dependency.
diff --git a/debian/changelog b/debian/changelog
index d001804..95bd5b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mesa (9.2~rc1-2) UNRELEASED; urgency=low
[ Jon Severinsson ]
* control: Recommend libtxc-dxtn-s2tc0 | libtxc-dxtn0, not just the virtual libtxc-dxtn0.
* control: Bump libdrm-dev build-dependency to 2.4.45.
+ * control: Add versioned libglapi-mesa dependency to libosmesa6.
-- Jon Severinsson <jon@severinsson.net> Tue, 20 Aug 2013 18:00:00 +0200
diff --git a/debian/control b/debian/control
index 702a2de..494f003 100644
--- a/debian/control
+++ b/debian/control
@@ -752,6 +752,7 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
+ libglapi-mesa (= ${binary:Version}),
Replaces: libgl1-mesa-swx11 (<< 6.5.2)
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
commit f04847a8ad99dde8bdc8dbb38a2b2ccfaf46df6c
Author: Jon Severinsson <jon@severinsson.net>
Date: Wed Aug 21 23:18:59 2013 +0200
control: Bump libdrm-dev build-dependency to 2.4.45.
diff --git a/debian/changelog b/debian/changelog
index 0cbf97a..d001804 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (9.2~rc1-2) UNRELEASED; urgency=low
[ Jon Severinsson ]
* control: Recommend libtxc-dxtn-s2tc0 | libtxc-dxtn0, not just the virtual libtxc-dxtn0.
+ * control: Bump libdrm-dev build-dependency to 2.4.45.
-- Jon Severinsson <jon@severinsson.net> Tue, 20 Aug 2013 18:00:00 +0200
diff --git a/debian/control b/debian/control
index 1480224..702a2de 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
debhelper (>= 8.1.3),
quilt (>= 0.40),
pkg-config,
- libdrm-dev (>= 2.4.42) [!hurd-any],
+ libdrm-dev (>= 2.4.45) [!hurd-any],
libx11-dev,
x11proto-gl-dev (>= 1.4.14),
libxxf86vm-dev,
@@ -278,7 +278,7 @@ Architecture: linux-any kfreebsd-any
Depends:
libegl1-mesa (= ${binary:Version}),
libegl1-mesa-drivers (= ${binary:Version}),
- libdrm-dev (>= 2.4.19) [!hurd-any],
+ libdrm-dev (>= 2.4.45) [!hurd-any],
x11proto-dri2-dev (>= 2.1),
x11proto-gl-dev (>= 1.4.11),
libx11-dev,
@@ -707,7 +707,7 @@ Architecture: any
Depends:
mesa-common-dev (= ${binary:Version}),
libgl1-mesa-glx (= ${binary:Version}),
- libdrm-dev (>= 2.4.24) [!hurd-any],
+ libdrm-dev (>= 2.4.45) [!hurd-any],
libx11-dev,
libx11-xcb-dev,
libxcb-dri2-0-dev,
@@ -739,7 +739,7 @@ Architecture: any
Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), libgl1-mesa-dev (<< 7.5~rc4-2)
Depends:
libx11-dev,
- libdrm-dev [!hurd-any],
+ libdrm-dev (>= 2.4.45) [!hurd-any],
${misc:Depends},
Description: Developer documentation for Mesa
This package includes the specifications for the Mesa-specific OpenGL
commit 506787330dab40152b7b377f61505e7320fcdc75
Author: Jon Severinsson <jon@severinsson.net>
Date: Wed Aug 21 23:18:58 2013 +0200
control: Recommend libtxc-dxtn-s2tc0 | libtxc-dxtn0, not just on the virtual libtxc-dxtn0.
diff --git a/debian/changelog b/debian/changelog
index 706ea50..0cbf97a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (9.2~rc1-2) UNRELEASED; urgency=low
+
+ [ Jon Severinsson ]
+ * control: Recommend libtxc-dxtn-s2tc0 | libtxc-dxtn0, not just the virtual libtxc-dxtn0.
+
+ -- Jon Severinsson <jon@severinsson.net> Tue, 20 Aug 2013 18:00:00 +0200
+
mesa (9.2~rc1-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index cd7e425..1480224 100644
--- a/debian/control
+++ b/debian/control
@@ -608,7 +608,7 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends},
${misc:Depends}
-Recommends: libtxc-dxtn0
+Recommends: libtxc-dxtn-s2tc0 | libtxc-dxtn0
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0), libgl1-mesa-dri-experimental (<< 7.11.1)
Reply to: