commit 70f0f586e5a6bb0b769e19bc644f6dad6e968097 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Apr 23 21:15:15 2018 +1000 [notify] ffmpeg: 3.4.2 -> 4.0 new dependency libsdl2 diff --git a/ffmpeg/.footprint b/ffmpeg/.footprint index 2981d769..37ad78b8 100644 --- a/ffmpeg/.footprint +++ b/ffmpeg/.footprint @@ -1,10 +1,12 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/ffmpeg +-rwxr-xr-x root/root usr/bin/ffplay -rwxr-xr-x root/root usr/bin/ffprobe --rwxr-xr-x root/root usr/bin/ffserver drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/libavcodec/ +-rw-r--r-- root/root usr/include/libavcodec/ac3_parser.h +-rw-r--r-- root/root usr/include/libavcodec/adts_parser.h -rw-r--r-- root/root usr/include/libavcodec/avcodec.h -rw-r--r-- root/root usr/include/libavcodec/avdct.h -rw-r--r-- root/root usr/include/libavcodec/avfft.h @@ -16,7 +18,6 @@ drwxr-xr-x root/root usr/include/libavcodec/ -rw-r--r-- root/root usr/include/libavcodec/mediacodec.h -rw-r--r-- root/root usr/include/libavcodec/qsv.h -rw-r--r-- root/root usr/include/libavcodec/vaapi.h --rw-r--r-- root/root usr/include/libavcodec/vda.h -rw-r--r-- root/root usr/include/libavcodec/vdpau.h -rw-r--r-- root/root usr/include/libavcodec/version.h -rw-r--r-- root/root usr/include/libavcodec/videotoolbox.h @@ -27,7 +28,6 @@ drwxr-xr-x root/root usr/include/libavdevice/ -rw-r--r-- root/root usr/include/libavdevice/version.h drwxr-xr-x root/root usr/include/libavfilter/ -rw-r--r-- root/root usr/include/libavfilter/avfilter.h --rw-r--r-- root/root usr/include/libavfilter/avfiltergraph.h -rw-r--r-- root/root usr/include/libavfilter/buffersink.h -rw-r--r-- root/root usr/include/libavfilter/buffersrc.h -rw-r--r-- root/root usr/include/libavfilter/version.h @@ -35,9 +35,6 @@ drwxr-xr-x root/root usr/include/libavformat/ -rw-r--r-- root/root usr/include/libavformat/avformat.h -rw-r--r-- root/root usr/include/libavformat/avio.h -rw-r--r-- root/root usr/include/libavformat/version.h -drwxr-xr-x root/root usr/include/libavresample/ --rw-r--r-- root/root usr/include/libavresample/avresample.h --rw-r--r-- root/root usr/include/libavresample/version.h drwxr-xr-x root/root usr/include/libavutil/ -rw-r--r-- root/root usr/include/libavutil/adler32.h -rw-r--r-- root/root usr/include/libavutil/aes.h @@ -63,6 +60,7 @@ drwxr-xr-x root/root usr/include/libavutil/ -rw-r--r-- root/root usr/include/libavutil/dict.h -rw-r--r-- root/root usr/include/libavutil/display.h -rw-r--r-- root/root usr/include/libavutil/downmix_info.h +-rw-r--r-- root/root usr/include/libavutil/encryption_info.h -rw-r--r-- root/root usr/include/libavutil/error.h -rw-r--r-- root/root usr/include/libavutil/eval.h -rw-r--r-- root/root usr/include/libavutil/ffversion.h @@ -76,6 +74,7 @@ drwxr-xr-x root/root usr/include/libavutil/ -rw-r--r-- root/root usr/include/libavutil/hwcontext_d3d11va.h -rw-r--r-- root/root usr/include/libavutil/hwcontext_drm.h -rw-r--r-- root/root usr/include/libavutil/hwcontext_dxva2.h +-rw-r--r-- root/root usr/include/libavutil/hwcontext_mediacodec.h -rw-r--r-- root/root usr/include/libavutil/hwcontext_qsv.h -rw-r--r-- root/root usr/include/libavutil/hwcontext_vaapi.h -rw-r--r-- root/root usr/include/libavutil/hwcontext_vdpau.h @@ -128,47 +127,42 @@ drwxr-xr-x root/root usr/include/libswscale/ -rw-r--r-- root/root usr/include/libswscale/version.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libavcodec.a -lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.57.107.100 -lrwxrwxrwx root/root usr/lib/libavcodec.so.57 -> libavcodec.so.57.107.100 --rwxr-xr-x root/root usr/lib/libavcodec.so.57.107.100 +lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.58.18.100 +lrwxrwxrwx root/root usr/lib/libavcodec.so.58 -> libavcodec.so.58.18.100 +-rwxr-xr-x root/root usr/lib/libavcodec.so.58.18.100 -rw-r--r-- root/root usr/lib/libavdevice.a -lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.57.10.100 -lrwxrwxrwx root/root usr/lib/libavdevice.so.57 -> libavdevice.so.57.10.100 --rwxr-xr-x root/root usr/lib/libavdevice.so.57.10.100 +lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.58.3.100 +lrwxrwxrwx root/root usr/lib/libavdevice.so.58 -> libavdevice.so.58.3.100 +-rwxr-xr-x root/root usr/lib/libavdevice.so.58.3.100 -rw-r--r-- root/root usr/lib/libavfilter.a -lrwxrwxrwx root/root usr/lib/libavfilter.so -> libavfilter.so.6.107.100 -lrwxrwxrwx root/root usr/lib/libavfilter.so.6 -> libavfilter.so.6.107.100 --rwxr-xr-x root/root usr/lib/libavfilter.so.6.107.100 +lrwxrwxrwx root/root usr/lib/libavfilter.so -> libavfilter.so.7.16.100 +lrwxrwxrwx root/root usr/lib/libavfilter.so.7 -> libavfilter.so.7.16.100 +-rwxr-xr-x root/root usr/lib/libavfilter.so.7.16.100 -rw-r--r-- root/root usr/lib/libavformat.a -lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.57.83.100 -lrwxrwxrwx root/root usr/lib/libavformat.so.57 -> libavformat.so.57.83.100 --rwxr-xr-x root/root usr/lib/libavformat.so.57.83.100 --rw-r--r-- root/root usr/lib/libavresample.a -lrwxrwxrwx root/root usr/lib/libavresample.so -> libavresample.so.3.7.0 -lrwxrwxrwx root/root usr/lib/libavresample.so.3 -> libavresample.so.3.7.0 --rwxr-xr-x root/root usr/lib/libavresample.so.3.7.0 +lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.58.12.100 +lrwxrwxrwx root/root usr/lib/libavformat.so.58 -> libavformat.so.58.12.100 +-rwxr-xr-x root/root usr/lib/libavformat.so.58.12.100 -rw-r--r-- root/root usr/lib/libavutil.a -lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.55.78.100 -lrwxrwxrwx root/root usr/lib/libavutil.so.55 -> libavutil.so.55.78.100 --rwxr-xr-x root/root usr/lib/libavutil.so.55.78.100 +lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.56.14.100 +lrwxrwxrwx root/root usr/lib/libavutil.so.56 -> libavutil.so.56.14.100 +-rwxr-xr-x root/root usr/lib/libavutil.so.56.14.100 -rw-r--r-- root/root usr/lib/libpostproc.a -lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.54.7.100 -lrwxrwxrwx root/root usr/lib/libpostproc.so.54 -> libpostproc.so.54.7.100 --rwxr-xr-x root/root usr/lib/libpostproc.so.54.7.100 +lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.55.1.100 +lrwxrwxrwx root/root usr/lib/libpostproc.so.55 -> libpostproc.so.55.1.100 +-rwxr-xr-x root/root usr/lib/libpostproc.so.55.1.100 -rw-r--r-- root/root usr/lib/libswresample.a -lrwxrwxrwx root/root usr/lib/libswresample.so -> libswresample.so.2.9.100 -lrwxrwxrwx root/root usr/lib/libswresample.so.2 -> libswresample.so.2.9.100 --rwxr-xr-x root/root usr/lib/libswresample.so.2.9.100 +lrwxrwxrwx root/root usr/lib/libswresample.so -> libswresample.so.3.1.100 +lrwxrwxrwx root/root usr/lib/libswresample.so.3 -> libswresample.so.3.1.100 +-rwxr-xr-x root/root usr/lib/libswresample.so.3.1.100 -rw-r--r-- root/root usr/lib/libswscale.a -lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.4.8.100 -lrwxrwxrwx root/root usr/lib/libswscale.so.4 -> libswscale.so.4.8.100 --rwxr-xr-x root/root usr/lib/libswscale.so.4.8.100 +lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.5.1.100 +lrwxrwxrwx root/root usr/lib/libswscale.so.5 -> libswscale.so.5.1.100 +-rwxr-xr-x root/root usr/lib/libswscale.so.5.1.100 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libavcodec.pc -rw-r--r-- root/root usr/lib/pkgconfig/libavdevice.pc -rw-r--r-- root/root usr/lib/pkgconfig/libavfilter.pc -rw-r--r-- root/root usr/lib/pkgconfig/libavformat.pc --rw-r--r-- root/root usr/lib/pkgconfig/libavresample.pc -rw-r--r-- root/root usr/lib/pkgconfig/libavutil.pc -rw-r--r-- root/root usr/lib/pkgconfig/libpostproc.pc -rw-r--r-- root/root usr/lib/pkgconfig/libswresample.pc @@ -194,10 +188,10 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/ffmpeg-scaler.1.gz -rw-r--r-- root/root usr/share/man/man1/ffmpeg-utils.1.gz -rw-r--r-- root/root usr/share/man/man1/ffmpeg.1.gz +-rw-r--r-- root/root usr/share/man/man1/ffplay-all.1.gz +-rw-r--r-- root/root usr/share/man/man1/ffplay.1.gz -rw-r--r-- root/root usr/share/man/man1/ffprobe-all.1.gz -rw-r--r-- root/root usr/share/man/man1/ffprobe.1.gz --rw-r--r-- root/root usr/share/man/man1/ffserver-all.1.gz --rw-r--r-- root/root usr/share/man/man1/ffserver.1.gz drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/libavcodec.3.gz -rw-r--r-- root/root usr/share/man/man3/libavdevice.3.gz diff --git a/ffmpeg/.md5sum b/ffmpeg/.md5sum index ee8973ca..60e024b3 100644 --- a/ffmpeg/.md5sum +++ b/ffmpeg/.md5sum @@ -1,3 +1,3 @@ 5e0c5cca88620751af75ce7a219b5b09 CVE-2018-6621.patch -26827ce59cf3379294d4c8731d85581f ffmpeg-3.4.2.tar.bz2 +bf6d0540acb6270fa52fdc53010a1206 ffmpeg-4.0.tar.bz2 dae0c10c99399580c929fc100e79faef ffmpeg-x264-10bit.sh diff --git a/ffmpeg/.signature b/ffmpeg/.signature index a9874a8a..da4a0c94 100644 --- a/ffmpeg/.signature +++ b/ffmpeg/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30gEkMN7MGlBFyLEELhjN6ob1AhQDyVJIT/UHJ90h9aPM+yXiFY0aFg45uDEkEhtuqI1GuJwi+kC8vij6y1zDA4= -SHA256 (Pkgfile) = 7e39ee721f34416d7d681bfba21674c1ee29005a4ee413e45902b97717d30d51 -SHA256 (.footprint) = 2b74837c5c830b52d0bb6f4258bdf7c2e4dd56982b9f9455248b8195b970d1cb -SHA256 (ffmpeg-3.4.2.tar.bz2) = eb0370bf223809b9ebb359fed5318f826ac038ce77933b3afd55ab1a0a21785a +RWSagIOpLGJF30M+U4K7v4CvrzZ2+Ufq6DwugCLiA4XaqoJSlGigdmW1PU8XysJDp37envUcnBkJM8NQXLsWnuQIu+jStLoHmQc= +SHA256 (Pkgfile) = 5602b58f5cfc75860779069e6d6224b43293996d296d33fb70e37eda6d0f4a8f +SHA256 (.footprint) = 8758c6076dbe8f13615e4a1c89aa6c1a57f49e5b2485959629d53bae80536055 +SHA256 (ffmpeg-4.0.tar.bz2) = 318a39d906c9107d49766c63787798dd078d2a36e6670a9dfeda3c55be4573b8 SHA256 (ffmpeg-x264-10bit.sh) = dde9627c41800235fbcfe0f74d2181be96239a82cd2d0d277715dddb57eb9cb3 SHA256 (CVE-2018-6621.patch) = e3b9aff1fe9aef2d7153d7517f9c349beef27c2859bf1fb01076eeab263a445e diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile index c9fdcbd5..539d0437 100644 --- a/ffmpeg/Pkgfile +++ b/ffmpeg/Pkgfile @@ -1,11 +1,11 @@ # Description: Complete solution to record, convert and stream audio and video. # URL: http://ffmpeg.org/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: bzip2 xz yasm zlib +# Depends on: libsdl2 yasm # Optional: alsa-lib fdk-aac gnutls lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus x264 x265 name=ffmpeg -version=3.4.2 +version=4.0 release=1 source=(https://ffmpeg.org/releases/$name-$version.tar.bz2 ffmpeg-x264-10bit.sh @@ -44,8 +44,8 @@ build() { --enable-version3 \ --enable-shared \ --enable-pic \ + --enable-ffplay \ --enable-avfilter \ - --enable-avresample \ --enable-postproc \ --enable-pthreads \ --enable-swresample