From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] ffmpeg: Update deps to use sdl2 in place of sdl
Date: Wed, 01 Sep 2021 23:06:33 +0200
Message-ID: <2eb94690-85c8-97c4-d2aa-9b8b4260220c@ipfire.org>
In-Reply-To: <20210901202100.2872528-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4794170403883118894=="
List-Id: <development.lists.ipfire.org>

--===============4794170403883118894==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi All,

I forgot to add in the commit that I also ran ./make.sh find-dependencies on =
the old SDL libraries and nothing got flagged up so it looks like there is on=
ly ffmpeg that is using sdl.

Regards,

Adolf.

On 01/09/2021 22:21, Adolf Belka wrote:
> - This patch needs to go together with the patch updating sdl to sdl2
>     https://patchwork.ipfire.org/project/ipfire/patch/20210824212848.131125=
7-1-adolf.belka(a)ipfire.org/
> - Update deps line in lfs to use sdl2 in place of sdl
> - Update rootfile
>=20
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>   config/rootfiles/packages/ffmpeg | 5 +++++
>   lfs/ffmpeg                       | 4 ++--
>   2 files changed, 7 insertions(+), 2 deletions(-)
>=20
> diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/f=
fmpeg
> 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    =3D $(URL_IPFIRE)
>   DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
>   TARGET     =3D $(DIR_INFO)/$(THISAPP)
>   PROG       =3D ffmpeg
> -PAK_VER    =3D 12
> +PAK_VER    =3D 13
>  =20
> -DEPS       =3D sdl lame libvorbis xvid
> +DEPS       =3D sdl2 lame libvorbis xvid
>  =20
>   ifeq "$(BUILD_ARCH)" "armv6l"
>   	LDFLAGS +=3D -latomic
>=20

--===============4794170403883118894==--