[SCM] handbrake/master: debian/patches: Refresh remaining patches.

Fri Jul 27 07:45:25 UTC 2012

The following commit has been merged in the master branch:
commit e6c15161cb966bad1868974d678f82545e8ca11d
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Fri Jul 27 04:44:43 2012 -0300

    debian/patches: Refresh remaining patches.
    
    Signed-off-by: Rogério Brito <rbrito at ime.usp.br>

diff --git a/debian/patches/0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch b/debian/patches/0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch
index d74131d..7fd7c09 100644
--- a/debian/patches/0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch
+++ b/debian/patches/0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch
@@ -14,11 +14,9 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
  libhb/deca52.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/libhb/deca52.c b/libhb/deca52.c
-index a8d537d..d137a96 100644
 --- a/libhb/deca52.c
 +++ b/libhb/deca52.c
-@@ -374,7 +374,7 @@ static int deca52BSInfo( hb_work_object_t *w, const hb_buffer_t *b,
+@@ -376,7 +376,7 @@
              // discard enough bytes from the front of the buffer to make
              // room for the new stuff
              int newlen = sizeof(w->audio->priv.config.a52.buf) - blen;
@@ -27,6 +25,3 @@ index a8d537d..d137a96 100644
              len = newlen;
          }
      }
--- 
-1.7.10
-
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 123a111..0db5ea1 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
@@ -76,18 +76,18 @@ 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
-@@ -82,6 +58,11 @@
-     ## build gtk when gtk+linux
+@@ -88,6 +64,11 @@
      MODULES += gtk
  endif
-+
+ 
 +ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system))
 +    ## build gtk when gtk+linux
 +    MODULES += gtk
 +endif
- 
++
  ifeq (1,$(FEATURE.local_yasm))
      MODULES += contrib/yasm
+ endif
 --- a/test/module.defs
 +++ b/test/module.defs
 @@ -9,10 +9,8 @@
diff --git a/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch b/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
index 81171b5..98aadd4 100644
--- a/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
+++ b/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
@@ -27,7 +27,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
 
 --- a/make/include/main.defs
 +++ b/make/include/main.defs
-@@ -64,6 +64,11 @@
+@@ -69,6 +69,11 @@
      MODULES += gtk
  endif
  
diff --git a/debian/patches/0008-Fix-for-compilation-with-Debian-s-libdca.patch b/debian/patches/0008-Fix-for-compilation-with-Debian-s-libdca.patch
index f17bab3..4299329 100644
--- a/debian/patches/0008-Fix-for-compilation-with-Debian-s-libdca.patch
+++ b/debian/patches/0008-Fix-for-compilation-with-Debian-s-libdca.patch
@@ -28,7 +28,7 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
  struct hb_work_private_s
  {
      hb_job_t    * job;
-@@ -258,7 +263,7 @@
+@@ -261,7 +266,7 @@
  
      for( i = 0; i < num_blocks; i++ )
      {
diff --git a/debian/patches/0010-Remove-FAAC-dependency.patch b/debian/patches/0010-Remove-FAAC-dependency.patch
index eaf7ebd..18369f9 100644
--- a/debian/patches/0010-Remove-FAAC-dependency.patch
+++ b/debian/patches/0010-Remove-FAAC-dependency.patch
@@ -55,7 +55,7 @@ to enter Debian.
  			break;
  		}
  	}
-@@ -139,7 +136,7 @@
+@@ -130,7 +127,7 @@
  			return HB_ACODEC_LAME;
  
  		case HB_ACODEC_AAC_PASS:
@@ -64,7 +64,7 @@ to enter Debian.
  
  		case HB_ACODEC_AC3_PASS:
  			return HB_ACODEC_AC3;
-@@ -155,7 +152,6 @@
+@@ -144,7 +141,6 @@
  	{
  		mask = 	HB_ACODEC_LAME |
  				HB_ACODEC_FFAAC |
@@ -74,7 +74,7 @@ to enter Debian.
  	if ( mux == HB_MUX_MKV )
 --- a/gtk/src/hb-backend.c
 +++ b/gtk/src/hb-backend.c
-@@ -3731,7 +3731,7 @@
+@@ -3729,7 +3729,7 @@
  gint
  ghb_get_default_acodec()
  {
@@ -83,7 +83,7 @@ to enter Debian.
  }
  
  static void
-@@ -4487,13 +4487,9 @@
+@@ -4485,13 +4485,9 @@
  			{
  				codec = HB_ACODEC_AC3;
  			}
@@ -98,7 +98,7 @@ to enter Debian.
  			}
  			value = ghb_lookup_acodec_value(codec);
  			ghb_settings_take_value(asettings, "AudioEncoder", value);
-@@ -4507,7 +4503,7 @@
+@@ -4505,7 +4501,7 @@
  			if (codec == HB_ACODEC_VORBIS)
  			{
  				a_unsup = "Vorbis";
@@ -119,7 +119,7 @@ to enter Debian.
  	{"Vorbis (vorbis)", "vorbis"},
 --- a/gtk/src/presets.c
 +++ b/gtk/src/presets.c
-@@ -2000,9 +2000,6 @@
+@@ -2004,9 +2004,6 @@
  static value_map_t acodec_xlat[] =
  {
  	{"AAC (ffmpeg)", "ffaac"},
@@ -131,7 +131,7 @@ to enter Debian.
  	{"AC3", "ac3"},			// Backwards compatibility with mac ui
 --- a/libhb/common.c
 +++ b/libhb/common.c
-@@ -65,7 +65,7 @@
+@@ -66,7 +66,7 @@
    { "AAC (CoreAudio)",    "ca_aac",     HB_ACODEC_CA_AAC,       HB_MUX_MP4|HB_MUX_MKV },
    { "HE-AAC (CoreAudio)", "ca_haac",    HB_ACODEC_CA_HAAC,      HB_MUX_MP4|HB_MUX_MKV },
  #endif
@@ -140,7 +140,7 @@ to enter Debian.
    { "AAC (ffmpeg)",       "ffaac",      HB_ACODEC_FFAAC,        HB_MUX_MP4|HB_MUX_MKV },
    { "AAC Passthru",       "copy:aac",   HB_ACODEC_AAC_PASS,     HB_MUX_MP4|HB_MUX_MKV },
    { "AC3 (ffmpeg)",       "ffac3",      HB_ACODEC_AC3,          HB_MUX_MP4|HB_MUX_MKV },
-@@ -414,22 +414,6 @@
+@@ -415,22 +415,6 @@
              }
              break;
  
@@ -163,7 +163,7 @@ to enter Debian.
          case HB_ACODEC_FFAAC:
              *low = 32 * channels;
              if (samplerate > 24000)
-@@ -1559,7 +1543,7 @@
+@@ -1560,7 +1544,7 @@
  
      /* Initalize some sensable defaults */
      audiocfg->in.track = audiocfg->out.track = 0;
@@ -214,7 +214,7 @@ to enter Debian.
  	hb_register( &hb_muxer );
 --- a/libhb/internal.h
 +++ b/libhb/internal.h
-@@ -355,7 +355,6 @@
+@@ -360,7 +360,6 @@
      WORK_DECAVCODEC,
      WORK_DECAVCODECV,
      WORK_DECLPCM,
@@ -241,7 +241,7 @@ to enter Debian.
  
 --- a/libhb/muxmkv.c
 +++ b/libhb/muxmkv.c
-@@ -251,7 +251,6 @@
+@@ -255,7 +255,6 @@
                  }
                  track->codecID = MK_ACODEC_FLAC;
                  break;
diff --git a/debian/patches/0013-format-security.patch b/debian/patches/0013-format-security.patch
index 584adea..0b6e5d9 100644
--- a/debian/patches/0013-format-security.patch
+++ b/debian/patches/0013-format-security.patch
@@ -4,7 +4,7 @@ Subject: Fix format string security errors.
 Forwarded: no
 --- a/libhb/deccc608sub.c
 +++ b/libhb/deccc608sub.c
-@@ -1607,7 +1607,7 @@ int write_cc_buffer_as_srt (struct eia60
+@@ -1607,7 +1607,7 @@
      if (debug_608)
      {
          hb_log ("\n- - - SRT caption - - -\n");
@@ -15,7 +15,7 @@ Forwarded: no
      XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
 --- a/libhb/decmpeg2.c
 +++ b/libhb/decmpeg2.c
-@@ -644,7 +644,7 @@ static int hb_libmpeg2_decode( hb_libmpe
+@@ -644,7 +644,7 @@
                  hb_audio_t *audio = hb_list_item( m->title->list_audio, 0 );
                  if( audio )
                  {

-- 
handbrake packaging

