Skip to contentSkip to conversation

shairport-sync: add upstream patch to fix soxr configure issue

PATCH New Jörg Krause 3 participants 5 messages Sep 9, 2018 – Oct 1, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 shairport-sync: add upstream patch to fix soxr configure issue

Commit b06639cf7a adds an upstream patch to fix a build issue with soxr. The patch also adds detecting soxr using pkg-config. Upstream detected an config issue [1], where the resulting binary lacks soxr support, although libsoxr was correctly detected.

This patch adds a define for HAVE_LIBSOXR when using pkg-config.

Backported from: cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9

[1] https://github.com/mikebrady/shairport-sync/issues/740

---
Should be committed to 2018.02.x and 2018.05.x, too.

---
 ...f-HAVE_LIBSOXR-with-using-pkg_config.patch | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch
package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch new file +34 -0
new file mode 100644
index 0000000000..e10142a201
@@ -0,0 +1,34 @@
+From cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9 Mon Sep 17 00:00:00 2001
+From: Mike Brady <[email protected]>
+Date: Sat, 8 Sep 2018 15:06:18 +0100
+Subject: [PATCH] Include a definition of HAVE_LIBSOXR with using pkg_config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit b06639cf7a adds an upstream patch to fix a build issue with soxr.
+The patch also adds detecting soxr using pkg-config. Upstream detected
+a config issue [1], where the resulting binary lacks soxr support, although
+libsoxr was correctly detected.
+
+Backported from: cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9
+
+Signed-off-by: J?rg Krause <[email protected]>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index ceec4af..690a774 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -180,6 +180,7 @@ AC_ARG_WITH(soxr, [  --with-soxr = choose libsoxr for high-quality interpolation
+     PKG_CHECK_MODULES(
+         [SOXR], [soxr],
+         [LIBS="${SOXR_LIBS} ${LIBS}"])
++    AC_DEFINE([HAVE_LIBSOXR],[1],[Define to 1 if you are including support for soxr interpolation])
+   else
+     AC_CHECK_LIB([avutil],[av_get_cpu_flags])
+     if  test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then
+-- 
+2.18.0
Signature · 1 line
2.18.0
#1 lore raw

PATCH 1/1 shairport-sync: add upstream patch to fix soxr configure issue

Hello,

Quoted 1 line · J?rg Krause

Commit b06639cf7a adds an upstream patch to fix a build issue with soxr.

I don't have any commit with the hash b06639cf7a in Buildroot. Are you talking about e047dee241fe0660d92311a124757065c6c4c93d instead ?

Quoted 1 line

Should be committed to 2018.02.x and 2018.05.x, too.

Well e047dee241fe0660d92311a124757065c6c4c93d was not backported to 2018.02.x and 2018.05.x. Are you sure 2018.02.x and 2018.05.x are affected by the soxr build issue that e047dee241fe0660d92311a124757065c6c4c93d is fixing ? Indeed, I don't see any autobuilder failure:
http://autobuild.buildroot.net/?reason=shairport%.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 shairport-sync: add upstream patch to fix soxr configure issue

Hi,

Quoted 7 lines · Thomas Petazzoni

Hello,

Quoted 1 line · J?rg Krause

Commit b06639cf7a adds an upstream patch to fix a build issue with soxr.

I don't have any commit with the hash b06639cf7a in Buildroot. Are you talking about e047dee241fe0660d92311a124757065c6c4c93d instead ?

Sorry. Yes, I am talking about
e047dee241fe0660d92311a124757065c6c4c93d. My bad!

Quoted 4 lines
Quoted 1 line

Should be committed to 2018.02.x and 2018.05.x, too.

Well e047dee241fe0660d92311a124757065c6c4c93d was not backported to 2018.02.x and 2018.05.x.

The commit for 2018.02.x is 2aafa0366f0fe73afdf97a9a52917b2f1dbdf392
[1] and for 2018.05.x is 72f10180f5cbc6f4f3914e4a142d25e13c322f08

Quoted 5 lines

Are you sure 2018.02.x and 2018.05.x are
affected by the soxr build issue that e047dee241fe0660d92311a124757065c6c4c93d is fixing ? Indeed, I don't see any autobuilder failure:
http://autobuild.buildroot.net/?reason=shairport%.

Peter commited the patch to 2018.02.x and 2018.05.x [3]. You're right, there aren't any autobuild failures and I didn't checked these branches for the build failure back then.

[1] https://git.buildroot.net/buildroot/commit/?h=2018.02.x&id=2aafa0366f0fe73afdf97a9a52917b2f1dbdf392
[2] https://git.buildroot.net/buildroot/commit/?h=2018.05.x&id=72f10180f5cbc6f4f3914e4a142d25e13c322f08
[3] https://patchwork.ozlabs.org/patch/962789/

Best regards,
J?rg Krause

#3 lore raw

PATCH 1/1 shairport-sync: add upstream patch to fix soxr configure issue

In reply to Jörg Krause

Hello,

Quoted 5 lines · J?rg Krause

Commit b06639cf7a adds an upstream patch to fix a build issue with soxr. The patch also adds detecting soxr using pkg-config. Upstream detected an config issue [1], where the resulting binary lacks soxr support, although libsoxr was correctly detected.

Quoted 7 lines

This patch adds a define for HAVE_LIBSOXR when using pkg-config.

Backported from: cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9

[1] https://github.com/mikebrady/shairport-sync/issues/740

Thanks for the additional explanations you have given, I have applied after fixing the reference to the previous commit in the commit log. I however have one request below.

Quoted 6 lines
package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch new file +0 -0
new file mode 100644
index 0000000000..e10142a201

package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch line 9

Quoted 9 lines
package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch new file +9 -0
@@ -0,0 +1,34 @@
+From cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9 Mon Sep 17 00:00:00 2001
+From: Mike Brady <[email protected]>
+Date: Sat, 8 Sep 2018 15:06:18 +0100
+Subject: [PATCH] Include a definition of HAVE_LIBSOXR with using pkg_config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit b06639cf7a adds an upstream patch to fix a build issue with soxr.

The patch descriptions should ideally not refer to Buildroot or Buildroot commits. Indeed, they should ideally be just the upstream patch, or a patch acceptable by upstream. A patch that talks about Buildroot commits is unlikely to be accepted upstream.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/1 shairport-sync: add upstream patch to fix soxr configure issue

In reply to Jörg Krause
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"J?rg" == J?rg Krause <[email protected]> writes:

Commit b06639cf7a adds an upstream patch to fix a build issue with soxr. The patch also adds detecting soxr using pkg-config. Upstream detected an config issue [1], where the resulting binary lacks soxr support, although libsoxr was correctly detected.

This patch adds a define for HAVE_LIBSOXR when using pkg-config.

Quoted 7 lines

Backported from: cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9

[1] https://github.com/mikebrady/shairport-sync/issues/740

---
Should be committed to 2018.02.x and 2018.05.x, too.

Committed to 2018.02.x, 2018.05.x and 2018.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard