[SCM] handbrake/master: update patch to use system library of fdk-aac

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e47f07d3382c6fa852c70ac71f46ff4a3ce22eab
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 15 14:39:36 2014 +0000

    update patch to use system library of fdk-aac

diff --git a/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch b/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
index fba6e26..5e9e62f 100644
--- a/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
+++ b/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
@@ -30,20 +30,29 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
  ifneq (,$(filter $(BUILD.system),cygwin mingw))
  ifneq ($(HAS.bz2),1)
      MODULES += contrib/bzip2
-@@ -59,12 +57,6 @@ ifeq (1,$(FEATURE.libmkv))
+@@ -41,7 +39,6 @@ ifneq (,$(filter $(BUILD.system),darwin
+     MODULES += contrib/libvorbis
+     MODULES += contrib/libtheora
+     MODULES += contrib/libsamplerate
+-endif
+ 
+ ifeq (1,$(FEATURE.fdk_aac))
+     MODULES += contrib/fdk-aac
+@@ -58,12 +55,8 @@ endif
+ ifeq (1,$(FEATURE.libmkv))
      MODULES += contrib/libmkv
  endif
++endif
  
 -MODULES += contrib/lame
 -MODULES += contrib/ffmpeg
 -MODULES += contrib/libdvdread
 -MODULES += contrib/libdvdnav
 -MODULES += contrib/libbluray
--
+ 
  ifneq (,$(filter $(BUILD.system),mingw))
  ifneq ($(HAS.pthread),1)
-     MODULES += contrib/pthreadw32
-@@ -75,8 +67,6 @@ ifeq (1,$(FEATURE.qsv))
+@@ -75,8 +68,6 @@ ifeq (1,$(FEATURE.qsv))
      MODULES += contrib/libmfx
  endif
  
@@ -52,7 +61,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
  ifneq (,$(filter $(BUILD.system),cygwin mingw))
  ifneq ($(HAS.iconv),1)
      MODULES += contrib/libiconv
-@@ -117,6 +107,11 @@ ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.syste
+@@ -117,6 +108,11 @@ ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.syste
      MODULES += gtk
  endif
  

-- 
handbrake packaging