commit 7546d1f7e363da96c63072c149a0dd6e0dffd1b4 Author: Danny Rawlins <monster.romster@gmail.com> Date: Wed Dec 14 19:26:00 2016 +1100 ffmpeg: enable nonfree opesssl or gnutls prefered if installed diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile index b5185df..565b653 100644 --- a/ffmpeg/Pkgfile +++ b/ffmpeg/Pkgfile @@ -3,11 +3,11 @@ # Maintainer: Danny Rawlins, crux at romster dot me # Packager: Matt Housh, jaeger at crux dot nu # Depends on: bzip2 xz yasm zlib -# Optional: alsa-lib fdk-aac lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus x264 x265 +# Optional: alsa-lib fdk-aac gnutls lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus x264 x265 name=ffmpeg version=3.2.2 -release=1 +release=2 source=(http://ffmpeg.org/releases/$name-$version.tar.bz2 ffmpeg-x264-10bit.sh) @@ -27,6 +27,12 @@ build() { [ -e '/usr/lib/pkgconfig/theora.pc' ] && PKGMK_FFMPEG+=' --enable-libtheora' [ -e '/usr/lib/pkgconfig/fdk-aac.pc' ] && PKGMK_FFMPEG+=' --enable-libfdk-aac --enable-nonfree' + if [ -e '/usr/lib/pkgconfig/gnutls.pc' ]; then + PKGMK_FFMPEG+=' --enable-gnutls' + else + PKGMK_FFMPEG+=' --enable-openssl --enable-nonfree' + fi + ./configure ${PKGMK_FFMPEG} \ --prefix=/usr \ --disable-debug \