Index: head/multimedia/aom/Makefile =================================================================== --- head/multimedia/aom/Makefile (revision 495841) +++ head/multimedia/aom/Makefile (revision 495842) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-1461 -DISTVERSIONSUFFIX= -g2ff3bc5bc +DISTVERSION= 1.0.0-1474 +DISTVERSIONSUFFIX= -g9814f1555 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= AV1 reference encoder/decoder LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_i386= nasm:devel/nasm USES= cmake compiler:c++11-lib perl5 USE_GITHUB= yes USE_PERL5= build USE_LDCONFIG= yes GH_ACCOUNT= jbeich # mirror CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= ENABLE_DOCS ENABLE_TESTS post-patch: # Extract (snapshot) version from the port instead of CHANGELOG @${REINPLACE_CMD} 's,$${AOM_ROOT}/CHANGELOG,${DISTVERSIONFULL:S/^v//},' \ ${WRKSRC}/build/cmake/version.cmake .include Index: head/multimedia/aom/distinfo =================================================================== --- head/multimedia/aom/distinfo (revision 495841) +++ head/multimedia/aom/distinfo (revision 495842) @@ -1,3 +1,3 @@ -TIMESTAMP = 1552520292 -SHA256 (jbeich-aom-v1.0.0-1461-g2ff3bc5bc_GH0.tar.gz) = cc63841d333b6c4ae2ca5a3ea142c4ef7d983052ec96e4190c663f1469ab968e -SIZE (jbeich-aom-v1.0.0-1461-g2ff3bc5bc_GH0.tar.gz) = 3208965 +TIMESTAMP = 1552685967 +SHA256 (jbeich-aom-v1.0.0-1474-g9814f1555_GH0.tar.gz) = 4fc5449fc8844d58c006533e4550548bc74575c2ba38c68c3d1e44f7263f714b +SIZE (jbeich-aom-v1.0.0-1474-g9814f1555_GH0.tar.gz) = 3211891 Index: head/multimedia/aom/files/patch-av1_encoder_encodeframe.c =================================================================== --- head/multimedia/aom/files/patch-av1_encoder_encodeframe.c (revision 495841) +++ head/multimedia/aom/files/patch-av1_encoder_encodeframe.c (nonexistent) @@ -1,34 +0,0 @@ -av1/encoder/encodeframe.c:3873:33: error: use of undeclared identifier 'ref_frame_flag_list'; did you mean 'av1_ref_frame_flag_list'? - assert(cpi->ref_frame_flags & ref_frame_flag_list[LAST_FRAME] || - ^~~~~~~~~~~~~~~~~~~ - av1_ref_frame_flag_list -/usr/include/assert.h:54:21: note: expanded from macro 'assert' -#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ - ^ -av1/encoder/encoder.h:1282:22: note: 'av1_ref_frame_flag_list' declared here -static const uint8_t av1_ref_frame_flag_list[REF_FRAMES] = { 0, - ^ -av1/encoder/encodeframe.c:3874:33: error: use of undeclared identifier 'ref_frame_flag_list'; did you mean 'av1_ref_frame_flag_list'? - cpi->ref_frame_flags & ref_frame_flag_list[ALTREF_FRAME]); - ^~~~~~~~~~~~~~~~~~~ - av1_ref_frame_flag_list -/usr/include/assert.h:54:21: note: expanded from macro 'assert' -#define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ - ^ -av1/encoder/encoder.h:1282:22: note: 'av1_ref_frame_flag_list' declared here -static const uint8_t av1_ref_frame_flag_list[REF_FRAMES] = { 0, - ^ - ---- av1/encoder/encodeframe.c.orig 2019-03-13 23:38:12 UTC -+++ av1/encoder/encodeframe.c -@@ -3870,8 +3870,8 @@ static void firstpass_simple_motion_search_features( - AV1_COMP *const cpi, MACROBLOCK *x, PC_TREE *pc_tree, int mi_row, - int mi_col, BLOCK_SIZE bsize, float *features) { - assert(mi_size_wide[bsize] == mi_size_high[bsize]); -- assert(cpi->ref_frame_flags & ref_frame_flag_list[LAST_FRAME] || -- cpi->ref_frame_flags & ref_frame_flag_list[ALTREF_FRAME]); -+ assert(cpi->ref_frame_flags & av1_ref_frame_flag_list[LAST_FRAME] || -+ cpi->ref_frame_flags & av1_ref_frame_flag_list[ALTREF_FRAME]); - - // Setting up motion search - const int ref_list[] = { LAST_FRAME, ALTREF_FRAME }; Property changes on: head/multimedia/aom/files/patch-av1_encoder_encodeframe.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property