From 3dae2b9aae29b50dcb386d9c43137db8ad6fdd1b Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sat, 17 Sep 2022 20:28:11 +0000
Subject: multimedia/aom: avoid leaking libjxl and vmaf via pkg-config

$ make stage-qa -C graphics/libavif
[...]
Error: /usr/local/lib/libavif.so.14.0.1 is linked to /usr/local/lib/libvmaf.so.1 from multimedia/vmaf but it is not declared as a dependency
Warning: you need LIB_DEPENDS+=libvmaf.so:multimedia/vmaf
Error: /usr/local/lib/libavif.so.14.0.1 is linked to /usr/local/lib/libjxl.so.0.7 from graphics/libjxl but it is not declared as a dependency
Warning: you need LIB_DEPENDS+=libjxl.so:graphics/libjxl

Reported by:	Tatsuki Makino (on ports@ list), Jan Henrik Sylvester (private mail)
---
 graphics/libavif/Makefile                                |  2 +-
 multimedia/aom/Makefile                                  |  2 +-
 multimedia/aom/files/patch-build_cmake_pkg__config.cmake | 13 +++++++++++++
 multimedia/avidemux-plugins/Makefile                     |  2 +-
 multimedia/gstreamer1-plugins-aom/Makefile               |  2 +-
 multimedia/libxine/Makefile                              |  2 +-
 multimedia/mythtv-frontend/Makefile                      |  2 +-
 multimedia/mythtv/Makefile                               |  1 +
 multimedia/vlc/Makefile                                  |  2 +-
 9 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 multimedia/aom/files/patch-build_cmake_pkg__config.cmake

diff --git a/graphics/libavif/Makefile b/graphics/libavif/Makefile
index 01237d0b8b48..7f252b0208d3 100644
--- a/graphics/libavif/Makefile
+++ b/graphics/libavif/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libavif
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 7217ea86726c..f3ef2cfc12fc 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/aom/files/patch-build_cmake_pkg__config.cmake b/multimedia/aom/files/patch-build_cmake_pkg__config.cmake
new file mode 100644
index 000000000000..6fcc7a9a5e01
--- /dev/null
+++ b/multimedia/aom/files/patch-build_cmake_pkg__config.cmake
@@ -0,0 +1,13 @@
+- Limit internal dependencies to static library
+
+--- build/cmake/pkg_config.cmake.orig	2022-06-17 17:46:18 UTC
++++ build/cmake/pkg_config.cmake
+@@ -51,7 +51,7 @@ file(APPEND "${pkgconfig_file}" "Version: ${package_ve
+   APPEND "${pkgconfig_file}"
+   "Description: Alliance for Open Media AV1 codec library v${aom_version}.\n")
+ file(APPEND "${pkgconfig_file}" "Version: ${package_version}\n")
+-file(APPEND "${pkgconfig_file}" "Requires:")
++file(APPEND "${pkgconfig_file}" "Requires.private:")
+ if(CONFIG_TUNE_VMAF)
+   file(APPEND "${pkgconfig_file}" " libvmaf")
+ endif()
diff --git a/multimedia/avidemux-plugins/Makefile b/multimedia/avidemux-plugins/Makefile
index 717d0439577d..d7209e79067a 100644
--- a/multimedia/avidemux-plugins/Makefile
+++ b/multimedia/avidemux-plugins/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	avidemux
 PORTVERSION=	${AVIDEMUX_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	-plugins
 
diff --git a/multimedia/gstreamer1-plugins-aom/Makefile b/multimedia/gstreamer1-plugins-aom/Makefile
index 6501591beca8..0a9b13372f38 100644
--- a/multimedia/gstreamer1-plugins-aom/Makefile
+++ b/multimedia/gstreamer1-plugins-aom/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	multimedia
 
 COMMENT=	GStreamer (libaom) plugin
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index b8daa8fecbda..84bf3e9ed240 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xine
 DISTVERSION=	1.2.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile
index 13dbf07a192e..713b4f053515 100644
--- a/multimedia/mythtv-frontend/Makefile
+++ b/multimedia/mythtv-frontend/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	3
+PORTREVISION=	4
 PKGNAMESUFFIX=	-${SLAVEPORT}
 
 MAINTAINER=	ahicks@p-o.co.uk
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 68e4c7854c39..da759224ad73 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -2,6 +2,7 @@ PORTNAME=	mythtv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	32.0-60
 DISTVERSIONSUFFIX=	-ge5c974e402
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 550079d0020a..14ae2e417e93 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vlc
 DISTVERSION=	3.0.17.4
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
-- 
cgit v1.2.3