gentoo resync : 11.05.2018

12 files changed, 166 insertions, 5 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 0d3df9570d42..f35f3d52774c 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index e612bc3c5c58..8f4c5e2d018e 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -3,9 +3,10 @@ AUX ffmpeg4.patch 1832 BLAKE2B 1770e99dacc641b066d79b83ad145631a1cbe0330e5bcf938
 AUX gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 542 BLAKE2B 31a9898e8a9741833acacdfa40db23b252a7c4de8491d7c9b80ed700499e11c078205889e402aa415a9e718cfa72783ac40ecc9956dc2e86db45cd5d90964fdc SHA512 65746044b1a8f2125b5113f4ec1ffa2c46b53f1927202c38130431e53875483ac834444e6e5ea1e589176dba0139e9703b4fc61be038ac305234b53765ba16cd
 AUX gpac-0.5.3-static-libs.patch 2843 BLAKE2B 99b301f9e4e0e87d9d93763dc40daa2bc2c57cbac4e09de4e9e86baff98c5ad62e598d532ba843e3eef8e0445c5fe66b03be0e3ef42b54c6dd3a84cff975878f SHA512 aa130e8744124c8cf4d280b669a0e1d133f57e3637a1ab7f151610439d37366145e1aec28a07338118f1c19e5a81c5068dcda813e15787575953332040603d5c
 AUX gpac-0.7.1-configure.patch 2928 BLAKE2B 98ce3227f87c3c4576f5d4bc3a28d560ca3f8d7912414984c7ea58dd27c5717ce30f28b0508368b39fb5b19159e363892fecd0d60d137bd65a4c3d7e02a6d69f SHA512 f359693d43b3d033bc05c8af4951aff9cb432601421d888e50296c6164157b85be368ea4ae828e5229ae9344738bd49136d947ef0eb57bf545f80c3243c94046
+AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e283269ea2f059b6be8bb547949e6c241f62ec4692b7b31626898cf31874ee8e8462e6cc414353aa8b72965cf SHA512 8361efbe7fa8989d63a8de733094e2f9e0f7467d7bf437330477bcbc4091517619c925aef056a1ee57c3cc7b0f3e973abab5cb095a5a8444ff1b220bbb7a2dde
 DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
 EBUILD gpac-0.6.1-r2.ebuild 3211 BLAKE2B abcf08b642fec5182c653b186fc61a16b0f8be87bcad28cd7494c3a871cc9717c3d8e9cef51616a7a9b99ed61d9e12644f284ecf95d3fb9fb0f8462faa6667eb SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5
-EBUILD gpac-0.7.1.ebuild 3406 BLAKE2B 37b5d6de46f3ab403b014387cac6b082c07d8cbbb085109cb7e9dcf40d95f94e739cd1feb4739a69db5d1649368e59874e0fabf24e456b20ca320c95694ac686 SHA512 98b41c2655f9e313e5eebafc2babce31072fac002cd83265ca4692ca0b7bd18be274330a2286b897b6edd451b942cc9b120b1689d242a7009a5b4d706f426d45
+EBUILD gpac-0.7.1.ebuild 3461 BLAKE2B 60a5c9e6acd71c5254fd0ca26e38f161ba53f8a24ea9a8856f55d9a80d8fc877566e83344ae20ab2941787292b54d1ef00ec43eddd5077157e2f2e243c272f03 SHA512 3499a090bc797415b05e138f55aa8fa57292a790d6f5a305e9ee7a0d6cceeada5306048027257f272cd2804d61e2dc99a402498f3a2a4745d8d31fd159040df4
 EBUILD gpac-9999.ebuild 3095 BLAKE2B 5a1223e8f93f7b0ac751e1a8f46c305b60d578bb8235d23c9bb9f9619db405ee35607714df635d003a0e742b425265114f3e4b2dca527b2601691ee93ce90ba5 SHA512 f5d8046010c916cdca9ae2698e5d08fe29fb2637a869799c021968aad872094d1e2ca68db77cf36c62b154bd5b5e31ff392b01cb522e701c04565304eb185a06
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/files/gpac-freetype.patch b/media-video/gpac/files/gpac-freetype.patch
new file mode 100644
index 000000000000..98224aff30e1
--- /dev/null
+++ b/media-video/gpac/files/gpac-freetype.patch
@@ -0,0 +1,15 @@
+Index: gpac-0.7.1/configure
+===================================================================
+--- gpac-0.7.1.orig/configure
++++ gpac-0.7.1/configure
+@@ -1117,8 +1117,8 @@ if docc $CFLAGS_DIR $ft_cflags $ft_lflag
+ fi
+ if test "$cross_prefix" = "" ; then
+     if test "$has_ft" = "no" ; then
+-        ft_cflags="`freetype-config --cflags 2>>$logs`"
+-        ft_lflags="`freetype-config --libs 2>>$logs`"
++        ft_cflags="`pkg-config --cflags freetype2 2>>$logs`"
++        ft_lflags="`pkg-config --libs freetype2 2>>$logs`"
+         if docc $ft_cflags $ft_lflags $LDFLAGS ; then
+             has_ft="system"
+         fi
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild
index ca4acbd586ef..ed5c090d045f 100644
--- a/media-video/gpac/gpac-0.7.1.ebuild
+++ b/media-video/gpac/gpac-0.7.1.ebuild
@@ -56,12 +56,14 @@ RDEPEND="
 "
 # disabled upstream, see applications/Makefile
 # wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 # DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt"
 PATCHES=(
 	"${FILESDIR}/${PN}-0.7.1-configure.patch"
 	"${FILESDIR}/ffmpeg4.patch"
+	"${FILESDIR}/${PN}-freetype.patch"
 )
 
 DOCS=(
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 67de1264aa2f..4c5d6d2d06e0 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,10 @@
 DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 72eb3b1a34bbed0d492098c02c1f60c7ce7f0ea6a8fbff6b88bd9d7af5891dda8c8adb9a0f856c65106fb430b481183ce74b9369590cd4dcfe881d7db84eb06d SHA512 dd18eeffc8a5210ca3c8a287321ad106f63cff8fbe5ad3891460aab7e60f2d5261a3f335f3991524a95724861288593cfb3bd9df6829a2f7751f6a1fdaba0ca6
 DIST mkvtoolnix-21.0.0.tar.xz 4682788 BLAKE2B 52d9920fc5b735f7d8af1f6e60828f143a914ce7cd7c635daacb6d2da584b0158f80e0f4d39824130b0c8fcc83b7c3a1215b2e965cb8b47b2b297df2d78414d5 SHA512 881e0c38eee2d36ab9dea5ccaa8ad74e0076cdc13606f873ab58bfeeec09c05e947529d3bad665b1d4df6a816faca30e8a685bc19115f90c18dac3c1ae27c252
 DIST mkvtoolnix-22.0.0.tar.xz 4714712 BLAKE2B 325a0a250db8c6c833b01e6bb613044ca21b4061cbbd516ee6c60388b17c9c3759cf9759af0e2c23091d8044fd86358122e0739bf7d6133be9befca37c6d0294 SHA512 59d299f21d484dc529dafe81a35d3351e4f57abf6a2d8889692d95b9b9ffacdca9b55a3cf373b147f3ff12595590bf98f49af5d22d311b9b2d03f12a4bba00a6
+DIST mkvtoolnix-23.0.0.tar.xz 4729056 BLAKE2B a264b482f141de502fb4c4aadcdc0ec1ed4e34d2ddc906d8d1f6a0b1ea76511a590ab9d90e035955aa138512877848752185012b8e7e1aeed3007c186c796190 SHA512 3c9072b54a4076e6fb934d40a2c2554dfa1316de1cb8d74ab262b0584eda1e679324aaf690195f68590413f9d3ca34d5d2a1f9f5545de065fe2db892eee19ffb
 EBUILD mkvtoolnix-19.0.0.ebuild 2549 BLAKE2B f205d940a9fe250d842cfeaffefd389be863556cfbb6d1d2960551c5b16ece35269c9c64f2c110655e38f2cda894c5940bf686fb04602ad997cca05f61ecb0b9 SHA512 e8291ce11ad3871b538ccce78d81e258ff4112098a14587f12a03969a40cec24ddb884a2c9e3c16503ac1272a586e6e61fef8d414c28e9ee526949c97e52124c
 EBUILD mkvtoolnix-21.0.0-r1.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 EBUILD mkvtoolnix-22.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
+EBUILD mkvtoolnix-23.0.0.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 EBUILD mkvtoolnix-9999.ebuild 2776 BLAKE2B 86398031edf9b7f0a3a4e6f4847e72d2ee9025af58a7ddd524dfad296a15e0b6f79f629f0ddb7ed1ed1cdc629d43d3d74ab4413fcc593e60fb08ddb1ef3b2a2b SHA512 28b5a3406f1f89c2839ed2f859d790c3171740cbff1a871111aeb31a7bedb9df0680cb96c64eb36363af680eb409d1069f5fd9bc33d1840d89ac0b5f6c9f4613
 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9
diff --git a/media-video/mkvtoolnix/mkvtoolnix-23.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-23.0.0.ebuild
new file mode 100644
index 000000000000..cc20f8c7ff38
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-23.0.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+	inherit git-r3
+else
+	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug pch test qt5"
+
+# check NEWS.md for build system changes entries for boost/libebml/libmatroska
+# version requirement updates and other packaging info
+RDEPEND="
+	>=dev-libs/boost-1.49.0:=
+	>=dev-libs/libebml-1.3.5:=
+	dev-libs/jsoncpp:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.8:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtmultimedia:5
+		app-text/cmark
+	)
+"
+DEPEND="${RDEPEND}
+	dev-ruby/rake
+	sys-devel/gettext
+	virtual/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	test? ( dev-cpp/gtest )
+"
+
+DOCS="AUTHORS NEWS.md README.md"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=$(qt5_get_bindir)/moc
+			--with-uic=$(qt5_get_bindir)/uic
+			--with-rcc=$(qt5_get_bindir)/rcc
+			--with-qmake=$(qt5_get_bindir)/qmake
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-update-check \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	einstalldocs
+	doman doc/man/*.1
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index de24cc03e350..ffe4ea263b3c 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -2,12 +2,13 @@ AUX dump_ffmpeg.sh 2529 BLAKE2B 2c945fcf0b430d74c85557f82497dbc4a2a8308ecb34c86e
 AUX mplayer-1.3-CVE-2016-4352.patch 617 BLAKE2B 57f85be46230fa0576c6569bafc8c65f24b0a59d3b083c06d2e14fe176505567feca5024bafd73fb1b48960ea95a4705132ed6e2166a31aabcd1e34fc41e3803 SHA512 654bfa8368a02669ba249aa0c1a605f285d4d967b7038285df0ba7b83cd034ac3aff933a564fd6f33c7a153267be19d9eb517a52c8f4b53a6f81b6b2c5558512
 AUX mplayer-1.3-ffmpeg4.patch 25679 BLAKE2B 08f9ddb05a11c9b7ce0de7fe7bb92b492d1b35e65437c09be07cd39aa70cd9541baf442ffae1ee3060fd94d78eca30fa35808db8eebfdf679456da2c1d8217e8 SHA512 9f29fcd0bfd374fecf15a40c51e2bac53d2646d939ea13e7afffc8e9854d6d2105142f95745f0b26d8f58e19938c5ccedb191af30858fb6f3520072c98db3081
 AUX mplayer-1.3-vdpau-x11.patch 547 BLAKE2B b168b61f5712788c25164cf286a119de1d42c1a142048fc8b138226d146614d7fc454dd7a5c05bfcbdef815bf5d5e18064e2893a3adecd0733fcb79a803a5876 SHA512 439c7925f97b973597239a8f684171e752321dad4bae80a3a2bad46dcf6bf0c49b0839cd5cdac5c8e0b9f5c165061b4177d05cd8060ebba6cd5c4e730ab019ab
+AUX mplayer-1.3.0-freetype_pkgconfig.patch 417 BLAKE2B 3eb3d8463917f938b587858bca55f974382eab82ca5b22d05f3a3f3ef0f640a991e4b0dc527a7b02788f9fe361ae96898208f9a8d45c6b7dc1ddea5dd07a2dea SHA512 6e934229ab5c3a7bbfb583c9e41365c9f9de8f1448ff6bd9dfb4a8053cae18b66081b64d9f1bd26678db69470372805566df52894cb9a433f38d3c15ed4a8815
 AUX prepare_mplayer.sh 757 BLAKE2B 5de1cb4b17628dd5443f98a20717f8ed028a76446104a471a669b1c7ed7a5b76a8e86203f436240312ac4814a0ba7dba7856bb4f3723da850188a3003aae8bbb SHA512 0add0707e15d58cee331fc82f884a44b29908c503f9ddcbb63dc01e237e2f457f599bae8644ce49f1af2cc7b3183529364ce30e6748889355c17cb96cecee71a
 DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
 DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
 DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
 DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
-EBUILD mplayer-1.3.0-r3.ebuild 17205 BLAKE2B 98a2cabf8229a211dfd7501671f8578d23c801838535a05f004612e57bd969d9d69e8bc9afdf4377125ca815b567d52b2c3b4e3419d28d6c1330b2101e672e3b SHA512 b1e3f85d27613dd4973410425c6557a94cded0c4674a5fcac9e43ff38fbcd393f2c48cfbd054a4af127c14e09866a62fbfeb2165104978f6883809e65b3e8170
-EBUILD mplayer-1.3.0-r5.ebuild 17229 BLAKE2B d27d1532b472d951bf0d6349ac846fbfb523f1a0341bd05ea763eef01642816b3e612159f4e86d18cbba8ab9c34ca868edf8e1f5d30353b12c5c66cd4f4847a2 SHA512 e252f16bce5964d790cad463cfb1ae3a61778bb148a2852949933a04864da1fef352aeea391bf15e4449d8b73c0fd6e7ec4f216bee88150067825a3c5e52b71f
+EBUILD mplayer-1.3.0-r3.ebuild 17273 BLAKE2B 760bc09441661e7fcc1a2d0243c60ea084b7d7a7e378fe65c1b7475b46a04b087281f4d8075271bd5e79980bb0416291c5c2a03592d3f3c1dca6b07f111401e7 SHA512 48ebca46b6d865cdc075d5f68f775ed86366b24d8e848962cc8cdb165d5c8d243e6f7dd215c5b570705879b3d2287731d15d129f5f131560a25f5f26a47c9f9c
+EBUILD mplayer-1.3.0-r5.ebuild 17297 BLAKE2B 5cf6ff6c9d48f91e837c4fd3e2d6bda6486e85ef01427943bd2c12fd7a68264ca5c0ad52c48624b72e0b73721c649a95804e2569ddb98555d8dfe5cdf74597ea SHA512 42b9866eecfb3eb44fecdb08dfdeac0a8ae878cb3c4757f5fe7b2f97bc7e60fbf8451ccef81bac7ec49c24072260dfd43d8a661e52a5c9edc15f5e75ef37ea3f
 EBUILD mplayer-9999.ebuild 16983 BLAKE2B 22736905b595451ca6ecbb09ca28a32e59655de960850764e22a228caceb515a05b4dca2af04af1d63c1a1b3e78709c69c69b35f28e79c15aa9149e1344b3e36 SHA512 a8625386b91ee53d09dc50ae5a34938f9e981e174748399d580329308fbca99afdf71340214f4a7d577f5c4c61dd7ba1a6edef11d62f40bf3430eb3d365889a5
 MISC metadata.xml 2530 BLAKE2B 83baf1357e9b0d31244b7c04ceab7eec0bc7db7eb9a2de4ffc1a85cc49af40f1094d9bdbac22c9abff43c215c19e5b8c745afbd397ae7221921c24b422590e3a SHA512 b650af6aa25ee064d81d3db5cc066d634eaf8c8ccdf8e1352d449f0579b0a310026be2ff873999767c5b82c25a76c138af722220892794b9c615ce477335a93b
diff --git a/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..4bd67ca185aa
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch
@@ -0,0 +1,14 @@
+Index: configure
+===================================================================
+--- a/configure   (revision 38020)
++++ b/configure   (revision 38021)
+@@ -839,7 +839,8 @@
+ _macosx_finder=no
+ _macosx_bundle=auto
+ _sortsub=yes
+-_freetypeconfig='freetype-config'
++_freetypeconfig='pkg-config freetype2'
++type freetype-config >/dev/null 2>&1 && _freetypeconfig=freetype-config
+ _fribidi=auto
+ _enca=auto
+ _inet6=auto
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index c52e83c38b30..c48e3a8e79db 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -242,6 +242,7 @@ src_prepare() {
 		subversion_wc_info
 		printf "${ESVN_WC_REVISION}" > $svf
 	else
+		epatch "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
 		epatch "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
 	fi
 	if [ ! -f VERSION ] ; then
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index 1e14de1f1ea4..6b515f5212dc 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -243,6 +243,7 @@ src_prepare() {
 		subversion_wc_info
 		printf "${ESVN_WC_REVISION}" > $svf
 	else
+		eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
 		eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
 		has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch
 	fi
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 459c88789d07..03219757039a 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -12,5 +12,5 @@ DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28f
 EBUILD mpv-0.25.0-r2.ebuild 10902 BLAKE2B fa9ae811c53d01d32b8288696436783f9cf434d04255c45ae5efb73d68821afe5bfc3a2548fde646e11b35b4329ca61fc4bf3d18e7277538274a10440cde9069 SHA512 00c1edd4c77e859fc03d8cbadfefa7278bceb94d788d1306478fbf7b7535225c15e6dc65058eccf8251b9e6f3a4f9ce7ba04bfbc2065ccff13416fc5a32ebb7b
 EBUILD mpv-0.27.2.ebuild 10508 BLAKE2B 37b3ba28fee39f4e5d54e8009888f2a2cdf6568b236acc43e58be9fee72c60b7140904c57db8ee9cba46698cc764908705076df3940e55858a141d59ab6d7a86 SHA512 ebf1bb73a7189768a522ac3d86d33eb63dd97459bbca488a08fa78554316d3ab28e7cd54ab80dd449b55b05dbd0dc00a0f3353bd18ca3fed7444978e0bf02aa9
 EBUILD mpv-0.28.2.ebuild 10150 BLAKE2B 6a578bb33d95a3f3f9a14e83415797b0db8958c6ac914154c864305721c7f25ffe8d7733a64e9cbae3db23bdffb157e9e35ba0aa2c5880f805cebd404bd14798 SHA512 0086735a3d64b4c918c24556d8738ab0f7a739d957f308f9ff5db7158091bce2febfdbe2056199f2a7d68bd6a1a1c93529c1bf58abab669438a6bcbe74776fe3
-EBUILD mpv-9999.ebuild 10002 BLAKE2B 665da5d08e33c03510e6c5ea78362ce1e6c7134b067e144d44ca26eb85e569a3a8ca1302082ed1426b91cbc21f66f8bc489c1e60b4b368ea0b71cbf5d2f6f1f0 SHA512 8db0e0ee96d643fd0f40653ed0e7c6c5ec1915bf7219e402cf82c669ef55190790f1e7a92a3031e6d9fa1d6b7f1c33f90b184c68fd069fcc7278071d9ccf3858
+EBUILD mpv-9999.ebuild 10052 BLAKE2B e947ea5eb136b6aa23a1fc605adb0c92f342437c37e80f11baf4c2c7d4d2c595b9bc41a3ab77725c80b440d4d06657d1007b4d3eb00c4224672ee5387991fc3a SHA512 0a8ae56b7c4769d96631aba34463a9ef9bad549d5db3b922347f97a40c8b2b40e6dc83b10c6bf838f224163482ff1d963a02c3c62d6fea354764275974ff6bd7
 MISC metadata.xml 2281 BLAKE2B fb3fb9a0a5798b9735a654b0b594961105427e03947709a098d73555844a52c38e961802cb3a5fe286dda25b5d502c8052dc874be3a5e509f2a7ed428aeea6a7 SHA512 cc2b169845069766379912edf2c30fd85fbd2d7bb584d18e9a4f599af6eb29e89e87dab8ac2d3f7a27ac5da7aec8edcd5b60c5c909821383b62e82c251931817
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 8ebf7c7bbb65..de7207561cea 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -119,6 +119,7 @@ DEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 	dev-python/docutils
 	virtual/pkgconfig
+	cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 )
 	doc? ( dev-python/rst2pdf )
 	dvb? ( virtual/linuxtv-dvb-headers )
 	test? ( >=dev-util/cmocka-1.0.0 )