[SCM] handbrake/master: Remove unused patches for third-party programs.

rbrito-guest at users.alioth.debian.org rbrito-guest at users.alioth.debian.org
Tue May 15 07:33:41 UTC 2012


The following commit has been merged in the master branch:
commit e27460b2e13de6b0dd66c911fd0df9f2b8881990
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Tue May 15 04:05:00 2012 -0300

    Remove unused patches for third-party programs.
    
    The patches removed are:
    
    * debian/patches/02_powerpc.diff: to fix use of altivec with mpeg2dec
      on PowerPC.
    * debian/patches/04_format-security.diff: fix for warnings/errors exposed
      in ffmpeg due to hardening flags of GCC.

diff --git a/debian/patches/02_powerpc.diff b/debian/patches/02_powerpc.diff
deleted file mode 100644
index ff2f91c..0000000
--- a/debian/patches/02_powerpc.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/contrib/mpeg2dec/A00-tags.patch
-+++ b/contrib/mpeg2dec/A00-tags.patch
-@@ -25,3 +25,14 @@
-      mpeg2dec->tag_previous = mpeg2dec->tag_current;
-      mpeg2dec->tag2_previous = mpeg2dec->tag2_current;
-      mpeg2dec->tag_current = tag;
-+--- mpeg2dec-orig/include/config.h.in	2008-07-09 21:18:25.000000000 +0200
-++++ mpeg2dec/include/config.h.in	2010-02-20 19:04:29.000000000 +0100
-+@@ -25,7 +25,7 @@
-+ #undef DEBUG
-+
-+ /* Define to 1 if you have the <altivec.h> header. */
-+-#undef HAVE_ALTIVEC_H
-++#define HAVE_ALTIVEC_H 1
-+
-+ /* Define if you have the `__builtin_expect' function. */
-+ #undef HAVE_BUILTIN_EXPECT
diff --git a/debian/patches/04_format-security.diff b/debian/patches/04_format-security.diff
deleted file mode 100644
index 935b733..0000000
--- a/debian/patches/04_format-security.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- /dev/null
-+++ b/contrib/ffmpeg/A10-format-security.patch
-@@ -0,0 +1,20 @@
-+--- a/libavcodec/srtdec.c
-++++ b/libavcodec/srtdec.c
-+@@ -110,7 +110,7 @@ static const char *srt_to_ass(AVCodecCon
-+                                     for (j=sptr-2; j>=0; j--)
-+                                         if (stack[j].param[i][0]) {
-+                                             out += snprintf(out, out_end-out,
-+-                                                            stack[j].param[i]);
-++                                                            "%s", stack[j].param[i]);
-+                                             break;
-+                                         }
-+                         } else {
-+@@ -146,7 +146,7 @@ static const char *srt_to_ass(AVCodecCon
-+                             for (i=0; i<PARAM_NUMBER; i++)
-+                                 if (stack[sptr].param[i][0])
-+                                     out += snprintf(out, out_end-out,
-+-                                                    stack[sptr].param[i]);
-++                                                    "%s", stack[sptr].param[i]);
-+                         }
-+                     } else if (!buffer[1] && strspn(buffer, "bisu") == 1) {
-+                         out += snprintf(out, out_end-out,
diff --git a/debian/patches/series b/debian/patches/series
index 19f0945..0894491 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
 0001-Remove-encoding-indication-from-desktop-file.patch
 0001-Fix-include-with-the-system-s-libav.patch
 01_build.diff
-#02_powerpc.diff
 03_kfreebsd.diff
-#04_format-security.diff
 0001-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
 0001-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list