diff --git a/oneVPL.patch b/oneVPL.patch new file mode 100644 index 0000000..849a565 --- /dev/null +++ b/oneVPL.patch @@ -0,0 +1,48 @@ +Backport of https://code.videolan.org/videolan/vlc/-/merge_requests/3843 +"Switch from deprecated MFX to VPL" for 3.0, as direct use of intel-mediasdk +is deprecated in favour of oneVPL. + +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -2923,9 +2923,9 @@ fi + + + dnl +-dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder ++dnl Intel oneAPI Video Processing Library + dnl +-PKG_ENABLE_MODULES_VLC([MFX], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto]) ++PKG_ENABLE_MODULES_VLC([VPL], [qsv], [vpl], [Intel oneAPI Video Processing Library encoder], [auto]) + + dnl + dnl libfluidsynth (MIDI synthetizer) plugin +diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am +--- a/modules/codec/Makefile.am ++++ b/modules/codec/Makefile.am +@@ -610,9 +610,9 @@ codec_LTLIBRARIES += $(LTLIBdav1d) + codec_LTLIBRARIES += $(LTLIBcrystalhd) + + libqsv_plugin_la_SOURCES = codec/qsv.c +-libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(MFX_CFLAGS) ++libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(VPL_CFLAGS) + libqsv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' +-libqsv_plugin_la_LIBADD = $(MFX_LIBS) ++libqsv_plugin_la_LIBADD = $(VPL_LIBS) + EXTRA_LTLIBRARIES += libqsv_plugin.la + codec_LTLIBRARIES += $(LTLIBqsv) + +diff --git a/modules/codec/qsv.c b/modules/codec/qsv.c +--- a/modules/codec/qsv.c ++++ b/modules/codec/qsv.c +@@ -33,7 +33,7 @@ + #include + #include + +-#include ++#include + + #define SOUT_CFG_PREFIX "sout-qsv-" + +-- +GitLab diff --git a/vlc.spec b/vlc.spec index 3f3456e..38ce111 100644 --- a/vlc.spec +++ b/vlc.spec @@ -21,7 +21,7 @@ %endif %ifarch x86_64 -%bcond mfx 1 +%bcond vpl 1 %endif Name: vlc @@ -39,6 +39,8 @@ Patch: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch Patch: fdk-aac2.patch # separate avcodec-vaapi conditional from other vaapi modules Patch: vaapi-without-ffmepg4.patch +# port from intel-mediasdk to oneVPL +Patch: oneVPL.patch %{load:%{S:1}} %global __provides_exclude_from ^%{vlc_plugindir}/.*$ @@ -122,9 +124,6 @@ BuildRequires: pkgconfig(libgme) #BuildRequires: pkgconfig(libgoom2) BuildRequires: pkgconfig(libidn) BuildRequires: pkgconfig(libmatroska) -%if %{with mfx} -BuildRequires: pkgconfig(libmfx) -%endif BuildRequires: pkgconfig(libmodplug) >= 0.8.9.0 BuildRequires: pkgconfig(libmpeg2) >= 0.3.2 BuildRequires: pkgconfig(libmpg123) @@ -192,6 +191,9 @@ BuildRequires: pkgconfig(twolame) BuildRequires: pkgconfig(vdpau) >= 0.6 BuildRequires: pkgconfig(vorbis) >= 1.1 BuildRequires: pkgconfig(vorbisenc) >= 1.1 +%if %{with vpl} +BuildRequires: pkgconfig(vpl) +%endif BuildRequires: pkgconfig(vpx) >= 1.5.0 BuildRequires: pkgconfig(wayland-client) >= 1.5.91 BuildRequires: pkgconfig(wayland-egl) @@ -567,7 +569,7 @@ export LIVE555_PREFIX=%{_prefix} --enable-x265%{!?with_x265:=no} \ --enable-x264%{!?with_x264:=no} \ --enable-x26410b%{!?with_x264:=no} \ - --enable-mfx%{!?with_mfx:=no} \ + --enable-vpl%{!?with_vpl:=no} \ --enable-fluidsynth \ --disable-fluidlite \ --enable-zvbi \