debian/changelog | 6 ++++++
debian/libegl1-mesa.symbols | 21 +++++++++++++++++++++
debian/libgbm1.symbols | 22 ++++++++++++++++++++--
debian/libgles2-mesa.symbols | 1 +
debian/libosmesa6-dev.install.in | 6 +++---
debian/libosmesa6.install.in | 2 +-
debian/patches/14-fix-osmesa-build.diff | 13 +++++++++++++
debian/patches/series | 1 +
debian/rules | 10 ++++++----
9 files changed, 72 insertions(+), 10 deletions(-)
New commits:
commit 764451ee6e63814944832049f6c26b4b0840e430
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Aug 21 01:53:13 2012 +0300
Added 14-fix-osmesa-build.diff, fixes glapi includes with out-of-tree
builds.
diff --git a/debian/changelog b/debian/changelog
index 20191c3..c4ffff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ mesa (8.1~git20120816.1597176f-1) UNRELEASED; urgency=low
* rules: --with-driver= is deprecated, use --enable-foo.
* rules: Purge .la files before dh_install.
* Update symbols.
+ * Added 14-fix-osmesa-build.diff, fixes glapi includes with out-of-tree
+ builds.
-- Julien Cristau <jcris...@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/patches/14-fix-osmesa-build.diff
b/debian/patches/14-fix-osmesa-build.diff
new file mode 100644
index 0000000..8699c49
--- /dev/null
+++ b/debian/patches/14-fix-osmesa-build.diff
@@ -0,0 +1,13 @@
+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)
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 5bdf237..1dd2780 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
10-hurd-configure-tweaks.diff
#11-hurd-ftbfs-again.diff
13-llvm-config-pick-a-version.diff
+14-fix-osmesa-build.diff
commit 9ecb05a24ae8ecbd44a06c90ac9235ee8c56acf9
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Aug 21 01:33:21 2012 +0300
Update symbols.
diff --git a/debian/changelog b/debian/changelog
index 6f6b9e5..20191c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ mesa (8.1~git20120816.1597176f-1) UNRELEASED; urgency=low
* libosmesa*.install.in: Install files from the correct path.
* rules: --with-driver= is deprecated, use --enable-foo.
* rules: Purge .la files before dh_install.
+ * Update symbols.
-- Julien Cristau <jcris...@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index cc73326..233124a 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -3,6 +3,19 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
# drivers. Handle the dependency explicitly in the driver
# package.
(regex)"^_egl.*@Base$" 7.8.1
+ dri2_add_config@Base 8.1~0
+ dri2_create_image_khr@Base 8.1~0
+ dri2_create_screen@Base 8.1~0
+ dri2_get_device_name_for_fd@Base 8.1~0
+ dri2_get_driver_for_fd@Base 8.1~0
+ dri2_initialize_drm@Base 8.1~0
+ dri2_initialize_wayland@Base 8.1~0
+ dri2_initialize_x11@Base 8.1~0
+ dri2_load_driver@Base 8.1~0
+ dri2_load_driver_swrast@Base 8.1~0
+ dri2_lookup_egl_image@Base 8.1~0
+ dri2_setup_screen@Base 8.1~0
+ dri2_to_egl_attribute_map@Base 8.1~0
eglBindAPI@Base 7.8.1
eglBindTexImage@Base 7.8.1
eglBindWaylandDisplayWL@Base 7.11~0
@@ -49,6 +62,7 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
eglQueryScreenSurfaceMESA@Base 7.8.1
eglQueryString@Base 7.8.1
eglQuerySurface@Base 7.8.1
+ eglQueryWaylandBufferWL@Base 8.1~0
eglReleaseTexImage@Base 7.8.1
eglReleaseThread@Base 7.8.1
eglScreenPositionMESA@Base 7.8.1
@@ -63,4 +77,11 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
eglWaitClient@Base 7.8.1
eglWaitGL@Base 7.8.1
eglWaitNative@Base 7.8.1
+ image_lookup_extension@Base 8.1~0
+ use_invalidate@Base 8.1~0
+ wayland_buffer_is_drm@Base 8.1~0
+ wayland_drm_buffer_get_buffer@Base 8.1~0
+ wayland_drm_buffer_get_format@Base 8.1~0
+ wayland_drm_init@Base 8.1~0
+ wayland_drm_uninit@Base 8.1~0
(arch=linux-any)wl_drm_interface@Base 8.0-2~
diff --git a/debian/libgbm1.symbols b/debian/libgbm1.symbols
index ea06a9e..c98d4ce 100644
--- a/debian/libgbm1.symbols
+++ b/debian/libgbm1.symbols
@@ -1,16 +1,34 @@
libgbm.so.1 libgbm1 #MINVER#
+ _gbm_create_device@Base 8.1~0
_gbm_fd_get_device_name@Base 7.11~1
_gbm_log@Base 7.11~1
_gbm_mesa_get_device@Base 7.11~1
_gbm_udev_device_new_from_fd@Base 7.11~1
+ devices@Base 8.1~0
+ dri2_loader_extension@Base 8.1~0
+ dri_fd_get_driver_name@Base 8.1~0
gbm_bo_create@Base 7.11~1
- gbm_bo_create_from_egl_image@Base 7.11~1
+#MISSING: 8.1~0 gbm_bo_create_from_egl_image@Base 7.11~1
gbm_bo_destroy@Base 7.11~1
+ gbm_bo_get_device@Base 8.1~0
+ gbm_bo_get_format@Base 8.1~0
gbm_bo_get_handle@Base 7.11~1
gbm_bo_get_height@Base 7.11~1
- gbm_bo_get_pitch@Base 7.11~1
+#MISSING: 8.1~0 gbm_bo_get_pitch@Base 7.11~1
+ gbm_bo_get_stride@Base 8.1~0
+ gbm_bo_get_user_data@Base 8.1~0
gbm_bo_get_width@Base 7.11~1
+ gbm_bo_import@Base 8.1~0
+ gbm_bo_set_user_data@Base 8.1~0
+ gbm_bo_write@Base 8.1~0
gbm_create_device@Base 7.11~1
gbm_device_destroy@Base 7.11~1
gbm_device_get_backend_name@Base 7.11~1
gbm_device_get_fd@Base 7.11~1
+ gbm_device_is_format_supported@Base 8.1~0
+ gbm_dri_backend@Base 8.1~0
+ gbm_surface_create@Base 8.1~0
+ gbm_surface_destroy@Base 8.1~0
+ gbm_surface_has_free_buffers@Base 8.1~0
+ gbm_surface_lock_front_buffer@Base 8.1~0
+ gbm_surface_release_buffer@Base 8.1~0
diff --git a/debian/libgles2-mesa.symbols b/debian/libgles2-mesa.symbols
index 034eb3b..b561787 100644
--- a/debian/libgles2-mesa.symbols
+++ b/debian/libgles2-mesa.symbols
@@ -104,6 +104,7 @@ libGLESv2.so.2 libgles2-mesa #MINVER# | libgles2
glPixelStorei@Base 7.8.1
glPolygonOffset@Base 7.8.1
glProgramBinaryOES@Base 7.8.1
+ glReadBufferNV@Base 8.1~0
glReadPixels@Base 7.8.1
glReleaseShaderCompiler@Base 7.8.1
glRenderbufferStorage@Base 7.8.1
commit ba8a0635de75b7e05333a17c24b79cf903e4eaf5
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Tue Aug 21 01:25:14 2012 +0300
rules: Purge .la files before dh_install.
diff --git a/debian/changelog b/debian/changelog
index cfbd5d2..6f6b9e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ mesa (8.1~git20120816.1597176f-1) UNRELEASED; urgency=low
* rules: Add --disable-shared-glapi to the swx11 targets.
* libosmesa*.install.in: Install files from the correct path.
* rules: --with-driver= is deprecated, use --enable-foo.
+ * rules: Purge .la files before dh_install.
-- Julien Cristau <jcris...@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/rules b/debian/rules
index 0d1648b..4e234fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -252,6 +252,8 @@ binary-arch: install
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:
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
+ # purge .la files
+ find debian/tmp/ -name '*.la' -exec rm '{}' ';'
dh_install -s --fail-missing
commit d58716558427b1e8e5d159b3224e309c0b49cec2
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Mon Aug 20 21:47:46 2012 +0300
rules: --with-driver= is deprecated, use --enable-foo.
diff --git a/debian/changelog b/debian/changelog
index c87ea6f..cfbd5d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ mesa (8.1~git20120816.1597176f-1) UNRELEASED; urgency=low
* rules: Update the clean target.
* rules: Add --disable-shared-glapi to the swx11 targets.
* libosmesa*.install.in: Install files from the correct path.
+ * rules: --with-driver= is deprecated, use --enable-foo.
-- Julien Cristau <jcris...@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/rules b/debian/rules
index 3f57365..0d1648b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,7 @@ else
endif
confflags-dri = \
- --with-driver=dri \
+ --enable-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'
\
@@ -125,7 +125,7 @@ confflags-dri = \
confflags-swx11+glu = \
--disable-egl \
--with-gallium-drivers= \
- --with-driver=xlib \
+ --enable-xlib-glx \
--disable-egl \
--disable-shared-glapi \
CFLAGS="$(CFLAGS)" \
@@ -134,7 +134,7 @@ confflags-swx11+glu = \
confflags-swx11+glu-static = \
--disable-egl \
--with-gallium-drivers= \
- --with-driver=xlib \
+ --enable-xlib-glx \
--enable-static \
--disable-egl \
--disable-shared-glapi \
@@ -144,7 +144,7 @@ confflags-swx11+glu-static = \
confflags-swx11+glu-i386-i686 = \
--disable-egl \
--with-gallium-drivers= \
- --with-driver=xlib \
+ --enable-xlib-glx \
--disable-egl \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
CFLAGS="$(CFLAGS) -march=i686" \
commit 28f5397741f870ebd9bb271f7098885a2af177a7
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Mon Aug 20 21:30:26 2012 +0300
libosmesa*.install.in: Install files from the correct path.
diff --git a/debian/changelog b/debian/changelog
index a8963ca..c87ea6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ mesa (8.1~git20120816.1597176f-1) UNRELEASED; urgency=low
* control: Bump libwayland-dev build-dep to 0.95.
* rules: Update the clean target.
* rules: Add --disable-shared-glapi to the swx11 targets.
+ * libosmesa*.install.in: Install files from the correct path.
-- Julien Cristau <jcris...@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/libosmesa6-dev.install.in b/debian/libosmesa6-dev.install.in
index bd7a488..cef6cac 100644
--- a/debian/libosmesa6-dev.install.in
+++ b/debian/libosmesa6-dev.install.in
@@ -1,3 +1,3 @@
-usr/include/GL/osmesa.h
-usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc
+dri/usr/include/GL/osmesa.h
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc
diff --git a/debian/libosmesa6.install.in b/debian/libosmesa6.install.in
index 1ada4d5..6289c66 100644
--- a/debian/libosmesa6.install.in
+++ b/debian/libosmesa6.install.in
@@ -1 +1 @@
-usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.*
--
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/e1t3ark-0000a2...@vasks.debian.org
