[SCM] bs1770gain/master: Remove obsolete patches 20-audio-decode-problem.diff and 30-strict-cast-align.diff.
pere at users.alioth.debian.org
pere at users.alioth.debian.org
Wed Jun 24 16:00:52 UTC 2015
The following commit has been merged in the master branch:
commit 2e54a7d54f2d3676fb8d97a75f63750fdbc3882e
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Wed Jun 24 15:59:22 2015 +0000
Remove obsolete patches 20-audio-decode-problem.diff and 30-strict-cast-align.diff.
diff --git a/debian/patches/20-audio-decode-problem.diff b/debian/patches/20-audio-decode-problem.diff
deleted file mode 100644
index 066aa19..0000000
--- a/debian/patches/20-audio-decode-problem.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Emit message when skipping package when audio decoding fail.
-Author: Petter Reinholdtsen <pere at hungry.com>
-Bug-Debian: https://bugs.debian.org/789254
-Forwarded: no
-Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2015-06-23
-
-diff --git a/libffsox-2/ffsox_frame_reader.c b/libffsox-2/ffsox_frame_reader.c
-index d4f9f1c..0bda906 100755
---- a/libffsox-2/ffsox_frame_reader.c
-+++ b/libffsox-2/ffsox_frame_reader.c
-@@ -146,6 +146,7 @@ static int frame_reader_run(frame_reader_t *n)
-
- if ((size=avcodec_decode_audio4(cc,frame,&got_frame,pkt))<0) {
- // skip the package.
-+ DMESSAGE("decoding audio, skipping audio package");
- pkt->size=0;
- return 0;
- }
diff --git a/debian/patches/30-strict-cast-align.diff b/debian/patches/30-strict-cast-align.diff
deleted file mode 100644
index 958f2c7..0000000
--- a/debian/patches/30-strict-cast-align.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-Description: Enforce strict cast alignment check and fix build problems.
-
- When building with -Wstrict-align, the compiler warn about changing
- the alignment of some pointers on some architectures like mips.
- Because of this, upstream decided to remove -Wstrict-align from the
- default build. I believe it should be kept, to discover new aligment
- problems introduced into the code in the future.
-
- This patch reintroduces it and fixes the know issues reported by the
- compiler today.
-
- The AVFrame.data char pointer is storing data believed to be properly
- aligned by the ffmpeg library, thus the warning can be ignored. The
-
- The pull_cb_t and sox_reader_t pointers are believed to be OK, but
- this has not been verified.
-
- With the following patch, the code build on mips and the program is
- able to transcode a 16 bit wav file.
-
-Author: Petter Reinholdtsen <pere at hungry.com>
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/789250
-Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2015-06-24
-
---- a/libffsox-2/Makefile.in
-+++ b/libffsox-2/Makefile.in
-@@ -115,7 +115,7 @@ BS1770GAIN_TOOLS_UNINSTALL = @BS1770GAIN_TOOLS_UNINSTALL@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- #CFLAGS+=-Wcast-align
--CFLAGS = @CFLAGS@ -Werror -Wall -Wformat -Wpointer-arith -Wcast-qual \
-+CFLAGS = @CFLAGS@ -Werror -Wall -Wformat -Wpointer-arith -Wcast-qual -Wcast-align \
- -Wreturn-type -Wextra -Wstrict-prototypes
- CPP = @CPP@
- #CFLAGS+=-Wmissing-declarations
---- bs1770gain-0.4.3.orig/libffsox-2/ffsox_frame_convert.c
-+++ bs1770gain-0.4.3/libffsox-2/ffsox_frame_convert.c
-@@ -140,10 +140,10 @@ static int convert_##r##i##_##w##i(conve
- R *rp; \
- W *wp,*mp; \
- \
-- rp=(R *)p->fr->frame->data[0]; \
-+ rp=(R *)(void*)p->fr->frame->data[0]; \
- rp+=channels*p->fr->nb_samples.frame; \
- \
-- wp=(W *)p->fw->frame->data[0]; \
-+ wp=(W *)(void*)p->fw->frame->data[0]; \
- wp+=channels*p->fw->nb_samples.frame; \
- mp=wp+channels*p->nb_samples; \
- \
-@@ -281,11 +281,11 @@ static int convert_##r##p##_##w##i(conve
- W *wp,*mp; \
- \
- for (ch=0;ch<channels;++ch) { \
-- rp[ch]=(R *)p->fr->frame->data[ch]; \
-+ rp[ch]=(R *)(void*)p->fr->frame->data[ch]; \
- rp[ch]+=p->fr->nb_samples.frame; \
- } \
- \
-- wp=(W *)p->fw->frame->data[0]; \
-+ wp=(W *)(void*)p->fw->frame->data[0]; \
- wp+=channels*p->fw->nb_samples.frame; \
- mp=wp+channels*p->nb_samples; \
- \
---- bs1770gain-0.4.3.orig/libffsox-2/ffsox_frame_convert_sox.c
-+++ bs1770gain-0.4.3/libffsox-2/ffsox_frame_convert_sox.c
-@@ -98,10 +98,10 @@ static void convert_##sfx##i(convert_t *
- \
- (void)ch; \
- \
-- rp=(T *)p->fr->frame->data[0]; \
-+ rp=(T *)(void*)p->fr->frame->data[0]; \
- rp+=channels*p->fr->nb_samples.frame; \
- \
-- wp=(sox_sample_t *)p->fw->frame->data[0]; \
-+ wp=(sox_sample_t *)(void*)p->fw->frame->data[0]; \
- wp+=channels*p->fw->nb_samples.frame; \
- mp=wp+channels*p->nb_samples; \
- \
-@@ -184,11 +184,11 @@ static void convert_##sfx##p(convert_t *
- SOX_SAMPLE_LOCALS; \
- \
- for (ch=0;ch<channels;++ch) { \
-- rp[ch]=(T *)p->fr->frame->data[ch]; \
-+ rp[ch]=(T *)(void*)p->fr->frame->data[ch]; \
- rp[ch]+=p->fr->nb_samples.frame; \
- } \
- \
-- wp=(sox_sample_t *)p->fw->frame->data[0]; \
-+ wp=(sox_sample_t *)(void*)p->fw->frame->data[0]; \
- wp+=channels*p->fw->nb_samples.frame; \
- mp=wp+channels*p->nb_samples; \
- \
---- bs1770gain-0.4.3.orig/libffsox-2/ffsox_sox_pull_handler.c
-+++ bs1770gain-0.4.3/libffsox-2/ffsox_sox_pull_handler.c
-@@ -32,7 +32,7 @@ static int getopts(sox_effect_t *e, int
- {
- priv_t *priv=e->priv;
-
-- priv->cb=1<argc?(pull_cb_t)argv[1]:NULL;
-+ priv->cb=1<argc?(pull_cb_t)(void*)argv[1]:NULL;
- priv->data=2<argc?(void *)argv[2]:NULL;
-
- return SOX_SUCCESS;
---- bs1770gain-0.4.3.orig/libffsox-2/ffsox_sox_read_handler.c
-+++ bs1770gain-0.4.3/libffsox-2/ffsox_sox_read_handler.c
-@@ -36,7 +36,7 @@ static int getopts(sox_effect_t *e, int
- goto argc;
- }
-
-- priv->read=(sox_reader_t *)argv[1];
-+ priv->read=(sox_reader_t *)(void*)argv[1];
-
- return SOX_SUCCESS;
- argc:
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7ab312f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-#20-audio-decode-problem.diff
-#30-strict-cast-align.diff
--
bs1770gain packaging
More information about the pkg-multimedia-commits
mailing list