summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-07-13 22:39:58 -0700
committerArmin Kuster <akuster808@gmail.com>2017-09-13 17:16:28 -0700
commit662ff1dd5e1fc261d8ab3364d3530754a9c6562c (patch)
tree464edd6513f8276f140e04227451ce177058b33e /meta-multimedia
parent349299001d0079b3214c96e2e41ae60f355fa943 (diff)
downloadmeta-openembedded-662ff1dd5e1fc261d8ab3364d3530754a9c6562c.tar.gz
sox: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> (cherry picked from commit 07ab8e107124d32c0229d2f40dd38caf1464722f) Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch28
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb4
2 files changed, 31 insertions, 1 deletions
diff --git a/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch
new file mode 100644
index 000000000..605863a22
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/sox/sox/0001-remove-the-error-line-and-live-without-file-type-det.patch
@@ -0,0 +1,28 @@
1From c2aed28e3e14329ad0a8c4371fdcce9934013f21 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 12 Jul 2017 16:36:06 -0700
4Subject: [PATCH] remove the #error line and live without file-type detection
5 with pipes
6
7this fallback is executed with musl
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/formats.c | 1 -
12 1 file changed, 1 deletion(-)
13
14diff --git a/src/formats.c b/src/formats.c
15index 7e231ca..b13f0d5 100644
16--- a/src/formats.c
17+++ b/src/formats.c
18@@ -416,7 +416,6 @@ static void UNUSED rewind_pipe(FILE * fp)
19 /* To fix this #error, either simply remove the #error line and live without
20 * file-type detection with pipes, or add support for your compiler in the
21 * lines above. Test with cat monkey.au | ./sox --info - */
22- #error FIX NEEDED HERE
23 #define NO_REWIND_PIPE
24 (void)fp;
25 #endif
26--
272.13.2
28
diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
index ada958b13..e115f1c18 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
@@ -27,7 +27,9 @@ LICENSE = "GPLv2 & LGPLv2.1"
27LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ 27LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \
28 file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24" 28 file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24"
29 29
30SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz" 30SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \
31 file://0001-remove-the-error-line-and-live-without-file-type-det.patch \
32 "
31SRC_URI[md5sum] = "b0c15cff7a4ba0ec17fdc74e6a1f9cf1" 33SRC_URI[md5sum] = "b0c15cff7a4ba0ec17fdc74e6a1f9cf1"
32SRC_URI[sha256sum] = "3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3" 34SRC_URI[sha256sum] = "3ee34b14dd267de378e8a117aae81ec4cae330772342e6a55bbf6520a0a88aa3"
33 35