mesa: Changes to 'debian-experimental'
debian/changelog | 5 +++++
debian/libgl1-mesa-dri.install.in | 1 +
debian/patches/15-fix-oot-build.diff | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 1 +
5 files changed, 30 insertions(+)
New commits:
commit 7e066a6d41cffe8cb86edbe2ca6a608739f4edef
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Feb 1 15:53:50 2013 +0200
rules: Add files to clean.
diff --git a/debian/changelog b/debian/changelog
index 2bb2826..f000374 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,7 @@ mesa (9.1~git20130129.ff515c4e-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* libgl1-mesa-dri.install.in: Include gallium-pipe/*.so.
+ * rules: Add files to clean.
-- Julien Cristau <jcristau@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/rules b/debian/rules
index d42ee39..a974635 100755
--- a/debian/rules
+++ b/debian/rules
@@ -229,6 +229,7 @@ clean: unpatch
rm -f src/glsl/builtins/tools/texture_builtins.pyc
rm -f src/mapi/glapi/gen/*.pyc
rm -f src/mesa/main/*.pyc
+ rm -f src/gallium/auxiliary/util/*.pyc
dh_clean
commit 4355086dc9e00b46b88a163c4e5218b4545edf38
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Feb 1 15:49:26 2013 +0200
libgl1-mesa-dri.install.in: Include gallium-pipe/*.so.
diff --git a/debian/changelog b/debian/changelog
index 8256e01..2bb2826 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,9 @@ mesa (9.1~git20130129.ff515c4e-1) UNRELEASED; urgency=low
* control: Bump libwayland-dev build-dep to 1.0.2.
* Remove 13-llvm-config-pick-a-version.diff and just pass a flag to configure.
+ [ Timo Aaltonen ]
+ * libgl1-mesa-dri.install.in: Include gallium-pipe/*.so.
+
-- Julien Cristau <jcristau@debian.org> 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 5eda011..fd90dfe 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,2 +1,3 @@
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_MULTIARCH}/
+dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe
commit ea466056692f6e62d2c4683f2cef23269a91f89a
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Feb 1 15:17:17 2013 +0200
15-fix-oot-build.diff: Use correct includes to fix out-of-tree builds.
diff --git a/debian/changelog b/debian/changelog
index 38ea581..8256e01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ mesa (9.1~git20130129.ff515c4e-1) UNRELEASED; urgency=low
* libegl1-mesa-drivers.install.linux: Bump libwayland-egl.so version
* control: Add libdrm-dev to mesa-common-dev Depends.
* control: Build-depend on llvm-3.2-dev (Closes: #678822).
+ * 15-fix-oot-build.diff: Use correct includes to fix out-of-tree builds.
[ Steve Langasek ]
* Install all dri drivers from the DESTDIR tree, instead of copying them
diff --git a/debian/patches/15-fix-oot-build.diff b/debian/patches/15-fix-oot-build.diff
new file mode 100644
index 0000000..7604766
--- /dev/null
+++ b/debian/patches/15-fix-oot-build.diff
@@ -0,0 +1,22 @@
+diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
+index d647a64..d770699 100644
+--- a/src/gallium/state_trackers/egl/Makefile.am
++++ b/src/gallium/state_trackers/egl/Makefile.am
+@@ -27,7 +27,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
+ AM_CFLAGS = $(GALLIUM_CFLAGS)
+ AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/egl/main \
+- -I$(top_srcdir)/src/egl/wayland/wayland-drm/ \
++ -I$(top_builddir)/src/egl/wayland/wayland-drm/ \
+ -I$(top_srcdir)/include
+
+ noinst_LTLIBRARIES = libegl.la
+@@ -71,7 +71,7 @@ AM_CFLAGS += \
+ AM_CPPFLAGS += \
+ -I$(top_srcdir)/src/gallium/winsys \
+ -I$(top_srcdir)/src/egl/wayland/wayland-egl \
+- -I$(top_srcdir)/src/egl/wayland/wayland-drm \
++ -I$(top_builddir)/src/egl/wayland/wayland-drm \
+ -DHAVE_WAYLAND_BACKEND
+ endif
+
diff --git a/debian/patches/series b/debian/patches/series
index 368fe24..9ffbdea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
10-hurd-configure-tweaks.diff
#11-hurd-ftbfs-again.diff
14-fix-osmesa-build.diff
+15-fix-oot-build.diff
Reply to: