svn commit: r508200 - in branches/2019Q3: multimedia/dav1d multimedia/ffmpeg multimedia/vlc www/firefox

[Jan Beich]

Author: jbeich
Date: Mon Aug  5 19:18:52 2019
New Revision: 508200
URL: https://svnweb.freebsd.org/changeset/ports/508200

Log:
  MFH: r508199
  
  multimedia/dav1d: update to 0.4.0
  
  - Drop meson hack for aarch64 after r50500
  
  Changes:	https://code.videolan.org/videolan/dav1d/tags/0.4.0
  Changes:	https://code.videolan.org/videolan/dav1d/blob/0.4.0/NEWS
  Changes:	https://code.videolan.org/videolan/dav1d/compare/0.3.1...0.4.0
  Approved by:	ports-secteam blanket (required by Firefox 69)

Modified:
  branches/2019Q3/multimedia/dav1d/Makefile
  branches/2019Q3/multimedia/dav1d/distinfo
  branches/2019Q3/multimedia/dav1d/pkg-plist
  branches/2019Q3/multimedia/ffmpeg/Makefile
  branches/2019Q3/multimedia/vlc/Makefile
  branches/2019Q3/www/firefox/Makefile
Directory Properties:
  branches/2019Q3/   (props changed)

Modified: branches/2019Q3/multimedia/dav1d/Makefile
==============================================================================
--- branches/2019Q3/multimedia/dav1d/Makefile	Mon Aug  5 19:16:53 2019	(r508199)
+++ branches/2019Q3/multimedia/dav1d/Makefile	Mon Aug  5 19:18:52 2019	(r508200)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	dav1d
-DISTVERSION=	0.3.1
+DISTVERSION=	0.4.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -19,13 +19,19 @@ USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GL_SITE=	https://code.videolan.org
 GL_ACCOUNT=	videolan
-GL_COMMIT=	c9427fd43a17d654402f49f8ce28c4991c7024da
-CONFIGURE_ENV=	UNAME_m=${ARCH} # XXX cpu_family()
+GL_COMMIT=	5f63e531b9d10a09afe0a6b4875ca4852a7e58c1
 
-OPTIONS_DEFINE=	TEST
+OPTIONS_DEFINE=	SDL TEST
+OPTIONS_SUB=	yes
 
+SDL_USES=	pkgconfig sdl
+SDL_USE=	SDL=sdl2
+SDL_BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers
+SDL_LIB_DEPENDS=	libplacebo.so:graphics/libplacebo \
+			libvulkan.so:graphics/vulkan-loader
+
 TEST_GL_TUPLE=	videolan:dav1d-test-data:3ccdd3df4fb8583d58bcc0101e315b00ec3ae130:testdata/tests/dav1d-test-data
-TEST_MESON_TRUE=build_tests testdata_tests
+TEST_MESON_TRUE=enable_tests testdata_tests
 
 .if make(makesum) # for optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
@@ -37,6 +43,9 @@ MESON_ARGS+=	${MESON_ARGS_${CHOSEN_COMPILER_TYPE}_${AR
 MESON_ARGS_clang_amd64=	-Dstack_alignment=16
 MESON_ARGS_clang_i386=	-Dstack_alignment=4
 .endif
+
+post-patch-SDL-off:
+	${REINPLACE_CMD} 's/sdl2/&-disabled/2' ${WRKSRC}/tools/meson.build
 
 pre-install-TEST-on: do-test
 

Modified: branches/2019Q3/multimedia/dav1d/distinfo
==============================================================================
--- branches/2019Q3/multimedia/dav1d/distinfo	Mon Aug  5 19:16:53 2019	(r508199)
+++ branches/2019Q3/multimedia/dav1d/distinfo	Mon Aug  5 19:18:52 2019	(r508200)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1557588190
-SHA256 (videolan-dav1d-c9427fd43a17d654402f49f8ce28c4991c7024da_GL0.tar.gz) = fad9d74887ad228e580fe09ffb1382e8ed001abe940f8ab6aedc5b538a6b72fa
-SIZE (videolan-dav1d-c9427fd43a17d654402f49f8ce28c4991c7024da_GL0.tar.gz) = 574244
+TIMESTAMP = 1564781751
+SHA256 (videolan-dav1d-5f63e531b9d10a09afe0a6b4875ca4852a7e58c1_GL0.tar.gz) = afbb904d89bb4a29e0993d10a99dcb38ebbd769e31b707d6c5a61a37b3ce39c6
+SIZE (videolan-dav1d-5f63e531b9d10a09afe0a6b4875ca4852a7e58c1_GL0.tar.gz) = 635412
 SHA256 (videolan-dav1d-test-data-3ccdd3df4fb8583d58bcc0101e315b00ec3ae130_GL0.tar.gz) = 4ac0c3fa7993f53c6e5f03fda28252269ecd6ca11bcd96f6026cb0c2edb64d41
 SIZE (videolan-dav1d-test-data-3ccdd3df4fb8583d58bcc0101e315b00ec3ae130_GL0.tar.gz) = 31340228

Modified: branches/2019Q3/multimedia/dav1d/pkg-plist
==============================================================================
--- branches/2019Q3/multimedia/dav1d/pkg-plist	Mon Aug  5 19:16:53 2019	(r508199)
+++ branches/2019Q3/multimedia/dav1d/pkg-plist	Mon Aug  5 19:18:52 2019	(r508200)
@@ -1,4 +1,5 @@
 bin/dav1d
+%%SDL%%bin/dav1dplay
 include/dav1d/common.h
 include/dav1d/data.h
 include/dav1d/dav1d.h
@@ -6,6 +7,6 @@ include/dav1d/headers.h
 include/dav1d/picture.h
 include/dav1d/version.h
 lib/libdav1d.so
-lib/libdav1d.so.1
-lib/libdav1d.so.1.1.0
+lib/libdav1d.so.2
+lib/libdav1d.so.2.0.0
 libdata/pkgconfig/dav1d.pc

Modified: branches/2019Q3/multimedia/ffmpeg/Makefile
==============================================================================
--- branches/2019Q3/multimedia/ffmpeg/Makefile	Mon Aug  5 19:16:53 2019	(r508199)
+++ branches/2019Q3/multimedia/ffmpeg/Makefile	Mon Aug  5 19:18:52 2019	(r508200)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	4.1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	https://ffmpeg.org/releases/

Modified: branches/2019Q3/multimedia/vlc/Makefile
==============================================================================
--- branches/2019Q3/multimedia/vlc/Makefile	Mon Aug  5 19:16:53 2019	(r508199)
+++ branches/2019Q3/multimedia/vlc/Makefile	Mon Aug  5 19:18:52 2019	(r508200)
@@ -3,6 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	3.0.7.1
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \

Modified: branches/2019Q3/www/firefox/Makefile
==============================================================================
--- branches/2019Q3/www/firefox/Makefile	Mon Aug  5 19:16:53 2019	(r508199)
+++ branches/2019Q3/www/firefox/Makefile	Mon Aug  5 19:18:52 2019	(r508200)
@@ -3,6 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	68.0.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \