From patchwork Sun Apr 12 21:45:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 460575 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id B39381402F4 for ; Mon, 13 Apr 2015 07:45:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=nYBdogNk; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7A90794C13; Sun, 12 Apr 2015 21:45:53 +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 OZ7hX06wCSBH; Sun, 12 Apr 2015 21:45:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 077F094C65; Sun, 12 Apr 2015 21:45:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id DFC011C2282 for ; Sun, 12 Apr 2015 21:45:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D5AC0A1622 for ; Sun, 12 Apr 2015 21:45:47 +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 k9iWufkvipng for ; Sun, 12 Apr 2015 21:45:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by fraxinus.osuosl.org (Postfix) with ESMTPS id F3116A14EF for ; Sun, 12 Apr 2015 21:45:46 +0000 (UTC) Received: by widjs5 with SMTP id js5so51462407wid.1 for ; Sun, 12 Apr 2015 14:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ds4JI6SeDEEMFNPthbN26pxG0Y1vYQxZtF5tgCDthYc=; b=nYBdogNk75eHPwvPFLCIMkfswTR5TsoGgpwv/bjMwIda5ASHLRelxEchGhM9sQBs8r H5EEoZ+hb+9tAvFRjhef6naGzfY9MN1fqZY1gpgjVFNjVC+yUUriV1PcioML/YaEEfKq WMbTaG844wtNo72YeFP+7I7Sq7di0Aib2aMzeQVdytc5LM1HCtlprUs3RoYT3eD9znOK c73H6e5z88HBpeEon+OVkkE/5pt+0jKi4nCyrJpVtqtVOrzBExKTemlHIPi5qi+CxSxT plm6edAH3M4YVLd6Rd2p77eR3w5t2yrheUg41byr2hEZoqQ2qFKVGoLJGh0DX5QMLFts OPsQ== X-Received: by 10.180.74.198 with SMTP id w6mr15937658wiv.69.1428875145722; Sun, 12 Apr 2015 14:45:45 -0700 (PDT) Received: from localhost.localdomain (mangue.f00.fr. [82.226.166.74]) by mx.google.com with ESMTPSA id e2sm8606016wij.5.2015.04.12.14.45.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Apr 2015 14:45:45 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Sun, 12 Apr 2015 23:45:37 +0200 Message-Id: <1428875137-16284-2-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1428875137-16284-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1428875137-16284-1-git-send-email-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH 2/2] package/kodi: Fix build errors due to new ffmpeg X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" We bumped ffmpeg to 2.6.1, the commit log makes a reference to: https://github.com/xbmc/xbmc/pull/6636 But this pull request was only merged for Isengard which is the next version of Kodi, with the current Helix version, it doesn't build. It doesn't seem a good idea to revert the cited commit, so while Isengard is not out, we can live with that small patch to Kodi. This patch applies what can be found with in the pull request: https://github.com/xbmc/xbmc/commit/dfe123f23a5e933c8f0f3367f24630de2beb29ec Signed-off-by: Maxime Hadjinlian --- .../0002-Fix-build-error-with-ffmpeg-2.6.1.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/kodi/0002-Fix-build-error-with-ffmpeg-2.6.1.patch diff --git a/package/kodi/0002-Fix-build-error-with-ffmpeg-2.6.1.patch b/package/kodi/0002-Fix-build-error-with-ffmpeg-2.6.1.patch new file mode 100644 index 0000000..5e5f5b6 --- /dev/null +++ b/package/kodi/0002-Fix-build-error-with-ffmpeg-2.6.1.patch @@ -0,0 +1,41 @@ +From 0d0c975f87bbf0fff008b091485c5f2e26f5ef5e Mon Sep 17 00:00:00 2001 +From: Maxime Hadjinlian +Date: Wed, 8 Apr 2015 17:44:38 +0200 +Subject: [PATCH] Fix build error with ffmpeg 2.6.1 + +With this commit: 4d094d9eb4edba5b6c3c229a2c02da1427e43fe5 + +We bumped ffmpeg to 2.6.1, the commit log makes a reference to: + https://github.com/xbmc/xbmc/pull/6636 + +But this pull request was only merged for Isengard which is the next +version of Kodi, with the current Helix version, it won't build. + +This patch applies what can be found in the pull request: +https://github.com/xbmc/xbmc/commit/dfe123f23a5e933c8f0f3367f24630de2beb29ec + +So it builds with the newer ffmpeg. + +This patch *MUST* be removed when we bump Kodi to Isengard. + +Signed-off-by: Maxime Hadjinlian +--- + xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +index 6f37758..fdb770e 100644 +--- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp ++++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +@@ -541,7 +541,7 @@ void CDVDDemuxFFmpeg::Flush() + { + // naughty usage of an internal ffmpeg function + if (m_pFormatContext) +- av_read_frame_flush(m_pFormatContext); ++ avformat_flush(m_pFormatContext); + + m_currentPts = DVD_NOPTS_VALUE; + +-- +2.1.4 +