mesa: Changes to 'debian-experimental'
debian/changelog | 16 ++++++++++++++++
debian/control | 2 +-
debian/libegl1-mesa-dev.install.in | 3 +--
debian/libegl1-mesa-dev.install.linux.in | 10 ++++++++++
debian/libegl1-mesa-drivers.install.in | 3 +--
debian/libegl1-mesa-drivers.install.linux.in | 6 ++++++
debian/libegl1-mesa.symbols | 2 +-
debian/rules | 8 ++++++++
8 files changed, 44 insertions(+), 6 deletions(-)
New commits:
commit 2fed388934f51a9c69f6b7c3b3977a0cd083db4a
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 14 11:38:45 2012 +0100
Automatically revert changes to bin/{config.{guess,sub},install-sh}.
Do that in the clean target. The first two are modified, the last one
needs to be turned back into a symlink.
diff --git a/debian/changelog b/debian/changelog
index 465cf9e..92f3d1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ mesa (8.0-2) UNRELEASED; urgency=low
and bump the version.
* Limit the build-dependency on libwayland-dev to linux-any too, and
bump it.
+ * Automatically revert changes to bin/{config.{guess,sub},install-sh} in
+ the clean target. The first two are modified, the last one needs to be
+ turned back into a symlink.
-- Julien Cristau <jcristau@debian.org> Sat, 11 Feb 2012 11:49:06 +0100
diff --git a/debian/rules b/debian/rules
index 271b1a6..3bf3702 100755
--- a/debian/rules
+++ b/debian/rules
@@ -196,7 +196,10 @@ confflags-swx11+glu-i386-i686 = \
CFLAGS="$(CFLAGS) -march=i686" \
CXXFLAGS="$(CXXFLAGS) -march=i686"
+autotools_files = bin/config.guess bin/config.sub
+
configure: $(QUILT_STAMPFN) configure.ac
+ for file in $(autotools_files); do cp $$file $$file.pristine; done
autoreconf -vfi
# list the configurations that will built
@@ -260,6 +263,9 @@ clean: unpatch
rm -rf aclocal.m4 missing depcomp install-sh ltmain.sh
rm -rf $(STAMP_DIR)
for file in debian/*.in; do rm -f $${file%%.in}; done
+ # Those are auto-updated, grr:
+ for file in $(autotools_files); do if [ -f $$file.pristine ]; then mv -f $$file.pristine $$file; fi; done
+ ln -sf minstall bin/install-sh
dh_clean
commit 9a2775d2a7882f77e700554a9a22b24123a4abac
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Feb 14 11:06:49 2012 +0100
Limit Wayland stuff to linux-any and bump versions.
diff --git a/debian/changelog b/debian/changelog
index 9b727b0..465cf9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ mesa (8.0-2) UNRELEASED; urgency=low
add a few files for Wayland, but only for Linux:
- libegl1-mesa-dev.install.linux.in
- libegl1-mesa-drivers.install.linux.in
+ * Limit the wl_drm_interface symbol to arch=linux-any accordingly,
+ and bump the version.
+ * Limit the build-dependency on libwayland-dev to linux-any too, and
+ bump it.
-- Julien Cristau <jcristau@debian.org> Sat, 11 Feb 2012 11:49:06 +0100
diff --git a/debian/control b/debian/control
index a1aa3c4..9c12a53 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
flex,
bison,
llvm-2.9-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
- libwayland-dev,
+ libwayland-dev (>= 0.85.0) [linux-any],
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
Homepage: http://mesa3d.sourceforge.net/
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index 5810730..cc73326 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -63,4 +63,4 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
eglWaitClient@Base 7.8.1
eglWaitGL@Base 7.8.1
eglWaitNative@Base 7.8.1
- wl_drm_interface@Base 7.11~0
+ (arch=linux-any)wl_drm_interface@Base 8.0-2~
commit c67ca734f423378d1277d577c1b48b55d2a95ba1
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Feb 10 20:05:45 2012 +0100
Enable Wayland support again.
diff --git a/debian/changelog b/debian/changelog
index 0845b9a..9b727b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
mesa (8.0-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Only build the radeon, r200, i915 and i965 dri drivers on Linux. They
require KMS.
+ [ Cyril Brulebois ]
+ * Enable wayland support again, but only on Linux. Wayland needs some
+ porting (it uses *CLOEXEC flags and epoll). For that, add those files
+ since EGL packages are also shipped on GNU/kFreeBSD, and we need to
+ add a few files for Wayland, but only for Linux:
+ - libegl1-mesa-dev.install.linux.in
+ - libegl1-mesa-drivers.install.linux.in
+
-- Julien Cristau <jcristau@debian.org> Sat, 11 Feb 2012 11:49:06 +0100
mesa (8.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 33a7eb5..a1aa3c4 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
flex,
bison,
llvm-2.9-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
-# libwayland-dev,
+ libwayland-dev,
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
Homepage: http://mesa3d.sourceforge.net/
diff --git a/debian/libegl1-mesa-dev.install.in b/debian/libegl1-mesa-dev.install.in
index 3f3094f..51abf94 100644
--- a/debian/libegl1-mesa-dev.install.in
+++ b/debian/libegl1-mesa-dev.install.in
@@ -1,6 +1,5 @@
+# This file gets tweaked in an os-specific fashion (see libegl1-mesa-dev.install.linux.in)
dri/usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so usr/lib/${DEB_HOST_MULTIARCH}
-#dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.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
-#dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libegl1-mesa-dev.install.linux.in b/debian/libegl1-mesa-dev.install.linux.in
new file mode 100644
index 0000000..13565b7
--- /dev/null
+++ b/debian/libegl1-mesa-dev.install.linux.in
@@ -0,0 +1,10 @@
+# OS-independent part (from libegl1-mesa-dev.install.in):
+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
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+
+# Wayland support, only on Linux:
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libegl1-mesa-drivers.install.in b/debian/libegl1-mesa-drivers.install.in
index c226c5e..72a3603 100644
--- a/debian/libegl1-mesa-drivers.install.in
+++ b/debian/libegl1-mesa-drivers.install.in
@@ -1,3 +1,2 @@
+# This file gets tweaked in an os-specific fashion (see libegl1-mesa-drivers.install.linux.in)
dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so usr/lib/${DEB_HOST_MULTIARCH}/egl
-#dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 usr/lib/${DEB_HOST_MULTIARCH}
-#dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0 usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libegl1-mesa-drivers.install.linux.in b/debian/libegl1-mesa-drivers.install.linux.in
new file mode 100644
index 0000000..5001e0a
--- /dev/null
+++ b/debian/libegl1-mesa-drivers.install.linux.in
@@ -0,0 +1,6 @@
+# OS-independent part (from libegl1-mesa-drivers.install.in):
+dri/usr/lib/${DEB_HOST_MULTIARCH}/egl/egl_gallium.so usr/lib/${DEB_HOST_MULTIARCH}/egl
+
+# Wayland support, only on Linux:
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 usr/lib/${DEB_HOST_MULTIARCH}
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0 usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libegl1-mesa.symbols b/debian/libegl1-mesa.symbols
index 4a405b0..5810730 100644
--- a/debian/libegl1-mesa.symbols
+++ b/debian/libegl1-mesa.symbols
@@ -63,4 +63,4 @@ libEGL.so.1 libegl1-mesa #MINVER# | libegl1-x11
eglWaitClient@Base 7.8.1
eglWaitGL@Base 7.8.1
eglWaitNative@Base 7.8.1
-# wl_drm_interface@Base 7.11~0
+ wl_drm_interface@Base 7.11~0
diff --git a/debian/rules b/debian/rules
index f50a43b..271b1a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,6 +81,8 @@ else
# Although the KMS egl drivers will probably build on kfreebsd & hurd
# only linux actually has KMS drivers implemented at this point.
EGL_DISPLAYS += drm
+# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
+ EGL_DISPLAYS += wayland
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += r200 radeon nouveau
endif
Reply to: