Merge remote-tracking branch 'tombriden/sipsimple-ffmpeg'

This commit is contained in:
Julian Ospald 2020-08-12 19:17:44 +02:00
commit a85ef37a79
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28

View File

@ -12,7 +12,6 @@ SLOT="0"
PLATFORMS="~amd64 ~x86" PLATFORMS="~amd64 ~x86"
MYOPTIONS=" MYOPTIONS="
( providers: libressl openssl ) [[ number-selected = exactly-one ]] ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
( providers: ffmpeg libav ) [[ number-selected = exactly-one ]]
" "
DEPENDENCIES=" DEPENDENCIES="
@ -23,12 +22,11 @@ DEPENDENCIES="
dev-db/sqlite:3 dev-db/sqlite:3
dev-libs/icu:= dev-libs/icu:=
dev-python/python-application[>=2.5.0][python_abis:*(-)?] dev-python/python-application[>=2.5.0][python_abis:*(-)?]
media/ffmpeg[h264]
media-libs/libvpx media-libs/libvpx
media-libs/v4l-utils media-libs/v4l-utils
sys-apps/util-linux sys-apps/util-linux
sys-sound/alsa-lib sys-sound/alsa-lib
providers:ffmpeg? ( media/ffmpeg[h264] )
providers:libav? ( media/libav[h264] )
providers:libressl? ( dev-libs/libressl:= ) providers:libressl? ( dev-libs/libressl:= )
providers:openssl? ( dev-libs/openssl ) providers:openssl? ( dev-libs/openssl )
run: run: