| Message ID | 20240406073216.1054073-3-bernd@kuhls.net |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [01/18] package/freeswitch: fix build with ffmpeg 6.0 | expand |
On 2024-04-06 09:32 +0200, Bernd Kuhls spake thusly: > Added with commit > http://git.videolan.org/?p=ffmpeg.git;a=commit;h=7158f1e64d9b76afea78537a35c465447df0cff8 > > "It will fail to run configure script if both libmfx and libvpl are > enabled. > > It is recommended to use oneVPL for new work, even for currently > available hardwares" I like those little quotes and references that explain the reasoning behind the change, thanks! > Signed-off-by: Bernd Kuhls <bernd@kuhls.net> > --- > package/ffmpeg/ffmpeg.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk > index acd5a7d8b2..e7fc1854e5 100644 > --- a/package/ffmpeg/ffmpeg.mk > +++ b/package/ffmpeg/ffmpeg.mk > @@ -321,12 +321,18 @@ else > FFMPEG_CONF_OPTS += --disable-libbluray > endif > > +ifeq ($(BR2_PACKAGE_LIBVPL),y) > +FFMPEG_CONF_OPTS += --enable-libvpl --disable-libmfx > +FFMPEG_DEPENDENCIES += libvpl > +else > ifeq ($(BR2_PACKAGE_INTEL_MEDIASDK),y) > FFMPEG_CONF_OPTS += --enable-libmfx > FFMPEG_DEPENDENCIES += intel-mediasdk > else > FFMPEG_CONF_OPTS += --disable-libmfx > endif > +FFMPEG_CONF_OPTS += --disable-libvpl > +endif I think we can simplify this a little bit: ifeq ($(BR2_PACKAGE_LIBVPL),y) FFMPEG_CONF_OPTS += --enable-libvpl --disable-libmfx FFMPEG_DEPENDENCIES += libvpl else ifeq ($(BR2_PACKAGE_INTEL_MEDIASDK),y) FFMPEG_CONF_OPTS += --disable-libvpl --enable-libmfx FFMPEG_DEPENDENCIES += intel-mediasdk else FFMPEG_CONF_OPTS += --disable-libvpl --disable-libmfx endif Regards, Yann E. MORIN. > ifeq ($(BR2_PACKAGE_RTMPDUMP),y) > FFMPEG_CONF_OPTS += --enable-librtmp > -- > 2.39.2 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
Am Sun, 7 Apr 2024 11:29:00 +0200 schrieb Yann E. MORIN:
> I think we can simplify this a little bit:
Hi Yann,
thanks, will be included in v2.
Regards, Bernd
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index acd5a7d8b2..e7fc1854e5 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -321,12 +321,18 @@ else FFMPEG_CONF_OPTS += --disable-libbluray endif +ifeq ($(BR2_PACKAGE_LIBVPL),y) +FFMPEG_CONF_OPTS += --enable-libvpl --disable-libmfx +FFMPEG_DEPENDENCIES += libvpl +else ifeq ($(BR2_PACKAGE_INTEL_MEDIASDK),y) FFMPEG_CONF_OPTS += --enable-libmfx FFMPEG_DEPENDENCIES += intel-mediasdk else FFMPEG_CONF_OPTS += --disable-libmfx endif +FFMPEG_CONF_OPTS += --disable-libvpl +endif ifeq ($(BR2_PACKAGE_RTMPDUMP),y) FFMPEG_CONF_OPTS += --enable-librtmp
Added with commit http://git.videolan.org/?p=ffmpeg.git;a=commit;h=7158f1e64d9b76afea78537a35c465447df0cff8 "It will fail to run configure script if both libmfx and libvpl are enabled. It is recommended to use oneVPL for new work, even for currently available hardwares" Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- package/ffmpeg/ffmpeg.mk | 6 ++++++ 1 file changed, 6 insertions(+)