[SCM] ffmpeg/master: Re-enable x265 on alpha, as it's available again.

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 990e34750a66322af2df71d827d1fc499ca91678
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Sep 15 20:16:03 2015 +0200

    Re-enable x265 on alpha, as it's available again.

diff --git a/debian/control b/debian/control
index 9a4af28..6baf679 100644
--- a/debian/control
+++ b/debian/control
@@ -126,7 +126,7 @@ Build-Depends:
 # --enable-libx264
  libx264-dev [!sparc64],
 # --enable-libx265
- libx265-dev [!alpha],
+ libx265-dev,
 # --enable-x11grab
  libxext-dev,
 # --enable-libxvid
diff --git a/debian/rules b/debian/rules
index 4247d49..a416549 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,6 +96,7 @@ CONFIG := --prefix=/usr \
 	--enable-libvpx \
 	--enable-libwavpack \
 	--enable-libwebp \
+	--enable-libx265 \
 	--enable-libxvid \
 	--enable-libzvbi \
 	--enable-opengl \
@@ -142,11 +143,6 @@ ifeq (,$(filter $(DEB_HOST_ARCH),alpha sh4 sparc64))
 	CONFIG += --enable-libopencv
 endif
 
-# Recent x265 is not available on alpha due to #789807.
-ifeq (,$(filter $(DEB_HOST_ARCH),alpha))
-	CONFIG += --enable-libx265
-endif
-
 # Disable i686 optimizations on i386, because they are not always available on this architecture.
 ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386))
 	CONFIG += --disable-i686

-- 
ffmpeg packaging