[SCM] handbrake/master: Refresh patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 09156513475a198e46f71344eda2fcf2bc6402c0
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Feb 15 22:50:28 2016 +0100

    Refresh patches

diff --git a/debian/patches/001-Do-not-require-wget-or-curl.patch b/debian/patches/001-Do-not-require-wget-or-curl.patch
index 5a11ff5..705babd 100644
--- a/debian/patches/001-Do-not-require-wget-or-curl.patch
+++ b/debian/patches/001-Do-not-require-wget-or-curl.patch
@@ -2,9 +2,9 @@ Description: Do not require neither wget nor curl to build
 Author: Reinhard Tartler <siretart at debian.org>
 Last-Update: 2014-09-27
 
---- handbrake.orig/make/configure.py
-+++ handbrake/make/configure.py
-@@ -977,6 +977,7 @@ class SelectTool( Action ):
+--- a/make/configure.py
++++ b/make/configure.py
+@@ -1018,6 +1018,7 @@
          self.name     = name
          self.pool     = pool
          self.kwargs   = kwargs
@@ -12,7 +12,7 @@ Last-Update: 2014-09-27
  
      def _action( self ):
          self.session = []
-@@ -1428,7 +1429,7 @@ try:
+@@ -1476,7 +1477,7 @@
          xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
          lipo       = ToolProbe( 'LIPO.exe',       'lipo', abort=False )
  
diff --git a/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch b/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
index aace593..4793a9e 100644
--- a/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
+++ b/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
@@ -27,19 +27,13 @@ Last-Update: 2014-09-27
      MODULES += contrib/pthreadw32
 --- a/test/module.defs
 +++ b/test/module.defs
-@@ -9,14 +9,12 @@
- 
- TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
- 
--TEST.GCC.L = $(CONTRIB.build/)lib
--
- TEST.libs = $(LIBHB.a)
+@@ -15,8 +15,8 @@
  
  TEST.GCC.l = \
-         ass avcodec avformat avutil avresample dvdnav dvdread \
--        fontconfig fribidi mp3lame ogg \
+         ass avresample avformat avcodec avutil mp3lame dvdnav dvdread \
+-        fontconfig fribidi ogg \
 -        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \
-+        fontconfig mp3lame ogg \
++        fontconfig ogg \
 +        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 x265 \
          bluray freetype xml2 bz2 z
  
diff --git a/debian/patches/003-remove-vpx.patch b/debian/patches/003-remove-vpx.patch
index 5411424..46de999 100644
--- a/debian/patches/003-remove-vpx.patch
+++ b/debian/patches/003-remove-vpx.patch
@@ -5,7 +5,7 @@ Last-Update: 2014-09-27
 
 --- a/gtk/configure.ac
 +++ b/gtk/configure.ac
-@@ -163,7 +163,7 @@
+@@ -158,7 +158,7 @@
  GHB_TOOLS_CFLAGS=`$BUILD_PKG_CONFIG --cflags glib-2.0 gdk-pixbuf-2.0`
  GHB_TOOLS_LIBS=`$BUILD_PKG_CONFIG --libs glib-2.0 gdk-pixbuf-2.0`
  
@@ -27,10 +27,10 @@ Last-Update: 2014-09-27
  ifeq (1,$(FEATURE.fdk_aac))
 --- a/test/module.defs
 +++ b/test/module.defs
-@@ -14,7 +14,7 @@
+@@ -16,7 +16,7 @@
  TEST.GCC.l = \
-         ass avcodec avformat avutil avresample dvdnav dvdread \
-         fontconfig mp3lame ogg \
+         ass avresample avformat avcodec avutil mp3lame dvdnav dvdread \
+         fontconfig ogg \
 -        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 x265 \
 +        samplerate swscale theoraenc theoradec vorbis vorbisenc x264 x265 \
          bluray freetype xml2 bz2 z
diff --git a/debian/patches/005-use-libtoolize.patch b/debian/patches/005-use-libtoolize.patch
index 08a5f5b..4ef28b8 100644
--- a/debian/patches/005-use-libtoolize.patch
+++ b/debian/patches/005-use-libtoolize.patch
@@ -4,11 +4,9 @@ Bug-Debian: https://bugs.debian.org/761757
 Author: Sebastian Ramacher <sramacher at debian.org>
 Last-Update: 2014-09-28
 
-Index: handbrake/make/configure.py
-===================================================================
---- handbrake.orig/make/configure.py
-+++ handbrake/make/configure.py
-@@ -1423,7 +1423,7 @@ try:
+--- a/make/configure.py
++++ b/make/configure.py
+@@ -1471,7 +1471,7 @@
          autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=False )
          automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=False )
          cmake    = ToolProbe( 'CMAKE.exe',    'cmake', abort=False )

-- 
handbrake packaging