[SCM] transcode/master: Remove --enable-x265 and --enable-xvid

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5b34dfb76043950492078fb1d52e37ef022d990c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Sep 11 15:02:00 2013 +0200

    Remove --enable-x265 and --enable-xvid
    
    They also need --enable-experimental, but this needs to be ported to libav 9 first

diff --git a/debian/control b/debian/control
index 4af4302..ebcde64 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends:
  dh-autoreconf,
  liba52-0.7.4-dev,
  libasound2-dev [linux-any],
- libavcodec-dev,
- libavformat-dev,
- libavutil-dev,
+ libavcodec-dev (>= 6:9),
+ libavformat-dev (>= 6:9),
+ libavutil-dev (>= 7:9),
  libdv4-dev,
  libdvdread-dev,
  libfaad-dev,
@@ -33,13 +33,15 @@ Build-Depends:
  libswscale-dev,
  libtheora-dev,
  libvorbis-dev,
- libx264-dev,
  libxaw7-dev,
  libxft-dev,
  libxml2-dev,
  libxv-dev,
- libxvidcore-dev,
  libxxf86vm-dev [i386]
+# libx264-dev and libxvidcore-dev are only required if --enable-x264 and
+# --enable-xvid are passed to configure.
+# libx264-dev,
+# libxvidcore-dev,
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/transcode.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/transcode.git
 
diff --git a/debian/rules b/debian/rules
index 81d57af..b9fd74c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,6 @@ endif
 
 confflags += $(nooptflags)
 confflags += --enable-a52
-#confflags += --enable-faac
 confflags += --enable-ffmpeg
 confflags += --enable-freetype2
 confflags += --enable-iconv
@@ -38,8 +37,11 @@ confflags += --enable-oss
 confflags += --enable-sdl
 confflags += --enable-theora
 confflags += --enable-vorbis
-confflags += --enable-x264
-confflags += --enable-xvid
+# The following flags also need --enable-experimental, but this needs to be
+# ported to libav 9.
+# confflags += --enable-faac
+# confflags += --enable-x264
+# confflags += --enable-xvid
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 confflags += --enable-alsa

-- 
transcode packaging