From patchwork Thu Jan 31 12:15:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: LP C X-Patchwork-Id: 1034162 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cordier.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43qzjf090Gz9sDB for ; Thu, 31 Jan 2019 23:16:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D04D987F8F; Thu, 31 Jan 2019 12:16:17 +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 cX7PX0sNJ2m6; Thu, 31 Jan 2019 12:16:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 08AEC87F89; Thu, 31 Jan 2019 12:16:16 +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 5A7421BF361 for ; Thu, 31 Jan 2019 12:16:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 53838874C1 for ; Thu, 31 Jan 2019 12:16:09 +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 vjr2X-lXMLls for ; Thu, 31 Jan 2019 12:16:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay-1.mailobj.net (relay-1.mailobj.net [213.182.54.6]) by whitealder.osuosl.org (Postfix) with ESMTPS id D526F86096 for ; Thu, 31 Jan 2019 12:16:05 +0000 (UTC) Received: from v-1c (unknown [192.168.90.161]) by relay-1.mailobj.net (Postfix) with SMTP id C00B312A5; Thu, 31 Jan 2019 13:16:03 +0100 (CET) Received: by mail-1.net-c.com [213.182.54.15] with ESMTP Thu, 31 Jan 2019 13:16:03 +0100 (CET) X-EA-Auth: yanFF/1Qww56dmbK+KEDlmlEnsqSdnRH7g1sZIuuyQCbg1+1K5RGjgUUapJhmMMoSHDvjLz/cXzTLx5NMccc83oihAIxOPcA From: Louis-Paul Cordier To: buildroot@buildroot.org Date: Thu, 31 Jan 2019 13:15:24 +0100 Message-Id: <20190131121526.11816-5-lpdev@cordier.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190131121526.11816-1-lpdev@cordier.org> References: <20190131121526.11816-1-lpdev@cordier.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/6] ffmpeg: bump to version 4.1. ffserver is not supported anymore. 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: Louis-Paul Cordier , Bernd Kuhls , Mahyar Koshkouei Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Louis-Paul Cordier --- package/ffmpeg/0001-ffmpeg-pthreads.patch | 34 ----------------------- package/ffmpeg/Config.in | 6 ---- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 8 +----- 4 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 package/ffmpeg/0001-ffmpeg-pthreads.patch diff --git a/package/ffmpeg/0001-ffmpeg-pthreads.patch b/package/ffmpeg/0001-ffmpeg-pthreads.patch deleted file mode 100644 index c6d75d2297..0000000000 --- a/package/ffmpeg/0001-ffmpeg-pthreads.patch +++ /dev/null @@ -1,34 +0,0 @@ -From patchwork Wed Oct 25 13:32:36 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [FFmpeg-devel] configure: v4l2_m2m depends on pthreads -From: Mark Thompson -X-Patchwork-Id: 5688 -Message-Id: <27e5b360-1210-d550-c8de-a761f8e9f326@jkqxz.net> -To: FFmpeg development discussions and patches -Date: Wed, 25 Oct 2017 14:32:36 +0100 - -Fixes build with --disable-pthreads. - -Downloaded from upstream patchworks: -https://patchwork.ffmpeg.org/patch/5688/ - -Signed-off-by: Bernd Kuhls ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index c86e578..76523c8 100755 ---- a/configure -+++ b/configure -@@ -2780,7 +2780,7 @@ omx_rpi_select="omx" - qsvdec_select="qsv" - qsvenc_select="qsv" - vaapi_encode_deps="vaapi" --v4l2_m2m_deps_any="linux_videodev2_h" -+v4l2_m2m_deps="linux_videodev2_h pthreads" - - hwupload_cuda_filter_deps="cuda" - scale_npp_filter_deps="cuda libnpp" diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 2d94c5712a..eec7ce0f6b 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -63,12 +63,6 @@ config BR2_PACKAGE_FFMPEG_FFPLAY comment "ffplay needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -config BR2_PACKAGE_FFMPEG_FFSERVER - bool "Build ffserver" - depends on BR2_USE_MMU # fork() - help - FFserver is a streaming server for both audio and video. - config BR2_PACKAGE_FFMPEG_FFPROBE bool "Build ffprobe" help diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index e00c4ec56c..c21561698f 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 741cbd6394eaed370774ca4cc089eaafbc54d0824b9aa360d4b3b0cbcbc4a92c ffmpeg-3.4.5.tar.xz +sha256 a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994 ffmpeg-4.1.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index b86d465df8..c42fa54cd1 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.4.5 +FFMPEG_VERSION = 4.1 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES @@ -84,12 +84,6 @@ else FFMPEG_CONF_OPTS += --disable-ffplay endif -ifeq ($(BR2_PACKAGE_FFMPEG_FFSERVER),y) -FFMPEG_CONF_OPTS += --enable-ffserver -else -FFMPEG_CONF_OPTS += --disable-ffserver -endif - ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y) FFMPEG_CONF_OPTS += --enable-avresample else