From patchwork Sun Aug 12 20:32:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 956705 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41pVsR3CzWz9s9l for ; Mon, 13 Aug 2018 06:32:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9FA7A226B5; Sun, 12 Aug 2018 20:32:24 +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 7ERYV1yoJewM; Sun, 12 Aug 2018 20:32:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 43CD6226B0; Sun, 12 Aug 2018 20:32:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7C6B11CF2AB for ; Sun, 12 Aug 2018 20:32:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7874A857C2 for ; Sun, 12 Aug 2018 20:32:12 +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 65Lvb-1O8SPS for ; Sun, 12 Aug 2018 20:32:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id BEF1181E67 for ; Sun, 12 Aug 2018 20:32:11 +0000 (UTC) Received: from fwd22.aul.t-online.de (fwd22.aul.t-online.de [172.20.26.127]) by mailout08.t-online.de (Postfix) with SMTP id 5EE9641CA046; Sun, 12 Aug 2018 22:32:10 +0200 (CEST) Received: from fli4l.lan.fli4l (S86K-6ZOwhnlo66xsp2tkK60x7ZB65z+JtY4iP-T0Q7q85meLs++rCIX9d+JMi8gCD@[84.161.177.252]) by fwd22.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1fox1y-1cqH0S0; Sun, 12 Aug 2018 22:32:06 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:38600 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.91) (envelope-from ) id 1fox1x-00085e-Bp; Sun, 12 Aug 2018 22:32:05 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 12 Aug 2018 22:32:00 +0200 Message-Id: <20180812203205.7251-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.18.0 X-ID: S86K-6ZOwhnlo66xsp2tkK60x7ZB65z+JtY4iP-T0Q7q85meLs++rCIX9d+JMi8gCD X-TOI-MSGID: 12b62840-ac61-4748-965d-162f5c7fc590 Subject: [Buildroot] [PATCH/next 1/6] package/aubio: Fix build with FFmpeg 4.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , Hiroshi Kawashima , Fabrice Fontaine , Sven Neumann MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Bernd Kuhls --- package/aubio/0001-ffmpeg4.patch | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/aubio/0001-ffmpeg4.patch diff --git a/package/aubio/0001-ffmpeg4.patch b/package/aubio/0001-ffmpeg4.patch new file mode 100644 index 0000000000..bdaac55a3d --- /dev/null +++ b/package/aubio/0001-ffmpeg4.patch @@ -0,0 +1,32 @@ +From 5690daf759b473b9d13b4547ef37adc2695cf524 Mon Sep 17 00:00:00 2001 +From: James Cowgill +Date: Sun, 25 Feb 2018 14:23:25 +0000 +Subject: [PATCH] Fix build with FFmpeg 4.0 + +Downloaded from upstream commit +https://git.aubio.org/?p=aubio.git;a=commitdiff;h=5690daf759b473b9d13b4547ef37adc2695cf524 + +Signed-off-by: Bernd Kuhls +--- + src/io/source_avcodec.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c +index ccdce807..8197445c 100644 +--- a/src/io/source_avcodec.c ++++ b/src/io/source_avcodec.c +@@ -58,7 +58,11 @@ + #include "fmat.h" + #include "source_avcodec.h" + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0) + #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE ++#else ++#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE ++#endif + + struct _aubio_source_avcodec_t { + uint_t hop_size; +-- +2.11.0 +