multimedia/aom: update to 3.0.0

Changes:	https://aomedia.googlesource.com/aom/+log/v2.0.2..v3.0.0
Reported by:	portscout

11 files changed, 22 insertions, 32 deletions

diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 58ad74943fa0..b49a4d6987ce 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.2
+DISTVERSION=	3.0.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	VMAF
 
 VMAF_DESC=		Encoding tuning for VMAF
 VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
-VMAF_USES=		localbase:ldflags
+VMAF_USES=		localbase:ldflags pkgconfig
 VMAF_CMAKE_ON=		-DCONFIG_TUNE_VMAF:STRING=1
 
 post-patch:
diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
index ac1a48775a7d..7dc19c062b52 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612832758
-SHA256 (jbeich-aom-v2.0.2_GH0.tar.gz) = 881e6892eac001303218107d2cca4bf46a1fe61d627122071e4f6d2fc7a02f25
-SIZE (jbeich-aom-v2.0.2_GH0.tar.gz) = 3507798
+TIMESTAMP = 1616521696
+SHA256 (jbeich-aom-v3.0.0_GH0.tar.gz) = a6f5087ceff8888ab06c92cbb200681be8082e001fe25e196912877055df7737
+SIZE (jbeich-aom-v3.0.0_GH0.tar.gz) = 4588304
diff --git a/multimedia/aom/files/patch-CMakeLists.txt b/multimedia/aom/files/patch-CMakeLists.txt
deleted file mode 100644
index 9aa4db0efa80..000000000000
--- a/multimedia/aom/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-- Prefer linking against shared libvmaf (since 1.5.1)
-
---- CMakeLists.txt.orig	2020-02-26 23:23:16 UTC
-+++ CMakeLists.txt
-@@ -424,7 +424,7 @@ if(CONFIG_AV1_ENCODER)
-               ${AOM_ENCODER_TOOL_TARGETS})
- 
-   if(CONFIG_TUNE_VMAF)
--    find_library(VMAF libvmaf.a vmaf)
-+    find_library(VMAF vmaf)
-     if(NOT VMAF)
-       message(FATAL_ERROR "VMAF library not found.")
-     endif()
diff --git a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake b/multimedia/aom/files/patch-build_cmake_aom__configure.cmake
index 25d9467d6633..5b2650ea5d63 100644
--- a/multimedia/aom/files/patch-build_cmake_aom__configure.cmake
+++ b/multimedia/aom/files/patch-build_cmake_aom__configure.cmake
@@ -1,21 +1,22 @@
 - FreeBSD and NetBSD powerpc* targets don't abbreviate to ppc*
 - ARM uses compiler intrinsics, so don't require GNU as
 
---- build/cmake/aom_configure.cmake.orig	2020-02-07 16:59:05 UTC
+--- build/cmake/aom_configure.cmake.orig	2021-02-23 19:51:03 UTC
 +++ build/cmake/aom_configure.cmake
-@@ -74,7 +74,7 @@ if(NOT AOM_TARGET_CPU)
+@@ -71,7 +71,7 @@ if(NOT AOM_TARGET_CPU)
      set(AOM_TARGET_CPU "${cpu_lowercase}")
-   elseif("${cpu_lowercase}" MATCHES "aarch64")
+   elseif(cpu_lowercase MATCHES "aarch64")
      set(AOM_TARGET_CPU "arm64")
--  elseif("${cpu_lowercase}" MATCHES "^ppc")
-+  elseif("${cpu_lowercase}" MATCHES "^ppc|^powerpc")
+-  elseif(cpu_lowercase MATCHES "^ppc")
++  elseif(cpu_lowercase MATCHES "^ppc|^powerpc")
      set(AOM_TARGET_CPU "ppc")
    else()
      message(WARNING "The architecture ${CMAKE_SYSTEM_PROCESSOR} is not "
-@@ -162,17 +162,6 @@ elseif("${AOM_TARGET_CPU}" MATCHES "arm")
+@@ -159,17 +159,6 @@ elseif(AOM_TARGET_CPU MATCHES "arm")
+     if(NOT AS_EXECUTABLE)
        set(AS_EXECUTABLE as)
      endif()
-   endif()
+-  endif()
 -  find_program(as_executable_found ${AS_EXECUTABLE})
 -  if(NOT as_executable_found)
 -    message(
@@ -26,7 +27,6 @@
 -        "to your CMake command line."
 -        "To build without optimizations, add -DAOM_TARGET_CPU=generic to your "
 -        "cmake command line.")
--  endif()
+   endif()
    string(STRIP "${AOM_AS_FLAGS}" AOM_AS_FLAGS)
  endif()
- 
diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist
index 636b6f66bf0a..c1bce9cf8900 100644
--- a/multimedia/aom/pkg-plist
+++ b/multimedia/aom/pkg-plist
@@ -11,6 +11,6 @@ include/aom/aomcx.h
 include/aom/aomdx.h
 lib/libaom.a
 lib/libaom.so
-lib/libaom.so.2
-lib/libaom.so.2.0.2
+lib/libaom.so.3
+lib/libaom.so.3.0.0
 libdata/pkgconfig/aom.pc
diff --git a/multimedia/avidemux-plugins/Makefile b/multimedia/avidemux-plugins/Makefile
index 2f49d7226e9a..6133b942d32f 100644
--- a/multimedia/avidemux-plugins/Makefile
+++ b/multimedia/avidemux-plugins/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-plugins
 
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 6bcf4c779148..e5bcb36dd9f7 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	4.3.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
diff --git a/multimedia/gstreamer1-plugins-aom/Makefile b/multimedia/gstreamer1-plugins-aom/Makefile
index 5c1d3fdfd202..e9332e9946aa 100644
--- a/multimedia/gstreamer1-plugins-aom/Makefile
+++ b/multimedia/gstreamer1-plugins-aom/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	multimedia
 
 COMMENT=	GStreamer (libaom) plugin
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index b094eabd872b..e23c6d444c1e 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xine
 DISTVERSION=	1.2.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 165a42b3d1e4..89cbb50c608a 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	mythtv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	31.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index f76395632864..e06b421146d3 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	3.0.12
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \