Merge branch 'ubuntu' into ubuntu+1ubuntu+1

9 files changed, 96 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index aa66b0eee74..9903b0e1b4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,53 @@ mesa (10.2.0~git20140319-0ubuntu1) UNRELEASED; urgency=medium
 
  -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 19 Mar 2014 11:31:15 +0100
 
+mesa (10.1.0-4ubuntu1) trusty; urgency=medium
+
+  * Merge from unreleased debian sid.
+  * Add explicit libudev1 | libudev0 dependency. (LP: #1296947)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 31 Mar 2014 09:56:17 +0000
+
+mesa (10.1.0-5) UNRELEASED; urgency=low
+
+  * Add explicit libudev1 dependency.
+    - libudev is being dlsym'd now, but still a dependency.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 31 Mar 2014 11:25:48 +0200
+
+mesa (10.1.0-4) unstable; urgency=medium
+
+  [ Andreas Boll ]
+  * Fix unsatisfiable libwayland-egl1-mesa and libwayland-dev dependency on
+    !linux (Closes: #742306).
+  * Install /etc/drirc on hurd (Closes: #741572).
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 22 Mar 2014 10:39:12 +0100
+
+mesa (10.1.0-3) unstable; urgency=medium
+
+  [ Andreas Boll ]
+  * Build OpenCL only on architectures where we have LLVM enabled.
+  * Actually enable radeonsi on kfreebsd.
+
+  [ Sven Joachim ]
+  * Drop dependency of libegl1-mesa-drivers on libgl1-mesa-dri again.
+
+  [ Julien Cristau ]
+  * Steal Ubuntu patch to work around build failure on armhf
+    (https://bugs.freedesktop.org/show_bug.cgi?id=72064)
+  * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org>  Wed, 19 Mar 2014 22:48:14 +0100
+
+mesa (10.1.0-2) experimental; urgency=medium
+
+  [ Sjoerd Simons ]
+  * Install libwayland-egl in a separate library package (libwayland-egl1-mesa)
+    and provide a virtual libwayland-egl1 package. (Closes: #739269).
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 17 Mar 2014 23:11:14 +0100
+
 mesa (10.1.0-1ubuntu1) trusty; urgency=medium
 
   * Merge from released debian-experimental.
diff --git a/debian/control b/debian/control
index 0f6633b6f86..a1f52c4e5a7 100644
--- a/debian/control
+++ b/debian/control
@@ -99,6 +99,7 @@ Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+ libudev1 | libudev0,
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: generic buffer management API -- runtime
@@ -146,6 +147,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
+ libudev1 | libudev0,
 Recommends: libegl1-mesa-drivers
 Provides: libegl1-x11
 Conflicts: libegl1-x11
@@ -198,7 +200,7 @@ Depends:
  libxshmfence-dev,
  libx11-xcb-dev,
  libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
- libwayland-dev (>= 1.2.0),
+ libwayland-dev (>= 1.2.0) [linux-any],
  ${misc:Depends},
 Description: free implementation of the EGL API -- development files
  This package contains the development environment required for compiling
@@ -217,6 +219,8 @@ Depends:
  ${misc:Depends},
  libegl1-mesa (= ${binary:Version}),
  libglapi-mesa (= ${binary:Version}),
+ libwayland-egl1-mesa (= ${binary:Version}) [linux-any],
+ libudev1 | libudev0,
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: free implementation of the EGL API -- hardware drivers
@@ -243,6 +247,35 @@ Description: free implementation of the EGL API -- driver debugging symbols
  This package contains the debugging symbols for the drivers required for
  hardware accelerated rendering of EGL-based graphics libraries.
 
+Package: libwayland-egl1-mesa
+Section: libs
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ libegl1-mesa (= ${binary:Version})
+Recommends: libegl1-mesa-drivers
+Provides: libwayland-egl1
+Conflicts: libwayland-egl1
+Replaces: libwayland-egl1, libegl1-mesa-drivers  (<< 10.1.0-2)
+Breaks: libegl1-mesa-drivers (<< 10.1.0-2)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: implementation of the Wayland EGL platform -- runtime
+ This package contains the mesa implementation of the Wayland EGL platform
+
+Package: libwayland-egl1-mesa-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any
+Depends:
+ libwayland-egl1-mesa (= ${binary:Version}),
+ ${misc:Depends},
+Multi-Arch: same
+Description: implementation of the Wayland EGL platform -- debugging symbols
+ This package contains the debugging symbols for the mesa implementation of the
+ Wayland EGL platform
+
 Package: libopenvg1-mesa
 Section: libs
 Architecture: linux-any kfreebsd-any
@@ -443,8 +476,9 @@ Section: libs
 Architecture: any
 Depends:
  ${shlibs:Depends},
- libglapi-mesa (= ${binary:Version}),
  ${misc:Depends}
+ libglapi-mesa (= ${binary:Version}),
+ libudev1 | libudev0,
 Recommends: libgl1-mesa-dri (>= 7.2)
 Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
 Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
diff --git a/debian/libegl1-mesa-dev.install.linux.in b/debian/libegl1-mesa-dev.install.linux.in
index fabc4707d57..c014d268cce 100644
--- a/debian/libegl1-mesa-dev.install.linux.in
+++ b/debian/libegl1-mesa-dev.install.linux.in
@@ -5,5 +5,5 @@ dri/usr/include/KHR usr/include
 dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/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}/mesa-egl
+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-dev.links.in b/debian/libegl1-mesa-dev.links.in
index 0e8afbdcb29..e41ad6a273a 100644
--- a/debian/libegl1-mesa-dev.links.in
+++ b/debian/libegl1-mesa-dev.links.in
@@ -1,2 +1 @@
 /usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl/libEGL.so /usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so
-/usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl/libwayland-egl.so /usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so
diff --git a/debian/libegl1-mesa-drivers.install.linux.in b/debian/libegl1-mesa-drivers.install.linux.in
index 9bd3fde116f..741f9626b05 100644
--- a/debian/libegl1-mesa-drivers.install.linux.in
+++ b/debian/libegl1-mesa-drivers.install.linux.in
@@ -1,6 +1,2 @@
 # 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}/mesa-egl
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0.0 usr/lib/${DEB_HOST_MULTIARCH}/mesa-egl
diff --git a/debian/libgl1-mesa-dri.install.kfreebsd.in b/debian/libgl1-mesa-dri.install.in
index 1d835ea0844..1d835ea0844 100644
--- a/debian/libgl1-mesa-dri.install.kfreebsd.in
+++ b/debian/libgl1-mesa-dri.install.in
diff --git a/debian/libwayland-egl1-mesa.install.in b/debian/libwayland-egl1-mesa.install.in
new file mode 100644
index 00000000000..9adea448b47
--- /dev/null
+++ b/debian/libwayland-egl1-mesa.install.in
@@ -0,0 +1,3 @@
+# 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.0 usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/libwayland-egl1-mesa.symbols b/debian/libwayland-egl1-mesa.symbols
new file mode 100644
index 00000000000..4ec0edc9333
--- /dev/null
+++ b/debian/libwayland-egl1-mesa.symbols
@@ -0,0 +1,5 @@
+libwayland-egl.so.1 libwayland-egl1-mesa #MINVER# | libwayland-egl1
+ wl_egl_window_create@Base 10.0.2
+ wl_egl_window_destroy@Base 10.0.2
+ wl_egl_window_get_attached_size@Base 10.0.2
+ wl_egl_window_resize@Base 10.0.2
diff --git a/debian/rules b/debian/rules
index 8291b5c9e24..43329b04f9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ else
 	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-ifeq (,$(filter $(DEB_HOST_ARCH), armel armhf))
+ifeq (,$(filter $(DEB_HOST_ARCH), armhf))
 buildflags = \
 	$(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
 else
@@ -97,14 +97,10 @@ else
     DRI_DRIVERS += r200 radeon
     GALLIUM_DRIVERS += r600 r300
   endif
-  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 armhf))
-    # Radeonsi needs LLVM, so only build it on the subset of archs
-    # where we have LLVM enabled.
-    GALLIUM_DRIVERS += radeonsi
-  endif
 
-  # LLVM is required for r300g and llvmpipe:
+  # LLVM is required for r300g, radeonsi and llvmpipe:
   ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf))
+	GALLIUM_DRIVERS += radeonsi
 	confflags_GALLIUM += --enable-gallium-llvm
 	confflags_GALLIUM += --with-llvm-shared-libs
   endif
@@ -276,7 +272,7 @@ binary-arch: install
 	# Because there's no packaging problem so onerous that accomodating
 	# proprietary alternatives can't make more difficult…
 	set -e ; for PACKAGE in \
-		libegl1-mesa libgles1-mesa libgles2-mesa libopenvg1-mesa ; do \
+		libegl1-mesa libgles1-mesa libgles2-mesa libopenvg1-mesa; do \
 			dh_makeshlibs -p$$PACKAGE -- -c4 \
 			-edebian/$$PACKAGE/usr/lib/$(DEB_HOST_MULTIARCH)/mesa-egl/\* \
 		; done