From patchwork Fri Aug 30 18:51:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1156023 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EmKoRsa5"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46KpVF2XZDz9sDB for ; Sat, 31 Aug 2019 04:51:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 366F587EBE; Fri, 30 Aug 2019 18:51:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r2l0de0ij55z; Fri, 30 Aug 2019 18:51:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0561E87D5C; Fri, 30 Aug 2019 18:51:28 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3E34D1BF3F6 for ; Fri, 30 Aug 2019 18:51:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F423486918 for ; Fri, 30 Aug 2019 18:51:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 53XikAARdHXD for ; Fri, 30 Aug 2019 18:51:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7C95A86CAE for ; Fri, 30 Aug 2019 18:50:44 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id h7so6607563wrt.13 for ; Fri, 30 Aug 2019 11:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/JHhH/NKdLT9JlaxVoIbIpY3esSNkqXMu/SJA7q1t+8=; b=EmKoRsa5a9MrVkzbwL2HblAFR3IVhq+tnY0j7kwwIuZKArECB/IcAk6KLruOjHm+F4 48aGZd+alXYf8to6q58/2m+DNoYH3EpVtzm8o6eHMlPi61HzE6RFEqkCx1iw5ctavfIo ck7eaxPernqq5Of+32feTW46Jr5qZdtST9CL47zOgTUxAR/3bnMHaVUI7VLoCNTRAY7N 3RAIoP1CSDKk19+JYA4msTPfL4EpOyYgxKSZ60nC0kk8bflpZHt/P0+A/t8+gahucThl mU9/MslsLBuLv2ynpuikViLwf4KpdAgl1a82B1rjwlHdQJh8iUImdS/95bqT64y6CxqZ pnhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/JHhH/NKdLT9JlaxVoIbIpY3esSNkqXMu/SJA7q1t+8=; b=qD7VFh4AGFVSLBWQ8LVSRK27gafdAbQjQJTDQe0SydC7guL3ZgSjM78xtQEzaUJaGD gSwu0WhmVmI75Fdg9/g+ONbni+UAYPEdGu9Xd+ljV15yzg8RcwZRm8xbTDEamjommJ+y Bdvfl0YyrVMy5IoUXMa/azmuxRiq9yfYKk1LI9tCLkZ1mb7qyfunYCEge4Yi+SUNVipA qFHqMkRf1DjJzc5EXkKYiQTERnakTKszxpcecFpaJsPLfNZtMN5PZ147kVQj9O5ZKDtB k4UiyW8vmaKYMQLgxfGNXn5Om8RKyCUuOEUpl17KHxdbN+OAobdlFnbKhk0Q8y4JMm/c Yfhg== X-Gm-Message-State: APjAAAWIOBtJ+MAEziPfb0mFsMjyMdFY5Pm61JqITGHtylrTurtyknTk oTIhnhRB64yjvQcZThfyoK2hUi/p X-Google-Smtp-Source: APXvYqwHQPxxw1X03Kxd4ui3ehNncXQKzowNLTuASDRuQXC5hnDPM8DItwTnFA23imB7G0VktLd79w== X-Received: by 2002:a5d:4f01:: with SMTP id c1mr20386995wru.43.1567191042689; Fri, 30 Aug 2019 11:50:42 -0700 (PDT) Received: from kali.home (lfbn-ren-1-605-248.w81-53.abo.wanadoo.fr. [81.53.181.248]) by smtp.gmail.com with ESMTPSA id f6sm16158029wrh.30.2019.08.30.11.50.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 11:50:42 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 30 Aug 2019 20:51:04 +0200 Message-Id: <20190830185104.6303-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.23.0.rc1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 1/1] package/shairport-sync: fix static build with soxr X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Commit 4a28f22383f07b7ea96ee1d63ee2fbeadaec5444 "package/shairport-sync: bump to version 3.2.2", wrongly removed first and second patches so add them back to fix static build with soxr. Indeed, these patches were only merged in version 3.3. Fixes: - http://autobuild.buildroot.org/results/7edc8f8bafdc9982f8f35e171010227d6b00da46 Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Add URL to autobuilder failure ...ibsoxr-is-built-to-rely-on-libavutil.patch | 40 +++++++++++++++++++ ...f-HAVE_LIBSOXR-with-using-pkg_config.patch | 24 +++++++++++ 2 files changed, 64 insertions(+) create mode 100644 package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch create mode 100644 package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch diff --git a/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch b/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch new file mode 100644 index 0000000000..c76c4fa4fe --- /dev/null +++ b/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch @@ -0,0 +1,40 @@ +From 5101ab2d13e2b89ea3c1276df5fb7413634eeccd Mon Sep 17 00:00:00 2001 +From: Mike Brady +Date: Sat, 25 Aug 2018 13:08:37 +0100 +Subject: [PATCH] Sometimes libsoxr is built to rely on libavutil. If libavutil + is detected, link to it when building libsoxr. Add pgk_config support to soxr + selection. + +[Retrieved from: +https://github.com/mikebrady/shairport-sync/commit/5101ab2d13e2b89ea3c1276df5fb7413634eeccd] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0c917a43..2b6fddb3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -176,7 +176,20 @@ AC_ARG_WITH(ssl, [ choose --with-ssl=openssl, --with-ssl=mbedtls or --with-ssl=p + # Look for soxr flag + AC_ARG_WITH(soxr, [ --with-soxr = choose libsoxr for high-quality interpolation], [ + AC_MSG_RESULT(>>Including support for soxr-based interpolation) +- AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!))], ) ++ if test "x${with_pkg_config}" = xyes ; then ++ PKG_CHECK_MODULES( ++ [SOXR], [soxr], ++ [LIBS="${SOXR_LIBS} ${LIBS}"]) ++ else ++ AC_CHECK_LIB([avutil],[av_get_cpu_flags]) ++ if test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then ++ # soxr may link against libavutil, depending on the architecture, but for the sake of simplicity link with it if it is found ++ AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!), [-lavutil]) ++ else ++ AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!)) ++ fi ++ fi ++], ) + + # Look for metadata flag -- set flag for conditional compilation + AC_ARG_WITH(metadata, [ --with-metadata = include support for a metadata feed], [ diff --git a/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch b/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch new file mode 100644 index 0000000000..937e8385ba --- /dev/null +++ b/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch @@ -0,0 +1,24 @@ +From cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9 Mon Sep 17 00:00:00 2001 +From: Mike Brady +Date: Sat, 8 Sep 2018 15:06:18 +0100 +Subject: [PATCH] Include a definition of HAVE_LIBSOXR with using pkg_config + +[Retrieved from: +https://github.com/mikebrady/shairport-sync/commit/cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9] +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index ceec4af6..690a774f 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