Use gles dev package and set proper config options for armel builds.

debian/control

@@ -4,23 +4,77 @@ Priority: optional
 Maintainer: Team XBMC <team-xbmc@lists.launchpad.net>
 Uploaders: Andres Mejia <ceros@xbmc.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), python-support, cmake, autopoint,
- autotools-dev, autoconf, automake, unzip, libboost-dev, zip, libtool,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libglew-dev,
- libmad0-dev, libjpeg-dev, libsamplerate-dev, libogg-dev, libvorbis-dev,
- libfreetype6-dev, libfontconfig-dev, libbz2-dev, libfribidi-dev,
- libsqlite3-dev, libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev,
- libpcre3-dev, liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev,
- libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev,
- libxmu-dev, libcurl4-gnutls-dev | libcurl-dev,
- libdbus-1-dev, libpulse-dev,
- libavahi-common-dev, libavahi-client-dev, libxrandr-dev, libavcodec-dev,
- libavformat-dev, libavutil-dev, libpostproc-dev, libswscale-dev,
- libmpeg2-4-dev, libass-dev (>= 0.9.8), libmpcdec-dev, libflac-dev,
- libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], yasm, libcwiid1-dev,
- libbluetooth-dev, zlib1g-dev, libsmbclient-dev,
- libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
- libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl,
+Build-Depends: debhelper (>= 7.0.50~),
+ python-support,
+ cmake,
+ autopoint,
+ autotools-dev,
+ autoconf,
+ automake,
+ unzip,
+ libboost-dev,
+ zip,
+ libtool,
+ libgles2-mesa-dev [armel] | libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev,
+ libglew-dev,
+ libmad0-dev,
+ libjpeg-dev,
+ libsamplerate-dev,
+ libogg-dev,
+ libvorbis-dev,
+ libfreetype6-dev,
+ libfontconfig-dev,
+ libbz2-dev,
+ libfribidi-dev,
+ libsqlite3-dev,
+ libmysqlclient-dev,
+ libasound-dev,
+ libpng12-dev | libpng-dev,
+ libpcre3-dev,
+ liblzo2-dev,
+ libcdio-dev,
+ libsdl-dev,
+ libsdl-image1.2-dev,
+ libsdl-mixer1.2-dev,
+ libenca-dev,
+ libjasper-dev,
+ libxt-dev,
+ libxmu-dev,
+ libcurl4-gnutls-dev | libcurl-dev,
+ libdbus-1-dev,
+ libpulse-dev,
+ libavahi-common-dev,
+ libavahi-client-dev,
+ libxrandr-dev,
+ libavcodec-dev,
+ libavformat-dev,
+ libavutil-dev,
+ libpostproc-dev,
+ libswscale-dev,
+ libmpeg2-4-dev,
+ libass-dev (>= 0.9.8),
+ libmpcdec-dev,
+ libflac-dev,
+ libwavpack-dev,
+ python-dev,
+ gawk,
+ gperf,
+ nasm [!amd64],
+ yasm,
+ libcwiid1-dev,
+ libbluetooth-dev,
+ zlib1g-dev,
+ libsmbclient-dev,
+ libiso9660-dev,
+ libssl-dev,
+ lsb-release,
+ libvdpau-dev,
+ libmicrohttpd-dev,
+ libmodplug-dev,
+ librtmp-dev,
+ libcrystalhd-dev,
+ curl,
 Standards-Version: 3.9.1
 Homepage: http://xbmc.org/
 Vcs-Git: git://github.com/xbmc/xbmc-packaging.git

debian/rules

@@ -4,6 +4,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # Set this variable to yes for release builds to disable debugging and enable
 # optimizations.
@@ -18,12 +19,23 @@ endif
 
 # Ubuntu or Debian specific options
 ifeq (Ubuntu,$(shell lsb_release -is))
-  DISTRO_SPECIFIC_OPTIONS = 
+  DISTRO_SPECIFIC_OPTIONS =
+# Enable external libraries for all architectures except i386 and amd64
+ifeq (,$(filter i386 amd64,$(DEB_HOST_ARCH)))
+  DISTRO_SPECIFIC_OPTIONS = --enable-external-libraries
+endif
 else
   DISTRO_SPECIFIC_OPTIONS = --enable-external-libraries --disable-dvdcss \
     --disable-non-free
 endif
 
+# Enable gles for armel
+ifeq (,$(filter armel,$(DEB_HOST_ARCH)))
+GL_CONFIG_OPTIONS = --enable-gl --disable-gles
+else
+GL_CONFIG_OPTIONS = --disable-gl --enable-gles
+endif
+
 # Various environment variables to set
 ENV_OPTIONS = CFLAGS="$(DEB_CFLAGS)" CXXFLAGS="$(DEB_CXXFLAGS)"
 
@@ -34,12 +46,13 @@ XBMC_CONFIG_OPTIONS ?= --host=$(DEB_HOST_GNU_TYPE) \
   --build=$(DEB_BUILD_GNU_TYPE) \
   --prefix=/usr --docdir=/usr/share/doc/xbmc \
   $(DEBUG_OPTIONS) \
-  --enable-gl --disable-gles --enable-vdpau --disable-vaapi \
+  --enable-vdpau --disable-vaapi \
   --disable-vdadecoder --disable-openmax --disable-tegra --disable-profiling \
   --enable-joystick --enable-xrandr --enable-goom --disable-ccache \
   --enable-pulse --enable-rtmp --enable-ffmpeg-libvorbis --disable-mid \
   --disable-hal --enable-avahi --disable-asap-codec \
   --enable-webserver \
+  $(GL_CONFIG_OPTIONS) \
   $(XBMC_CONFIG_EXTRA_OPTIONS) \
   $(DISTRO_SPECIFIC_OPTIONS) \
   $(ENV_OPTIONS)

debian/var_info

@@ -2,23 +2,77 @@
 # This is a file run by sh used for replacing certain variables from input
 # files in the XBMC packaging.
 
-BUILD_DEPENDS="debhelper (>= 7.0.50~), python-support, cmake, autopoint,
- autotools-dev, autoconf, automake, unzip, libboost-dev, zip, libtool,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libglew-dev,
- libmad0-dev, libjpeg-dev, libsamplerate-dev, libogg-dev, libvorbis-dev,
- libfreetype6-dev, libfontconfig-dev, libbz2-dev, libfribidi-dev,
- libsqlite3-dev, libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev,
- libpcre3-dev, liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev,
- libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev,
- libxmu-dev, libcurl4-gnutls-dev | libcurl-dev,
- libdbus-1-dev, libpulse-dev,
- libavahi-common-dev, libavahi-client-dev, libxrandr-dev, libavcodec-dev,
- libavformat-dev, libavutil-dev, libpostproc-dev, libswscale-dev,
- libmpeg2-4-dev, libass-dev (>= 0.9.8), libmpcdec-dev, libflac-dev,
- libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], yasm, libcwiid1-dev,
- libbluetooth-dev, zlib1g-dev, libsmbclient-dev,
- libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
- libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl,"
+BUILD_DEPENDS="debhelper (>= 7.0.50~),
+ python-support,
+ cmake,
+ autopoint,
+ autotools-dev,
+ autoconf,
+ automake,
+ unzip,
+ libboost-dev,
+ zip,
+ libtool,
+ libgles2-mesa-dev [armel] | libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev,
+ libglew-dev,
+ libmad0-dev,
+ libjpeg-dev,
+ libsamplerate-dev,
+ libogg-dev,
+ libvorbis-dev,
+ libfreetype6-dev,
+ libfontconfig-dev,
+ libbz2-dev,
+ libfribidi-dev,
+ libsqlite3-dev,
+ libmysqlclient-dev,
+ libasound-dev,
+ libpng12-dev | libpng-dev,
+ libpcre3-dev,
+ liblzo2-dev,
+ libcdio-dev,
+ libsdl-dev,
+ libsdl-image1.2-dev,
+ libsdl-mixer1.2-dev,
+ libenca-dev,
+ libjasper-dev,
+ libxt-dev,
+ libxmu-dev,
+ libcurl4-gnutls-dev | libcurl-dev,
+ libdbus-1-dev,
+ libpulse-dev,
+ libavahi-common-dev,
+ libavahi-client-dev,
+ libxrandr-dev,
+ libavcodec-dev,
+ libavformat-dev,
+ libavutil-dev,
+ libpostproc-dev,
+ libswscale-dev,
+ libmpeg2-4-dev,
+ libass-dev (>= 0.9.8),
+ libmpcdec-dev,
+ libflac-dev,
+ libwavpack-dev,
+ python-dev,
+ gawk,
+ gperf,
+ nasm [!amd64],
+ yasm,
+ libcwiid1-dev,
+ libbluetooth-dev,
+ zlib1g-dev,
+ libsmbclient-dev,
+ libiso9660-dev,
+ libssl-dev,
+ lsb-release,
+ libvdpau-dev,
+ libmicrohttpd-dev,
+ libmodplug-dev,
+ librtmp-dev,
+ libcrystalhd-dev,
+ curl,"
 
 case "$1" in
     BUILD_DEPENDS)