[SCM] mplayer/master: Enable joystick support on Linux only, Closes: #638408

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0db89610268ed1e19f25f0bfc94a53d7e428b4d7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Sep 2 09:17:37 2011 +0200

    Enable joystick support on Linux only, Closes: #638408

diff --git a/debian/rules b/debian/rules
index 66430e6..2b22d65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,6 @@ CONFIGURE_FLAGS = \
 	--disable-libavformat_a \
 	--disable-libpostproc_a \
 	--disable-libswscale_a \
-	--enable-joystick \
 	$(archconf)
 
 ifeq ($(DEB_HOST_ARCH),i386)
@@ -88,7 +87,7 @@ CONFIGURE_FLAGS += --enable-debug
 endif
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-    CONFIGURE_FLAGS += --enable-mga --enable-3dfx --enable-tdfxfb
+    CONFIGURE_FLAGS += --enable-mga --enable-3dfx --enable-tdfxfb --enable-joystick
 endif
 
 # See http://wiki.debian.org/Teams/Dpkg/DebianRules; #465282  and

-- 
mplayer packaging