Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
ffmpeg: add conflicts and provides
This commit is contained in:
Josef Schlehofer 2022-10-28 13:47:33 +02:00 committed by GitHub
commit bdfd040a11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
multimedia/ffmpeg/Makefile
View file

@ -333,6 +333,7 @@ define Package/libffmpeg-audio-dec
$(call Package/libffmpeg/Default) $(call Package/libffmpeg/Default)
TITLE+= (audio) TITLE+= (audio)
VARIANT:=audio-dec VARIANT:=audio-dec
CONFLICTS:=libffmpeg-full
endef endef
define Package/libffmpeg-audio-dec/description define Package/libffmpeg-audio-dec/description
@ -351,6 +352,7 @@ $(call Package/libffmpeg/Default)
+PACKAGE_libx264:libx264 \ +PACKAGE_libx264:libx264 \
+!PACKAGE_libx264:fdk-aac +!PACKAGE_libx264:fdk-aac
VARIANT:=full VARIANT:=full
PROVIDES:=libffmpeg-mini libffmpeg-audio-dec
endef endef
@ -365,6 +367,7 @@ define Package/libffmpeg-mini
$(call Package/libffmpeg/Default) $(call Package/libffmpeg/Default)
TITLE+= (mini) TITLE+= (mini)
VARIANT:=mini VARIANT:=mini
CONFLICTS:=libffmpeg-full
endef endef
define Package/libffmpeg-mini/description define Package/libffmpeg-mini/description