[Pkg-sdl-commits] [libsdl2] 01/01: Conditional dependencies libegl1-mesa-dev, libgles2-mesa-dev and libwayland-dev

[Manuel A. Fernandez Montecelo]

This is an automated email from the git hooks/post-receive script.

mafm pushed a commit to branch master
in repository libsdl2.

commit 730b6a5df32587589ee21e2511e9eb167c5aee33
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Sat Mar 15 01:04:40 2014 +0000

    Conditional dependencies libegl1-mesa-dev, libgles2-mesa-dev and libwayland-dev
    
    Conditional dependencies libegl1-mesa-dev [!hurd-any], libgles2-mesa-dev [!hurd-any] and libwayland-dev [linux-any], they do not seem to support these kernels at the moment
---
 debian/changelog |  8 ++++++++
 debian/control   | 12 ++++++------
 debian/rules     | 11 +++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9be618..acb8a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libsdl2 (2.0.2+dfsg1-2) UNRELEASED; urgency=medium
+
+  * Conditional dependencies libegl1-mesa-dev [!hurd-any],
+    libgles2-mesa-dev [!hurd-any] and libwayland-dev [linux-any], they do
+    not seem to support these kernels at the moment
+
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Sat, 15 Mar 2014 00:58:26 +0000
+
 libsdl2 (2.0.2+dfsg1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 8ee52b8..1be2ca1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,15 +12,15 @@ Build-Depends: debhelper (>= 9),
                libasound2-dev [linux-any],
                libdbus-1-dev,
                libegl1-mesa-dev,
-               libgl1-mesa-dev,
-               libgles2-mesa-dev,
+               libgl1-mesa-dev [!hurd-any],
+               libgles2-mesa-dev [!hurd-any],
                libglu1-mesa-dev,
                libpulse-dev,
                libts-dev [linux-any],
                libudev-dev [linux-any],
                libusb2-dev [kfreebsd-any],
                libusbhid-dev [kfreebsd-any],
-               libwayland-dev,
+               libwayland-dev [linux-any],
                libx11-dev,
                libxcursor-dev,
                libxext-dev,
@@ -58,16 +58,16 @@ Depends: ${misc:Depends},
          libsdl2-2.0-0 (= ${binary:Version}),
          libasound2-dev [linux-any],
          libdbus-1-dev,
-         libegl1-mesa-dev,
+         libegl1-mesa-dev [!hurd-any],
          libgl1-mesa-dev,
-         libgles2-mesa-dev,
+         libgles2-mesa-dev [!hurd-any],
          libglu1-mesa-dev,
          libpulse-dev,
          libts-dev [linux-any],
          libudev-dev [linux-any],
          libusb2-dev [kfreebsd-any],
          libusbhid-dev [kfreebsd-any],
-         libwayland-dev,
+         libwayland-dev [linux-any],
          libx11-dev,
          libxcursor-dev,
          libxext-dev,
diff --git a/debian/rules b/debian/rules
index 258f2e9..bb86c63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,17 @@ ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
   confflags += --disable-altivec
 endif
 
+# disable Wayland on non-Linux, they do not support other kernels at the moment
+ifeq (,$(findstring linux,$(DEB_HOST_ARCH_CPU)))
+  confflags += --disable-video-wayland
+endif
+
+# disable OpenGLES on Hurd, it does not support it at the moment
+ifeq (hurd,$(findstring hurd,$(DEB_HOST_ARCH_CPU)))
+  confflags += --disable--video-opengles
+endif
+
+
 %:
 	dh $@ --with autoreconf --parallel
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2.git