Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Nov 2018 05:58:49 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r485115 - in head/multimedia/vlc3: . files
Message-ID:  <201811170558.wAH5wnqX009647@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Sat Nov 17 05:58:48 2018
New Revision: 485115
URL: https://svnweb.freebsd.org/changeset/ports/485115

Log:
  Fix build with installed libaom; support libaom via AOM OPTION
  
  PR:		233063
  Reported by:	rkoberman@gmail.com, patch idea by jbeich
  MFH:		2018Q4

Added:
  head/multimedia/vlc3/files/patch-modules_codec_aom.c   (contents, props changed)
Modified:
  head/multimedia/vlc3/Makefile

Modified: head/multimedia/vlc3/Makefile
==============================================================================
--- head/multimedia/vlc3/Makefile	Sat Nov 17 03:29:58 2018	(r485114)
+++ head/multimedia/vlc3/Makefile	Sat Nov 17 05:58:48 2018	(r485115)
@@ -65,7 +65,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 \
@@ -79,6 +79,7 @@ OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD
 		V4L VAAPI VCD VDPAU VORBIS WAYLAND 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

Added: head/multimedia/vlc3/files/patch-modules_codec_aom.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vlc3/files/patch-modules_codec_aom.c	Sat Nov 17 05:58:48 2018	(r485115)
@@ -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 },



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811170558.wAH5wnqX009647>