public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/sox] rawhide: Remove obsolete downstream patches
@ 2026-09-02 22:08 Gerald B Cox
0 siblings, 0 replies; only message in thread
From: Gerald B Cox @ 2026-09-02 22:08 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/sox
Branch : rawhide
Commit : 86ba5bcc4cd919b55bf7cca2a1e10fe2a7858e4a
Author : Gerald B Cox <gbcox@fedoraproject.org>
Date : 2026-09-02T15:08:31-07:00
Stats : +0/-495 in 13 file(s)
URL : https://src.fedoraproject.org/rpms/sox/c/86ba5bcc4cd919b55bf7cca2a1e10fe2a7858e4a?branch=rawhide
Log:
Remove obsolete downstream patches
---
diff --git a/sox-14.4.2-bug_1226675_fix.patch b/sox-14.4.2-bug_1226675_fix.patch
deleted file mode 100644
index c4279f5..0000000
--- a/sox-14.4.2-bug_1226675_fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/src/ao.c b/src/ao.c
-index 4791d4e..3d6431d 100644
---- a/src/ao.c
-+++ b/src/ao.c
-@@ -34,9 +34,21 @@ typedef struct {
- static int startwrite(sox_format_t * ft)
- {
- priv_t * ao = (priv_t *)ft->priv;
-+ unsigned bytes_per_sample = (ft->encoding.bits_per_sample + 7) >> 3;
-
-- ao->buf_size = sox_globals.bufsiz - (sox_globals.bufsiz % (ft->encoding.bits_per_sample >> 3));
-- ao->buf_size *= (ft->encoding.bits_per_sample >> 3);
-+ if (bytes_per_sample == 0)
-+ {
-+ lsx_fail("startwrite [ao driver]: Corrupted encoding data (bits per sample should not be zero)");
-+ return SOX_EOF;
-+ }
-+
-+ /* Since sox_sw_write_buf works with 16-bit samples, ensure there is an enough room */
-+ if (bytes_per_sample < 2)
-+ bytes_per_sample = 2;
-+ /* Align the buffer size to the boundary divisible by bytes_per_sample */
-+ ao->buf_size = sox_globals.bufsiz - (sox_globals.bufsiz % bytes_per_sample);
-+ /* - add back possibly truncated bytes */
-+ ao->buf_size += bytes_per_sample;
- ao->buf = lsx_malloc(ao->buf_size);
-
- if (!ao->buf)
-@@ -90,12 +102,17 @@ static void sox_sw_write_buf(char *buf1, sox_sample_t const * buf2, size_t len,
- static size_t write_samples(sox_format_t *ft, const sox_sample_t *buf, size_t len)
- {
- priv_t * ao = (priv_t *)ft->priv;
-+ /* This will be always > 0 in the case the format handler is properly used */
-+ unsigned bytes_per_sample = (ft->encoding.bits_per_sample + 7) >> 3;
- uint_32 aobuf_size;
-
-- if (len > ao->buf_size / (ft->encoding.bits_per_sample >> 3))
-- len = ao->buf_size / (ft->encoding.bits_per_sample >> 3);
-+ /* Normalize the number of samples */
-+ if (bytes_per_sample < 2)
-+ bytes_per_sample = 2;
-+ if (len > ao->buf_size / bytes_per_sample)
-+ len = ao->buf_size / bytes_per_sample;
-
-- aobuf_size = (ft->encoding.bits_per_sample >> 3) * len;
-+ aobuf_size = bytes_per_sample * len;
-
- sox_sw_write_buf(ao->buf, buf, len, ft->encoding.reverse_bytes,
- &(ft->clips));
diff --git a/sox-14.4.2-bug_1480678_fix.patch b/sox-14.4.2-bug_1480678_fix.patch
deleted file mode 100644
index ad2b408..0000000
--- a/sox-14.4.2-bug_1480678_fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/src/wav.c
-+++ b/src/wav.c
-@@ -712,6 +712,11 @@
- ft->signal.channels = wChannels;
- else
- lsx_report("User options overriding channels read in .wav header");
-+
-+ if (ft->signal.channels == 0) {
-+ lsx_fail_errno(ft, SOX_EHDR, "Channel count is zero");
-+ return SOX_EOF;
-+ }
-
- if (ft->signal.rate == 0 || ft->signal.rate == dwSamplesPerSecond)
- ft->signal.rate = dwSamplesPerSecond;
---- a/src/hcom.c
-+++ b/src/hcom.c
-@@ -73,6 +73,14 @@
- size_t pos; /* Where next byte goes */
- } priv_t;
-
-+static int dictvalid(int n, int size, int left, int right)
-+{
-+ if (n > 0 && left < 0)
-+ return 1;
-+
-+ return (unsigned)left < size && (unsigned)right < size;
-+}
-+
- static int startread(sox_format_t * ft)
- {
- priv_t *p = (priv_t *) ft->priv;
-@@ -150,6 +158,11 @@
- lsx_debug("%d %d",
- p->dictionary[i].dict_leftson,
- p->dictionary[i].dict_rightson);
-+ if (!dictvalid(i, dictsize, p->dictionary[i].dict_leftson,
-+ p->dictionary[i].dict_rightson)) {
-+ lsx_fail_errno(ft, SOX_EHDR, "Invalid dictionary");
-+ return SOX_EOF;
-+ }
- }
- rc = lsx_skipbytes(ft, (size_t) 1); /* skip pad byte */
- if (rc)
---- a/src/wav.c
-+++ b/src/wav.c
-@@ -1381,6 +1381,12 @@
- int bytespersample; /* (uncompressed) bytes per sample (per channel) */
- long blocksWritten = 0;
- sox_bool isExtensible = sox_false; /* WAVE_FORMAT_EXTENSIBLE? */
-+
-+ if (ft->signal.channels > UINT16_MAX) {
-+ lsx_fail_errno(ft, SOX_EOF, "Too many channels (%u)",
-+ ft->signal.channels);
-+ return SOX_EOF;
-+ }
-
- dwSamplesPerSecond = ft->signal.rate;
- wChannels = ft->signal.channels;
diff --git a/sox-14.4.2-bug_1500553_fix.patch b/sox-14.4.2-bug_1500553_fix.patch
deleted file mode 100644
index 3bbbf00..0000000
--- a/sox-14.4.2-bug_1500553_fix.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/src/adpcm.c b/src/adpcm.c
-index 2e13867..f64b7d5 100644
---- a/src/adpcm.c
-+++ b/src/adpcm.c
-@@ -71,6 +71,11 @@ const short lsx_ms_adpcm_i_coef[7][2] = {
- { 392,-232}
- };
-
-+extern void *lsx_ms_adpcm_alloc(unsigned chans)
-+{
-+ return lsx_malloc(chans * sizeof(MsState_t));
-+}
-+
- static inline sox_sample_t AdpcmDecode(sox_sample_t c, MsState_t *state,
- sox_sample_t sample1, sox_sample_t sample2)
- {
-@@ -102,6 +107,7 @@ static inline sox_sample_t AdpcmDecode(sox_sample_t c, MsState_t *state,
-
- /* lsx_ms_adpcm_block_expand_i() outputs interleaved samples into one output buffer */
- const char *lsx_ms_adpcm_block_expand_i(
-+ void *priv,
- unsigned chans, /* total channels */
- int nCoef,
- const short *coef,
-@@ -113,7 +119,7 @@ const char *lsx_ms_adpcm_block_expand_i(
- const unsigned char *ip;
- unsigned ch;
- const char *errmsg = NULL;
-- MsState_t state[4]; /* One decompressor state for each channel */
-+ MsState_t *state = priv; /* One decompressor state for each channel */
-
- /* Read the four-byte header for each channel */
- ip = ibuff;
-diff --git a/src/adpcm.h b/src/adpcm.h
-index af4d6f0..db5cc61 100644
---- a/src/adpcm.h
-+++ b/src/adpcm.h
-@@ -29,8 +29,11 @@
- /* default coef sets */
- extern const short lsx_ms_adpcm_i_coef[7][2];
-
-+extern void *lsx_ms_adpcm_alloc(unsigned chans);
-+
- /* lsx_ms_adpcm_block_expand_i() outputs interleaved samples into one output buffer */
- extern const char *lsx_ms_adpcm_block_expand_i(
-+ void *priv,
- unsigned chans, /* total channels */
- int nCoef,
- const short *coef,
-diff --git a/src/wav.c b/src/wav.c
-index 3e80e69..f7e72c2 100644
---- a/src/wav.c
-+++ b/src/wav.c
-@@ -82,6 +82,7 @@ typedef struct {
- /* following used by *ADPCM wav files */
- unsigned short nCoefs; /* ADPCM: number of coef sets */
- short *lsx_ms_adpcm_i_coefs; /* ADPCM: coef sets */
-+ void *ms_adpcm_data; /* Private data of adpcm decoder */
- unsigned char *packet; /* Temporary buffer for packets */
- short *samples; /* interleaved samples buffer */
- short *samplePtr; /* Pointer to current sample */
-@@ -175,7 +176,7 @@ static unsigned short AdpcmReadBlock(sox_format_t * ft)
- }
- }
-
-- errmsg = lsx_ms_adpcm_block_expand_i(ft->signal.channels, wav->nCoefs, wav->lsx_ms_adpcm_i_coefs, wav->packet, wav->samples, samplesThisBlock);
-+ errmsg = lsx_ms_adpcm_block_expand_i(wav->ms_adpcm_data, ft->signal.channels, wav->nCoefs, wav->lsx_ms_adpcm_i_coefs, wav->packet, wav->samples, samplesThisBlock);
-
- if (errmsg)
- lsx_warn("%s", errmsg);
-@@ -786,6 +787,7 @@ static int startread(sox_format_t * ft)
-
- /* nCoefs, lsx_ms_adpcm_i_coefs used by adpcm.c */
- wav->lsx_ms_adpcm_i_coefs = lsx_malloc(wav->nCoefs * 2 * sizeof(short));
-+ wav->ms_adpcm_data = lsx_ms_adpcm_alloc(wChannels);
- {
- int i, errct=0;
- for (i=0; len>=2 && i < 2*wav->nCoefs; i++) {
-@@ -1211,6 +1213,7 @@ static int stopread(sox_format_t * ft)
- free(wav->packet);
- free(wav->samples);
- free(wav->lsx_ms_adpcm_i_coefs);
-+ free(wav->ms_adpcm_data);
- free(wav->comment);
- wav->comment = NULL;
-
diff --git a/sox-14.4.2-bug_1500554_fix.patch b/sox-14.4.2-bug_1500554_fix.patch
deleted file mode 100644
index 473c383..0000000
--- a/sox-14.4.2-bug_1500554_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ef3d8be0f80cbb650e4766b545d61e10d7a24c9e Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Sun, 5 Nov 2017 16:21:23 +0000
-Subject: [PATCH] wav: ima_adpcm: fix buffer overflow on corrupt input
- (CVE-2017-15370)
-
-Add the same check bad block size as was done for MS adpcm in commit
-f39c574b ("More checks for invalid MS ADPCM blocks").
----
- src/wav.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/wav.c b/src/wav.c
-index 5202556c..3e80e692 100644
---- a/src/wav.c
-+++ b/src/wav.c
-@@ -127,7 +127,7 @@ static unsigned short ImaAdpcmReadBlock(sox_format_t * ft)
- /* work with partial blocks. Specs say it should be null */
- /* padded but I guess this is better than trailing quiet. */
- samplesThisBlock = lsx_ima_samples_in((size_t)0, (size_t)ft->signal.channels, bytesRead, (size_t) 0);
-- if (samplesThisBlock == 0)
-+ if (samplesThisBlock == 0 || samplesThisBlock > wav->samplesPerBlock)
- {
- lsx_warn("Premature EOF on .wav input file");
- return 0;
diff --git a/sox-14.4.2-bug_1500570_fix.patch b/sox-14.4.2-bug_1500570_fix.patch
deleted file mode 100644
index cde253d..0000000
--- a/sox-14.4.2-bug_1500570_fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 818bdd0ccc1e5b6cae742c740c17fd414935cf39 Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Sun, 5 Nov 2017 15:57:48 +0000
-Subject: [PATCH] flac: fix crash on corrupt metadata (CVE-2017-15371)
-
----
- src/flac.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-Index: sox/src/flac.c
-===================================================================
---- sox.orig/src/flac.c
-+++ sox/src/flac.c
-@@ -119,9 +119,10 @@ static void decoder_metadata_callback(FL
- p->total_samples = metadata->data.stream_info.total_samples;
- }
- else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
-+ const FLAC__StreamMetadata_VorbisComment *vc = &metadata->data.vorbis_comment;
- size_t i;
-
-- if (metadata->data.vorbis_comment.num_comments == 0)
-+ if (vc->num_comments == 0)
- return;
-
- if (ft->oob.comments != NULL) {
-@@ -129,8 +130,9 @@ static void decoder_metadata_callback(FL
- return;
- }
-
-- for (i = 0; i < metadata->data.vorbis_comment.num_comments; ++i)
-- sox_append_comment(&ft->oob.comments, (char const *) metadata->data.vorbis_comment.comments[i].entry);
-+ for (i = 0; i < vc->num_comments; ++i)
-+ if (vc->comments[i].entry)
-+ sox_append_comment(&ft->oob.comments, (char const *) vc->comments[i].entry);
- }
- }
-
diff --git a/sox-14.4.2-bug_1510923_fix.patch b/sox-14.4.2-bug_1510923_fix.patch
deleted file mode 100644
index 772a0bb..0000000
--- a/sox-14.4.2-bug_1510923_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/aiff.c b/src/aiff.c
-index 240d2e1..11ddb54 100644
---- a/src/aiff.c
-+++ b/src/aiff.c
-@@ -62,7 +62,6 @@ int lsx_aiffstartread(sox_format_t * ft)
- size_t ssndsize = 0;
- char *annotation;
- char *author;
-- char *comment = NULL;
- char *copyright;
- char *nametext;
-
-@@ -270,6 +269,7 @@ int lsx_aiffstartread(sox_format_t * ft)
- free(annotation);
- }
- else if (strncmp(buf, "COMT", (size_t)4) == 0) {
-+ char *comment = NULL;
- rc = commentChunk(&comment, "Comment:", ft);
- if (rc) {
- /* Fail already called in function */
diff --git a/sox-14.4.2-bug_1545867_fix.patch b/sox-14.4.2-bug_1545867_fix.patch
deleted file mode 100644
index 562cb22..0000000
--- a/sox-14.4.2-bug_1545867_fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-A corrupt header specifying zero channels would send read_channels()
-into an infinite loop. Prevent this by sanity checking the channel
-count in open_read(). Also add an upper bound to prevent overflow
-in multiplication.
----
- src/xa.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/xa.c b/src/xa.c
-index 81a767720d93..9fc086eca2b2 100644
---- a/src/xa.c
-+++ b/src/xa.c
-@@ -143,6 +143,12 @@ static int startread(sox_format_t * ft)
- lsx_report("User options overriding rate read in .xa header");
- }
-
-+ if (ft->signal.channels == 0 || ft->signal.channels > UINT16_MAX) {
-+ lsx_fail_errno(ft, SOX_EFMT, "invalid channel count %d",
-+ ft->signal.channels);
-+ return SOX_EOF;
-+ }
-+
- /* Check for supported formats */
- if (ft->encoding.bits_per_sample != 16) {
- lsx_fail_errno(ft, SOX_EFMT, "%d-bit sample resolution not supported.",
---
-2.17.0
diff --git a/sox-14.4.2-fsf_address_fix.patch b/sox-14.4.2-fsf_address_fix.patch
deleted file mode 100644
index 4c6e537..0000000
--- a/sox-14.4.2-fsf_address_fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f4853a8119d22096fbe9fd076799a105e3b3abb7 Mon Sep 17 00:00:00 2001
-From: Jiri Kucera <jkucera@redhat.com>
-Date: Tue, 30 Jan 2018 00:29:19 +0100
-Subject: [PATCH] Fixed FSF address
-
----
- src/ladspa.h | 25 ++++++++++++-------------
- 1 file changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/src/ladspa.h b/src/ladspa.h
-index 5c30a8a..299412b 100644
---- a/src/ladspa.h
-+++ b/src/ladspa.h
-@@ -3,21 +3,20 @@
- Linux Audio Developer's Simple Plugin API Version 1.1[LGPL].
- Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis,
- Stefan Westerfeld.
--
-- This library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public License
-- as published by the Free Software Foundation; either version 2.1 of
-- the License, or (at your option) any later version.
--
-+
-+ This library is free software; you can redistribute it and/or modify it
-+ under the terms of the GNU Lesser General Public License as published by
-+ the Free Software Foundation; either version 2.1 of the License, or (at
-+ your option) any later version.
-+
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with this library; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-- USA. */
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
-+ General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public License
-+ along with this library; if not, write to the Free Software Foundation,
-+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-
- #ifndef LADSPA_INCLUDED
- #define LADSPA_INCLUDED
diff --git a/sox-14.4.2-hcom_stopwrite_big_endian_bug_fix.patch b/sox-14.4.2-hcom_stopwrite_big_endian_bug_fix.patch
deleted file mode 100644
index 9aa8206..0000000
--- a/sox-14.4.2-hcom_stopwrite_big_endian_bug_fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/hcom.c b/src/hcom.c
-index e76820e..fb8de99 100644
---- a/src/hcom.c
-+++ b/src/hcom.c
-@@ -428,12 +428,19 @@ static int stopwrite(sox_format_t * ft)
- {
- priv_t *p = (priv_t *) ft->priv;
- unsigned char *compressed_data = p->data;
-- size_t compressed_len = p->pos;
-+ int32_t compressed_len = (int32_t)p->pos;
- int rc = SOX_SUCCESS;
-
-+ if (p->pos >> 32 > 0)
-+ lsx_warn(
-+ "%s: possible data loss"
-+ " (the size of data to be written has exceeded its limit)",
-+ ft->filename
-+ );
-+
- /* Compress it all at once */
- if (compressed_len)
-- compress(ft, &compressed_data, (int32_t *)&compressed_len);
-+ compress(ft, &compressed_data, &compressed_len);
- free(p->data);
-
- /* Write the header */
-@@ -447,7 +454,7 @@ static int stopwrite(sox_format_t * ft)
- if (lsx_error(ft)) {
- lsx_fail_errno(ft, errno, "write error in HCOM header");
- rc = SOX_EOF;
-- } else if (lsx_writebuf(ft, compressed_data, compressed_len) != compressed_len) {
-+ } else if (lsx_writebuf(ft, compressed_data, (size_t) compressed_len) != (size_t) compressed_len) {
- /* Write the compressed_data fork */
- lsx_fail_errno(ft, errno, "can't write compressed HCOM data");
- rc = SOX_EOF;
-@@ -456,7 +463,7 @@ static int stopwrite(sox_format_t * ft)
-
- if (rc == SOX_SUCCESS)
- /* Pad the compressed_data fork to a multiple of 128 bytes */
-- lsx_padbytes(ft, 128u - (compressed_len % 128));
-+ lsx_padbytes(ft, (size_t) 128 - (compressed_len % 128));
-
- return rc;
- }
diff --git a/sox-14.4.2-installcheck_fix.patch b/sox-14.4.2-installcheck_fix.patch
deleted file mode 100644
index 0d654a0..0000000
--- a/sox-14.4.2-installcheck_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9c0842680a4a46ef64990d6c40de05aa30286d54 Mon Sep 17 00:00:00 2001
-From: Jiri Kucera <jkucera@redhat.com>
-Date: Thu, 25 Jan 2018 21:53:30 +0100
-Subject: [PATCH] Added $(DESTDIR) in front of ${bindir} so proper sox binary
- is invoked during tests
-
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7cceaaf..caf9864 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -194,6 +194,6 @@ loc:
- # would run the test suite, but an uninstalled libltdl build cannot
- # currently load its formats and effects, so the checks would fail.
- installcheck:
-- $(srcdir)/tests.sh --bindir=${bindir} --builddir=${builddir} --srcdir=${srcdir}
-- $(srcdir)/testall.sh --bindir=${bindir} --srcdir=${srcdir}
-+ $(srcdir)/tests.sh --bindir=$(DESTDIR)${bindir} --builddir=${builddir} --srcdir=${srcdir}
-+ $(srcdir)/testall.sh --bindir=$(DESTDIR)${bindir} --srcdir=${srcdir}
-
diff --git a/sox-14.4.2-lpc10.patch b/sox-14.4.2-lpc10.patch
deleted file mode 100644
index da359be..0000000
--- a/sox-14.4.2-lpc10.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur sox-14.4.2.orig/configure.ac sox-14.4.2/configure.ac
---- sox-14.4.2.orig/configure.ac 2015-02-22 14:48:57.000000000 -0600
-+++ sox-14.4.2/configure.ac 2015-11-06 11:48:26.179858149 -0600
-@@ -471,8 +471,6 @@
- AC_CHECK_LIB(lpc10, create_lpc10_encoder_state, LPC10_LIBS="$LPC10_LIBS -llpc10", found_liblpc10=no)
- if test "$found_liblpc10" = yes; then
- AC_DEFINE(EXTERNAL_LPC10, 1, [Define if you are using an external LPC10 library])
--else
-- LIBLPC10_LIBADD=../lpc10/liblpc10.la
- fi
- AM_CONDITIONAL(EXTERNAL_LPC10, test x$found_liblpc10 = xyes)
- AC_SUBST(LIBLPC10_LIBADD)
-@@ -670,7 +668,7 @@
- AM_CONDITIONAL(STATIC_LIBSOX_ONLY, test "$enable_shared" = "no" -a "$enable_static" = "yes")
-
- dnl Generate output files.
--AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc)
-+AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile msvc9/Makefile msvc10/Makefile sox.pc)
- AC_OUTPUT
-
- if test "$using_gsm" != "no"; then
-diff -Naur sox-14.4.2.orig/Makefile.am sox-14.4.2/Makefile.am
---- sox-14.4.2.orig/Makefile.am 2014-10-05 21:02:30.000000000 -0500
-+++ sox-14.4.2/Makefile.am 2015-11-06 11:48:26.179858149 -0600
-@@ -2,8 +2,8 @@
-
- ACLOCAL_AMFLAGS = -I m4
-
--SUBDIRS = lpc10 libgsm src
--DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10
-+SUBDIRS = libgsm src
-+DIST_SUBDIRS = libgsm src msvc9 msvc10
-
- RM = rm -f
-
diff --git a/sox-14.4.2-lsx_symbols.patch b/sox-14.4.2-lsx_symbols.patch
deleted file mode 100644
index f5cebd7..0000000
--- a/sox-14.4.2-lsx_symbols.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur sox-14.4.2.orig/src/Makefile.am sox-14.4.2/src/Makefile.am
---- sox-14.4.2.orig/src/Makefile.am 2014-10-29 22:29:54.000000000 -0500
-+++ sox-14.4.2/src/Makefile.am 2015-11-06 09:49:34.466595616 -0600
-@@ -95,7 +95,7 @@
-
- libsox_la_CFLAGS = @WARN_CFLAGS@
- libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \
-- -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$'
-+ -export-symbols-regex '^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|flush|error|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$'
-
- if HAVE_WIN32_LTDL
- libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h
diff --git a/sox-sample_tes-t-c99.patch b/sox-sample_tes-t-c99.patch
deleted file mode 100644
index 6f72d99..0000000
--- a/sox-sample_tes-t-c99.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Include <math.h> for the fabs function, to avoid an implicit function
-declaration. Such implicit declarations are incompatible with strict
-C99 compilers because this feature was removed from C in 1999.
-
-Fixed slightly differently upstream via:
-
-commit 65c7a43ff357d20a375cbc0f2bbbb9184b1da10e
-Author: Mans Rullgard <mans@mansr.com>
-Date: Mon Aug 3 11:04:30 2020 +0100
-
- sox_sample_test: clean up nonsense
-
- Move code from pointless .h file to .c file.
- Remove warning suppression pragmas.
- Fix causes of warnings.
-
- See also bug #326.
-
-https://sourceforge.net/p/sox/code/ci/65c7a43ff357d20a375cbc0f2bbbb9184b1da10e
-
-diff --git a/src/sox_sample_test.h b/src/sox_sample_test.h
-index 62b55e4137a3aa7e..17f0069cd561b8c4 100644
---- a/src/sox_sample_test.h
-+++ b/src/sox_sample_test.h
-@@ -19,6 +19,7 @@
- #undef NDEBUG /* Must undef above assert.h or other that might include it. */
- #endif
- #include <assert.h>
-+#include <math.h>
- #include "sox.h"
-
- #define TEST_UINT(bits) \
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-02 22:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-02 22:08 [rpms/sox] rawhide: Remove obsolete downstream patches Gerald B Cox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox