[SCM] libav/experimental: refresh quilt patches

Fri Jan 10 14:01:58 UTC 2014

The following commit has been merged in the experimental branch:
commit 6d4de16ebb7eaa8cef0ea93a0fa947c12661d6b2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Dec 18 15:15:18 2013 +0000

    refresh quilt patches

diff --git a/debian/patches/03-disable-configuration-warnings.patch b/debian/patches/03-disable-configuration-warnings.patch
index 59b5c84..0f5a630 100644
--- a/debian/patches/03-disable-configuration-warnings.patch
+++ b/debian/patches/03-disable-configuration-warnings.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/cmdutils.c
 +++ b/cmdutils.c
-@@ -712,7 +712,9 @@ void print_error(const char *filename, i
+@@ -765,7 +765,9 @@ void print_error(const char *filename, i
      av_log(NULL, AV_LOG_ERROR, "%s: %s\n", filename, errbuf_ptr);
  }
  
diff --git a/debian/patches/freetype-api.patch b/debian/patches/freetype-api.patch
index 08b08e0..394e528 100644
--- a/debian/patches/freetype-api.patch
+++ b/debian/patches/freetype-api.patch
@@ -2,17 +2,6 @@ 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/configure
-+++ b/configure
-@@ -3481,7 +3481,7 @@ enabled frei0r     && { check_header fre
- enabled gnutls     && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
- enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
- enabled libfdk_aac && require  libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
--enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
-+enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype.h" FT_Init_FreeType
- enabled libgsm     && require  libgsm gsm/gsm.h gsm_create -lgsm
- enabled libilbc    && require  libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc
- enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
 --- a/libavfilter/vf_drawtext.c
 +++ b/libavfilter/vf_drawtext.c
 @@ -47,7 +47,6 @@
diff --git a/debian/patches/makeinfo.patch b/debian/patches/makeinfo.patch
index 2310bc1..c7c7cbb 100644
--- a/debian/patches/makeinfo.patch
+++ b/debian/patches/makeinfo.patch
@@ -5,27 +5,36 @@ Description: Transition from the `texi2html' utility to the `makeinfo' utility f
 
 --- a/configure
 +++ b/configure
-@@ -1797,7 +1797,7 @@ avprobe_deps="avcodec avformat"
- avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
- avserver_extralibs='$ldl'
+@@ -1177,7 +1177,7 @@ CONFIG_LIST="
+     sram
+     static
+     swscale_alpha
+-    texi2html
++    makeinfo
+     thumb
+     version3
+     xmm_clobber_test
+@@ -2019,7 +2019,7 @@ avserver_extralibs='$ldl'
  
--doc_deps="texi2html"
-+doc_deps="makeinfo"
+ # documentation
+ pod2man_deps="doc"
+-texi2html_deps="doc"
++makeinfo_deps="doc"
  
  # default parameters
  
-@@ -3533,7 +3533,7 @@ if check_pkg_config sdl SDL_events.h SDL
-     check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size
+@@ -3954,7 +3954,7 @@ if check_pkg_config sdl SDL_events.h SDL
  fi
  
+ pod2man --help     > /dev/null 2>&1 && enable pod2man   || disable pod2man
 -texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
-+makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
++makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
  
  check_header linux/fb.h
  check_header linux/videodev2.h
 --- a/doc/platform.texi
 +++ b/doc/platform.texi
-@@ -251,7 +251,7 @@ llrint() in its C library.
+@@ -258,7 +258,7 @@ llrint() in its C library.
  Install your Cygwin with all the "Base" packages, plus the
  following "Devel" ones:
  @example
@@ -36,7 +45,16 @@ Description: Transition from the `texi2html' utility to the `makeinfo' utility f
  In order to run FATE you will also need the following "Utils" packages:
 --- a/doc/Makefile
 +++ b/doc/Makefile
-@@ -29,7 +29,7 @@ $(GENTEXI): doc/avoptions_%.texi: doc/pr
+@@ -12,7 +12,7 @@ HTMLPAGES   = $(AVPROGS-yes:%=doc/%.html
+               doc/platform.html                                         \
+ 
+ DOCS-$(CONFIG_POD2MAN)                          += $(MANPAGES) $(PODPAGES)
+-DOCS-$(CONFIG_TEXI2HTML)                        += $(HTMLPAGES)
++DOCS-$(CONFIG_MAKEINFO)                        += $(HTMLPAGES)
+ DOCS = $(DOCS-yes)
+ 
+ DOC_EXAMPLES-$(CONFIG_OUTPUT_EXAMPLE)           += output
+@@ -42,7 +42,7 @@ $(GENTEXI): doc/avoptions_%.texi: doc/pr
  doc/%.html: TAG = HTML
  doc/%.html: doc/%.texi $(SRC_PATH)/doc/t2h.init $(GENTEXI)
  	$(Q)$(TEXIDEP)
@@ -44,4 +62,13 @@ Description: Transition from the `texi2html' utility to the `makeinfo' utility f
 +	$(M)makeinfo --html -I doc --no-split --css-ref=t2h.init --output $@ $<
  
  doc/%.pod: TAG = POD
- doc/%.pod: doc/%.texi $(GENTEXI)
+ doc/%.pod: doc/%.texi $(SRC_PATH)/doc/texi2pod.pl $(GENTEXI)
+@@ -61,7 +61,7 @@ doc/doxy/html: $(SRC_PATH)/doc/Doxyfile
+ 	$(M)$(SRC_PATH)/doc/doxy-wrapper.sh $(SRC_PATH) $^
+ 
+ install-progs-$(CONFIG_POD2MAN): install-man
+-install-progs-$(CONFIG_TEXI2HTML): install-doc
++install-progs-$(CONFIG_MAKEINFO): install-doc
+ 
+ install-doc: $(HTMLPAGES)
+ 	$(Q)mkdir -p "$(DOCDIR)"
diff --git a/debian/patches/series b/debian/patches/series
index b5ce535..8012f3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 03-disable-configuration-warnings.patch
 makeinfo.patch
 spelling-errors.patch
-freetype-api.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
index 85aa7da..f7e06ec 100644
--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -3,7 +3,7 @@ Description: Fix some spelling errors detected by lintian.
 
 --- a/doc/filters.texi
 +++ b/doc/filters.texi
-@@ -52,7 +52,7 @@ terminated when the next special charact
+@@ -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.
@@ -12,7 +12,7 @@ Description: Fix some spelling errors detected by lintian.
  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
-@@ -2294,7 +2294,7 @@ value is "-1".
+@@ -2671,7 +2671,7 @@ value is "-1".
  
  @end table
  
@@ -34,7 +34,7 @@ Description: Fix some spelling errors detected by lintian.
  @example
 --- a/doc/protocols.texi
 +++ b/doc/protocols.texi
-@@ -536,7 +536,7 @@ avplay sap://[ff0e::2:7ffe]
+@@ -549,7 +549,7 @@ avplay sap://[ff0e::2:7ffe]
  
  @section tcp
  

-- 
Libav/FFmpeg packaging

