Index: multimedia/gstreamer1-libav/Makefile
===================================================================
--- multimedia/gstreamer1-libav/Makefile	(revision 484631)
+++ multimedia/gstreamer1-libav/Makefile	(working copy)
@@ -34,11 +34,9 @@
 FFMPEG_BROKEN=	fails to build with ffmpeg 4.0, see bug 227748
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_WITH=	system-libav
-FFMPEG_BUILD_DEPENDS_OFF=as:devel/binutils nasm:devel/nasm
-FFMPEG_CONFIGURE_ENV_OFF=${MACHINE:Marm*:C/.+/ASFLAGS=-no-integrated-as/}
+FFMPEG_BUILD_DEPENDS_OFF=	nasm:devel/nasm
 FFMPEG_MAKE_ENV_OFF=	V=1
 FFMPEG_VARS_OFF+=	NOPRECIOUSMAKEVARS=yes # ARCH
-FFMPEG_VARS_OFF+=	LLD_UNSAFE=yes # aarch64
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||g' \
Index: multimedia/gstreamer1-libav/files/patch-gst-libs_ext_libav_configure
===================================================================
--- multimedia/gstreamer1-libav/files/patch-gst-libs_ext_libav_configure	(revision 484631)
+++ multimedia/gstreamer1-libav/files/patch-gst-libs_ext_libav_configure	(working copy)
@@ -14,7 +14,15 @@
  cpu="generic"
  intrinsics="none"
  
-@@ -6492,6 +6487,9 @@ elif enabled llvm_gcc; then
+@@ -4956,6 +4951,7 @@ case $target_os in
+         disable symver
+         ;;
+     freebsd)
++        enable section_data_rel_ro
+         ;;
+     bsd/os)
+         add_extralibs -lpoll -lgnugetopt
+@@ -6492,6 +6488,9 @@ elif enabled llvm_gcc; then
  elif enabled clang; then
      check_cflags -mllvm -stack-alignment=16
      check_cflags -mstack-alignment=16