[SCM] handbrake/master: Refresh patches

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 503bb912c5dee5a83e34c33147d67aae30a4c785
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Sep 27 13:54:12 2014 +0200

    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 3118b2e..5a11ff5 100644
--- a/debian/patches/001-Do-not-require-wget-or-curl.patch
+++ b/debian/patches/001-Do-not-require-wget-or-curl.patch
@@ -1,8 +1,9 @@
-Author: Reinhard Tartler <siretart at debian.org>
 Description: Do not require neither wget nor curl to build
+Author: Reinhard Tartler <siretart at debian.org>
+Last-Update: 2014-09-27
 
---- a/make/configure.py
-+++ b/make/configure.py
+--- handbrake.orig/make/configure.py
++++ handbrake/make/configure.py
 @@ -977,6 +977,7 @@ class SelectTool( Action ):
          self.name     = name
          self.pool     = pool
@@ -11,7 +12,7 @@ Description: Do not require neither wget nor curl to build
  
      def _action( self ):
          self.session = []
-@@ -1440,7 +1441,7 @@ try:
+@@ -1428,7 +1429,7 @@ try:
          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 7fb9113..a0f9749 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
@@ -1,63 +1,29 @@
-From: Christian Marillat <marillat at debian.org>
-Date: Tue, 15 May 2012 04:48:54 -0300
-Subject: Remove embedded/downloaded copies of various libraries
-
-Once this is acceptable, this should be forwarded upstream so that the
-use of system libraries is an option, instead of downloading libraries
-and programs at build time.
-
+Description: Remove embedded/downloaded copies of various libraries
+ Once this is acceptable, this should be forwarded upstream so that the
+ use of system libraries is an option, instead of downloading libraries
+ and programs at build time.
+Author: Christian Marillat <marillat at debian.org>
 Forwarded: no
-Last-Update: 2013-02-15
-
----
- gtk/src/Makefile.am    |    4 ++--
- make/include/main.defs |   26 +++++---------------------
- test/module.defs       |   10 +++-------
- 3 files changed, 10 insertions(+), 30 deletions(-)
+Last-Update: 2014-09-27
 
+diff --git a/make/include/main.defs b/make/include/main.defs
+index a6ea8a4..02ef41a 100644
 --- a/make/include/main.defs
 +++ b/make/include/main.defs
-@@ -23,8 +23,6 @@ else
-     AUTOTOOL_MODULES =
- endif
- 
--MODULES += contrib/a52dec
--
- ifneq (,$(filter $(BUILD.system),cygwin mingw))
- ifneq ($(HAS.bz2),1)
-     MODULES += contrib/bzip2
-@@ -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
-@@ -62,12 +59,8 @@ endif
- ifeq (1,$(FEATURE.x265))
+@@ -61,12 +61,6 @@ ifeq (1,$(FEATURE.x265))
      MODULES += contrib/x265
  endif
-+endif
  
--MODULES += contrib/lame
 -MODULES += contrib/ffmpeg
+-MODULES += contrib/libvpx
 -MODULES += contrib/libdvdread
 -MODULES += contrib/libdvdnav
 -MODULES += contrib/libbluray
- 
+-
  ifneq (,$(filter $(BUILD.system),mingw))
  ifneq ($(HAS.pthread),1)
-@@ -79,8 +72,6 @@ ifeq (1,$(FEATURE.qsv))
-     MODULES += contrib/libmfx
- endif
- 
--MODULES += contrib/x264
--
- ifneq (,$(filter $(BUILD.system),cygwin mingw))
- ifneq ($(HAS.iconv),1)
-     MODULES += contrib/libiconv
-@@ -121,6 +112,11 @@ ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.syste
+     MODULES += contrib/pthreadw32
+@@ -112,6 +106,11 @@ ifeq (1-linux,$(FEATURE.gtk)-$(BUILD.system))
      MODULES += gtk
  endif
  
@@ -66,12 +32,14 @@ Last-Update: 2013-02-15
 +    MODULES += gtk
 +endif
 +
- ifeq (1,$(FEATURE.local_yasm))
-     MODULES += contrib/yasm
- endif
+ ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.system))
+     ## build gtk when gtk+gnu
+     MODULES += gtk
+diff --git a/test/module.defs b/test/module.defs
+index 4c81c2c..7889293 100644
 --- a/test/module.defs
 +++ b/test/module.defs
-@@ -9,13 +9,11 @@ TEST.c.o = $(patsubst $(SRC/)%.c,$(BUILD
+@@ -9,13 +9,11 @@ TEST.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(TEST.c))
  
  TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
  
@@ -80,9 +48,9 @@ Last-Update: 2013-02-15
  TEST.libs = $(LIBHB.a)
  
  TEST.GCC.l = \
-         a52 ass avcodec avformat avutil avresample dvdnav dvdread \
+         ass avcodec avformat avutil avresample dvdnav dvdread \
 -        fontconfig fribidi mp3lame ogg \
 +        fontconfig mp3lame ogg \
-         samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
+         samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \
          bluray freetype xml2 bz2 z
  

-- 
handbrake packaging