Index: head/multimedia/aom/Makefile =================================================================== --- head/multimedia/aom/Makefile (revision 495676) +++ head/multimedia/aom/Makefile (revision 495677) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-1448 -DISTVERSIONSUFFIX= -g559efba4a +DISTVERSION= 1.0.0-1461 +DISTVERSIONSUFFIX= -g2ff3bc5bc 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 495676) +++ head/multimedia/aom/distinfo (revision 495677) @@ -1,3 +1,3 @@ -TIMESTAMP = 1552349623 -SHA256 (jbeich-aom-v1.0.0-1448-g559efba4a_GH0.tar.gz) = 27446c7ac2a745da0e980abb2798e0cd44322d5d079709adbcf27c0f2d19e00c -SIZE (jbeich-aom-v1.0.0-1448-g559efba4a_GH0.tar.gz) = 3198074 +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 Index: head/multimedia/aom/files/patch-av1_encoder_encodeframe.c =================================================================== --- head/multimedia/aom/files/patch-av1_encoder_encodeframe.c (nonexistent) +++ head/multimedia/aom/files/patch-av1_encoder_encodeframe.c (revision 495677) @@ -0,0 +1,34 @@ +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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property