From patchwork Sat Apr 2 17:34:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 605435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 3qclkJ27vKz9sCk for ; Sun, 3 Apr 2016 03:34:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 435BC23337; Sat, 2 Apr 2016 17:34:47 +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 xpiAf0LbVMmT; Sat, 2 Apr 2016 17:34:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7B1552382C; Sat, 2 Apr 2016 17:34:45 +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 903A61C29C9 for ; Sat, 2 Apr 2016 17:34:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 89ABB89E96 for ; Sat, 2 Apr 2016 17:34:43 +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 cFvXkLYCzdsn for ; Sat, 2 Apr 2016 17:34:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 44B3A896D2 for ; Sat, 2 Apr 2016 17:34:42 +0000 (UTC) Received: from fwd10.aul.t-online.de (fwd10.aul.t-online.de [172.20.26.152]) by mailout12.t-online.de (Postfix) with SMTP id AF6FEC1BAF; Sat, 2 Apr 2016 19:34:39 +0200 (CEST) Received: from fli4l.lan.fli4l (VgtG7uZHQhHy48JccrZz4VJ1wCjFO3GzF3FGkPvsjGFxV3cundb-3u0ah4azXiygCX@[84.178.251.170]) by fwd10.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1amPRX-0cHeAS0; Sat, 2 Apr 2016 19:34:39 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:36050 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.87) (envelope-from ) id 1amPRW-0001Mu-0t; Sat, 02 Apr 2016 19:34:38 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 2 Apr 2016 19:34:30 +0200 Message-Id: <1459618474-11464-3-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459618474-11464-1-git-send-email-bernd.kuhls@t-online.de> References: <1459618474-11464-1-git-send-email-bernd.kuhls@t-online.de> X-ID: VgtG7uZHQhHy48JccrZz4VJ1wCjFO3GzF3FGkPvsjGFxV3cundb-3u0ah4azXiygCX X-TOI-MSGID: 6eed7781-6ded-4d95-b8de-d970a20bc237 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH v2 2/6] package/ffmpeg: bump to version 3.0.1 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" From: Vicente Olivert Riera - Remove non-existen configure options: - --disable-mips32r2 - --disable-libvo-aacenc - Amend renamed configure options: - --disable-mipsdspr1 has been renamed to --disable-mipsdsp Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls --- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index 8643bff..65fe32b 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 25bcedbdafadac3d09c325c1d46a51f53d858b26a260d5aed6b4f17fea6e07fa ffmpeg-2.8.6.tar.xz +sha256 c389ca5e3c29e758dd82ee6981130fe79e73b06e26db1a3aa971daea63598bc1 ffmpeg-3.0.1.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index ddfac20..26633e4 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 2.8.6 +FFMPEG_VERSION = 3.0.1 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -41,7 +41,7 @@ FFMPEG_CONF_OPTS = \ --enable-runtime-cpudetect \ --disable-hardcoded-tables \ --disable-memalign-hack \ - --disable-mipsdspr1 \ + --disable-mipsdsp \ --disable-mipsdspr2 \ --disable-msa \ --enable-hwaccels \ @@ -58,7 +58,6 @@ FFMPEG_CONF_OPTS = \ --disable-libnut \ --disable-libopenjpeg \ --disable-libschroedinger \ - --disable-libvo-aacenc \ --disable-libvo-amrwbenc \ --disable-symver \ --disable-doc @@ -437,14 +436,6 @@ FFMPEG_CONF_OPTS += \ --enable-mipsfpu endif -ifeq ($(BR2_mips_32r2),y) -FFMPEG_CONF_OPTS += \ - --enable-mips32r2 -else -FFMPEG_CONF_OPTS += \ - --disable-mips32r2 -endif - ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) FFMPEG_CONF_OPTS += --enable-altivec else