[SCM] handbrake/experimental: Update patches for x265

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 43d39ec4d5dac13df7be39e98719d25910e83f3c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Nov 30 18:29:05 2014 +0100

    Update patches for x265

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 a0f9749..aace593 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
@@ -6,14 +6,16 @@ Author: Christian Marillat <marillat at debian.org>
 Forwarded: no
 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
-@@ -61,12 +61,6 @@ ifeq (1,$(FEATURE.x265))
-     MODULES += contrib/x265
+@@ -57,16 +57,6 @@
+     MODULES += contrib/fdk-aac
  endif
  
+-ifeq (1,$(FEATURE.x265))
+-    MODULES += contrib/x265
+-endif
+-
 -MODULES += contrib/ffmpeg
 -MODULES += contrib/libvpx
 -MODULES += contrib/libdvdread
@@ -23,23 +25,9 @@ index a6ea8a4..02ef41a 100644
  ifneq (,$(filter $(BUILD.system),mingw))
  ifneq ($(HAS.pthread),1)
      MODULES += contrib/pthreadw32
-@@ -112,6 +106,11 @@ ifeq (1-linux,$(FEATURE.gtk)-$(BUILD.system))
-     MODULES += gtk
- endif
- 
-+ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system))
-+    ## build gtk when gtk+linux
-+    MODULES += gtk
-+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/)%.o,$(TEST.c))
+@@ -9,14 +9,12 @@
  
  TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
  
@@ -50,7 +38,20 @@ index 4c81c2c..7889293 100644
  TEST.GCC.l = \
          ass avcodec avformat avutil avresample dvdnav dvdread \
 -        fontconfig fribidi mp3lame ogg \
+-        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \
 +        fontconfig mp3lame ogg \
-         samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \
++        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 x265 \
          bluray freetype xml2 bz2 z
  
+ ifeq (1,$(FEATURE.qsv))
+--- a/libhb/module.defs
++++ b/libhb/module.defs
+@@ -107,7 +107,7 @@
+ LIBHB.dll.libs = $(foreach n, \
+         ass avcodec avformat avutil avresample dvdnav dvdread \
+         fontconfig freetype mp3lame \
+-        ogg samplerate swscale vpx theora vorbis vorbisenc x264 xml2 bluray, \
++        ogg samplerate swscale vpx theora vorbis vorbisenc x264 x265 xml2 bluray, \
+         $(CONTRIB.build/)lib/lib$(n).a )
+ 
+ ifeq (1,$(FEATURE.fdk_aac))
diff --git a/debian/patches/003-remove-vpx.patch b/debian/patches/003-remove-vpx.patch
index 5264ed1..5411424 100644
--- a/debian/patches/003-remove-vpx.patch
+++ b/debian/patches/003-remove-vpx.patch
@@ -3,9 +3,9 @@ Description: Do not link against libvpx
 Author: Sebastian Ramacher <sramacher at debian.org>
 Last-Update: 2014-09-27
 
---- handbrake.orig/gtk/configure.ac
-+++ handbrake/gtk/configure.ac
-@@ -163,7 +163,7 @@ fi
+--- a/gtk/configure.ac
++++ b/gtk/configure.ac
+@@ -163,7 +163,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`
  
@@ -14,25 +14,25 @@ Last-Update: 2014-09-27
  
  case $host in
    *-*-mingw*)
---- handbrake.orig/libhb/module.defs
-+++ handbrake/libhb/module.defs
-@@ -107,7 +107,7 @@ LIBHB.lib = $(LIBHB.build/)hb.lib
+--- a/libhb/module.defs
++++ b/libhb/module.defs
+@@ -107,7 +107,7 @@
  LIBHB.dll.libs = $(foreach n, \
          ass avcodec avformat avutil avresample dvdnav dvdread \
          fontconfig freetype mp3lame \
--        ogg samplerate swscale vpx theora vorbis vorbisenc x264 xml2 bluray, \
-+        ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
+-        ogg samplerate swscale vpx theora vorbis vorbisenc x264 x265 xml2 bluray, \
++        ogg samplerate swscale theora vorbis vorbisenc x264 x265 xml2 bluray, \
          $(CONTRIB.build/)lib/lib$(n).a )
  
  ifeq (1,$(FEATURE.fdk_aac))
---- handbrake.orig/test/module.defs
-+++ handbrake/test/module.defs
-@@ -14,7 +14,7 @@ TEST.libs = $(LIBHB.a)
+--- a/test/module.defs
++++ b/test/module.defs
+@@ -14,7 +14,7 @@
  TEST.GCC.l = \
          ass avcodec avformat avutil avresample dvdnav dvdread \
          fontconfig mp3lame ogg \
--        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \
-+        samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
+-        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 x265 \
++        samplerate swscale theoraenc theoradec vorbis vorbisenc x264 x265 \
          bluray freetype xml2 bz2 z
  
  ifeq (1,$(FEATURE.qsv))

-- 
handbrake packaging