Merge pull request #19693 from turris-cz/ffmpeg-conflicts-provides

ffmpeg: add conflicts and provides
This commit is contained in:
Josef Schlehofer authored and GitHub committed 2022-10-28 13:47:33 +02:00
commit bdfd040a11
1 file changed
+3
+3
View File
@@ -333,6 +333,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
@@ -351,6 +352,7 @@ $(call Package/libffmpeg/Default)
+PACKAGE_libx264:libx264 \
+!PACKAGE_libx264:fdk-aac
VARIANT:=full
PROVIDES:=libffmpeg-mini libffmpeg-audio-dec
endef
@@ -365,6 +367,7 @@ define Package/libffmpeg-mini
$(call Package/libffmpeg/Default)
TITLE+= (mini)
VARIANT:=mini
CONFLICTS:=libffmpeg-full
endef
define Package/libffmpeg-mini/description