diff -Nru libsdl2-2.0.2+dfsg1/debian/changelog libsdl2-2.0.2+dfsg1/debian/changelog --- libsdl2-2.0.2+dfsg1/debian/changelog 2014-03-19 20:24:39.000000000 +0000 +++ libsdl2-2.0.2+dfsg1/debian/changelog 2014-04-10 00:15:22.000000000 +0000 @@ -1,3 +1,9 @@ +libsdl2 (2.0.2+dfsg1-3ubuntu1) trusty; urgency=medium + + * Enable Mir video support (LP: #1295389). + + -- Brandon Schaefer Thu, 10 Apr 2014 01:15:21 +0100 + libsdl2 (2.0.2+dfsg1-3) unstable; urgency=medium * Actually change Build-Depends libegl1-mesa-dev to be conditionally diff -Nru libsdl2-2.0.2+dfsg1/debian/control libsdl2-2.0.2+dfsg1/debian/control --- libsdl2-2.0.2+dfsg1/debian/control 2014-03-19 20:17:22.000000000 +0000 +++ libsdl2-2.0.2+dfsg1/debian/control 2014-04-10 00:14:20.000000000 +0000 @@ -1,7 +1,8 @@ Source: libsdl2 Priority: optional Section: libs -Maintainer: Debian SDL packages maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian SDL packages maintainers Uploaders: Barry deFreese , Sam Hocevar , Manuel A. Fernandez Montecelo , @@ -15,6 +16,7 @@ libgl1-mesa-dev, libgles2-mesa-dev [!hurd-any], libglu1-mesa-dev, + libmirclient-dev [i386 amd64 armhf], libpulse-dev, libts-dev [linux-any], libudev-dev [linux-any], @@ -62,6 +64,7 @@ libgl1-mesa-dev, libgles2-mesa-dev [!hurd-any], libglu1-mesa-dev, + libmirclient-dev [i386 amd64 armhf], libpulse-dev, libts-dev [linux-any], libudev-dev [linux-any], diff -Nru libsdl2-2.0.2+dfsg1/debian/rules libsdl2-2.0.2+dfsg1/debian/rules --- libsdl2-2.0.2+dfsg1/debian/rules 2014-03-15 01:42:53.000000000 +0000 +++ libsdl2-2.0.2+dfsg1/debian/rules 2014-04-10 00:10:02.000000000 +0000 @@ -2,8 +2,10 @@ SHLIBVER = 2.0.0 -DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +MIR_SUPPORTED_ARCH := i386 amd64 armhf confflags = --disable-rpath --enable-sdl-dlopen --disable-loadso \ --disable-nas --disable-esd --disable-arts \ @@ -29,6 +31,9 @@ confflags += --disable--video-opengles endif +ifneq (,$(filter $(MIR_SUPPORTED_ARCH),$(DEB_HOST_ARCH))) + confflags += --enable-video-mir --enable-mir-shared +endif %: dh $@ --with autoreconf --parallel