debian/changelog | 7 +++++++
debian/control | 1 -
debian/libosmesa6-dev.install.in | 6 +++---
debian/libosmesa6.install.in | 2 +-
debian/not-installed | 14 ++++++++++++++
debian/rules | 12 ++++++++++--
6 files changed, 35 insertions(+), 7 deletions(-)
New commits:
commit d2438c3747d7131d4a865d1baf2a9fa310ba2817
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Sep 17 11:35:41 2015 +0300
release to trusty
diff --git a/debian/changelog b/debian/changelog
index efba74d..1ea554e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-mesa (10.1.3-0ubuntu0.5) UNRELEASED; urgency=medium
+mesa (10.1.3-0ubuntu0.5) trusty; urgency=medium
* Build osmesa separately and without using shared glapi again.
(LP: #1424059)
- -- Timo Aaltonen <tjaal...@debian.org> Thu, 17 Sep 2015 08:59:44 +0300
+ -- Timo Aaltonen <tjaal...@debian.org> Thu, 17 Sep 2015 11:35:21 +0300
mesa (10.1.3-0ubuntu0.4) trusty; urgency=medium
commit a140a14ef74e9505e3713ca429e4fc08d6e39a01
Author: Timo Aaltonen <tjaal...@debian.org>
Date: Thu Sep 17 10:59:00 2015 +0300
Build osmesa separately and without using shared glapi again. (LP: #1424059)
diff --git a/debian/changelog b/debian/changelog
index b36bf14..efba74d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.3-0ubuntu0.5) UNRELEASED; urgency=medium
+
+ * Build osmesa separately and without using shared glapi again.
+ (LP: #1424059)
+
+ -- Timo Aaltonen <tjaal...@debian.org> Thu, 17 Sep 2015 08:59:44 +0300
+
mesa (10.1.3-0ubuntu0.4) trusty; urgency=medium
* Allow unrenamed -dev packages to work with the renamed stack. (LP:
#1424466)
diff --git a/debian/control b/debian/control
index d18bfcc..cfec2a1 100644
--- a/debian/control
+++ b/debian/control
@@ -657,7 +657,6 @@ 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
diff --git a/debian/libosmesa6-dev.install.in b/debian/libosmesa6-dev.install.in
index 9796d26..9ce06c1 100644
--- a/debian/libosmesa6-dev.install.in
+++ b/debian/libosmesa6-dev.install.in
@@ -1,3 +1,3 @@
-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
+usr/include/GL/osmesa.h usr/include/GL
+usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc
diff --git a/debian/libosmesa6.install.in b/debian/libosmesa6.install.in
index e34327e..1ada4d5 100644
--- a/debian/libosmesa6.install.in
+++ b/debian/libosmesa6.install.in
@@ -1 +1 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.*
usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.*
diff --git a/debian/not-installed b/debian/not-installed
index d3048a4..ffc3524 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -2,5 +2,19 @@
# Common list:
NOT_INSTALLED := \
+ etc/drirc \
+ usr/lib/*/libGL.so* \
+ usr/lib/*/pkgconfig/dri.pc \
+ usr/lib/*/pkgconfig/gl.pc \
+ usr/include/GL/glext.h \
+ usr/include/GL/gl.h \
+ usr/include/GL/gl_mangle.h \
+ usr/include/GL/glxext.h \
+ usr/include/GL/glx.h \
+ usr/include/GL/glx_mangle.h \
+ usr/include/GL/wglext.h \
+ usr/include/GL/wmesa.h \
+ usr/include/GL/internal/dri_interface.h \
+ dri/usr/include/GL/osmesa.h \
dri/usr/include/GL/wglext.h \
dri/usr/include/GL/wmesa.h
diff --git a/debian/rules b/debian/rules
index 43329b0..6158520 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,7 @@ buildflags-i686 = \
include debian/not-installed
# build the following configurations by default
-CONFIGS = dri
+CONFIGS = dri osmesa
STAMP_DIR = debian/stamp
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
@@ -118,7 +118,7 @@ confflags-dri = \
--with-dri-drivers="$(DRI_DRIVERS)" \
--with-dri-driverdir=/usr/lib/$(DEB_HOST_MULTIARCH)/dri \
--with-dri-searchpath='/usr/lib/$(DEB_HOST_MULTIARCH)/dri:\$$$${ORIGIN}/dri:/usr/lib/dri'
\
- --enable-osmesa \
+ --disable-osmesa \
--enable-glx-tls \
--enable-shared-glapi \
--enable-texture-float \
@@ -132,6 +132,14 @@ confflags-dri = \
$(confflags_OPENVG) \
$(buildflags)
+confflags-osmesa = \
+ --disable-egl \
+ --disable-shared-glapi \
+ --enable-osmesa \
+ --with-dri-drivers= \
+ --with-gallium-drivers= \
+ $(buildflags)
+
configure: $(QUILT_STAMPFN) configure.ac
autoreconf -vfi
