[SCM] libav/experimental: apply post 11~alpha1 patches
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:04:19 UTC 2014
The following commit has been merged in the experimental branch:
commit afcf572304e42876da20b95de3a2aaff20b3071d
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun Aug 10 11:57:08 2014 -0400
apply post 11~alpha1 patches
diff --git a/debian/patches/series b/debian/patches/series
index 3199e41..66698be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,8 @@
03-disable-configuration-warnings.patch
+upstream/0001-tiff-Improve-grayscale-support.patch
+upstream/0002-configure-Add-probe-identification-of-MS-armasm.patch
+upstream/0003-configure-Enable-gas-preprocessor-on-all-OSes-but-on.patch
+upstream/0004-configure-Suggest-upgrading-gas-preprocessor-instead.patch
+upstream/0005-Prepare-for-11_alpha2-Release.patch
+upstream/0006-mpegts-Return-proper-error-code-on-invalid-input-dat.patch
+upstream/0007-lavc-drop-the-av_fast_-re-m-alloc-compatibility-wrap.patch
diff --git a/debian/patches/upstream/0001-tiff-Improve-grayscale-support.patch b/debian/patches/upstream/0001-tiff-Improve-grayscale-support.patch
new file mode 100644
index 0000000..15f8e32
--- /dev/null
+++ b/debian/patches/upstream/0001-tiff-Improve-grayscale-support.patch
@@ -0,0 +1,60 @@
+From 2597a842a0a2c7e8aa76f32733d27bf64817ae86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes at flameeyes.eu>
+Date: Sat, 9 Aug 2014 14:19:45 +0100
+Subject: [PATCH 1/7] tiff: Improve grayscale support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Only use PAL8 if palette is present, else use GRAY8 for pixfmt.
+
+Instead of simulating a grayscale palette, use real grayscale pixels, if no
+palette is actually defined.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes at flameeyes.eu>
+Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
+---
+ libavcodec/tiff.c | 14 +++-----------
+ 1 file changed, 3 insertions(+), 11 deletions(-)
+
+diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
+index 2aff45a..ca5ec75 100644
+--- a/libavcodec/tiff.c
++++ b/libavcodec/tiff.c
+@@ -246,15 +246,14 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
+
+ static int init_image(TiffContext *s, AVFrame *frame)
+ {
+- int i, ret;
+- uint32_t *pal;
++ int ret;
+
+ switch (s->bpp * 10 + s->bppcount) {
+ case 11:
+ s->avctx->pix_fmt = AV_PIX_FMT_MONOBLACK;
+ break;
+ case 81:
+- s->avctx->pix_fmt = AV_PIX_FMT_PAL8;
++ s->avctx->pix_fmt = s->palette_is_set ? AV_PIX_FMT_PAL8 : AV_PIX_FMT_GRAY8;
+ break;
+ case 243:
+ s->avctx->pix_fmt = AV_PIX_FMT_RGB24;
+@@ -290,14 +289,7 @@ static int init_image(TiffContext *s, AVFrame *frame)
+ return ret;
+ }
+ if (s->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
+- if (s->palette_is_set) {
+- memcpy(frame->data[1], s->palette, sizeof(s->palette));
+- } else {
+- /* make default grayscale pal */
+- pal = (uint32_t *) frame->data[1];
+- for (i = 0; i < 256; i++)
+- pal[i] = i * 0x010101;
+- }
++ memcpy(frame->data[1], s->palette, sizeof(s->palette));
+ }
+ return 0;
+ }
+--
+1.9.1
+
diff --git a/debian/patches/upstream/0002-configure-Add-probe-identification-of-MS-armasm.patch b/debian/patches/upstream/0002-configure-Add-probe-identification-of-MS-armasm.patch
new file mode 100644
index 0000000..40f5d58
--- /dev/null
+++ b/debian/patches/upstream/0002-configure-Add-probe-identification-of-MS-armasm.patch
@@ -0,0 +1,32 @@
+From f4312352fc52cc47c1ba398a33f629d32a737e91 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
+Date: Sat, 9 Aug 2014 22:25:44 +0300
+Subject: [PATCH 2/7] configure: Add probe identification of MS armasm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Martin Storsjö <martin at martin.st>
+---
+ configure | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/configure b/configure
+index c128b29..b9626e7 100755
+--- a/configure
++++ b/configure
+@@ -2883,6 +2883,11 @@ probe_cc(){
+ _cflags_size="-O2 -Munroll=c:1 $opt_common"
+ _cflags_noopt="-O1"
+ _flags_filter=pgi_flags
++ elif $_cc 2>&1 | grep -q 'Microsoft.*ARM.*Assembler'; then
++ _type=armasm
++ _ident=$($_cc | head -n1)
++ # 4509: "This form of conditional instruction is deprecated"
++ _flags="-nologo -ignore 4509"
+ elif $_cc 2>&1 | grep -q Microsoft; then
+ _type=msvc
+ _ident=$($cc 2>&1 | head -n1)
+--
+1.9.1
+
diff --git a/debian/patches/upstream/0003-configure-Enable-gas-preprocessor-on-all-OSes-but-on.patch b/debian/patches/upstream/0003-configure-Enable-gas-preprocessor-on-all-OSes-but-on.patch
new file mode 100644
index 0000000..b8b7389
--- /dev/null
+++ b/debian/patches/upstream/0003-configure-Enable-gas-preprocessor-on-all-OSes-but-on.patch
@@ -0,0 +1,60 @@
+From 9f8cf50e3be04b8e178086edaa4598826143303d Mon Sep 17 00:00:00 2001
+From: Diego Biurrun <diego at biurrun.de>
+Date: Sat, 9 Aug 2014 08:06:12 -0700
+Subject: [PATCH 3/7] configure: Enable gas-preprocessor on all OSes but only
+ if available
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Martin Storsjö <martin at martin.st>
+---
+ configure | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index b9626e7..684a93c 100755
+--- a/configure
++++ b/configure
+@@ -2199,8 +2199,6 @@ ranlib="ranlib"
+ strip="strip"
+ yasmexe="yasm"
+
+-nogas=":"
+-
+ # machine
+ arch_default=$(uname -m)
+ cpu="generic"
+@@ -3424,7 +3422,6 @@ case $target_os in
+ add_extralibs -lpoll -lgnugetopt
+ ;;
+ darwin)
+- gas="gas-preprocessor.pl $cc"
+ enabled ppc && add_asflags -force_cpusubtype_ALL
+ SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
+ enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
+@@ -3783,8 +3780,21 @@ EOF
+ }
+
+ if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
++ nogas=:
+ enabled_any arm aarch64 && nogas=die
+ enabled_all ppc altivec && nogas=warn
++ as_noop=-v
++
++ case $as_type in
++ arm*) gaspp_as_type=armasm; as_noop=-h ;;
++ gcc) gaspp_as_type=gas ;;
++ *) gaspp_as_type=$as_type ;;
++ esac
++
++ [ $target_os = "darwin" ] && gaspp_as_type="apple-$gaspp_as_type"
++
++ check_cmd gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type -- $as $as_noop &&
++ gas="gas-preprocessor.pl -arch $arch -as-type $gaspp_as_type -- $as"
+
+ if ! check_gas ; then
+ as=${gas:=$as}
+--
+1.9.1
+
diff --git a/debian/patches/upstream/0004-configure-Suggest-upgrading-gas-preprocessor-instead.patch b/debian/patches/upstream/0004-configure-Suggest-upgrading-gas-preprocessor-instead.patch
new file mode 100644
index 0000000..3057bae
--- /dev/null
+++ b/debian/patches/upstream/0004-configure-Suggest-upgrading-gas-preprocessor-instead.patch
@@ -0,0 +1,32 @@
+From ab0742d2f34d70415620441b7ed7da2f03a0c14f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
+Date: Sun, 10 Aug 2014 16:05:41 +0300
+Subject: [PATCH 4/7] configure: Suggest upgrading gas-preprocessor instead of
+ just installing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Older versions don't support all the features we test for now.
+
+Signed-off-by: Martin Storsjö <martin at martin.st>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 684a93c..411af5e 100755
+--- a/configure
++++ b/configure
+@@ -3799,7 +3799,7 @@ if enabled_any arm aarch64 || enabled_all ppc altivec && enabled asm; then
+ if ! check_gas ; then
+ as=${gas:=$as}
+ check_gas || \
+- $nogas "GNU assembler not found, install gas-preprocessor"
++ $nogas "GNU assembler not found, install/update gas-preprocessor"
+ fi
+
+ check_as <<EOF && enable as_func
+--
+1.9.1
+
diff --git a/debian/patches/upstream/0005-Prepare-for-11_alpha2-Release.patch b/debian/patches/upstream/0005-Prepare-for-11_alpha2-Release.patch
new file mode 100644
index 0000000..16395f4
--- /dev/null
+++ b/debian/patches/upstream/0005-Prepare-for-11_alpha2-Release.patch
@@ -0,0 +1,19 @@
+From 59cc0812207e3c2e2f2e559d60d0a8f9296a8847 Mon Sep 17 00:00:00 2001
+From: Reinhard Tartler <siretart at tauware.de>
+Date: Sun, 10 Aug 2014 10:07:55 -0400
+Subject: [PATCH 5/7] Prepare for 11_alpha2 Release
+
+---
+ RELEASE | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/RELEASE b/RELEASE
+index 086e7dc..83512dd 100644
+--- a/RELEASE
++++ b/RELEASE
+@@ -1 +1 @@
+-11_alpha1
++11_alpha2
+--
+1.9.1
+
diff --git a/debian/patches/upstream/0006-mpegts-Return-proper-error-code-on-invalid-input-dat.patch b/debian/patches/upstream/0006-mpegts-Return-proper-error-code-on-invalid-input-dat.patch
new file mode 100644
index 0000000..d170162
--- /dev/null
+++ b/debian/patches/upstream/0006-mpegts-Return-proper-error-code-on-invalid-input-dat.patch
@@ -0,0 +1,62 @@
+From 8dca0877e3e1457e9ec79ffa1ead1135aabb791c Mon Sep 17 00:00:00 2001
+From: Nidhi Makhijani <nidhimj22 at gmail.com>
+Date: Sat, 9 Aug 2014 23:49:12 +0530
+Subject: [PATCH 6/7] mpegts: Return proper error code on invalid input data
+
+Signed-off-by: Diego Biurrun <diego at biurrun.de>
+---
+ libavformat/mpegtsenc.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
+index 457b2e7..b210b02 100644
+--- a/libavformat/mpegtsenc.c
++++ b/libavformat/mpegtsenc.c
+@@ -165,7 +165,7 @@ static int mpegts_write_section1(MpegTSSection *s, int tid, int id,
+ tot_len = 3 + 5 + len + 4;
+ /* check if not too big */
+ if (tot_len > 1024)
+- return -1;
++ return AVERROR_INVALIDDATA;
+
+ q = section;
+ *q++ = tid;
+@@ -1006,7 +1006,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
+
+ if (ts_st->first_pts_check && pts == AV_NOPTS_VALUE) {
+ av_log(s, AV_LOG_ERROR, "first pts value must set\n");
+- return AVERROR(EINVAL);
++ return AVERROR_INVALIDDATA;
+ }
+ ts_st->first_pts_check = 0;
+
+@@ -1017,7 +1017,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
+ if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {
+ av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, "
+ "no startcode found, use -bsf h264_mp4toannexb\n");
+- return AVERROR(EINVAL);
++ return AVERROR_INVALIDDATA;
+ }
+
+ do {
+@@ -1040,7 +1040,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
+ } else if (st->codec->codec_id == AV_CODEC_ID_AAC) {
+ if (pkt->size < 2) {
+ av_log(s, AV_LOG_ERROR, "AAC packet too short\n");
+- return AVERROR(EINVAL);
++ return AVERROR_INVALIDDATA;
+ }
+ if ((AV_RB16(pkt->data) & 0xfff0) != 0xfff0) {
+ int ret;
+@@ -1049,7 +1049,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
+ if (!ts_st->amux) {
+ av_log(s, AV_LOG_ERROR, "AAC bitstream not in ADTS format "
+ "and extradata missing\n");
+- return AVERROR(EINVAL);
++ return AVERROR_INVALIDDATA;
+ }
+
+ av_init_packet(&pkt2);
+--
+1.9.1
+
diff --git a/debian/patches/upstream/0007-lavc-drop-the-av_fast_-re-m-alloc-compatibility-wrap.patch b/debian/patches/upstream/0007-lavc-drop-the-av_fast_-re-m-alloc-compatibility-wrap.patch
new file mode 100644
index 0000000..36ab2a1
--- /dev/null
+++ b/debian/patches/upstream/0007-lavc-drop-the-av_fast_-re-m-alloc-compatibility-wrap.patch
@@ -0,0 +1,36 @@
+From d63443b9684fa7b3e086634f7b44b203b6d9221e Mon Sep 17 00:00:00 2001
+From: Anton Khirnov <anton at khirnov.net>
+Date: Sun, 10 Aug 2014 10:13:30 +0000
+Subject: [PATCH 7/7] lavc: drop the av_fast_{re,m}alloc compatibility wrappers
+
+They were only needed until the bump.
+---
+ libavcodec/utils.c | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/libavcodec/utils.c b/libavcodec/utils.c
+index b115da1..4253e8c 100644
+--- a/libavcodec/utils.c
++++ b/libavcodec/utils.c
+@@ -56,18 +56,6 @@ static int (*lockmgr_cb)(void **mutex, enum AVLockOp op);
+ static void *codec_mutex;
+ static void *avformat_mutex;
+
+-#if FF_API_FAST_MALLOC && CONFIG_SHARED && HAVE_SYMVER
+-FF_SYMVER(void*, av_fast_realloc, (void *ptr, unsigned int *size, size_t min_size), "LIBAVCODEC_55")
+-{
+- return av_fast_realloc(ptr, size, min_size);
+-}
+-
+-FF_SYMVER(void, av_fast_malloc, (void *ptr, unsigned int *size, size_t min_size), "LIBAVCODEC_55")
+-{
+- av_fast_malloc(ptr, size, min_size);
+-}
+-#endif
+-
+ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size)
+ {
+ void **p = ptr;
+--
+1.9.1
+
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list