[SCM] vlc/master: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/vlc

[sramacher at users.alioth.debian.org]

Fix --enable-glesvX to --enable-glesX.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0daeee086d0881de7c5dc806b40e435a60fa79e6
X-Git-Newrev: 518aa3557e362ac8a99805b7c3edfbe778136b12

The following commit has been merged in the master branch:
commit 5259fcf7cee23d35d604fc82c368d889c80b9401
Merge: 2f1adf99e5c7ccf5d2fa41deec63a91f62fc78cb 0daeee086d0881de7c5dc806b40e435a60fa79e6
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Aug 20 01:01:46 2014 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/vlc

diff --combined debian/rules
index 84554a8,8f6a252..d0ecbc8
--- a/debian/rules
+++ b/debian/rules
@@@ -59,8 -59,8 +59,8 @@@ confflags += 
  	--enable-freerdp \
  	--enable-freetype \
  	--enable-fribidi \
- 	--enable-glesv1 \
- 	--enable-glesv2 \
+ 	--enable-gles1 \
+ 	--enable-gles2 \
  	--enable-glx \
  	--enable-gnutls \
  	--enable-jack \
@@@ -98,7 -98,6 +98,7 @@@
  	--enable-upnp \
  	--enable-vcdx \
  	--enable-vdpau \
 +	--enable-vnc \
  	--enable-vorbis \
  	--enable-x264 \
  	--enable-zvbi \
@@@ -110,6 -109,7 +110,6 @@@
  # fdkaac -> in Debian non-free
  # gnomevfs -> poorly maintained
  # goom -> not in Debian
 -# libvnc -> libvncserver-dev (containing libvncclient) conflicts with gnutls28
  # mfx -> currently not supported on Linux
  # opencv -> developer plugin not required by end users
  # projectm -> broken
@@@ -123,6 -123,7 +123,6 @@@ confflags += 
  	--disable-fdkaac \
  	--disable-gnomevfs \
  	--disable-goom \
 -	--disable-libvnc \
  	--disable-mfx \
  	--disable-opencv \
  	--disable-projectm \

-- 
VLC media player packaging