[SCM] xbmc/master: Use OpenGL, not OpenGL ES for MIPS

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f360edf4ae068f743fb2a2f8391977b634748e07
Author: Balint Reczey <balint at balitreczey.hu>
Date:   Mon Oct 20 13:45:04 2014 +0100

    Use OpenGL, not OpenGL ES for MIPS

diff --git a/debian/control b/debian/control
index 81cf5b5..8b4582d 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 9~),
  libboost-dev,
  zip,
  libtool,
- libgles2-mesa-dev [armel armhf mipsel mips] | libgl1-mesa-dev | libgl-dev,
+ libgles2-mesa-dev [armel armhf] | libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev,
  libftgl-dev,
  libglew-dev,
diff --git a/debian/patches/0013-mips-Add-configure-option-for-mips-and-mipsel.patch b/debian/patches/0013-mips-Add-configure-option-for-mips-and-mipsel.patch
index be45541..4e226a7 100644
--- a/debian/patches/0013-mips-Add-configure-option-for-mips-and-mipsel.patch
+++ b/debian/patches/0013-mips-Add-configure-option-for-mips-and-mipsel.patch
@@ -21,7 +21,7 @@ index 2e49fa1..186edfe 100644
 +     use_arch="mips"
 +     ffmpeg_target_os=linux
 +     use_joystick=no
-+     use_gles=yes
++     use_gles=no
 +     use_sdl=yes
 +     use_x11=yes
 +     use_wayland=no
diff --git a/debian/rules b/debian/rules
index 088fc2e..1bc1ca6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,15 +13,23 @@ else
   ARCH_SPECIFIC_LIB_RECOMMENDS = -lcrystalhd
 endif
 
-# Enable gles for armel, armhf, mipsel and mips
-# Also disable VDPAU and VAAPI there since they break the build with gles
-ifeq (,$(filter armel armhf mipsel mips,$(DEB_HOST_ARCH)))
 GL_CONFIG_OPTIONS = --enable-gl --disable-gles --enable-vdpau
-ARCH_SPECIFIC_LIB_RECOMMENDS += -lvdpau
+ARCH_SPECIFIC_LIB_RECOMMENDS_ADD = -lvdpau
+
+# Enable gles for armel, armhf
+# Also disable VDPAU and VAAPI there since they break the build with gles
+ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
+GL_CONFIG_OPTIONS = --disable-gl --enable-gles --disable-vdpau --disable-vaapi
+ARCH_SPECIFIC_LIB_RECOMMENDS_ADD =
 else
-GL_CONFIG_OPTIONS = --disable-gl --enable-gles --disable-vdpau \
-                    --disable-vaapi
+# Enable OpenGL but no VDPAU or VAAPI for MIPS
+ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
+GL_CONFIG_OPTIONS = --enable-gl --disable-gles --disable-vdpau --disable-vaapi
+ARCH_SPECIFIC_LIB_RECOMMENDS_ADD =
 endif
+endif
+
+ARCH_SPECIFIC_LIB_RECOMMENDS += $(ARCH_SPECIFIC_LIB_RECOMMENDS_ADD)
 
 # Various environment variables to set
 DEB_CFLAGS ?=  $(shell dpkg-buildflags --get CPPFLAGS) \

-- 
xbmc packaging