[SCM] libav/master: remove unapplied patches

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Sep 13 12:15:23 UTC 2014


The following commit has been merged in the master branch:
commit 45118c6fb8f7d44b379d6289af8c0685d286f00e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Sep 13 07:33:36 2014 -0400

    remove unapplied patches

diff --git a/debian/patches/01-Tweak-doxygen-config.patch b/debian/patches/01-Tweak-doxygen-config.patch
deleted file mode 100644
index 050f0f0..0000000
--- a/debian/patches/01-Tweak-doxygen-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Reinhard Tartler <siretart at tauware.de>
-Date: Mon, 28 Jun 2010 22:43:55 +0200
-Subject: [PATCH] Tweak doxygen config
-
-exclude some directories we use for packaging from doxygen documentation
----
- Doxyfile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/doc/Doxyfile
-+++ b/doc/Doxyfile
-@@ -616,7 +616,7 @@ RECURSIVE              = YES
- # excluded from the INPUT source files. This way you can easily exclude a
- # subdirectory from a directory tree whose root is specified with the INPUT tag.
- 
--EXCLUDE                =
-+EXCLUDE                = debian debian-shared debian-static debian-cmov .pc .git
- 
- # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
- # directories that are symbolic links (a Unix filesystem feature) are excluded
diff --git a/debian/patches/freetype-api.patch b/debian/patches/freetype-api.patch
deleted file mode 100644
index 394e528..0000000
--- a/debian/patches/freetype-api.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: Use the freetype API correctly.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731307
-
---- a/libavfilter/vf_drawtext.c
-+++ b/libavfilter/vf_drawtext.c
-@@ -47,7 +47,6 @@
- #include "video.h"
- 
- #include <ft2build.h>
--#include <freetype/config/ftheader.h>
- #include FT_FREETYPE_H
- #include FT_GLYPH_H
- 
diff --git a/debian/patches/openjpeg.patch b/debian/patches/openjpeg.patch
deleted file mode 100644
index f08bef7..0000000
--- a/debian/patches/openjpeg.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From aa807425395caa17a85ed2833133278e8bd44a76 Mon Sep 17 00:00:00 2001
-From: Luca Barbato <lu_zero at gentoo.org>
-Date: Wed, 12 Mar 2014 09:30:07 +0000
-Subject: [PATCH] configure: Support older version of openjpeg1
-
-It should work best for debian stable and people not installing the .pc
-file.
----
- configure |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/configure
-+++ b/configure
-@@ -3938,7 +3938,8 @@ enabled libmp3lame        && require "li
- enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
- enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
- enabled libopencv         && require_pkg_config opencv opencv/cv.h cvCreateImageHeader
--enabled libopenjpeg       && require_pkg_config libopenjpeg1 openjpeg.h opj_version
-+enabled libopenjpeg       && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg; } ||
-+                               { require_pkg_config libopenjpeg1 openjpeg.h opj_version; } }
- enabled libopus           && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
- enabled libpulse          && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
- enabled librtmp           && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 60cd52b..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: Fix some spelling errors detected by lintian.
-
---- a/doc/filters.texi
-+++ b/doc/filters.texi
-@@ -69,7 +69,7 @@ terminated when the next special charact
- 
- The name and arguments of the filter are optionally preceded and
- followed by a list of link labels.
--A link label allows to name a link and associate it to a filter output
-+A link label allows one to name a link and associate it to a filter output
- or input pad. The preceding labels @var{in_link_1}
- ... @var{in_link_N}, are associated to the filter input pads,
- the following labels @var{out_link_1} ... @var{out_link_M}, are
-@@ -2735,7 +2735,7 @@ value is "-1".
- 
- @end table
- 
--This filter allows to overlay a second video on top of main input of
-+This filter allows one to overlay a second video on top of main input of
- a filtergraph as shown in this graph:
- @example
- input -----------> deltapts0 --> overlay --> output
---- a/doc/indevs.texi
-+++ b/doc/indevs.texi
-@@ -291,7 +291,7 @@ other filename will be interpreted as de
- 
- X11 video input device.
- 
--This device allows to capture a region of an X11 display.
-+This device allows one to capture a region of an X11 display.
- 
- The filename passed as input has the syntax:
- @example
---- a/doc/protocols.texi
-+++ b/doc/protocols.texi
-@@ -549,7 +549,7 @@ avplay sap://[ff0e::2:7ffe]
- 
- @section tcp
- 
--Trasmission Control Protocol.
-+Transmission Control Protocol.
- 
- The required syntax for a TCP url is:
- @example

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list