commit 1ff773e8db6ac61e72080e677f6a28c9a404ba04 Author: Tim Biermann <tbier@posteo.de> Date: Wed Jun 29 18:30:40 2022 +0200 ffmpeg3: dropped diff --git a/ffmpeg3/.footprint b/ffmpeg3/.footprint deleted file mode 100644 index 19896f521..000000000 --- a/ffmpeg3/.footprint +++ /dev/null @@ -1,177 +0,0 @@ -drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/ld.so.conf.d/ --rw-r--r-- root/root etc/ld.so.conf.d/ffmpeg3.conf -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/ffmpeg3/ -drwxr-xr-x root/root usr/include/ffmpeg3/libavcodec/ --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/avcodec.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/avdct.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/avfft.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/d3d11va.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/dirac.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/dv_profile.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/dxva2.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/jni.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/mediacodec.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/qsv.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/vaapi.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/vda.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/vdpau.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/version.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/videotoolbox.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/vorbis_parser.h --rw-r--r-- root/root usr/include/ffmpeg3/libavcodec/xvmc.h -drwxr-xr-x root/root usr/include/ffmpeg3/libavdevice/ --rw-r--r-- root/root usr/include/ffmpeg3/libavdevice/avdevice.h --rw-r--r-- root/root usr/include/ffmpeg3/libavdevice/version.h -drwxr-xr-x root/root usr/include/ffmpeg3/libavfilter/ --rw-r--r-- root/root usr/include/ffmpeg3/libavfilter/avfilter.h --rw-r--r-- root/root usr/include/ffmpeg3/libavfilter/avfiltergraph.h --rw-r--r-- root/root usr/include/ffmpeg3/libavfilter/buffersink.h --rw-r--r-- root/root usr/include/ffmpeg3/libavfilter/buffersrc.h --rw-r--r-- root/root usr/include/ffmpeg3/libavfilter/version.h -drwxr-xr-x root/root usr/include/ffmpeg3/libavformat/ --rw-r--r-- root/root usr/include/ffmpeg3/libavformat/avformat.h --rw-r--r-- root/root usr/include/ffmpeg3/libavformat/avio.h --rw-r--r-- root/root usr/include/ffmpeg3/libavformat/version.h -drwxr-xr-x root/root usr/include/ffmpeg3/libavresample/ --rw-r--r-- root/root usr/include/ffmpeg3/libavresample/avresample.h --rw-r--r-- root/root usr/include/ffmpeg3/libavresample/version.h -drwxr-xr-x root/root usr/include/ffmpeg3/libavutil/ --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/adler32.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/aes.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/aes_ctr.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/attributes.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/audio_fifo.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/avassert.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/avconfig.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/avstring.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/avutil.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/base64.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/blowfish.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/bprint.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/bswap.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/buffer.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/camellia.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/cast5.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/channel_layout.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/common.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/cpu.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/crc.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/des.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/dict.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/display.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/downmix_info.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/error.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/eval.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/ffversion.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/fifo.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/file.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/frame.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hash.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hmac.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hwcontext.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hwcontext_cuda.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hwcontext_d3d11va.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hwcontext_drm.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hwcontext_dxva2.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hwcontext_qsv.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hwcontext_vaapi.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hwcontext_vdpau.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/hwcontext_videotoolbox.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/imgutils.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/intfloat.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/intreadwrite.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/lfg.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/log.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/lzo.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/macros.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/mastering_display_metadata.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/mathematics.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/md5.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/mem.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/motion_vector.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/murmur3.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/opt.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/parseutils.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/pixdesc.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/pixelutils.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/pixfmt.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/random_seed.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/rational.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/rc4.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/replaygain.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/ripemd.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/samplefmt.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/sha.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/sha512.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/spherical.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/stereo3d.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/tea.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/threadmessage.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/time.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/timecode.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/timestamp.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/tree.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/twofish.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/version.h --rw-r--r-- root/root usr/include/ffmpeg3/libavutil/xtea.h -drwxr-xr-x root/root usr/include/ffmpeg3/libpostproc/ --rw-r--r-- root/root usr/include/ffmpeg3/libpostproc/postprocess.h --rw-r--r-- root/root usr/include/ffmpeg3/libpostproc/version.h -drwxr-xr-x root/root usr/include/ffmpeg3/libswresample/ --rw-r--r-- root/root usr/include/ffmpeg3/libswresample/swresample.h --rw-r--r-- root/root usr/include/ffmpeg3/libswresample/version.h -drwxr-xr-x root/root usr/include/ffmpeg3/libswscale/ --rw-r--r-- root/root usr/include/ffmpeg3/libswscale/swscale.h --rw-r--r-- root/root usr/include/ffmpeg3/libswscale/version.h -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/ffmpeg3/ --rw-r--r-- root/root usr/lib/ffmpeg3/libavcodec.a -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavcodec.so -> libavcodec.so.57.107.100 -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavcodec.so.57 -> libavcodec.so.57.107.100 --rwxr-xr-x root/root usr/lib/ffmpeg3/libavcodec.so.57.107.100 --rw-r--r-- root/root usr/lib/ffmpeg3/libavdevice.a -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavdevice.so -> libavdevice.so.57.10.100 -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavdevice.so.57 -> libavdevice.so.57.10.100 --rwxr-xr-x root/root usr/lib/ffmpeg3/libavdevice.so.57.10.100 --rw-r--r-- root/root usr/lib/ffmpeg3/libavfilter.a -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavfilter.so -> libavfilter.so.6.107.100 -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavfilter.so.6 -> libavfilter.so.6.107.100 --rwxr-xr-x root/root usr/lib/ffmpeg3/libavfilter.so.6.107.100 --rw-r--r-- root/root usr/lib/ffmpeg3/libavformat.a -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavformat.so -> libavformat.so.57.83.100 -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavformat.so.57 -> libavformat.so.57.83.100 --rwxr-xr-x root/root usr/lib/ffmpeg3/libavformat.so.57.83.100 --rw-r--r-- root/root usr/lib/ffmpeg3/libavresample.a -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavresample.so -> libavresample.so.3.7.0 -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavresample.so.3 -> libavresample.so.3.7.0 --rwxr-xr-x root/root usr/lib/ffmpeg3/libavresample.so.3.7.0 --rw-r--r-- root/root usr/lib/ffmpeg3/libavutil.a -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavutil.so -> libavutil.so.55.78.100 -lrwxrwxrwx root/root usr/lib/ffmpeg3/libavutil.so.55 -> libavutil.so.55.78.100 --rwxr-xr-x root/root usr/lib/ffmpeg3/libavutil.so.55.78.100 --rw-r--r-- root/root usr/lib/ffmpeg3/libpostproc.a -lrwxrwxrwx root/root usr/lib/ffmpeg3/libpostproc.so -> libpostproc.so.54.7.100 -lrwxrwxrwx root/root usr/lib/ffmpeg3/libpostproc.so.54 -> libpostproc.so.54.7.100 --rwxr-xr-x root/root usr/lib/ffmpeg3/libpostproc.so.54.7.100 --rw-r--r-- root/root usr/lib/ffmpeg3/libswresample.a -lrwxrwxrwx root/root usr/lib/ffmpeg3/libswresample.so -> libswresample.so.2.9.100 -lrwxrwxrwx root/root usr/lib/ffmpeg3/libswresample.so.2 -> libswresample.so.2.9.100 --rwxr-xr-x root/root usr/lib/ffmpeg3/libswresample.so.2.9.100 --rw-r--r-- root/root usr/lib/ffmpeg3/libswscale.a -lrwxrwxrwx root/root usr/lib/ffmpeg3/libswscale.so -> libswscale.so.4.8.100 -lrwxrwxrwx root/root usr/lib/ffmpeg3/libswscale.so.4 -> libswscale.so.4.8.100 --rwxr-xr-x root/root usr/lib/ffmpeg3/libswscale.so.4.8.100 -drwxr-xr-x root/root usr/lib/ffmpeg3/pkgconfig/ --rw-r--r-- root/root usr/lib/ffmpeg3/pkgconfig/libavcodec.pc --rw-r--r-- root/root usr/lib/ffmpeg3/pkgconfig/libavdevice.pc --rw-r--r-- root/root usr/lib/ffmpeg3/pkgconfig/libavfilter.pc --rw-r--r-- root/root usr/lib/ffmpeg3/pkgconfig/libavformat.pc --rw-r--r-- root/root usr/lib/ffmpeg3/pkgconfig/libavresample.pc --rw-r--r-- root/root usr/lib/ffmpeg3/pkgconfig/libavutil.pc --rw-r--r-- root/root usr/lib/ffmpeg3/pkgconfig/libpostproc.pc --rw-r--r-- root/root usr/lib/ffmpeg3/pkgconfig/libswresample.pc --rw-r--r-- root/root usr/lib/ffmpeg3/pkgconfig/libswscale.pc -drwxr-xr-x root/root usr/share/ diff --git a/ffmpeg3/.signature b/ffmpeg3/.signature deleted file mode 100644 index 656ced5d8..000000000 --- a/ffmpeg3/.signature +++ /dev/null @@ -1,6 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/gA9/Hq84lhRd8Na6nTQcfnu36juAlSciFZpmJZAbhlRBZLhvbClR86oEGfvQVyzWW6Jb6DtYUoS5sxOX9UlwY= -SHA256 (Pkgfile) = 94172843502d575cd274cbf2aa4ae385c259ea579b68e674da3e158741c8a0e5 -SHA256 (.footprint) = 81e1bbe44a880860dedec30c4a6e85abf3ad6ec0693706bf790adb60f91f9bf0 -SHA256 (ffmpeg-3.4.2.tar.bz2) = eb0370bf223809b9ebb359fed5318f826ac038ce77933b3afd55ab1a0a21785a -SHA256 (CVE-2018-6621.patch) = e3b9aff1fe9aef2d7153d7517f9c349beef27c2859bf1fb01076eeab263a445e diff --git a/ffmpeg3/CVE-2018-6621.patch b/ffmpeg3/CVE-2018-6621.patch deleted file mode 100644 index 8c9e4dd0e..000000000 --- a/ffmpeg3/CVE-2018-6621.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libavcodec/utvideodec.c 2017-12-11 05:35:09.000000000 +0800 -+++ b/libavcodec/utvideodec.c 2018-02-06 15:54:54.872000000 +0800 -@@ -561,7 +561,7 @@ static int decode_frame(AVCodecContext * - for (j = 0; j < c->slices; j++) { - slice_end = bytestream2_get_le32u(&gb); - if (slice_end < 0 || slice_end < slice_start || -- bytestream2_get_bytes_left(&gb) < slice_end) { -+ bytestream2_get_bytes_left(&gb) < slice_end + 1024LL) { - av_log(avctx, AV_LOG_ERROR, "Incorrect slice size\n"); - return AVERROR_INVALIDDATA; - } diff --git a/ffmpeg3/Pkgfile b/ffmpeg3/Pkgfile deleted file mode 100644 index 67e3478d7..000000000 --- a/ffmpeg3/Pkgfile +++ /dev/null @@ -1,62 +0,0 @@ -# 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 -# Optional: alsa-lib fdk-aac gnutls lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus x264 x265 - -name=ffmpeg3 -version=3.4.2 -release=1 -source=(https://ffmpeg.org/releases/ffmpeg-$version.tar.bz2 - CVE-2018-6621.patch) - -build() { - cd ffmpeg-$version - - #https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6621 - patch -p1 -i $SRC/CVE-2018-6621.patch - -[ -e '/usr/lib/pkgconfig/libwebp.pc' ] && PKGMK_FFMPEG+=' --enable-libwebp' -[ -e '/usr/lib/pkgconfig/vdpau.pc' ] && PKGMK_FFMPEG+=' --enable-vdpau' -[ -e '/usr/lib/pkgconfig/freetype2.pc' ] && PKGMK_FFMPEG+=' --enable-libfreetype' -[ -e '/usr/lib/pkgconfig/x264.pc' ] && PKGMK_FFMPEG+=' --enable-libx264' -[ -e '/usr/lib/pkgconfig/x265.pc' ] && PKGMK_FFMPEG+=' --enable-libx265' -[ -e '/usr/lib/pkgconfig/libass.pc' ] && PKGMK_FFMPEG+=' --enable-libass' -[ -e '/usr/include/lame/lame.h' ] && PKGMK_FFMPEG+=' --enable-libmp3lame' -[ -e '/usr/lib/pkgconfig/opus.pc' ] && PKGMK_FFMPEG+=' --enable-libopus' -[ -e '/usr/lib/pkgconfig/vpx.pc' ] && PKGMK_FFMPEG+=' --enable-libvpx' -[ -e '/usr/lib/pkgconfig/vorbis.pc' ] && PKGMK_FFMPEG+=' --enable-libvorbis' -[ -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 \ - --incdir='/usr/include/ffmpeg3' \ - --libdir='/usr/lib/ffmpeg3' \ - --shlibdir='/usr/lib/ffmpeg3' \ - --disable-debug \ - --disable-doc \ - --enable-gpl \ - --enable-version3 \ - --enable-shared \ - --enable-pic \ - --enable-avfilter \ - --enable-avresample \ - --enable-postproc \ - --enable-pthreads \ - --enable-swresample - - make - make DESTDIR=$PKG install - install -d $PKG/etc/ld.so.conf.d - echo -e '/usr/lib/\n/usr/lib/ffmpeg3/' > \ - $PKG/etc/ld.so.conf.d/ffmpeg3.conf - - rm -r $PKG/usr/{bin,share/ffmpeg} -} diff --git a/ffmpeg3/README b/ffmpeg3/README deleted file mode 100644 index a9272ac7b..000000000 --- a/ffmpeg3/README +++ /dev/null @@ -1,9 +0,0 @@ -compatable ffmpeg version 3 - -add: - -PKG_CONFIG_PATH+="/usr/lib/ffmpeg3/pkgconfig" \ - ./configure ... - - -To any affected ports.