From patchwork Sun Aug 9 09:35:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1342579 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=Ov+hoY/Y; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BPYrF5CCqz9sRK for ; Sun, 9 Aug 2020 19:36:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 54DDD203DD; Sun, 9 Aug 2020 09:36:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VieZzGPILJcx; Sun, 9 Aug 2020 09:35:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9767E2041B; Sun, 9 Aug 2020 09:35:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1F9871BF3FD for ; Sun, 9 Aug 2020 09:35:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1BC15883B7 for ; Sun, 9 Aug 2020 09:35:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c110mjoStTRe for ; Sun, 9 Aug 2020 09:35:55 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0E31F883A8 for ; Sun, 9 Aug 2020 09:35:55 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id i6so4309084edy.5 for ; Sun, 09 Aug 2020 02:35:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jqvyi5h06ytCXdjTnLWj5Yy72f7/XRdEpf7nLjUYb2g=; b=Ov+hoY/YAkkHiDNNsAu651y6sqnIT9JP29nocZ9hVXAtwONbhPByoIq0CQMuee7Tc/ CXYiQsOhrBwpDVjzO7t5fR7tMqFlNn1bm7b/LNiNC8PPoRKCxFOtQDfDlbedUojioNNX 2OH5qRJhvzzNqsbL3qp3FTxFwtCjNAfCYwtKiCNKYmj3fLzTWnuyxu6h6FYNgwQs5xrU q8wKnZAvpdw3eaV5otMXdyWmrmzj9UdsK1S2VZjMLvFwPh4x9cq3NnHuusK1Gn8dOF28 tsNQ2AQnRzTLasayTbRvhyA9zBWoU58LSq0Um/LnsmZsSRgibN3CtfCBrK6nAFvy4kEN fLvg== 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=jqvyi5h06ytCXdjTnLWj5Yy72f7/XRdEpf7nLjUYb2g=; b=Kq4u1SSWnnHvgdbM6/eYyz0MlYJ/8k355/8JYwvpTbmp/KuvHGZSo1aLUg6urYv4dt AeewBy0nZr9xqSISZRebcFYtmjfyB7wJoytVtKdCZ9KQUFelhjS0E+kVd4ZYsabtu7y3 TXkWRovOJnPIboF/3RBmz6goVFAAm2MycRh21eVaC86oyn14hyRf/QD0nftiI+SqbOLE luBolvPJH5M3/X09Pakqya/hoZnZqwEbnptR6Oev/lmQdNed/OFSZ7O1dA1JMdOr+kAO PxMx9/4gMkHUOUYq2EzeheJE5R7vfOSfRIWwBNm/uLyQbbo++VqmG9jNpEGU1SdBLTHs GuBg== X-Gm-Message-State: AOAM533UfrCf9WFGMZRfm5DW2tBimGfK2B+ulRsvzl+5ddNZEJQanBdM A31vln/tPOet7hjepQUSPifYP+tLyZI= X-Google-Smtp-Source: ABdhPJyDeJKlp6p0pNKGibK6DqInKmZh9EJUQyIp3IWBLaVT/L/xi+nT+otFgSNmZQ/noPj02iJUyg== X-Received: by 2002:a50:fc82:: with SMTP id f2mr16091658edq.53.1596965752975; Sun, 09 Aug 2020 02:35:52 -0700 (PDT) Received: from localhost.localdomain (cust-210-40-109-94.dyn.as47377.net. [94.109.40.210]) by smtp.gmail.com with ESMTPSA id d19sm10221450ejk.47.2020.08.09.02.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Aug 2020 02:35:52 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Sun, 9 Aug 2020 11:35:38 +0200 Message-Id: <20200809093538.126676-1-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/librtlsdr: bump to more recent upstream master version 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: Jason Pruitt , Gwenhael Goavec-Merou , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since 948666dfde1e0a5d149442f80facc162a83016ad, librtlsdr in Buildroot is no longer built from an official release, but from a commit on the master branch. However, the commit that was referenced has a broken pkgconfig file templating, such that other packages using `pkgconfig --libs librtlsdr` as part of their build process (such as dump1090) could not be built anymore: Before 948666dfde1e0a5d149442f80facc162a83016ad: $ cat staging/usr/lib/pkgconfig/librtlsdr.pc prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: RTL-SDR Library Description: C Utility Library Version: 0.6.0 Cflags: -I${includedir}/ Libs: -L${libdir} -lrtlsdr -lusb-1.0 Libs.private: On 948666dfde1e0a5d149442f80facc162a83016ad: $ cat staging/usr/lib/pkgconfig/librtlsdr.pc prefix= exec_prefix= libdir= includedir= Name: RTL-SDR Library Description: C Utility Library Version: 7082 Cflags: -I${includedir}/ Libs: -L${libdir} -lrtlsdr Libs.private: -lusb-1.0 In the meantime, upstream released a bugfix for that ([1]), so we bump to that commit as well, and update the only patch for shared libs accordingly, because upstream also added a new tool called `rtl_biast` in the meantime. Finaly, we update the hash file to the two-spaces convention. Fixes: http://autobuild.buildroot.net/results/b4c/b4cdcb59cc61c51c024197a64865ad4b60023d0c/ [1]: https://github.com/steve-m/librtlsdr/commit/ed0317e6a58c098874ac58b769cf2e609c18d9a5 Signed-off-by: Titouan Christophe Tested-by: Heiko Thiery Tested-by: Gwenhael Goavec-Merou --- .../0001-disable_shared_library_target_in_build.patch | 9 +++++---- package/librtlsdr/librtlsdr.hash | 4 ++-- package/librtlsdr/librtlsdr.mk | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch index 376aa23344..2fb63465de 100644 --- a/package/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ b/package/librtlsdr/0001-disable_shared_library_target_in_build.patch @@ -1,4 +1,4 @@ -From c8878472bf84c656979ea1d07e7ed55b0aa2c939 Mon Sep 17 00:00:00 2001 +From 9a1c2587d4ef18e2026811deabd024eb7577d9ce Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Fri, 15 May 2020 16:14:48 +0200 Subject: [PATCH] disable shared library target in build @@ -19,12 +19,13 @@ will be install. Signed-off-by: Yuvaraj Patil Signed-off-by: Fabrice Fontaine Signed-off-by: Gwenhael Goavec-Merou +Signed-off-by: Titouan Christophe --- src/CMakeLists.txt | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 33faee7..d82fc87 100644 +index de93044..13b7b1a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,6 +18,8 @@ @@ -121,9 +122,9 @@ index 33faee7..d82fc87 100644 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file ) +endif() - install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power + install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast DESTINATION ${CMAKE_INSTALL_BINDIR} ) -- -2.26.2 +2.25.3 diff --git a/package/librtlsdr/librtlsdr.hash b/package/librtlsdr/librtlsdr.hash index 920a755033..e4b0871db3 100644 --- a/package/librtlsdr/librtlsdr.hash +++ b/package/librtlsdr/librtlsdr.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 78c20031287017d057941640dcf05cb7666cfedcfad1b4a1186ed00cabfabc2f librtlsdr-d794155ba65796a76cd0a436f9709f4601509320.tar.gz +sha256 f09ff5ba2fa1780071321ba22885b9d1a16ac9d4b944a97e39b6921960439301 librtlsdr-ed0317e6a58c098874ac58b769cf2e609c18d9a5.tar.gz # License file, locally calculated -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk index 16f2632789..47586bdfb2 100644 --- a/package/librtlsdr/librtlsdr.mk +++ b/package/librtlsdr/librtlsdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRTLSDR_VERSION = d794155ba65796a76cd0a436f9709f4601509320 +LIBRTLSDR_VERSION = ed0317e6a58c098874ac58b769cf2e609c18d9a5 LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) LIBRTLSDR_LICENSE = GPL-2.0+ LIBRTLSDR_LICENSE_FILES = COPYING