[SCM] libav/master: Revert "Add special handling of Raspbian" due to release of RPi 2

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 82584de3cabe67afb642d407aeb4b44a9d2b944f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Apr 20 20:26:17 2015 +0200

    Revert "Add special handling of Raspbian" due to release of RPi 2
    
    This reverts commit 463505b1a53fa192191694d56cc4369ef49b1b68.

diff --git a/debian/confflags b/debian/confflags
index 073de71..9d8ee47 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -26,9 +26,6 @@ check_cpp = $(shell $(CROSS)cpp -dM -P /dev/null | grep -q '^\#define $(1)' && e
 # configuration
 check_asm = $(shell echo 'void foo(void) { __asm__ volatile("$(1)"); }' | $(CROSS)gcc -x c -c - -o /dev/null 2>/dev/null && echo 1 || echo 0)
 
-# this is 0 or 1 depending on wehter we build for Raspbian
-is_raspbian := $(shell dpkg-vendor --derives-from raspbian && echo 1 || echo 0)
-
 # the other flavors always build dynamic versions
 # Also, disable architecture-specific optimizations for default shared build
 ifeq ($(DEB_HOST_ARCH_CPU),arm)
@@ -49,12 +46,9 @@ ifeq ($(DEB_HOST_ARCH_CPU),arm)
     FLAVORS += vfp
     endif
     # only build a NEON flavour if the toolchain doesn't enable NEON by default
-    # and we are not building for Raspbian
     ifneq ($(has_neon),1)
-    ifneq ($(is_raspbian),1)
     FLAVORS += neon
     endif
-    endif
     # calling-conventions for VFP and NEON flavours: if the toolchain uses
     # -mfloat-abi=soft, we want to use softfp, otherwise we want to use the
     # toolchain default (either softfp or hardfp)
@@ -110,11 +104,6 @@ confflags += --prefix=/usr
 confflags += $(shell test -x /usr/bin/yasm || echo --disable-yasm )
 confflags += --disable-avserver
 
-ifeq ($(is_raspbian),1)
-# Disable armv6t2 and NEON on Raspbian
-confflags += --disable-armv6t2 --disable-neon
-endif
-
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has
 # plenty of incompatible assembly; not sure how to detect that properly

-- 
Libav/FFmpeg packaging