[SCM] ffmpeg/master: sync patches with upstream release branch
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Sep 20 04:59:53 UTC 2011
The following commit has been merged in the master branch:
commit 28f942d971f065f01427c8cf91e3d64ceb0eba8c
Author: Reinhard Tartler <siretart at tauware.de>
Date: Mon Sep 5 07:09:08 2011 +0200
sync patches with upstream release branch
diff --git a/debian/patches/01-Tweak-doxygen-config.patch b/debian/patches/01-Tweak-doxygen-config.patch
index e7f3e76..c932bb8 100644
--- a/debian/patches/01-Tweak-doxygen-config.patch
+++ b/debian/patches/01-Tweak-doxygen-config.patch
@@ -9,7 +9,7 @@ exclude some directories we use for packaging from doxygen documentation
--- a/Doxyfile
+++ b/Doxyfile
-@@ -563,7 +563,7 @@ RECURSIVE = YES
+@@ -610,7 +610,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.
diff --git a/debian/patches/02-make-MAP_ANONYMOUS_AVAILABLE.patch b/debian/patches/02-make-MAP_ANONYMOUS_AVAILABLE.patch
index 7ea7c4b..1d44a9b 100644
--- a/debian/patches/02-make-MAP_ANONYMOUS_AVAILABLE.patch
+++ b/debian/patches/02-make-MAP_ANONYMOUS_AVAILABLE.patch
@@ -79,10 +79,11 @@ matching a platform with the same C library makes sense to me.
enable dv1394
;;
irix*)
-@@ -2504,6 +2504,7 @@ case $target_os in
+@@ -2504,7 +2504,7 @@ case $target_os in
add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
;;
gnu)
+- add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
+ add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
;;
qnx)
diff --git a/debian/patches/03-filter-name-needs-to-be-double-0-terminated.patch b/debian/patches/03-filter-name-needs-to-be-double-0-terminated.patch
deleted file mode 100644
index eae2d73..0000000
--- a/debian/patches/03-filter-name-needs-to-be-double-0-terminated.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: Reinhard Tartler <siretart at ubuntu.com>
-Description: filter name needs to be double 0 terminated
-Forwarded: http://bugzilla.libav.org/show_bug.cgi?id=35
-Bug-Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=654634
-
---- a/libpostproc/postprocess.c
-+++ b/libpostproc/postprocess.c
-@@ -763,7 +763,8 @@ pp_mode *pp_get_mode_by_name_and_quality
- ppMode->maxClippedThreshold= 0.01;
- ppMode->error=0;
-
-- av_strlcpy(temp, name, GET_MODE_BUFFER_SIZE);
-+ memset(temp, 0, GET_MODE_BUFFER_SIZE);
-+ av_strlcpy(temp, name, GET_MODE_BUFFER_SIZE - 1);
-
- av_log(NULL, AV_LOG_DEBUG, "pp: %s\n", name);
-
-@@ -819,7 +820,7 @@ pp_mode *pp_get_mode_by_name_and_quality
-
- plen= strlen(p);
- spaceLeft= p - temp + plen;
-- if(spaceLeft + newlen >= GET_MODE_BUFFER_SIZE){
-+ if(spaceLeft + newlen >= GET_MODE_BUFFER_SIZE - 1){
- ppMode->error++;
- break;
- }
diff --git a/debian/patches/post-0.7.1/0004-configure-add-missing-CFLAGS-to-fix-building-on-the-.patch b/debian/patches/post-0.7.1/0004-configure-add-missing-CFLAGS-to-fix-building-on-the-.patch
new file mode 100644
index 0000000..c3b0360
--- /dev/null
+++ b/debian/patches/post-0.7.1/0004-configure-add-missing-CFLAGS-to-fix-building-on-the-.patch
@@ -0,0 +1,27 @@
+From b37131f798941af1eb88e2d550203bdebb8b4324 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at debian.org>
+Date: Fri, 12 Aug 2011 14:11:21 +0200
+Subject: [PATCH 4/6] configure: add missing CFLAGS to fix building on the HURD
+
+Signed-off-by: Reinhard Tartler <siretart at tauware.de>
+Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
+(cherry picked from commit f60d13663742d1c695680ede83c4d646bc57d380)
+---
+ configure | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure b/configure
+index 5e40e08..b6e2ff9 100755
+--- a/configure
++++ b/configure
+@@ -2504,6 +2504,7 @@ case $target_os in
+ add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
+ ;;
+ gnu)
++ add_cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
+ ;;
+ qnx)
+ add_cppflags -D_QNX_SOURCE
+--
+1.7.4.1
+
diff --git a/debian/patches/post-0.7.1/0005-postprocess.c-filter-name-needs-to-be-double-0-termi.patch b/debian/patches/post-0.7.1/0005-postprocess.c-filter-name-needs-to-be-double-0-termi.patch
new file mode 100644
index 0000000..83a54e2
--- /dev/null
+++ b/debian/patches/post-0.7.1/0005-postprocess.c-filter-name-needs-to-be-double-0-termi.patch
@@ -0,0 +1,37 @@
+From 20ca827019a72bfacb38e73d0b8590e651818272 Mon Sep 17 00:00:00 2001
+From: Piotr Kaczuba <p.kaczuba at attika.ath.cx>
+Date: Mon, 30 May 2011 13:19:35 +0200
+Subject: [PATCH 5/6] postprocess.c: filter name needs to be double 0 terminated
+
+Signed-off-by: Reinhard Tartler <siretart at tauware.de>
+(cherry picked from commit f4f3300c09bb13eb7922e60888b55e3e0fb325e7)
+---
+ libpostproc/postprocess.c | 5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
+index dd50daf..eacf262 100644
+--- a/libpostproc/postprocess.c
++++ b/libpostproc/postprocess.c
+@@ -763,7 +763,8 @@ pp_mode *pp_get_mode_by_name_and_quality(const char *name, int quality)
+ ppMode->maxClippedThreshold= 0.01;
+ ppMode->error=0;
+
+- av_strlcpy(temp, name, GET_MODE_BUFFER_SIZE);
++ memset(temp, 0, GET_MODE_BUFFER_SIZE);
++ av_strlcpy(temp, name, GET_MODE_BUFFER_SIZE - 1);
+
+ av_log(NULL, AV_LOG_DEBUG, "pp: %s\n", name);
+
+@@ -819,7 +820,7 @@ pp_mode *pp_get_mode_by_name_and_quality(const char *name, int quality)
+
+ plen= strlen(p);
+ spaceLeft= p - temp + plen;
+- if(spaceLeft + newlen >= GET_MODE_BUFFER_SIZE){
++ if(spaceLeft + newlen >= GET_MODE_BUFFER_SIZE - 1){
+ ppMode->error++;
+ break;
+ }
+--
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
index d16e221..43960b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,9 @@
-01-Tweak-doxygen-config.patch
-02-make-MAP_ANONYMOUS_AVAILABLE.patch
-03-filter-name-needs-to-be-double-0-terminated.patch
-
post-0.7.1/0001-riff-Add-mpgv-MPEG-2-fourcc.patch
post-0.7.1/0002-jpegdec-actually-search-for-and-parse-RSTn.patch
post-0.7.1/0003-cavs-fix-some-crashes-with-invalid-bitstreams.patch
+post-0.7.1/0004-configure-add-missing-CFLAGS-to-fix-building-on-the-.patch
+post-0.7.1/0005-postprocess.c-filter-name-needs-to-be-double-0-termi.patch
+
+01-Tweak-doxygen-config.patch
+02-make-MAP_ANONYMOUS_AVAILABLE.patch
+
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list