From 4f101b38b037c5ace7b12b5c8068260e817362dc Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Mon, 24 Oct 2022 14:40:11 +0200 Subject: [PATCH] ffmpeg: add conflicts and provides Motivation of this change is that full variants provides the mini variant and as well audio-dec package, thus you can not install both as it fails with the following output: Collected errors: * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavcodec.so.58 But that file is already provided by package * libffmpeg-full * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavcodec.so.58.91.100 But that file is already provided by package * libffmpeg-full * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavdevice.so.58 But that file is already provided by package * libffmpeg-full * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavdevice.so.58.10.100 But that file is already provided by package * libffmpeg-full * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavformat.so.58 But that file is already provided by package * libffmpeg-full * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavformat.so.58.45.100 But that file is already provided by package * libffmpeg-full * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavutil.so.56 But that file is already provided by package * libffmpeg-full * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavutil.so.56.51.100 But that file is already provided by package * libffmpeg-full * opkg_install_cmd: Cannot install package libffmpeg-audio-dec. Let's change it to: Installing libffmpeg-audio-dec (4.3.4-1) to root... Collected errors: * check_conflicts_for: The following packages conflict with libffmpeg-audio-dec: * check_conflicts_for: libffmpeg-full * * opkg_install_cmd: Cannot install package libffmpeg-audio-dec. Signed-off-by: Josef Schlehofer (cherry picked from commit 9693bd47c5a67def43577c082d8ece34ffaf5113) --- multimedia/ffmpeg/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index b6bd661cb..c0b7ee368 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -331,6 +331,7 @@ define Package/libffmpeg-audio-dec $(call Package/libffmpeg/Default) TITLE+= (audio) VARIANT:=audio-dec + CONFLICTS:=libffmpeg-full endef define Package/libffmpeg-audio-dec/description @@ -349,6 +350,7 @@ $(call Package/libffmpeg/Default) +PACKAGE_libx264:libx264 \ +!PACKAGE_libx264:fdk-aac VARIANT:=full + PROVIDES:=libffmpeg-mini libffmpeg-audio-dec endef @@ -363,6 +365,7 @@ define Package/libffmpeg-mini $(call Package/libffmpeg/Default) TITLE+= (mini) VARIANT:=mini + CONFLICTS:=libffmpeg-full endef define Package/libffmpeg-mini/description