From patchwork Wed Sep 1 20:21:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4654 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4H0FnN6FNWz3wy6 for ; Wed, 1 Sep 2021 20:21:12 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4H0FnM58J1zPv; Wed, 1 Sep 2021 20:21:11 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4H0FnM3KPfz2yBX; Wed, 1 Sep 2021 20:21:11 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4H0FnL3723z2xLb for ; Wed, 1 Sep 2021 20:21:10 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4H0FnK4Y28z14j; Wed, 1 Sep 2021 20:21:09 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1630527669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=oPDXw+yxsbvKN2ZnRYWPs/oxXXRfm9I9fy6mZZ7Hj2E=; b=wVuDvkN77NtzeBLy4ZczU4H0QuN9agF/4mAGpnbkA4ar/6t+YFzyUWSUBrxVHkRVeXRGSm 15sSTlEft5hK01BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1630527669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=oPDXw+yxsbvKN2ZnRYWPs/oxXXRfm9I9fy6mZZ7Hj2E=; b=qWrWLdfN7xxlMYUUxne3fnT7buZwRIjySlLD6fXlTbYqGALAd1bZHMsRgy5RVFYmYgdLaZ Vw48gz0jAc2Q1PDPU5yFD/YP1D0CbEuFTDZed3uaoYh/cJxRkpELo0uslToq7+rs2VZmto GCqsXajLW4pkyuU2g4fouJz3qID4O5LNIDDId6jO0NAoEUwEI0gXIQ49KQCFpxy5NONhLC 1PKDb4HG5EK2u6w91ilhRN/WuSxT0Mh6QcLKK1mExV6yHUe4fx+CzRlG9G/ff+sT7gSWBI DS/Rn1rfNdz1RlE0OhN6ypc61lFg/VzfnjzyIZdLZh+k09W/hWoK6zEahzA67g== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] ffmpeg: Update deps to use sdl2 in place of sdl Date: Wed, 1 Sep 2021 22:21:00 +0200 Message-Id: <20210901202100.2872528-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - This patch needs to go together with the patch updating sdl to sdl2 https://patchwork.ipfire.org/project/ipfire/patch/20210824212848.1311257-1-adolf.belka@ipfire.org/ - Update deps line in lfs to use sdl2 in place of sdl - Update rootfile Signed-off-by: Adolf Belka --- config/rootfiles/packages/ffmpeg | 5 +++++ lfs/ffmpeg | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index b388d18f1..65dd0d360 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -1,4 +1,5 @@ usr/bin/ffmpeg +usr/bin/ffplay usr/bin/ffprobe #usr/include/libavcodec #usr/include/libavcodec/ac3_parser.h @@ -188,6 +189,8 @@ usr/lib/libswscale.so.5.9.100 #usr/share/doc/ffmpeg/ffmpeg-scaler.html #usr/share/doc/ffmpeg/ffmpeg-utils.html #usr/share/doc/ffmpeg/ffmpeg.html +#usr/share/doc/ffmpeg/ffplay-all.html +#usr/share/doc/ffmpeg/ffplay.html #usr/share/doc/ffmpeg/ffprobe-all.html #usr/share/doc/ffmpeg/ffprobe.html #usr/share/doc/ffmpeg/general.html @@ -246,6 +249,8 @@ usr/lib/libswscale.so.5.9.100 #usr/share/man/man1/ffmpeg-scaler.1 #usr/share/man/man1/ffmpeg-utils.1 #usr/share/man/man1/ffmpeg.1 +#usr/share/man/man1/ffplay-all.1 +#usr/share/man/man1/ffplay.1 #usr/share/man/man1/ffprobe-all.1 #usr/share/man/man1/ffprobe.1 #usr/share/man/man3/libavcodec.3 diff --git a/lfs/ffmpeg b/lfs/ffmpeg index 1efa14a36..21c21cc88 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 12 +PAK_VER = 13 -DEPS = sdl lame libvorbis xvid +DEPS = sdl2 lame libvorbis xvid ifeq "$(BUILD_ARCH)" "armv6l" LDFLAGS += -latomic