June 2016 - crux-commits

ports/opt (3.2): [notify] gnutls: updated to 3.4.13
by crux＠crux.nu 07 Jun '16

07 Jun '16

commit c320b797e566b2b8d6ea0f57be2e7e4990c46564 Author: Jose V Beneyto <sepen(a)crux.nu> Date: Tue Jun 7 15:12:18 2016 +0200 [notify] gnutls: updated to 3.4.13 Security fix: http://www.gnutls.org/security.html#GNUTLS-SA-2016-1 diff --git a/gnutls/.footprint b/gnutls/.footprint index d49008e..5371e64 100644 --- a/gnutls/.footprint +++ b/gnutls/.footprint @@ -29,9 +29,9 @@ drwxr-xr-x root/root usr/include/gnutls/ -rw-r--r-- root/root usr/include/gnutls/x509.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libgnutls.la -lrwxrwxrwx root/root usr/lib/libgnutls.so -> libgnutls.so.30.6.4 -lrwxrwxrwx root/root usr/lib/libgnutls.so.30 -> libgnutls.so.30.6.4 --rwxr-xr-x root/root usr/lib/libgnutls.so.30.6.4 +lrwxrwxrwx root/root usr/lib/libgnutls.so -> libgnutls.so.30.6.5 +lrwxrwxrwx root/root usr/lib/libgnutls.so.30 -> libgnutls.so.30.6.5 +-rwxr-xr-x root/root usr/lib/libgnutls.so.30.6.5 -rwxr-xr-x root/root usr/lib/libgnutlsxx.la lrwxrwxrwx root/root usr/lib/libgnutlsxx.so -> libgnutlsxx.so.28.1.0 lrwxrwxrwx root/root usr/lib/libgnutlsxx.so.28 -> libgnutlsxx.so.28.1.0 diff --git a/gnutls/.md5sum b/gnutls/.md5sum index dcd8c29..82fbae8 100644 --- a/gnutls/.md5sum +++ b/gnutls/.md5sum @@ -1 +1 @@ -c76571745c31746ead94af9c4c719124 gnutls-3.4.12.tar.xz +bdaccae1942c643fe907090438ec942a gnutls-3.4.13.tar.xz diff --git a/gnutls/Pkgfile b/gnutls/Pkgfile index 488329b..261c8df 100644 --- a/gnutls/Pkgfile +++ b/gnutls/Pkgfile @@ -5,7 +5,7 @@ # Depends on: nettle libidn name=gnutls -version=3.4.12 +version=3.4.13 release=1 source=(ftp://ftp.gnutls.org/gcrypt/$name/v${version%.*}/$name-${version}.t…

1 0

ports/core (3.2): eudev: update to 3.2
by crux＠crux.nu 07 Jun '16

07 Jun '16

commit b0e7d632d27cfc257498b11ea30b04cef425613f Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jun 7 10:08:54 2016 +0200 eudev: update to 3.2 diff --git a/eudev/.md5sum b/eudev/.md5sum index 6ab4ffd..d460cd4 100644 --- a/eudev/.md5sum +++ b/eudev/.md5sum @@ -1,3 +1,3 @@ ee21e150df6c804eef03a6cb2fc1cceb 81-crux.rules -c4dace42deecede102b6c01904042acc eudev-3.1.5.tar.gz +7e42d9b9ed8162021665139520676367 eudev-3.2.tar.gz aca6cf2f09643d6a6c0e9d94d4b89645 start_udev diff --git a/eudev/Pkgfile b/eudev/Pkgfile index 7713d68..b0b9dca 100644 --- a/eudev/Pkgfile +++ b/eudev/Pkgfile @@ -4,8 +4,8 @@ # Depends on: kmod name=eudev -version=3.1.5 -release=2 +version=3.2 +release=1 source=(http://dev.gentoo.org/~blueness/$name/$name-$version.tar.gz 81-crux.rules start_udev)

1 0

ports/core (3.2): libdevmapper: update to 1.02.126
by crux＠crux.nu 07 Jun '16

07 Jun '16

commit e5ec54b5846d95dc01bbb47ca90e26134d6fae22 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jun 7 10:08:25 2016 +0200 libdevmapper: update to 1.02.126 diff --git a/libdevmapper/.md5sum b/libdevmapper/.md5sum index a3e1f28..a25d05d 100644 --- a/libdevmapper/.md5sum +++ b/libdevmapper/.md5sum @@ -1 +1 @@ -c6c3724de741ea9910acae3b0669a45f LVM2.2.02.154.tgz +8e8025f2d82861c7285e2a36c58d279c LVM2.2.02.155.tgz diff --git a/libdevmapper/Pkgfile b/libdevmapper/Pkgfile index 71a2e99..f62c893 100644 --- a/libdevmapper/Pkgfile +++ b/libdevmapper/Pkgfile @@ -4,12 +4,12 @@ # Depends on: eudev util-linux name=libdevmapper -version=1.02.125 +version=1.02.126 release=1 -source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/releases/LVM2.2.02.154.tgz) +source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/releases/LVM2.2.02.155.tgz) build() { - cd LVM2.2.02.154 + cd LVM2.2.02.155 ./configure --prefix=/usr \ --exec-prefix= \

1 0

ports/core (3.2): dash: update to 0.5.9
by crux＠crux.nu 07 Jun '16

07 Jun '16

commit 5fe4d76e237da37e6fb88b7fbe580cc1b112b498 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jun 7 10:08:04 2016 +0200 dash: update to 0.5.9 diff --git a/dash/.md5sum b/dash/.md5sum index 31e9caf..f95fd80 100644 --- a/dash/.md5sum +++ b/dash/.md5sum @@ -1 +1 @@ -560115ed2234988add8da59ee4015ee1 dash-20150713.tar.xz +57341c24c3ebd3d5fc3a863001c94be6 dash-0.5.9.tar.gz diff --git a/dash/Pkgfile b/dash/Pkgfile index d1c5939..d3b7f08 100644 --- a/dash/Pkgfile +++ b/dash/Pkgfile @@ -3,14 +3,13 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=dash -version=20150713 +version=0.5.9 release=1 -source=(http://jue.li/crux/files/$name-$version.tar.xz) +source=(http://gondor.apana.org.au/~herbert/dash/files/$name-$version.tar.gz) build() { cd $name-$version - ./autogen.sh - ./configure --prefix= --mandir=/usr/share/man + ./configure --prefix=/ --mandir=/usr/share/man make make DESTDIR=$PKG install ln -s dash $PKG/bin/sh

1 0

ports/opt (3.2): lvm2: update to 2.02.155
by crux＠crux.nu 07 Jun '16

07 Jun '16

commit d21fc2200cdf37ff8195e1fb25212d1867489ca1 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jun 7 10:06:48 2016 +0200 lvm2: update to 2.02.155 diff --git a/lvm2/.md5sum b/lvm2/.md5sum index a3e1f28..a25d05d 100644 --- a/lvm2/.md5sum +++ b/lvm2/.md5sum @@ -1 +1 @@ -c6c3724de741ea9910acae3b0669a45f LVM2.2.02.154.tgz +8e8025f2d82861c7285e2a36c58d279c LVM2.2.02.155.tgz diff --git a/lvm2/Pkgfile b/lvm2/Pkgfile index 8ce5d74..df1cc5d 100644 --- a/lvm2/Pkgfile +++ b/lvm2/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libdevmapper name=lvm2 -version=2.02.154 +version=2.02.155 release=1 source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/releases/LVM2.$ve…

1 0

ports/opt (3.2): samhain: update to 4.1.4
by crux＠crux.nu 07 Jun '16

07 Jun '16

commit 48f455a181dabb4ac90e71d874c6e47208d80914 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jun 7 10:05:51 2016 +0200 samhain: update to 4.1.4 diff --git a/samhain/.md5sum b/samhain/.md5sum index 3f55417..ee6316d 100644 --- a/samhain/.md5sum +++ b/samhain/.md5sum @@ -1 +1 @@ -03630b53b5041a9b2ec45553a76326f9 samhain_signed-4.1.3.tar.gz +1ab697b7000d0a272d9ade05bb1bc6e0 samhain_signed-4.1.4.tar.gz diff --git a/samhain/Pkgfile b/samhain/Pkgfile index 99d89b1..8474d1c 100644 --- a/samhain/Pkgfile +++ b/samhain/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Juergen Daubert, jue at crux dot nu name=samhain -version=4.1.3 +version=4.1.4 release=1 source=(http://la-samhna.de/archive/${name}_signed-$version.tar.gz)

1 0

ports/opt (3.2): dar: update to 2.5.5
by crux＠crux.nu 07 Jun '16

07 Jun '16

commit 9c933ea3e7e46d50ba52b787e19228484c272f4b Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jun 7 10:05:28 2016 +0200 dar: update to 2.5.5 diff --git a/dar/.footprint b/dar/.footprint index 08cb14b..0eb8e9e 100644 --- a/dar/.footprint +++ b/dar/.footprint @@ -97,9 +97,9 @@ drwxr-xr-x root/root usr/include/dar/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libdar64.a -rwxr-xr-x root/root usr/lib/libdar64.la -lrwxrwxrwx root/root usr/lib/libdar64.so -> libdar64.so.5000.8.0 -lrwxrwxrwx root/root usr/lib/libdar64.so.5000 -> libdar64.so.5000.8.0 --rwxr-xr-x root/root usr/lib/libdar64.so.5000.8.0 +lrwxrwxrwx root/root usr/lib/libdar64.so -> libdar64.so.5000.8.1 +lrwxrwxrwx root/root usr/lib/libdar64.so.5000 -> libdar64.so.5000.8.1 +-rwxr-xr-x root/root usr/lib/libdar64.so.5000.8.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libdar64.pc drwxr-xr-x root/root usr/share/ diff --git a/dar/.md5sum b/dar/.md5sum index 6dd8deb..3e9794e 100644 --- a/dar/.md5sum +++ b/dar/.md5sum @@ -1,2 +1,2 @@ -a64591ce1562c75687512a7f4ab27160 dar-2.5.4.tar.gz +500b3464cf9290dbedd35fc8d6b9ca90 dar-2.5.5.tar.gz f453ca0df13e48ca72095f9ef71529c9 darrc diff --git a/dar/Pkgfile b/dar/Pkgfile index d060072..f69866e 100644 --- a/dar/Pkgfile +++ b/dar/Pkgfile @@ -4,9 +4,9 @@ # Depends on: attr, lzo, zlib, bzip2, xz, libgcrypt name=dar -version=2.5.4 +version=2.5.5 release=1 -source=(http://downloads.sourceforge.net/project/dar/dar/v$version/$name-$version.tar.gz \ +source=(http://downloads.sourceforge.net/project/dar/dar/$version/$name-$version.tar.gz \ darrc) build () {

1 0

ports/contrib (3.2): libquicktime: patch for ffmpeg version 3
by crux＠crux.nu 07 Jun '16

07 Jun '16

commit 6a460f6aa85c2b6aa2825f802dcc89a1ad7846cd Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Jun 7 13:00:11 2016 +1000 libquicktime: patch for ffmpeg version 3 diff --git a/libquicktime/.footprint b/libquicktime/.footprint index 320d9a0..1e52070 100644 --- a/libquicktime/.footprint +++ b/libquicktime/.footprint @@ -55,6 +55,7 @@ drwxr-xr-x root/root usr/lib/libquicktime/ -rwxr-xr-x root/root usr/lib/libquicktime/lqt_x264.so drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libquicktime.pc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/lqtplay.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/lqtplay.1.gz diff --git a/libquicktime/.md5sum b/libquicktime/.md5sum index 203f95f..2adf6a1 100644 --- a/libquicktime/.md5sum +++ b/libquicktime/.md5sum @@ -1,2 +1,2 @@ -a789f9852747c73dd28fa6fe7796adf6 ffmpeg2.0.patch +8a0f1e55e448fa13b03712d2d7cd3bd7 libquicktime-1.2.4-ffmpeg3-1.patch 81cfcebad9b7ee7e7cfbefc861d6d61b libquicktime-1.2.4.tar.gz diff --git a/libquicktime/Pkgfile b/libquicktime/Pkgfile index 1976039..d8874e9 100644 --- a/libquicktime/Pkgfile +++ b/libquicktime/Pkgfile @@ -6,18 +6,17 @@ name=libquicktime version=1.2.4 -release=2 +release=3 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name… - ffmpeg2.0.patch) + libquicktime-1.2.4-ffmpeg3-1.patch) build() { cd $name-$version - patch -p 1 -i $SRC/ffmpeg2.0.patch + patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg3-1.patch ./configure \ --prefix=/usr \ - --mandir=/usr/man \ --enable-gpl \ --disable-nls \ --with-libdv \ diff --git a/libquicktime/ffmpeg2.0.patch b/libquicktime/ffmpeg2.0.patch deleted file mode 100644 index 6bec4d9..0000000 --- a/libquicktime/ffmpeg2.0.patch +++ /dev/null @@ -1,135 +0,0 @@ -Binary files a/plugins/ffmpeg/.lqt_ffmpeg.c.swp and b/plugins/ffmpeg/.lqt_ffmpeg.c.swp differ -diff -rupN a/plugins/ffmpeg/ffmpeg.h b/plugins/ffmpeg/ffmpeg.h ---- a/plugins/ffmpeg/ffmpeg.h 2012-02-15 20:48:30.000000000 +0100 -+++ b/plugins/ffmpeg/ffmpeg.h 2013-07-15 15:05:19.307534593 +0200 -@@ -45,3 +45,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - - - #endif -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 -+#define CODEC_FLAG2_STRICT_GOP 0x00000002 -+#define CODEC_FLAG_QP_RD 0x08000000 -+#define CODEC_FLAG_CBP_RD 0x04000000 -diff -rupN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c ---- a/plugins/ffmpeg/lqt_ffmpeg.c 2012-02-15 20:48:30.000000000 +0100 -+++ b/plugins/ffmpeg/lqt_ffmpeg.c 2013-07-15 15:19:09.730831655 +0200 -@@ -89,19 +89,8 @@ int ffmpeg_num_video_codecs = -1; - PARAM_QSCALE, \ - PARAM_QCOMPRESS, \ - PARAM_QBLUR, \ -- PARAM_QUANTIZER_NOISE_SHAPING, \ - PARAM_TRELLIS - --#define ENCODE_PARAM_VIDEO_QUANTIZER_IP \ -- ENCODE_PARAM_VIDEO_QUANTIZER_I, \ -- PARAM_I_QUANT_FACTOR, \ -- PARAM_I_QUANT_OFFSET -- --#define ENCODE_PARAM_VIDEO_QUANTIZER_IPB \ -- ENCODE_PARAM_VIDEO_QUANTIZER_IP, \ -- PARAM_B_QUANT_FACTOR, \ -- PARAM_B_QUANT_OFFSET -- - #define ENCODE_PARAM_VIDEO_FRAMETYPES_IP \ - { \ - .name = "frame_types", \ -@@ -207,7 +196,6 @@ static lqt_parameter_info_static_t encod - ENCODE_PARAM_VIDEO_FRAMETYPES_IPB, - PARAM_FLAG_AC_PRED_MPEG4, - ENCODE_PARAM_VIDEO_RATECONTROL, -- ENCODE_PARAM_VIDEO_QUANTIZER_IPB, - PARAM_FLAG_CBP_RD, - ENCODE_PARAM_VIDEO_ME, - PARAM_FLAG_GMC, -@@ -225,7 +213,6 @@ static lqt_parameter_info_static_t encod - static lqt_parameter_info_static_t encode_parameters_dx50[] = { - ENCODE_PARAM_VIDEO_FRAMETYPES_IP, - ENCODE_PARAM_VIDEO_RATECONTROL, -- ENCODE_PARAM_VIDEO_QUANTIZER_IP, - ENCODE_PARAM_VIDEO_ME, - ENCODE_PARAM_VIDEO_ME_PRE, - ENCODE_PARAM_VIDEO_MASKING, -@@ -237,7 +224,6 @@ static lqt_parameter_info_static_t encod - static lqt_parameter_info_static_t encode_parameters_h263[] = { - ENCODE_PARAM_VIDEO_FRAMETYPES_IP, - ENCODE_PARAM_VIDEO_RATECONTROL, -- ENCODE_PARAM_VIDEO_QUANTIZER_IP, - ENCODE_PARAM_VIDEO_ME, - PARAM_FLAG_4MV, - ENCODE_PARAM_VIDEO_ME_PRE, -@@ -250,7 +236,6 @@ static lqt_parameter_info_static_t encod - static lqt_parameter_info_static_t encode_parameters_h263p[] = { - ENCODE_PARAM_VIDEO_FRAMETYPES_IP, - ENCODE_PARAM_VIDEO_RATECONTROL, -- ENCODE_PARAM_VIDEO_QUANTIZER_IP, - ENCODE_PARAM_VIDEO_ME, - PARAM_FLAG_4MV, - ENCODE_PARAM_VIDEO_ME_PRE, -@@ -264,7 +249,6 @@ static lqt_parameter_info_static_t encod - static lqt_parameter_info_static_t encode_parameters_msmpeg4v3[] = { - ENCODE_PARAM_VIDEO_FRAMETYPES_IP, - ENCODE_PARAM_VIDEO_RATECONTROL, -- ENCODE_PARAM_VIDEO_QUANTIZER_IP, - ENCODE_PARAM_VIDEO_ME, - ENCODE_PARAM_VIDEO_ME_PRE, - ENCODE_PARAM_VIDEO_MASKING, -diff -rupN a/plugins/ffmpeg/params.c b/plugins/ffmpeg/params.c ---- a/plugins/ffmpeg/params.c 2012-03-07 15:10:41.000000000 +0100 -+++ b/plugins/ffmpeg/params.c 2013-07-15 15:09:38.214189953 +0200 -@@ -202,8 +202,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_INT("ff_max_b_frames",max_b_frames); - PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); - PARAM_INT("ff_b_frame_strategy",b_frame_strategy); -+#if (LIBAVCODEC_VERSION_MAJOR < 55) - PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); - PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); -+#endif - PARAM_INT("ff_strict_std_compliance",strict_std_compliance); - PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); - PARAM_INT("ff_rc_min_rate",rc_min_rate); -@@ -241,8 +243,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon - PARAM_QP2LAMBDA("ff_lmax", lmax); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); -+#if #if (LIBAVCODEC_VERSION_MAJOR < 55) - PARAM_INT("ff_inter_threshold",inter_threshold); - PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); -+#endif - PARAM_INT("ff_thread_count",thread_count); - PARAM_INT("ff_me_threshold",me_threshold); - PARAM_INT("ff_mb_threshold",mb_threshold); -diff -rupN a/plugins/ffmpeg/params.h b/plugins/ffmpeg/params.h ---- a/plugins/ffmpeg/params.h 2011-05-11 17:13:39.000000000 +0200 -+++ b/plugins/ffmpeg/params.h 2013-07-15 15:09:04.860858069 +0200 -@@ -177,6 +177,7 @@ the reference. Unused for constant quant - .val_max = { .val_int = 1 }, \ - } - -+#if (LIBAVCODEC_VERSION_MAJOR < 55) - #define PARAM_LUMA_ELIM_THRESHOLD \ - { \ - .name = "ff_luma_elim_threshold", \ -@@ -202,6 +203,7 @@ recommendation") \ - chrominamce. Negative values also consider dc \ - coefficient. 7 is JVT recommendation") \ - } -+#endif - - #define PARAM_STRICT_STANDARD_COMPLIANCE \ - { \ -@@ -739,6 +741,7 @@ with max and/or min bitrate, this must b - - /* Does nothing */ - /** Frame types */ -+#if (LIBAVCODEC_VERSION_MAJOR < 55) - #define PARAM_INTER_THRESHOLD \ - { \ - .name = "ff_inter_threshold", \ -@@ -759,6 +762,7 @@ with max and/or min bitrate, this must b - .help_string = TRS("Choose quantization such that noise will be masked by " \ - "similar-frequency content in the image") \ - } -+#endif - - /** Motion estimation */ - #define PARAM_ME_THRESHOLD \ diff --git a/libquicktime/libquicktime-1.2.4-ffmpeg3-1.patch b/libquicktime/libquicktime-1.2.4-ffmpeg3-1.patch new file mode 100644 index 0000000..81c76ab --- /dev/null +++ b/libquicktime/libquicktime-1.2.4-ffmpeg3-1.patch @@ -0,0 +1,1014 @@ +Submitted By: Armin K. <krejzi at mail dot com> +Date: 2016-05-04 +Initial Package Version: 1.2.4 +Upstream Status: Fixed +Origin: Gentoo and Debian +Description: Fixes building against FFmpeg version >= 3.0.0 + +--- a/plugins/ffmpeg/audio.c 2012-03-29 21:44:28.000000000 +0200 ++++ b/plugins/ffmpeg/audio.c 2016-02-15 16:17:09.977415405 +0100 +@@ -45,6 +45,11 @@ + #define ENCODE_AUDIO 1 + #endif + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++/* from libavcodec/avcodec.h dated Dec 23 2012 */ ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#endif ++ + /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ + + /* MPEG Audio header parsing code */ +@@ -626,7 +631,7 @@ + { + /* If the codec is mp3, make sure to decode the very last frame */ + +- if((codec->avctx->codec_id == CODEC_ID_MP3) && ++ if((codec->avctx->codec_id == AV_CODEC_ID_MP3) && + (codec->bytes_in_chunk_buffer >= 4)) + { + if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0)) +@@ -695,7 +700,7 @@ + + /* Some really broken mp3 files have the header bytes split across 2 chunks */ + +- if(codec->avctx->codec_id == CODEC_ID_MP3) ++ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) + { + if(codec->bytes_in_chunk_buffer < 4) + { +@@ -806,7 +811,7 @@ + + if(bytes_decoded < 0) + { +- if(codec->avctx->codec_id == CODEC_ID_MP3) ++ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) + { + /* For mp3, bytes_decoded < 0 means, that the frame should be muted */ + memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end - +@@ -866,8 +871,8 @@ + quicktime_audio_map_t *track_map = &file->atracks[track]; + quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv; + +- if((codec->decoder->id == CODEC_ID_MP2) || +- (codec->decoder->id == CODEC_ID_MP3)) ++ if((codec->decoder->id == AV_CODEC_ID_MP2) || ++ (codec->decoder->id == AV_CODEC_ID_MP3)) + { + mpa_header h; + uint32_t header; +@@ -909,7 +914,7 @@ + else + track_map->ci.bitrate = h.bitrate; + } +- else if(codec->decoder->id == CODEC_ID_AC3) ++ else if(codec->decoder->id == AV_CODEC_ID_AC3) + { + a52_header h; + uint8_t * ptr; +@@ -986,7 +991,7 @@ + #endif + /* Some codecs need extra stuff */ + +- if(codec->decoder->id == CODEC_ID_ALAC) ++ if(codec->decoder->id == AV_CODEC_ID_ALAC) + { + header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len); + if(header) +@@ -995,7 +1000,7 @@ + codec->avctx->extradata_size = header_len; + } + } +- if(codec->decoder->id == CODEC_ID_QDM2) ++ if(codec->decoder->id == AV_CODEC_ID_QDM2) + { + header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len); + if(header) +@@ -1261,7 +1266,7 @@ + pkt.data = codec->chunk_buffer; + pkt.size = codec->chunk_buffer_alloc; + +- avcodec_get_frame_defaults(&f); ++ av_frame_unref(&f); + f.nb_samples = codec->avctx->frame_size; + + avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, +@@ -1495,9 +1500,9 @@ + codec_base->decode_audio = lqt_ffmpeg_decode_audio; + codec_base->set_parameter = set_parameter; + +- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2)) ++ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2)) + codec_base->read_packet = read_packet_mpa; +- else if(decoder->id == CODEC_ID_AC3) ++ else if(decoder->id == AV_CODEC_ID_AC3) + { + codec_base->write_packet = write_packet_ac3; + codec_base->read_packet = read_packet_ac3; +--- a/plugins/ffmpeg/ffmpeg.h 2012-02-15 20:48:30.000000000 +0100 ++++ b/plugins/ffmpeg/ffmpeg.h 2016-02-15 16:15:08.114897089 +0100 +@@ -27,6 +27,7 @@ + + #include <quicktime/qtprivate.h> + #include AVCODEC_HEADER ++#include <libavutil/mem.h> + + void quicktime_init_video_codec_ffmpeg(quicktime_codec_t * codec, + quicktime_video_map_t *vtrack, +--- a/plugins/ffmpeg/lqt_ffmpeg.c 2012-02-15 20:48:30.000000000 +0100 ++++ b/plugins/ffmpeg/lqt_ffmpeg.c 2016-02-15 16:17:09.973415323 +0100 +@@ -386,7 +386,7 @@ + struct CODECIDMAP codecidmap_v[] = + { + { +- .id = CODEC_ID_MPEG1VIDEO, ++ .id = AV_CODEC_ID_MPEG1VIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -397,7 +397,7 @@ + .wav_ids = { LQT_WAV_ID_NONE } + }, + { +- .id = CODEC_ID_MPEG4, ++ .id = AV_CODEC_ID_MPEG4, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -415,7 +415,7 @@ + .compression_id = LQT_COMPRESSION_MPEG4_ASP, + }, + { +- .id = CODEC_ID_MSMPEG4V1, ++ .id = AV_CODEC_ID_MSMPEG4V1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -426,7 +426,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MSMPEG4V2, ++ .id = AV_CODEC_ID_MSMPEG4V2, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -437,7 +437,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MSMPEG4V3, ++ .id = AV_CODEC_ID_MSMPEG4V3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -453,7 +453,7 @@ + .do_encode = 1, + }, + { +- .id = CODEC_ID_MSMPEG4V3, ++ .id = AV_CODEC_ID_MSMPEG4V3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -468,7 +468,7 @@ + }, + #if 0 + { +- .id = CODEC_ID_WMV1, ++ .id = AV_CODEC_ID_WMV1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -481,7 +481,7 @@ + }, + #endif + { +- .id = CODEC_ID_H263, ++ .id = AV_CODEC_ID_H263, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -493,7 +493,7 @@ + .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP, + }, + { +- .id = CODEC_ID_H263, ++ .id = AV_CODEC_ID_H263, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -508,7 +508,7 @@ + .do_encode = 1, + }, + { +- .id = CODEC_ID_H264, ++ .id = AV_CODEC_ID_H264, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -519,7 +519,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_H263P, ++ .id = AV_CODEC_ID_H263P, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -533,7 +533,7 @@ + .do_encode = 1, + }, + { +- .id = CODEC_ID_H263I, ++ .id = AV_CODEC_ID_H263I, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -544,7 +544,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_SVQ1, ++ .id = AV_CODEC_ID_SVQ1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -555,7 +555,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_SVQ3, ++ .id = AV_CODEC_ID_SVQ3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -566,7 +566,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MJPEG, ++ .id = AV_CODEC_ID_MJPEG, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -580,7 +580,7 @@ + .do_encode = 1, + }, + { +- .id = CODEC_ID_MJPEGB, ++ .id = AV_CODEC_ID_MJPEGB, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -594,7 +594,7 @@ + }, + #if LIBAVCODEC_BUILD >= 3346688 + { +- .id = CODEC_ID_TARGA, ++ .id = AV_CODEC_ID_TARGA, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -606,7 +606,7 @@ + #endif + #if LIBAVCODEC_BUILD >= 3347456 + { +- .id = CODEC_ID_TIFF, ++ .id = AV_CODEC_ID_TIFF, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -617,7 +617,7 @@ + }, + #endif + { +- .id = CODEC_ID_8BPS, ++ .id = AV_CODEC_ID_8BPS, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -627,7 +627,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_INDEO3, ++ .id = AV_CODEC_ID_INDEO3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -638,7 +638,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_RPZA, ++ .id = AV_CODEC_ID_RPZA, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -648,7 +648,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_SMC, ++ .id = AV_CODEC_ID_SMC, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -658,7 +658,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_CINEPAK, ++ .id = AV_CODEC_ID_CINEPAK, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -669,7 +669,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_CYUV, ++ .id = AV_CODEC_ID_CYUV, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -680,7 +680,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_QTRLE, ++ .id = AV_CODEC_ID_QTRLE, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -693,7 +693,7 @@ + .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE }, + }, + { +- .id = CODEC_ID_MSRLE, ++ .id = AV_CODEC_ID_MSRLE, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -703,7 +703,7 @@ + .wav_ids = { LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -719,7 +719,7 @@ + .image_sizes = image_sizes_dv, + }, + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -735,7 +735,7 @@ + .image_sizes = image_sizes_dv, + }, + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -751,7 +751,7 @@ + }, + /* DVCPRO HD (decoding only for now) */ + { +- .id = CODEC_ID_DVVIDEO, ++ .id = AV_CODEC_ID_DVVIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -772,7 +772,7 @@ + // .do_encode = 1 + }, + { +- .id = CODEC_ID_FFVHUFF, ++ .id = AV_CODEC_ID_FFVHUFF, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -785,7 +785,7 @@ + .do_encode = 1 + }, + { +- .id = CODEC_ID_FFV1, ++ .id = AV_CODEC_ID_FFV1, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -801,7 +801,7 @@ + }, + #if LIBAVCODEC_BUILD >= 3352576 + { +- .id = CODEC_ID_DNXHD, ++ .id = AV_CODEC_ID_DNXHD, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -817,7 +817,7 @@ + }, + #endif + { +- .id = CODEC_ID_MPEG2VIDEO, ++ .id = AV_CODEC_ID_MPEG2VIDEO, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -839,7 +839,7 @@ + struct CODECIDMAP codecidmap_a[] = + { + { +- .id = CODEC_ID_MP3, ++ .id = AV_CODEC_ID_MP3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -851,7 +851,7 @@ + .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE }, + }, + { +- .id = CODEC_ID_MP2, ++ .id = AV_CODEC_ID_MP2, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -866,7 +866,7 @@ + .compression_id = LQT_COMPRESSION_MP2, + }, + { +- .id = CODEC_ID_AC3, ++ .id = AV_CODEC_ID_AC3, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -881,7 +881,7 @@ + .compression_id = LQT_COMPRESSION_AC3, + }, + { +- .id = CODEC_ID_QDM2, ++ .id = AV_CODEC_ID_QDM2, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -896,7 +896,7 @@ + #if 1 + /* Doesn't work as long as audio chunks are not split into VBR "Samples" */ + { +- .id = CODEC_ID_ALAC, ++ .id = AV_CODEC_ID_ALAC, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -909,7 +909,7 @@ + #if 1 + /* Sounds ugly */ + { +- .id = CODEC_ID_ADPCM_MS, ++ .id = AV_CODEC_ID_ADPCM_MS, + .index = -1, + .encoder = NULL, + .decoder = NULL, +@@ -922,7 +922,7 @@ + #if 1 + /* Sounds ugly */ + { +- .id = CODEC_ID_ADPCM_IMA_WAV, ++ .id = AV_CODEC_ID_ADPCM_IMA_WAV, + .index = -1, + .encoder = NULL, + .decoder = NULL, +--- a/plugins/ffmpeg/params.c 2012-03-07 15:10:41.000000000 +0100 ++++ b/plugins/ffmpeg/params.c 2016-02-15 16:15:08.114897089 +0100 +@@ -101,6 +101,17 @@ + } \ + } + ++#define PARAM_DICT_INT(name, dict_name) \ ++ { \ ++ if(!strcasecmp(name, key)) \ ++ { \ ++ char buf[128]; \ ++ snprintf(buf, sizeof(buf), "%d", *(int*)value); \ ++ av_dict_set(options, dict_name, buf, 0); \ ++ found = 1; \ ++ } \ ++ } ++ + #define PARAM_DICT_FLAG(name, dict_name) \ + { \ + if(!strcasecmp(name, key)) \ +@@ -202,8 +213,15 @@ + PARAM_INT("ff_max_b_frames",max_b_frames); + PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); + PARAM_INT("ff_b_frame_strategy",b_frame_strategy); ++ ++#if LIBAVCODEC_VERSION_MAJOR >= 55 ++ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); ++ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold"); ++#else + PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); + PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); ++#endif ++ + PARAM_INT("ff_strict_std_compliance",strict_std_compliance); + PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); + PARAM_INT("ff_rc_min_rate",rc_min_rate); +@@ -241,8 +259,15 @@ + PARAM_QP2LAMBDA("ff_lmax", lmax); + PARAM_INT("ff_noise_reduction",noise_reduction); + PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); ++ ++#if LIBAVCODEC_VERSION_MAJOR >= 55 ++ PARAM_DICT_INT("ff_inter_threshold","inter_threshold"); ++ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping"); ++#else + PARAM_INT("ff_inter_threshold",inter_threshold); + PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); ++#endif ++ + PARAM_INT("ff_thread_count",thread_count); + PARAM_INT("ff_me_threshold",me_threshold); + PARAM_INT("ff_mb_threshold",mb_threshold); +@@ -272,8 +297,16 @@ + PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); + PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); + // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused ++ ++#if LIBAVCODEC_VERSION_MAJOR >= 55 ++ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd"); ++ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); ++ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); ++#else + PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); + PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); ++ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); ++#endif + + #if LIBAVCODEC_VERSION_MAJOR >= 54 + PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); +@@ -288,7 +321,6 @@ + PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); + PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); + PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); +- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); + PARAM_ENUM("ff_coder_type",coder_type,coder_type); + + } +--- a/plugins/ffmpeg/video.c 2012-02-25 20:46:56.000000000 +0100 ++++ b/plugins/ffmpeg/video.c 2016-02-15 16:17:09.982415507 +0100 +@@ -37,10 +37,10 @@ + #endif + + +-#ifdef PIX_FMT_YUV422P10 +-#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 ++#ifdef AV_PIX_FMT_YUV422P10 ++#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 + #else +-#define PIX_FMT_YUV422P10_OR_DUMMY -1234 ++#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 + #endif + + #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) +@@ -90,9 +90,9 @@ + int imx_bitrate; + int imx_strip_vbi; + +- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while +- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ +- enum PixelFormat reinterpret_pix_fmt; ++ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while ++ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ ++ enum AVPixelFormat reinterpret_pix_fmt; + + int is_imx; + int y_offset; +@@ -137,42 +137,42 @@ + + static const struct + { +- enum PixelFormat ffmpeg_id; ++ enum AVPixelFormat ffmpeg_id; + int lqt_id; + int exact; + } + colormodels[] = + { +- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) ++ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) + #if LIBAVUTIL_VERSION_INT < (50<<16) +- { PIX_FMT_YUV422, BC_YUV422, 1 }, ++ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, + #else +- { PIX_FMT_YUYV422, BC_YUV422, 1 }, ++ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, + #endif +- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... +- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... +- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) +- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) +- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) +- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) +-#ifdef PIX_FMT_YUV422P10 +- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 +-#endif +- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness +- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) +- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) +- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) ++ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... ++ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... ++ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) ++ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) ++ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) ++ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) ++#ifdef AV_PIX_FMT_YUV422P10 ++ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 ++#endif ++ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness ++ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) ++ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) ++ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) + #if LIBAVUTIL_VERSION_INT < (50<<16) +- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... ++ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... + #else +- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... ++ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... + #endif +- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 +- { PIX_FMT_GRAY8, BC_RGB888, 0 }, +- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white +- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black +- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette +- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) ++ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 ++ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, ++ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white ++ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black ++ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette ++ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) + }; + + static const struct +@@ -343,16 +343,16 @@ + if (!codec->pix_fmts) + return 0; + +- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) ++ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) + { +- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) ++ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) + return 1; + } + + return 0; + } + +-static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) ++static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) + { + int i; + +@@ -361,10 +361,10 @@ + if(colormodels[i].lqt_id == id) + return colormodels[i].ffmpeg_id; + } +- return PIX_FMT_NB; ++ return AV_PIX_FMT_NB; + } + +-static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) ++static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) + { + int i; + +@@ -400,26 +400,26 @@ + codec->reinterpret_pix_fmt = codec->avctx->pix_fmt; + + /* First we try codec-specific colormodel matching. */ +- if(codec->decoder->id == CODEC_ID_DNXHD) ++ if(codec->decoder->id == AV_CODEC_ID_DNXHD) + { +- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which +- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ +- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) ++ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which ++ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ ++ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) + { +- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); ++ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); + *exact = 1; + if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) + { + vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; +- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; +- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except ++ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; ++ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except + // there is no such colormodel in FFMpeg. Fortunately, it's not a problem + // in this case, as reinterpret_pix_fmt is only used when *exact == 0. + } + else + { + vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; +- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; ++ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; + } + return; + } +@@ -438,16 +438,16 @@ + quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv; + codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel); + +- if (codec->encoder->id == CODEC_ID_DNXHD) ++ if (codec->encoder->id == AV_CODEC_ID_DNXHD) + { +- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 +- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 ++ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 ++ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 + (in fact, the latter doesn't even exist) */ +- codec->avctx->pix_fmt = PIX_FMT_YUV422P; ++ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; + if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) + { + if (lqt_tenbit_dnxhd_supported(codec->encoder)) +- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; ++ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; + } + } + } +@@ -458,7 +458,7 @@ + /* From avcodec.h: */ + + /* +- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA ++ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA + * color is put together as: + * (A << 24) | (R << 16) | (G << 8) | B + * This is stored as BGRA on little endian CPU architectures and ARGB on +@@ -530,7 +530,7 @@ + */ + + static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, +- AVFrame * in_frame, enum PixelFormat in_format, ++ AVFrame * in_frame, enum AVPixelFormat in_format, + unsigned char ** out_frame, int out_format, + int width, int height, int row_span, int row_span_uv) + { +@@ -547,9 +547,9 @@ + * RGBA format like in ffmpeg?? + */ + #if LIBAVUTIL_VERSION_INT < (50<<16) +- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) ++ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) + #else +- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) ++ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) + #endif + { + convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); +@@ -728,13 +728,13 @@ + + /* Set extradata: It's done differently for each codec */ + +- if(codec->decoder->id == CODEC_ID_SVQ3) ++ if(codec->decoder->id == AV_CODEC_ID_SVQ3) + { + extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4; + extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4; + + } +- else if(codec->decoder->id == CODEC_ID_H264) ++ else if(codec->decoder->id == AV_CODEC_ID_H264) + { + user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len); + +@@ -753,7 +753,7 @@ + } + + } +- else if(codec->decoder->id == CODEC_ID_MPEG4) ++ else if(codec->decoder->id == AV_CODEC_ID_MPEG4) + { + if(trak->mdia.minf.stbl.stsd.table[0].has_esds) + { +@@ -829,7 +829,7 @@ + if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) + return -1; + #endif +- codec->frame = avcodec_alloc_frame(); ++ codec->frame = av_frame_alloc(); + vtrack->stream_cmodel = LQT_COLORMODEL_NONE; + codec->initialized = 1; + } +@@ -929,10 +929,10 @@ + #ifdef HAVE_LIBSWSCALE + + #if LIBAVUTIL_VERSION_INT < (50<<16) +- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && ++ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && + (vtrack->stream_cmodel == BC_RGBA8888))) + #else +- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && ++ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && + (vtrack->stream_cmodel == BC_RGBA8888))) + #endif + { +@@ -947,15 +947,15 @@ + } + #endif + } +- if(codec->decoder->id == CODEC_ID_DVVIDEO) ++ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO) + { + if(vtrack->stream_cmodel == BC_YUV420P) + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; + vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST; + vtrack->ci.id = LQT_COMPRESSION_DV; + } +- else if((codec->decoder->id == CODEC_ID_MPEG4) || +- (codec->decoder->id == CODEC_ID_H264)) ++ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) || ++ (codec->decoder->id == AV_CODEC_ID_H264)) + { + if(vtrack->stream_cmodel == BC_YUV420P) + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; +@@ -1299,13 +1299,13 @@ + { + if(vtrack->stream_cmodel == BC_YUV420P) + { +- if(codec->encoder->id == CODEC_ID_MPEG4) ++ if(codec->encoder->id == AV_CODEC_ID_MPEG4) + { + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; + /* enable interlaced encoding */ + vtrack->interlace_mode = LQT_INTERLACE_NONE; + } +- else if(codec->encoder->id == CODEC_ID_DVVIDEO) ++ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) + { + vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; + } +@@ -1318,7 +1318,7 @@ + + if(!codec->initialized) + { +- codec->frame = avcodec_alloc_frame(); ++ codec->frame = av_frame_alloc(); + + /* time_base is 1/framerate for constant framerate */ + +@@ -1340,7 +1340,7 @@ + codec->avctx->sample_aspect_ratio.num = pixel_width; + codec->avctx->sample_aspect_ratio.den = pixel_height; + /* Use global headers for mp4v */ +- if(codec->encoder->id == CODEC_ID_MPEG4) ++ if(codec->encoder->id == AV_CODEC_ID_MPEG4) + { + if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) + { +@@ -1364,12 +1364,12 @@ + } + #endif + } +- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) && ++ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) && + !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4)) + { + strncpy(trak->strl->strh.fccHandler, "div3", 4); + } +- else if((codec->encoder->id == CODEC_ID_H263) && ++ else if((codec->encoder->id == AV_CODEC_ID_H263) && + (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP))) + { + uint8_t d263_data[] = +@@ -1383,7 +1383,7 @@ + strncpy(trak->mdia.minf.stbl.stsd.table[0].format, + "s263", 4); + } +- else if(codec->encoder->id == CODEC_ID_FFVHUFF) ++ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) + { + if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) + { +@@ -1391,22 +1391,22 @@ + codec->write_global_header = 1; + } + } +- else if(codec->encoder->id == CODEC_ID_QTRLE) ++ else if(codec->encoder->id == AV_CODEC_ID_QTRLE) + { + if(vtrack->stream_cmodel == BC_RGBA8888) + { + /* Libquicktime doesn't natively support a color model equivalent +- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. ++ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. + So, we use BC_RGBA8888 and do ad hoc conversion below. */ +- codec->avctx->pix_fmt = PIX_FMT_ARGB; ++ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; + vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; + } + } +- else if(codec->encoder->id == CODEC_ID_DVVIDEO) ++ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) + { + set_dv_fourcc(width, height, vtrack->stream_cmodel, trak); + } +- else if(codec->encoder->id == CODEC_ID_DNXHD) ++ else if(codec->encoder->id == AV_CODEC_ID_DNXHD) + { + if(vtrack->interlace_mode != LQT_INTERLACE_NONE) + { +@@ -1467,7 +1467,7 @@ + } + // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); + +- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) ++ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) + { + if(!codec->tmp_rows) + { +@@ -1492,7 +1492,7 @@ + vtrack->stream_cmodel, + 0, 0, 0, codec->y_offset); + } +- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) ++ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) + { + convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, + codec->tmp_rows[0], codec->tmp_row_span, +@@ -1558,12 +1558,12 @@ + + #endif + +- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD) ++ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD) + setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded); + + if(bytes_encoded) + { +- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0)) ++ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0)) + { + /* Some codecs don't bother generating presentation timestamps. + FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */ +@@ -1590,13 +1590,13 @@ + + if(codec->write_global_header && !codec->global_header_written) + { +- if(codec->encoder->id == CODEC_ID_FFVHUFF) ++ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) + { + quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms, + "glbl", + codec->avctx->extradata, codec->avctx->extradata_size ); + } +- else if(codec->encoder->id == CODEC_ID_MPEG4) ++ else if(codec->encoder->id == AV_CODEC_ID_MPEG4) + { + int advanced = 0; + if(codec->avctx->max_b_frames || +@@ -1903,18 +1903,18 @@ + codec_base->encode_video = lqt_ffmpeg_encode_video; + codec_base->set_pass = set_pass_ffmpeg; + +- if(encoder->id == CODEC_ID_MPEG4) ++ if(encoder->id == AV_CODEC_ID_MPEG4) + { + codec_base->writes_compressed = writes_compressed_mpeg4; + codec_base->init_compressed = init_compressed_mpeg4; + codec_base->write_packet = write_packet_mpeg4; + } +- else if(encoder->id == CODEC_ID_MPEG2VIDEO) ++ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO) + { + codec_base->writes_compressed = writes_compressed_imx; + codec_base->init_compressed = init_compressed_imx; + } +- else if(encoder->id == CODEC_ID_DVVIDEO) ++ else if(encoder->id == AV_CODEC_ID_DVVIDEO) + { + codec_base->init_compressed = init_compressed_dv; + } +@@ -1922,7 +1922,7 @@ + } + if(decoder) + { +- if(decoder->id == CODEC_ID_H264) ++ if(decoder->id == AV_CODEC_ID_H264) + codec_base->read_packet = read_packet_h264; + codec_base->decode_video = lqt_ffmpeg_decode_video; + }

1 0

ports/opt (3.2): grub2-efi: updated to version 2.02-beta3
by crux＠crux.nu 05 Jun '16

05 Jun '16

commit 97a2ab9dff9bfe5588fcb8ebd8f3172ea1157b09 Author: Matt Housh <jaeger(a)crux.ninja> Date: Sun Jun 5 14:33:38 2016 -0500 grub2-efi: updated to version 2.02-beta3 diff --git a/grub2-efi/.footprint b/grub2-efi/.footprint index fb5e2e4..6a99af5 100644 --- a/grub2-efi/.footprint +++ b/grub2-efi/.footprint @@ -40,6 +40,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-efi/ -rwxr-xr-x root/root usr/lib/grub/i386-efi/boot.module -rw-r--r-- root/root usr/lib/grub/i386-efi/bsd.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/bsd.module +-rw-r--r-- root/root usr/lib/grub/i386-efi/bswap_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-efi/bswap_test.module -rw-r--r-- root/root usr/lib/grub/i386-efi/btrfs.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/btrfs.module -rw-r--r-- root/root usr/lib/grub/i386-efi/bufio.mod @@ -62,6 +64,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-efi/ -rwxr-xr-x root/root usr/lib/grub/i386-efi/cmdline_cat_test.module -rw-r--r-- root/root usr/lib/grub/i386-efi/cmp.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/cmp.module +-rw-r--r-- root/root usr/lib/grub/i386-efi/cmp_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-efi/cmp_test.module -rw-r--r-- root/root usr/lib/grub/i386-efi/command.lst -rw-r--r-- root/root usr/lib/grub/i386-efi/config.h -rw-r--r-- root/root usr/lib/grub/i386-efi/configfile.mod @@ -81,6 +85,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-efi/ -rwxr-xr-x root/root usr/lib/grub/i386-efi/cryptodisk.module -rw-r--r-- root/root usr/lib/grub/i386-efi/cs5536.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/cs5536.module +-rw-r--r-- root/root usr/lib/grub/i386-efi/ctz_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-efi/ctz_test.module -rw-r--r-- root/root usr/lib/grub/i386-efi/date.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/date.module -rw-r--r-- root/root usr/lib/grub/i386-efi/datehook.mod @@ -91,6 +97,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-efi/ -rwxr-xr-x root/root usr/lib/grub/i386-efi/disk.module -rw-r--r-- root/root usr/lib/grub/i386-efi/diskfilter.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/diskfilter.module +-rw-r--r-- root/root usr/lib/grub/i386-efi/div.mod +-rwxr-xr-x root/root usr/lib/grub/i386-efi/div.module -rw-r--r-- root/root usr/lib/grub/i386-efi/div_test.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/div_test.module -rw-r--r-- root/root usr/lib/grub/i386-efi/dm_nv.mod @@ -178,7 +186,7 @@ drwxr-xr-x root/root usr/lib/grub/i386-efi/ -rwxr-xr-x root/root usr/lib/grub/i386-efi/gcry_whirlpool.module -rw-r--r-- root/root usr/lib/grub/i386-efi/gdb.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/gdb.module --rwxr-xr-x root/root usr/lib/grub/i386-efi/gdb_grub +-rw-r--r-- root/root usr/lib/grub/i386-efi/gdb_grub -rw-r--r-- root/root usr/lib/grub/i386-efi/geli.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/geli.module -rw-r--r-- root/root usr/lib/grub/i386-efi/gettext.mod @@ -191,7 +199,7 @@ drwxr-xr-x root/root usr/lib/grub/i386-efi/ -rwxr-xr-x root/root usr/lib/grub/i386-efi/gfxterm_background.module -rw-r--r-- root/root usr/lib/grub/i386-efi/gfxterm_menu.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/gfxterm_menu.module --rwxr-xr-x root/root usr/lib/grub/i386-efi/gmodule.pl +-rw-r--r-- root/root usr/lib/grub/i386-efi/gmodule.pl -rw-r--r-- root/root usr/lib/grub/i386-efi/gptsync.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/gptsync.module -rw-r--r-- root/root usr/lib/grub/i386-efi/gzio.mod @@ -306,6 +314,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-efi/ -rwxr-xr-x root/root usr/lib/grub/i386-efi/mpi.module -rw-r--r-- root/root usr/lib/grub/i386-efi/msdospart.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/msdospart.module +-rw-r--r-- root/root usr/lib/grub/i386-efi/mul_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-efi/mul_test.module -rw-r--r-- root/root usr/lib/grub/i386-efi/multiboot.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/multiboot.module -rw-r--r-- root/root usr/lib/grub/i386-efi/multiboot2.mod @@ -384,6 +394,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-efi/ -rwxr-xr-x root/root usr/lib/grub/i386-efi/raid5rec.module -rw-r--r-- root/root usr/lib/grub/i386-efi/raid6rec.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/raid6rec.module +-rw-r--r-- root/root usr/lib/grub/i386-efi/random.mod +-rwxr-xr-x root/root usr/lib/grub/i386-efi/random.module -rw-r--r-- root/root usr/lib/grub/i386-efi/read.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/read.module -rw-r--r-- root/root usr/lib/grub/i386-efi/reboot.mod @@ -416,6 +428,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-efi/ -rwxr-xr-x root/root usr/lib/grub/i386-efi/setpci.module -rw-r--r-- root/root usr/lib/grub/i386-efi/sfs.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/sfs.module +-rw-r--r-- root/root usr/lib/grub/i386-efi/shift_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-efi/shift_test.module -rw-r--r-- root/root usr/lib/grub/i386-efi/signature_test.mod -rwxr-xr-x root/root usr/lib/grub/i386-efi/signature_test.module -rw-r--r-- root/root usr/lib/grub/i386-efi/sleep.mod @@ -553,6 +567,8 @@ drwxr-xr-x root/root usr/lib/grub/x86_64-efi/ -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/boot.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/bsd.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/bsd.module +-rw-r--r-- root/root usr/lib/grub/x86_64-efi/bswap_test.mod +-rwxr-xr-x root/root usr/lib/grub/x86_64-efi/bswap_test.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/btrfs.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/btrfs.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/bufio.mod @@ -575,6 +591,8 @@ drwxr-xr-x root/root usr/lib/grub/x86_64-efi/ -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/cmdline_cat_test.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/cmp.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/cmp.module +-rw-r--r-- root/root usr/lib/grub/x86_64-efi/cmp_test.mod +-rwxr-xr-x root/root usr/lib/grub/x86_64-efi/cmp_test.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/command.lst -rw-r--r-- root/root usr/lib/grub/x86_64-efi/config.h -rw-r--r-- root/root usr/lib/grub/x86_64-efi/configfile.mod @@ -594,6 +612,8 @@ drwxr-xr-x root/root usr/lib/grub/x86_64-efi/ -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/cryptodisk.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/cs5536.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/cs5536.module +-rw-r--r-- root/root usr/lib/grub/x86_64-efi/ctz_test.mod +-rwxr-xr-x root/root usr/lib/grub/x86_64-efi/ctz_test.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/date.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/date.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/datehook.mod @@ -604,6 +624,8 @@ drwxr-xr-x root/root usr/lib/grub/x86_64-efi/ -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/disk.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/diskfilter.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/diskfilter.module +-rw-r--r-- root/root usr/lib/grub/x86_64-efi/div.mod +-rwxr-xr-x root/root usr/lib/grub/x86_64-efi/div.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/div_test.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/div_test.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/dm_nv.mod @@ -689,7 +711,7 @@ drwxr-xr-x root/root usr/lib/grub/x86_64-efi/ -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/gcry_twofish.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/gcry_whirlpool.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/gcry_whirlpool.module --rwxr-xr-x root/root usr/lib/grub/x86_64-efi/gdb_grub +-rw-r--r-- root/root usr/lib/grub/x86_64-efi/gdb_grub -rw-r--r-- root/root usr/lib/grub/x86_64-efi/geli.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/geli.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/gettext.mod @@ -702,7 +724,7 @@ drwxr-xr-x root/root usr/lib/grub/x86_64-efi/ -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/gfxterm_background.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/gfxterm_menu.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/gfxterm_menu.module --rwxr-xr-x root/root usr/lib/grub/x86_64-efi/gmodule.pl +-rw-r--r-- root/root usr/lib/grub/x86_64-efi/gmodule.pl -rw-r--r-- root/root usr/lib/grub/x86_64-efi/gptsync.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/gptsync.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/gzio.mod @@ -817,6 +839,8 @@ drwxr-xr-x root/root usr/lib/grub/x86_64-efi/ -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/mpi.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/msdospart.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/msdospart.module +-rw-r--r-- root/root usr/lib/grub/x86_64-efi/mul_test.mod +-rwxr-xr-x root/root usr/lib/grub/x86_64-efi/mul_test.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/multiboot.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/multiboot.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/multiboot2.mod @@ -895,6 +919,8 @@ drwxr-xr-x root/root usr/lib/grub/x86_64-efi/ -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/raid5rec.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/raid6rec.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/raid6rec.module +-rw-r--r-- root/root usr/lib/grub/x86_64-efi/random.mod +-rwxr-xr-x root/root usr/lib/grub/x86_64-efi/random.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/read.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/read.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/reboot.mod @@ -927,6 +953,8 @@ drwxr-xr-x root/root usr/lib/grub/x86_64-efi/ -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/setpci.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/sfs.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/sfs.module +-rw-r--r-- root/root usr/lib/grub/x86_64-efi/shift_test.mod +-rwxr-xr-x root/root usr/lib/grub/x86_64-efi/shift_test.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/signature_test.mod -rwxr-xr-x root/root usr/lib/grub/x86_64-efi/signature_test.module -rw-r--r-- root/root usr/lib/grub/x86_64-efi/sleep.mod diff --git a/grub2-efi/.md5sum b/grub2-efi/.md5sum index 461e645..e38ae4f 100644 --- a/grub2-efi/.md5sum +++ b/grub2-efi/.md5sum @@ -1,2 +1 @@ -be62932eade308a364ea4bbc91295930 grub-2.02~beta2.tar.xz -1428560966c0b87094ec86589a45b44d grub2-cve-2015-8370.patch +ab399fc6f74a97d66ff77f04b743149c grub-2.02~beta3.tar.xz diff --git a/grub2-efi/Pkgfile b/grub2-efi/Pkgfile index dff53cd..36138da 100644 --- a/grub2-efi/Pkgfile +++ b/grub2-efi/Pkgfile @@ -4,18 +4,15 @@ # Depends on: grub2 name=grub2-efi -version=2.02-beta2 +version=2.02-beta3 release=1 -source=(http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz \ - grub2-cve-2015-8370.patch) +source=(http://alpha.gnu.org/gnu/grub/grub-2.02~beta3.tar.xz) build() { export CFLAGS="${CFLAGS} -Wno-error" - patch -p1 -d grub-2.02~beta2 -i $SRC/grub2-cve-2015-8370.patch - # fix for glibc 'gets' removal - sed -i -e '/gets is a/d' grub-2.02~beta2/grub-core/gnulib/stdio.in.h + sed -i -e '/gets is a/d' grub-2.02~beta3/grub-core/gnulib/stdio.in.h MODLIST="boot chain configfile fat ext2 linux normal ntfs part_gpt part_msdos" @@ -23,7 +20,7 @@ build() { do mkdir $ARCH cd $ARCH - ../grub-2.02~beta2/configure --prefix=/usr \ + ../grub-2.02~beta3/configure --prefix=/usr \ --with-platform=efi --target=$ARCH \ --program-prefix="" make diff --git a/grub2-efi/grub2-cve-2015-8370.patch b/grub2-efi/grub2-cve-2015-8370.patch deleted file mode 100644 index 802affb..0000000 --- a/grub2-efi/grub2-cve-2015-8370.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c -index 010e550..683a8aa 100644 ---- a/grub-core/lib/crypto.c -+++ b/grub-core/lib/crypto.c -@@ -470,7 +470,8 @@ grub_password_get (char buf[], unsigned buf_size) - - if (key == '\b') - { -- cur_len--; -+ if (cur_len) -+ cur_len--; - continue; - } - -diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c -index c6bd96e..8615c48 100644 ---- a/grub-core/normal/auth.c -+++ b/grub-core/normal/auth.c -@@ -174,8 +174,11 @@ grub_username_get (char buf[], unsigned buf_size) - - if (key == '\b') - { -- cur_len--; -- grub_printf ("\b"); -+ if (cur_len) -+ { -+ cur_len--; -+ grub_printf ("\b"); -+ } - continue; - } -

1 0

ports/opt (3.2): grub2: updated to version 2.02-beta3
by crux＠crux.nu 05 Jun '16

05 Jun '16

commit 4f7423242d86a9898bfff60864fb96238b79145f Author: Matt Housh <jaeger(a)crux.ninja> Date: Sun Jun 5 14:16:03 2016 -0500 grub2: updated to version 2.02-beta3 diff --git a/grub2/.footprint b/grub2/.footprint index 34b34a5..19cde90 100644 --- a/grub2/.footprint +++ b/grub2/.footprint @@ -73,6 +73,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rw-r--r-- root/root usr/lib/grub/i386-pc/boot_hybrid.img -rw-r--r-- root/root usr/lib/grub/i386-pc/bsd.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/bsd.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/bswap_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/bswap_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/btrfs.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/btrfs.module -rw-r--r-- root/root usr/lib/grub/i386-pc/bufio.mod @@ -101,6 +103,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/cmostest.module -rw-r--r-- root/root usr/lib/grub/i386-pc/cmp.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/cmp.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/cmp_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/cmp_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/command.lst -rw-r--r-- root/root usr/lib/grub/i386-pc/config.h -rw-r--r-- root/root usr/lib/grub/i386-pc/configfile.mod @@ -120,6 +124,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/cryptodisk.module -rw-r--r-- root/root usr/lib/grub/i386-pc/cs5536.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/cs5536.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/ctz_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/ctz_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/date.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/date.module -rw-r--r-- root/root usr/lib/grub/i386-pc/datehook.mod @@ -132,6 +138,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rw-r--r-- root/root usr/lib/grub/i386-pc/diskboot.img -rw-r--r-- root/root usr/lib/grub/i386-pc/diskfilter.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/diskfilter.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/div.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/div.module -rw-r--r-- root/root usr/lib/grub/i386-pc/div_test.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/div_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/dm_nv.mod @@ -215,7 +223,7 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/gcry_whirlpool.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gdb.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gdb.module --rwxr-xr-x root/root usr/lib/grub/i386-pc/gdb_grub +-rw-r--r-- root/root usr/lib/grub/i386-pc/gdb_grub -rw-r--r-- root/root usr/lib/grub/i386-pc/geli.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/geli.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gettext.mod @@ -228,7 +236,7 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/gfxterm_background.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gfxterm_menu.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gfxterm_menu.module --rwxr-xr-x root/root usr/lib/grub/i386-pc/gmodule.pl +-rw-r--r-- root/root usr/lib/grub/i386-pc/gmodule.pl -rw-r--r-- root/root usr/lib/grub/i386-pc/gptsync.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gptsync.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gzio.mod @@ -341,6 +349,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/mpi.module -rw-r--r-- root/root usr/lib/grub/i386-pc/msdospart.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/msdospart.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/mul_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/mul_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/multiboot.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/multiboot.module -rw-r--r-- root/root usr/lib/grub/i386-pc/multiboot2.mod @@ -431,6 +441,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/raid5rec.module -rw-r--r-- root/root usr/lib/grub/i386-pc/raid6rec.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/raid6rec.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/random.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/random.module -rw-r--r-- root/root usr/lib/grub/i386-pc/read.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/read.module -rw-r--r-- root/root usr/lib/grub/i386-pc/reboot.mod @@ -465,6 +477,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/setpci.module -rw-r--r-- root/root usr/lib/grub/i386-pc/sfs.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/sfs.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/shift_test.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/shift_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/signature_test.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/signature_test.module -rw-r--r-- root/root usr/lib/grub/i386-pc/sleep.mod diff --git a/grub2/.md5sum b/grub2/.md5sum index 751bfbe..06b528a 100644 --- a/grub2/.md5sum +++ b/grub2/.md5sum @@ -1,6 +1,5 @@ -be62932eade308a364ea4bbc91295930 grub-2.02~beta2.tar.xz +ab399fc6f74a97d66ff77f04b743149c grub-2.02~beta3.tar.xz 8459e7425bf9eea9d482e53c5b5c91c9 grub.cfg.sample 3a03d3f53911ac1889e6e68c8429f700 grub2-00_header.diff 0d8c1aa18cbb52ac57c8414abb185e19 grub2-10_linux.diff -1428560966c0b87094ec86589a45b44d grub2-cve-2015-8370.patch 8c28087c5fcb3188f1244b390efffdbe unifont-5.1.20080820.pcf.gz diff --git a/grub2/Pkgfile b/grub2/Pkgfile index 1ca888b..4c3766d 100644 --- a/grub2/Pkgfile +++ b/grub2/Pkgfile @@ -1,26 +1,24 @@ # Description: A Multiboot boot loader # URL: http://www.gnu.org/software/grub/ -# Maintainer: Matt Housh, jaeger at morpheus dot net +# Maintainer: Matt Housh, jaeger at crux dot ninja # Depends on: libdevmapper freetype name=grub2 -version=2.02-beta2 +version=2.02-beta3 release=1 -source=(http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz \ +source=(http://alpha.gnu.org/gnu/grub/grub-2.02~beta3.tar.xz \ http://unifoundry.com/unifont-5.1.20080820.pcf.gz \ - $name-00_header.diff $name-10_linux.diff grub.cfg.sample \ - $name-cve-2015-8370.patch) + $name-00_header.diff $name-10_linux.diff grub.cfg.sample) build() { export CFLAGS="${CFLAGS} -Wno-error" - cd grub-2.02~beta2 + cd grub-2.02~beta3 # fix for glibc 'gets' removal sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h patch -i $SRC/$name-00_header.diff util/grub.d/00_header.in patch -i $SRC/$name-10_linux.diff util/grub.d/10_linux.in - patch -p1 -i $SRC/$name-cve-2015-8370.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/grub2/grub2-cve-2015-8370.patch b/grub2/grub2-cve-2015-8370.patch deleted file mode 100644 index 802affb..0000000 --- a/grub2/grub2-cve-2015-8370.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c -index 010e550..683a8aa 100644 ---- a/grub-core/lib/crypto.c -+++ b/grub-core/lib/crypto.c -@@ -470,7 +470,8 @@ grub_password_get (char buf[], unsigned buf_size) - - if (key == '\b') - { -- cur_len--; -+ if (cur_len) -+ cur_len--; - continue; - } - -diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c -index c6bd96e..8615c48 100644 ---- a/grub-core/normal/auth.c -+++ b/grub-core/normal/auth.c -@@ -174,8 +174,11 @@ grub_username_get (char buf[], unsigned buf_size) - - if (key == '\b') - { -- cur_len--; -- grub_printf ("\b"); -+ if (cur_len) -+ { -+ cur_len--; -+ grub_printf ("\b"); -+ } - continue; - } -

1 0