From patchwork Thu Jan 5 19:18:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1722119 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Nnx8Z4mBYz23db for ; Fri, 6 Jan 2023 06:18:38 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 6673E606F9; Thu, 5 Jan 2023 19:18:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 6673E606F9 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CAOsWzhDDNgi; Thu, 5 Jan 2023 19:18:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id B471660608; Thu, 5 Jan 2023 19:18:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B471660608 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E7CDA1BF2C5 for ; Thu, 5 Jan 2023 19:18:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E8DA14007A for ; Thu, 5 Jan 2023 19:18:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E8DA14007A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nhqXldTqqOf1 for ; Thu, 5 Jan 2023 19:18:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 947BE41A5A Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by smtp4.osuosl.org (Postfix) with ESMTPS id 947BE41A5A for ; Thu, 5 Jan 2023 19:18:17 +0000 (UTC) Received: from fwd80.dcpf.telekom.de (fwd80.aul.t-online.de [10.223.144.106]) by mailout08.t-online.de (Postfix) with SMTP id 6F549232F9; Thu, 5 Jan 2023 20:18:14 +0100 (CET) Received: from fli4l.lan.fli4l ([84.161.180.73]) by fwd80.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1pDVkk-4HW5tB0; Thu, 5 Jan 2023 20:18:14 +0100 Received: from bruckner.lan.fli4l ([192.168.1.1]:39468) by fli4l.lan.fli4l with esmtp (Exim 4.96) (envelope-from ) id 1pDVkj-0000id-2Q; Thu, 05 Jan 2023 20:18:13 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Thu, 5 Jan 2023 20:18:12 +0100 Message-Id: <20230105191813.3533745-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1672946294-C23211D1-9B6AB1E2/0/0 CLEAN NORMAL X-TOI-MSGID: 3605d46f-831a-4120-8db9-9b0ef6f403c7 Subject: [Buildroot] [PATCH 1/2] package/freeswitch: ffmpeg's libavresample is an optional dependency X-BeenThere: buildroot@buildroot.org 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: "Yann E . MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" See upstream commit from 2019: https://github.com/signalwire/freeswitch/commit/e9c58084db249845af88011a1e3c5d7b9ec05a76#diff-2cd3a5516ad0fc3cba6d14d0ea3e72da43a2c2fc3c21eb7ade6c49d52136bbd2R43 Signed-off-by: Bernd Kuhls --- package/freeswitch/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in index bad101486c..1ab624c33c 100644 --- a/package/freeswitch/Config.in +++ b/package/freeswitch/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_FREESWITCH depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr, included in freeswitch source depends on BR2_USE_WCHAR # uses wchar_t - select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_JPEG From patchwork Thu Jan 5 19:18:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1722118 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Nnx8M6nS3z23db for ; Fri, 6 Jan 2023 06:18:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6E2CE401C8; Thu, 5 Jan 2023 19:18:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6E2CE401C8 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i2ZtCEB2j7rM; Thu, 5 Jan 2023 19:18:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 6A8DC401B3; Thu, 5 Jan 2023 19:18:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6A8DC401B3 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 113631BF2C5 for ; Thu, 5 Jan 2023 19:18:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E0C7B403A9 for ; Thu, 5 Jan 2023 19:18:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E0C7B403A9 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ahw5XJEEJtgB for ; Thu, 5 Jan 2023 19:18:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C36EC40131 Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by smtp2.osuosl.org (Postfix) with ESMTPS id C36EC40131 for ; Thu, 5 Jan 2023 19:18:17 +0000 (UTC) Received: from fwd80.dcpf.telekom.de (fwd80.aul.t-online.de [10.223.144.106]) by mailout08.t-online.de (Postfix) with SMTP id 7226E232FB; Thu, 5 Jan 2023 20:18:14 +0100 (CET) Received: from fli4l.lan.fli4l ([84.161.180.73]) by fwd80.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1pDVkk-4IH7Fh0; Thu, 5 Jan 2023 20:18:14 +0100 Received: from bruckner.lan.fli4l ([192.168.1.1]:39468) by fli4l.lan.fli4l with esmtp (Exim 4.96) (envelope-from ) id 1pDVkj-0000id-2Y; Thu, 05 Jan 2023 20:18:13 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Thu, 5 Jan 2023 20:18:13 +0100 Message-Id: <20230105191813.3533745-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230105191813.3533745-1-bernd.kuhls@t-online.de> References: <20230105191813.3533745-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1672946294-C13271D1-4E69D8EB/0/0 CLEAN NORMAL X-TOI-MSGID: b6c80506-e195-459f-8ab9-6ce315f97f72 Subject: [Buildroot] [PATCH 2/2] package/tvheadend: remove dependency to libavresample X-BeenThere: buildroot@buildroot.org 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: "Yann E . MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Add upstream patch to remove check for libavresample, this library is not used by tvheadend. Signed-off-by: Bernd Kuhls --- ...ove-libavresample-from-build-scripts.patch | 38 +++++++++++++++++++ package/tvheadend/Config.in | 1 - 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 package/tvheadend/0002-remove-libavresample-from-build-scripts.patch diff --git a/package/tvheadend/0002-remove-libavresample-from-build-scripts.patch b/package/tvheadend/0002-remove-libavresample-from-build-scripts.patch new file mode 100644 index 0000000000..63dfbb38d1 --- /dev/null +++ b/package/tvheadend/0002-remove-libavresample-from-build-scripts.patch @@ -0,0 +1,38 @@ +From 3a9e511b614bbbcea395e3ee8c16dc15692a17d4 Mon Sep 17 00:00:00 2001 +From: Pim Zandbergen +Date: Fri, 30 Dec 2022 01:46:43 +0100 +Subject: [PATCH] remove libavresample from build scripts + +Downloaded from upstream PR: +https://github.com/tvheadend/tvheadend/pull/1487 + +Signed-off-by: Bernd Kuhls +--- + Makefile | 1 - + configure | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 0ae3a19cab..a56a2fbdf9 100644 +--- a/Makefile ++++ b/Makefile +@@ -93,7 +93,6 @@ ifeq ($(CONFIG_LIBAV),yes) + FFMPEG_LIBS := \ + libavfilter \ + libswresample \ +- libavresample \ + libswscale \ + libavformat \ + libavcodec \ +diff --git a/configure b/configure +index c087502bf3..8ce559fa7b 100755 +--- a/configure ++++ b/configure +@@ -642,7 +642,6 @@ else + + check_pkg libavfilter ">=6.47.100" || has_libav=false + check_pkg libswresample ">=2.1.100" && has_resample=true +- check_pkg libavresample ">=3.0.0" && has_resample=true + check_pkg libswscale ">=4.1.100" || has_libav=false + check_pkg libavformat ">=57.41.100" || has_libav=false + check_pkg libavcodec ">=57.48.101" || has_libav=false diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in index 99a24ec011..3d21897c6d 100644 --- a/package/tvheadend/Config.in +++ b/package/tvheadend/Config.in @@ -63,7 +63,6 @@ config BR2_PACKAGE_TVHEADEND_TRANSCODING bool "transcoding support" depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_AVRESAMPLE select BR2_PACKAGE_FFMPEG_GPL # needed for x264 support select BR2_PACKAGE_FFMPEG_SWSCALE # vp8 encoder needs c++