Index: head/multimedia/aom/Makefile
===================================================================
--- head/multimedia/aom/Makefile	(revision 515314)
+++ head/multimedia/aom/Makefile	(revision 515315)
@@ -1,32 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.0-2541
-DISTVERSIONSUFFIX=	-g7e56b507f
+DISTVERSION=	1.0.0-2558
+DISTVERSIONSUFFIX=	-g25daf5d22
 CATEGORIES=	multimedia
+
+# XXX Drop revert of revert when ABI changes again
+# https://aomedia-review.googlesource.com/c/aom/+/96983
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	a70e67a5fd6a.patch:-p1
 
 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 <bsd.port.mk>
Index: head/multimedia/aom/distinfo
===================================================================
--- head/multimedia/aom/distinfo	(revision 515314)
+++ head/multimedia/aom/distinfo	(revision 515315)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1571512649
-SHA256 (jbeich-aom-v1.0.0-2541-g7e56b507f_GH0.tar.gz) = f77abe4613341c7ff30eca6934cab23a87b2e3846e5d7646ef383ef50a77d0d4
-SIZE (jbeich-aom-v1.0.0-2541-g7e56b507f_GH0.tar.gz) = 3438521
+TIMESTAMP = 1571872871
+SHA256 (jbeich-aom-v1.0.0-2558-g25daf5d22_GH0.tar.gz) = 563e96a67ee406c5109a6c194fd8f6fe976e2db85d4ffb536e805e38018c8fb0
+SIZE (jbeich-aom-v1.0.0-2558-g25daf5d22_GH0.tar.gz) = 3437867
+SHA256 (a70e67a5fd6a.patch) = 1231481f9ecdddf19edf20734ee9d2782bf89afa8800d46470c915464c0c311c
+SIZE (a70e67a5fd6a.patch) = 32538