From patchwork Tue May 1 07:10:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 906956 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 40Zsxk3d1Tz9s0q for ; Tue, 1 May 2018 17:10:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 866142637A; Tue, 1 May 2018 07:10:31 +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 A1IFBt2-xb9c; Tue, 1 May 2018 07:10:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E127B232FA; Tue, 1 May 2018 07:10:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C72AA1C11CF for ; Tue, 1 May 2018 07:10:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C4C1587E53 for ; Tue, 1 May 2018 07:10:28 +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 tK-h3jQrekXk for ; Tue, 1 May 2018 07:10:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by hemlock.osuosl.org (Postfix) with ESMTPS id B685787E4D for ; Tue, 1 May 2018 07:10:27 +0000 (UTC) Received: from fwd13.aul.t-online.de (fwd13.aul.t-online.de [172.20.27.62]) by mailout06.t-online.de (Postfix) with SMTP id 029BB41C2B0D; Tue, 1 May 2018 09:10:26 +0200 (CEST) Received: from fli4l.lan.fli4l (EfZ7swZFghr9ocQmTxE2uGe44iBjLIasJ9lL1SQ1N5h8U+P9AiBZ5ngN-W3ecKuQvs@[91.58.0.129]) by fwd13.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1fDPQZ-1ML41Q0; Tue, 1 May 2018 09:10:19 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:39710 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.91) (envelope-from ) id 1fDPQY-0007Gz-H9; Tue, 01 May 2018 09:10:18 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Tue, 1 May 2018 09:10:16 +0200 Message-Id: <20180501071017.14270-3-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180501071017.14270-1-bernd.kuhls@t-online.de> References: <20180501071017.14270-1-bernd.kuhls@t-online.de> X-ID: EfZ7swZFghr9ocQmTxE2uGe44iBjLIasJ9lL1SQ1N5h8U+P9AiBZ5ngN-W3ecKuQvs X-TOI-MSGID: 8d5d71df-3294-4a8b-a61b-75ba6d14e17f Subject: [Buildroot] [PATCH 3/4] package/tovid: switch from mplayer to mpv 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: Steve Kenton MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The mplayer package will be removed from buildroot, tovid can use mpv instead. Support for mpv was added upstream: https://github.com/tovid-suite/tovid/commit/05cbce2ea130e50f6bf1599816dd0d7bf3ace91a Signed-off-by: Bernd Kuhls --- package/tovid/Config.in | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/package/tovid/Config.in b/package/tovid/Config.in index d8052ea334..0d42785e8a 100644 --- a/package/tovid/Config.in +++ b/package/tovid/Config.in @@ -6,8 +6,9 @@ config BR2_PACKAGE_TOVID depends on BR2_USE_WCHAR depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mplayer + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 # mpv + depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 # mpv + depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC # mpv # The below dependencies are runtime dependencies only select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng select BR2_PACKAGE_DVDAUTHOR @@ -16,7 +17,7 @@ config BR2_PACKAGE_TOVID select BR2_PACKAGE_IMAGEMAGICK select BR2_PACKAGE_JPEG select BR2_PACKAGE_MJPEGTOOLS - select BR2_PACKAGE_MPLAYER + select BR2_PACKAGE_MPV select BR2_PACKAGE_PROCPS_NG # pgrep and pkill select BR2_PACKAGE_SOX help @@ -30,13 +31,17 @@ config BR2_PACKAGE_TOVID comment "tovid needs a toolchain w/ threads, C++, wchar" depends on BR2_USE_MMU depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 depends on !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 \ || !BR2_INSTALL_LIBSTDCPP \ || !BR2_USE_WCHAR + depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC comment "tovid depends on python or python3" depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 + depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC