From owner-svn-ports-all@freebsd.org Sat Nov 17 06:21:38 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4D3D1127564; Sat, 17 Nov 2018 06:21:38 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4AC0C7C241; Sat, 17 Nov 2018 06:21:38 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2BC732874C; Sat, 17 Nov 2018 06:21:38 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAH6LbmY024658; Sat, 17 Nov 2018 06:21:37 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAH6LbfS024656; Sat, 17 Nov 2018 06:21:37 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201811170621.wAH6LbfS024656@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 17 Nov 2018 06:21:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485116 - in branches/2018Q4/multimedia/vlc3: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2018Q4/multimedia/vlc3: . files X-SVN-Commit-Revision: 485116 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4AC0C7C241 X-Spamd-Result: default: False [0.19 / 15.00]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.19)[0.188,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2018 06:21:38 -0000 Author: riggs Date: Sat Nov 17 06:21:37 2018 New Revision: 485116 URL: https://svnweb.freebsd.org/changeset/ports/485116 Log: 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) Added: branches/2018Q4/multimedia/vlc3/files/patch-modules_codec_aom.c - copied unchanged from r485115, head/multimedia/vlc3/files/patch-modules_codec_aom.c Modified: branches/2018Q4/multimedia/vlc3/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/multimedia/vlc3/Makefile ============================================================================== --- branches/2018Q4/multimedia/vlc3/Makefile Sat Nov 17 05:58:48 2018 (r485115) +++ branches/2018Q4/multimedia/vlc3/Makefile Sat Nov 17 06:21:37 2018 (r485116) @@ -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 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 @@ -107,6 +108,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 Copied: branches/2018Q4/multimedia/vlc3/files/patch-modules_codec_aom.c (from r485115, head/multimedia/vlc3/files/patch-modules_codec_aom.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/multimedia/vlc3/files/patch-modules_codec_aom.c Sat Nov 17 06:21:37 2018 (r485116, copy of r485115, head/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 },