mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

sox: backport fix for dynamically linked flac builds

Browse Source 
The sox project upstream is dead, non-responsive, and various
developers started maintaining their own branches where they do
feature development (eg. adding DSD/DSF format support) and
bug-fixing. They don't have access to the central sox git repo.

So basically the project will eventually get forked (I started a
discussion in this direction). Until then, backport this flac build
fix which was lingering around out of tree for years.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Ioan-Adrian Ratiu
2018-03-02 20:33:46 +02:00
committed by Armin Kuster
parent 174047b69a
commit 50ad136fe7
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-multimedia/recipes-multimedia/sox/sox/0001-Update-exported-symbol-list.patch
+34
View File
@@ -0,0 +1,34 @@
From b1809d82031aa7c5bcaad58bcb4b59e082e0446e Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Sun, 5 Nov 2017 15:40:16 +0000
Subject: [PATCH] Update exported symbol list
commit 5c58413544 ("Don't export (most) internal libsox symbols")
breaks dynamic flac builds as flac.c references lsx.error, so add it
to the list of exceptions.
| .libs/flac.o: In function `decoder_read_callback':
| /usr/src/debug/sox/14.4.2-r0/sox-14.4.2/src/flac.c:63: undefined reference to `lsx_error'
Upstream-Status: Backport [https://bogomips.org/sox.git ("pu" branch)]
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 7cceaafd..a3a04ed1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -95,7 +95,7 @@ libsox_la_LIBADD += @GOMP_LIBS@
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_(([cm]|re)alloc|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|error|fail_errno|filelength|find_(enum_(text|value)|file_extension)|flush|getopt(_init)?|id3_read_tag|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|rewind|seeki|sigfigs3p?|strcasecmp|strdup|tell|unreadb|write(b|_b_buf|buf|s)))$$'
if HAVE_WIN32_LTDL
libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h
--
2.16.2
meta-multimedia/recipes-multimedia/sox/sox_14.4.2.bb
+1
View File
@@ -32,6 +32,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \
SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz \
file://0001-remove-the-error-line-and-live-without-file-type-det.patch \
file://0001-Update-exported-symbol-list.patch \
"
SRC_URI[md5sum] = "d04fba2d9245e661f245de0577f48a33"
SRC_URI[sha256sum] = "b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c"