[SCM] handbrake/master: debian/patches: Remove patches unreferenced in the series file.
rbrito-guest at users.alioth.debian.org
rbrito-guest at users.alioth.debian.org
Thu Sep 26 14:39:05 UTC 2013
The following commit has been merged in the master branch:
commit 8e0c650799b0d46f35446705a41c0dd8a3bb6fae
Author: Rogério Brito <rbrito at ime.usp.br>
Date: Thu Sep 26 11:28:35 2013 -0300
debian/patches: Remove patches unreferenced in the series file.
They are, after all, present in our history.
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
deleted file mode 100644
index 7fd7c09..0000000
--- a/debian/patches/0001-libhb-Fix-erroneous-memcpy-used-with-overlapping-mem.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f18f1e71e8c48e7d4fbcc3879e9b2515422f3999 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Fri, 22 Jun 2012 13:11:10 -0300
-Subject: [PATCH] libhb: Fix erroneous memcpy used with overlapping memory
- locations.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was discovered while running ghb under valgrind.
-
-Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
----
- libhb/deca52.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/libhb/deca52.c
-+++ b/libhb/deca52.c
-@@ -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;
-- memcpy( buf, buf + len - newlen, newlen );
-+ memmove( buf, buf + len - newlen, newlen );
- len = newlen;
- }
- }
diff --git a/debian/patches/0002-Fix-include-with-the-system-s-libav.patch b/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
deleted file mode 100644
index 2e96dcd..0000000
--- a/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Sat, 12 May 2012 01:53:49 -0300
-Subject: Fix include with the system's libav.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks to Fabian Greffrath for the more elegant solution than the "brute
-force" that I employed earlier.
-
-Forwarded: yes
-Last-Update: 2012-05-15
-Reviewed-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
-Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
----
- libhb/decavcodec.c | 4 +++-
- libhb/encavcodecaudio.c | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
---- a/libhb/decavcodec.c
-+++ b/libhb/decavcodec.c
-@@ -38,7 +38,9 @@
- #include "hb.h"
- #include "hbffmpeg.h"
- #include "downmix.h"
--#include "libavcodec/audioconvert.h"
-+
-+struct AVAudioConvert;
-+typedef struct AVAudioConvert AVAudioConvert;
-
- static void compute_frame_duration( hb_work_private_t *pv );
- static void flushDelayQueue( hb_work_private_t *pv );
---- a/libhb/encavcodecaudio.c
-+++ b/libhb/encavcodecaudio.c
-@@ -7,7 +7,9 @@
- #include "hb.h"
- #include "hbffmpeg.h"
- #include "downmix.h"
--#include "libavcodec/audioconvert.h"
-+
-+struct AVAudioConvert;
-+typedef struct AVAudioConvert AVAudioConvert;
-
- struct hb_work_private_s
- {
diff --git a/debian/patches/0007-Fix-for-compilation-with-Debian-s-libbluray.patch b/debian/patches/0007-Fix-for-compilation-with-Debian-s-libbluray.patch
deleted file mode 100644
index 7c2a3a6..0000000
--- a/debian/patches/0007-Fix-for-compilation-with-Debian-s-libbluray.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Fri, 1 Jun 2012 23:33:17 -0300
-Subject: Fix for compilation with Debian's libbluray.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch puts dummy values in calls that the development versions of
-HandBrake make to libbluray, as they use a different version of the library,
-with a different API (this new one needs more arguments to use a finer
-granularity selecting titles from the discs).
-
-Note that the values that I put here are simply dummy values (zeros,
-actually) that I can't test, as I don't have any bluray disc, let alone a
-bluray drive.
-
-Others should review this patch for unintended side-effects.
-
-Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
----
- libhb/bd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/libhb/bd.c
-+++ b/libhb/bd.c
-@@ -51,7 +51,7 @@
- goto fail;
- }
-
-- d->title_count = bd_get_titles( d->bd, TITLES_RELEVANT );
-+ d->title_count = bd_get_titles( d->bd, 0, TITLES_RELEVANT );
- if ( d->title_count == 0 )
- {
- hb_log( "bd: not a bd - trying as a stream/file instead" );
-@@ -60,7 +60,7 @@
- d->title_info = calloc( sizeof( BLURAY_TITLE_INFO* ) , d->title_count );
- for ( ii = 0; ii < d->title_count; ii++ )
- {
-- d->title_info[ii] = bd_get_title_info( d->bd, ii );
-+ d->title_info[ii] = bd_get_title_info( d->bd, ii, 0 );
- }
- qsort(d->title_info, d->title_count, sizeof( BLURAY_TITLE_INFO* ), title_info_compare_mpls );
- d->path = strdup( path );
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
deleted file mode 100644
index 4299329..0000000
--- a/debian/patches/0008-Fix-for-compilation-with-Debian-s-libdca.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Fri, 1 Jun 2012 23:47:34 -0300
-Subject: Fix for compilation with Debian's libdca.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since libdca is maintained by pkg-multimedia, we may be willing to select
-parts of HandBrake's contrib/libdca/A00-general.patch for inclusion on the
-library that we ship.
-
-Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
----
- libhb/decdca.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/libhb/decdca.c
-+++ b/libhb/decdca.c
-@@ -9,6 +9,11 @@
-
- #include "dca.h"
-
-+// Taken from HandBrake's patch to libdecdca
-+#define DCA_OUT_DPLI 0x200
-+#define DCA_OUT_DPLII 0x400
-+
-+
- struct hb_work_private_s
- {
- hb_job_t * job;
-@@ -261,7 +266,7 @@
-
- for( i = 0; i < num_blocks; i++ )
- {
-- dca_sample_t * samples_in;
-+ sample_t * samples_in;
- float * samples_out;
-
- dca_block( pv->state );
diff --git a/debian/patches/0013-format-security.patch b/debian/patches/0013-format-security.patch
deleted file mode 100644
index 0b6e5d9..0000000
--- a/debian/patches/0013-format-security.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Subject: Fix format string security errors.
-
-Forwarded: no
---- a/libhb/deccc608sub.c
-+++ b/libhb/deccc608sub.c
-@@ -1607,7 +1607,7 @@
- if (debug_608)
- {
- hb_log ("\n- - - SRT caption - - -\n");
-- hb_log (timeline);
-+ hb_log ("%s", timeline);
- }
- //fwrite (enc_buffer,enc_buffer_used,1,wb->fh);
- XMLRPC_APPEND(wb->enc_buffer,wb->enc_buffer_used);
---- a/libhb/decmpeg2.c
-+++ b/libhb/decmpeg2.c
-@@ -644,7 +644,7 @@
- hb_audio_t *audio = hb_list_item( m->title->list_audio, 0 );
- if( audio )
- {
-- snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ),
-+ snprintf( "%s", subtitle->iso639_2, sizeof( subtitle->iso639_2 ),
- audio->config.lang.iso639_2);
- } else {
- snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "und");
--
handbrake packaging
More information about the pkg-multimedia-commits
mailing list