MFH: r485115

Fix build with installed libaom; support libaom via AOM OPTION

PR:		233063
Reported by:	rkoberman@gmail.com, patch idea by jbeich

Approved by:	ports-secteam (riggs)

multimedia/vlc3/Makefile

@@ -64,7 +64,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS_i386=	-fomit-frame-pointer
 LIBS+=		-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	A52 AALIB ASS AVAHI CACA CHROMECAST DBUS DCA DOCS DVDREAD \
+OPTIONS_DEFINE=	A52 AALIB AOM ASS AVAHI CACA CHROMECAST DBUS DCA DOCS DVDREAD \
 		DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNUTLS \
 		GOOM HARFBUZZ JACK KATE LIBBLURAY LIBRSVG2 LIBSSH2 LIRC \
 		LIVEMEDIA LUA MAD MODPLUG MPEG2 MTP MUSEPACK \
@@ -78,6 +78,7 @@ OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \
 		V4L VAAPI VCD VDPAU VORBIS X11
 OPTIONS_SUB=	yes
 
+AOM_DESC=	AV1 video encoding/decoding via libaom
 ASS_DESC=	ASS/SSA subtitle rendering
 CHROMECAST_DESC=Streaming to Chromecast devices
 DVDREAD_DESC=	DVD Playback support
@@ -108,6 +109,9 @@ AALIB_CONFIGURE_ENABLE=	aa
 ASS_LIB_DEPENDS=	libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
+AOM_LIB_DEPENDS=	libaom.so:multimedia/aom
+AOM_CONFIGURE_ENABLE=	aom
+
 AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
 AVAHI_CONFIGURE_ENABLE=	avahi
 

multimedia/vlc3/files/patch-modules_codec_aom.c

@@ -0,0 +1,10 @@
+--- modules/codec/aom.c.orig	2018-07-24 15:13:43 UTC
++++ modules/codec/aom.c
+@@ -96,7 +96,6 @@ static const struct
+     { VLC_CODEC_I444, AOM_IMG_FMT_I444, 8, 0 },
+ 
+     { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
+-    { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
+ 
+     { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 },
+     { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },