Skip to content

Commit e336a03

Browse files
jolivainyann-morin-1998
authored andcommitted
package/sox: fix patch fuzz
Commit 8f88a64 "support/scripts/apply-patches.sh: set the maximum fuzz factor to 0" reduced the fuzz factor. Due to this change, sox fails to build with output: Applying 0001-uclibc.patch using patch: patching file src/formats.c Hunk #1 FAILED at 409. Hunk #2 succeeded at 477 (offset 60 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/formats.c.rej This commit refreshes the package patch on the current package version. Note 1: the failing patch 0001 was regenerated with "git format-patch". Since the patch file 0001 name changed in the regeneration, the ".checkpackageignore" entry is also updated accordingly. Note 2: patch 0002 did not require any update. Fixes: http://autobuild.buildroot.org/results/1bc396386aa3321fe48101caf9635ae41feb057b Signed-off-by: Julien Olivain <ju.o@free.fr> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
1 parent ddd7910 commit e336a03

6 files changed

Lines changed: 59 additions & 39 deletions

.checkpackageignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ package/softether/0008-librt.patch lib_patch.Upstream
14011401
package/softether/0009-uclibc-ai-addrconfig.patch lib_patch.Upstream
14021402
package/solarus/0001-cmake-remove-Werror.patch lib_patch.Upstream
14031403
package/solarus/0002-Add-a-basic-FindOpenGLES2.cmake.patch lib_patch.Sob lib_patch.Upstream
1404-
package/sox/0001-uclibc.patch lib_patch.Upstream
1404+
package/sox/0001-Make-SoX-support-uclibc-based-toolchains.patch lib_patch.Upstream
14051405
package/sox/0002-configure.ac-put-back-disable-stack-protector.patch lib_patch.Upstream
14061406
package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch lib_patch.Upstream
14071407
package/sox/0004-configure.ac-fix-static-linking-with-magic.patch lib_patch.Upstream
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From 5d51acafe9c38fb05939b4d2d6a9dcde12476458 Mon Sep 17 00:00:00 2001
2+
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
3+
Date: Sat, 29 Jun 2024 12:28:54 +0200
4+
Subject: [PATCH] Make SoX support uclibc-based toolchains
5+
6+
From:
7+
http://sourceforge.net/p/sox/bugs/179/
8+
9+
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
10+
[Julien: rebased patch on package git version 7524160,
11+
and regenerated with git format-patch]
12+
Signed-off-by: Julien Olivain <ju.o@free.fr>
13+
---
14+
src/formats.c | 3 +--
15+
1 file changed, 1 insertion(+), 2 deletions(-)
16+
17+
diff --git a/src/formats.c b/src/formats.c
18+
index 3fcf4382..9fc001bd 100644
19+
--- a/src/formats.c
20+
+++ b/src/formats.c
21+
@@ -466,7 +466,7 @@ static void UNUSED rewind_pipe(FILE * fp)
22+
#if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__
23+
fp->_p -= PIPE_AUTO_DETECT_SIZE;
24+
fp->_r += PIPE_AUTO_DETECT_SIZE;
25+
-#elif defined __GLIBC__
26+
+#elif defined __GLIBC__ && ! defined __UCLIBC__
27+
fp->_IO_read_ptr = fp->_IO_read_base;
28+
#elif defined _MSC_VER && _MSC_VER >= 1900
29+
#define NO_REWIND_PIPE
30+
@@ -477,7 +477,6 @@ static void UNUSED rewind_pipe(FILE * fp)
31+
/* To fix this #error, either simply remove the #error line and live without
32+
* file-type detection with pipes, or add support for your compiler in the
33+
* lines above. Test with cat monkey.wav | ./sox --info - */
34+
- #error FIX NEEDED HERE
35+
#define NO_REWIND_PIPE
36+
(void)fp;
37+
#endif
38+
--
39+
2.45.2
40+

package/sox/0001-uclibc.patch

Lines changed: 0 additions & 26 deletions
This file was deleted.

package/sox/0003-configure.ac-fix-static-linking-with-id3tag.patch

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8df3a56cfb104c84d4701562ae2e3c9dc4686798 Mon Sep 17 00:00:00 2001
1+
From 06e5cc069dbdfa060c3d9e75a798ec121ecc9349 Mon Sep 17 00:00:00 2001
22
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
33
Date: Sat, 6 Feb 2021 11:08:45 +0100
44
Subject: [PATCH] configure.ac: fix static linking with id3tag
@@ -23,17 +23,19 @@ util.c:(.text+0x240): undefined reference to `uncompress'
2323
Fixes:
2424
- http://autobuild.buildroot.org/results/73efdacf237e3d567fa66f3b3f68e624f5e35bc7
2525

26+
Signed-off-by: Julien Olivain <ju.o@free.fr>
27+
[Julien: rebased patch on package git version 7524160]
2628
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2729
[Upstream status: https://sourceforge.net/p/sox/patches/123]
2830
---
2931
configure.ac | 2 +-
3032
1 file changed, 1 insertion(+), 1 deletion(-)
3133

3234
diff --git a/configure.ac b/configure.ac
33-
index 39306398..896714f5 100644
35+
index a1665467..8f47a978 100644
3436
--- a/configure.ac
3537
+++ b/configure.ac
36-
@@ -83,7 +83,7 @@ dnl Various libraries
38+
@@ -88,7 +88,7 @@ dnl Various libraries
3739
SOX_WITH_LIB([magic], [magic.h], [magic], [magic_open])
3840
SOX_CHECK_LIB([ZLIB], [zlib.h], [z], [uncompress])
3941
SOX_WITH_LIB([png], [png.h], [png], [png_set_rows], [], [], [], [$ZLIB_LIBS])
@@ -43,5 +45,5 @@ index 39306398..896714f5 100644
4345

4446
dnl Optional formats
4547
--
46-
2.29.2
48+
2.45.2
4749

package/sox/0004-configure.ac-fix-static-linking-with-magic.patch

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4630e574e6c0269b94fd910e7c72b8ad1ee62ce7 Mon Sep 17 00:00:00 2001
1+
From 76b78cb89cf8fc36b4ced568f3b34f778df53411 Mon Sep 17 00:00:00 2001
22
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
33
Date: Wed, 3 Mar 2021 16:48:57 +0100
44
Subject: [PATCH] configure.ac: fix static linking with magic
@@ -24,17 +24,19 @@ compress.c:(.text+0x1d0): undefined reference to `inflateInit_'
2424
Fixes:
2525
- http://autobuild.buildroot.org/results/d96f27cd96926060046e2e1115777f5bceda3741
2626

27+
Signed-off-by: Julien Olivain <ju.o@free.fr>
28+
[Julien: rebased patch on package git version 7524160]
2729
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2830
[Upstream status: not sent yet (waiting for feedback on third patch)]
2931
---
3032
configure.ac | 2 +-
3133
1 file changed, 1 insertion(+), 1 deletion(-)
3234

3335
diff --git a/configure.ac b/configure.ac
34-
index 896714f5..8ae3202c 100644
36+
index 8f47a978..20454ed5 100644
3537
--- a/configure.ac
3638
+++ b/configure.ac
37-
@@ -80,7 +80,7 @@ SOX_REPORT([other], [LADSPA effect plugins], [$HAVE_LADSPA])
39+
@@ -85,7 +85,7 @@ SOX_REPORT([other], [LADSPA effect plugins], [$HAVE_LADSPA])
3840

3941
dnl Various libraries
4042

@@ -44,5 +46,5 @@ index 896714f5..8ae3202c 100644
4446
SOX_WITH_LIB([png], [png.h], [png], [png_set_rows], [], [], [], [$ZLIB_LIBS])
4547
SOX_WITH_LIB([id3tag], [id3tag.h], [id3tag], [id3_file_open], [], [], [], [$ZLIB_LIBS])
4648
--
47-
2.30.1
49+
2.45.2
4850

package/sox/0005-configure.ac-fix-static-linking-with-sndfile.patch

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 06109c84ab6930265287049c4bf9405e7ebc4986 Mon Sep 17 00:00:00 2001
1+
From 7a2e270989037663e740487a8248db1227697c92 Mon Sep 17 00:00:00 2001
22
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
33
Date: Wed, 4 Aug 2021 10:27:16 +0200
44
Subject: [PATCH] configure.ac: fix static linking with sndfile
@@ -20,17 +20,19 @@ flac.c:(.text+0xfc): undefined reference to `FLAC__StreamDecoderErrorStatusStrin
2020
Fixes:
2121
- http://autobuild.buildroot.org/results/4bc58ed68b29642876bb02710d0cd4f31540de86
2222

23+
Signed-off-by: Julien Olivain <ju.o@free.fr>
24+
[Julien: rebased patch on package git version 7524160]
2325
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2426
[Upstream status: not sent yet (waiting for feedback on third patch)]
2527
---
2628
configure.ac | 2 +-
2729
1 file changed, 1 insertion(+), 1 deletion(-)
2830

2931
diff --git a/configure.ac b/configure.ac
30-
index 8ae3202c..26510769 100644
32+
index 20454ed5..4330360b 100644
3133
--- a/configure.ac
3234
+++ b/configure.ac
33-
@@ -117,7 +117,7 @@ SOX_FMT_REQ([mp3], [MAD LAME TWOLAME])
35+
@@ -122,7 +122,7 @@ SOX_FMT_REQ([mp3], [MAD LAME TWOLAME])
3436
SOX_FMT_PKG([oggvorbis], [ogg vorbis vorbisenc vorbisfile])
3537
SOX_FMT_PKG([opus], [opusfile])
3638

@@ -40,5 +42,5 @@ index 8ae3202c..26510769 100644
4042

4143
SOX_FMT_LIB([wavpack], [wavpack/wavpack.h], [wavpack], [WavpackGetSampleRate])
4244
--
43-
2.30.2
45+
2.45.2
4446

0 commit comments

Comments
 (0)