6 files changed, 133 insertions, 4 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 5eaf18276ad3..d7c5d4ea712c 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 0a3f09593484..9282a68305a3 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,9 @@
 AUX makemkv-flags.patch 481 BLAKE2B 26ea134bddf0c1168944bc76de20cf1b860178a990dab88ee61f3656495ea125d97e929e0626b6626f2fa12e1219e3dcfb80067e9f682311bb75d8750dc7eddb SHA512 c43c28774e9750f79624ff682bbcd8566aadf18bf4c44692d214e80f654eecf63f26bcaa8c7292d4d8e3969350f50f0b720982099e0114866630a8c0828088a7
 AUX makemkv-path.patch 1579 BLAKE2B 6ca7ed6c854c0357fea864bedc3f65a1051a466a52db1380bf1904c97bfa2b455beeb7ff9852fe57f6d224ed659df63d02db96a281be7a14f0587bece9aff75b SHA512 9294d3645b953fdb7ca24e83066becfbf07e03cab01d0aaf4527cf2d54fb0990649da1f766836a0f3efea9c363c8f00116b4624c49fd7bcfa197cae2ef17e6ed
 DIST makemkv-bin-1.16.4.tar.gz 15455839 BLAKE2B 5d29416beeb06f5fc66db39e5323de4d3491b120ec1b734183c9aaf937baf8a63a277ddb378b668d9659c34449c474e2ab9a7bb82a448f33de85abf82e5e791b SHA512 d2d12a18ef64e77d7a47e1e68ced265fbd2071fd60fb8118085c2b8c892132e9ef81f1a54c09e5f45be6f880a91cef3bb25ed5e86e3735f5b449c6b7fb88a72f
+DIST makemkv-bin-1.16.5.tar.gz 15585124 BLAKE2B c006b47af571089de5a3283f0f4094556b3fbd9b67d26f7fc57e05e6feb0b3a6875742d8eb5536c561dbd8e6914b9255e38b97eb0b9acaba761daa28e532c3af SHA512 4e0ee2f2d9036a46dc3d3bdf13048c17f7efe886ddf808911d7694c319b0b887439907a0d5f47a7ff3824ef7bfb036d5900a66d3f500dc1b57223012479a0609
 DIST makemkv-oss-1.16.4.tar.gz 6536730 BLAKE2B 8f5167c6b5056f9ea38a47b60875aac8394c130b40f08ef7a102f00937c34feb58e6436a9140509da9fc2d2b835956dede6bd8485827f3037b2026b0421a7094 SHA512 e25b41cbc348a49f13914af6b2dd040376c7517273dd4f49dc68fe9e363e28e336fb6d3d525b190c11d70e7c9b7127ffabdd89b3130cd1aab55a6a6f708d7452
+DIST makemkv-oss-1.16.5.tar.gz 6541723 BLAKE2B e628fa65a883e69b51a84bdc0d46da5628c1981017f2e64a31e36e3b7bc45e16d2a94831a6e0fd405676d8385ce11afb9db7d5fc81f2cb174e9ca44dde775f1d SHA512 865f621fb326541dcc05231667510895cb20e3bccb4705d67533aefec57b043d6fd33f0541290428f45226123f2dc419f7d0f2c071518f6f7a548c5aeea8978e
 EBUILD makemkv-1.16.4.ebuild 3062 BLAKE2B dedd22e64d56f81d71ddc1a1485775929e50f0eec961c6d54e8cd28cbdd069ce1cf2ffff5b2fad82940df8f3d43d33557788e9eb74c4e4917037fa955069eb69 SHA512 7a59ec5d41b7d99b43bb2f2d9d023d9129d179d5573b054eafad16b56fc89f384d19dd7e1a9cbc048d395cd73e83cf7689821185646195e8eac18ff47d357d03
+EBUILD makemkv-1.16.5.ebuild 3062 BLAKE2B da5bfc8f074694402ad05878fcec5590a64e520a2793a509d28ce91cc5e63be150ab551bf0f9adb9d7bb0a2afd75cd3f72da9a2c68c6bd55ff80ccf080312ede SHA512 f64291ca19f83a2a32401376c93be2129a52146234d4d8185af9b6cae6081a5fb79e23c4be70abd250bd0b1c0a17fb0d4450c20f0aca7530e3f34b7306461405
 MISC metadata.xml 1272 BLAKE2B 7c02bfcb2638d2f33c6fbee2d0e79b6d7d270b8209f7ec82ec51d7cf0e19b94936ee599b618f9a6b9df280fc403b0890b2c8e2323525f6d50b79fc19d26c8756 SHA512 8de92a5802b26a98984be7b5e3c0868b249c14a77a690a186dc4361db1508b79c7ebccd261e7fe9251b2d4abbbe2b93aec8a91efeafc00baada2839020a9207f
diff --git a/media-video/makemkv/makemkv-1.16.5.ebuild b/media-video/makemkv/makemkv-1.16.5.ebuild
new file mode 100644
index 000000000000..23a32955e746
--- /dev/null
+++ b/media-video/makemkv/makemkv-1.16.5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic linux-info xdg
+
+MY_P=makemkv-oss-${PV}
+MY_PB=makemkv-bin-${PV}
+
+DESCRIPTION="Tool for ripping and streaming Blu-ray, HD-DVD and DVD discs"
+HOMEPAGE="http://www.makemkv.com/"
+SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
+	http://www.makemkv.com/download/${MY_PB}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+gui +java"
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="usr/bin/makemkvcon usr/bin/mmdtsdec"
+
+DEPEND="
+	dev-libs/expat
+	dev-libs/openssl:0=[-bindist(-)]
+	>=media-video/ffmpeg-1.0.0:0=
+	sys-libs/glibc
+	sys-libs/zlib
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="
+	${DEPEND}
+	net-misc/wget
+	java? ( >=virtual/jre-1.8 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	gui? ( dev-qt/qtcore:5 )
+"
+
+CONFIG_CHECK="~CHR_DEV_SG"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-path.patch
+	"${FILESDIR}"/${PN}-flags.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use java; then
+		rm -v "${WORKDIR}/${MY_PB}"/src/share/blues.* || die
+	fi
+}
+
+src_configure() {
+	# See bug #439380.
+	replace-flags -O* -Os
+
+	econf \
+		--enable-debug \
+		--disable-noec \
+		$(use_enable gui) \
+		$(use_enable gui qt5)
+}
+
+src_install() {
+	local myarch
+	case "${ARCH}" in
+		arm) myarch=armel ;;
+		x86) myarch=i386 ;;
+		*) myarch=${ARCH} ;;
+	esac
+
+	default
+
+	# add missing symlinks for QA
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
+	dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
+	dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
+	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
+
+	cd "${WORKDIR}"/${MY_PB} || die
+
+	# install prebuilt bin
+	dobin bin/"${myarch}"/makemkvcon
+
+	# additional tool is actually part of makemkvcon
+	dosym makemkvcon /usr/bin/sdftool
+
+	# install profiles and locales
+	insinto /usr/share/MakeMKV
+	doins src/share/*
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "While MakeMKV is in beta mode, upstream has provided a license"
+	elog "to use if you do not want to purchase one."
+	elog ""
+	elog "See this forum thread for more information, including the key:"
+	elog "https://www.makemkv.com/forum/viewtopic.php?f=5&t=1053"
+	elog ""
+	elog "Note that beta license may have an expiration date and you will"
+	elog "need to check for newer licenses/releases. "
+	elog ""
+	elog "We previously said to copy default.mmcp.xml to ~/.MakeMKV/. This"
+	elog "is no longer necessary and you should delete it from there to"
+	elog "avoid warning messages."
+	elog ""
+	elog "MakeMKV can also act as a drop-in replacement for libaacs and"
+	elog "libbdplus, allowing transparent decryption of a wider range of"
+	elog "titles under players like VLC and mplayer. To enable this, set"
+	elog "the following variables when launching the player:"
+	elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
+}
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 495cb6a16e3c..380be9154a21 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,5 @@
 DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B 97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04 SHA512 99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae2360ffff62053c163bc3c55b254df021e005b350ebc3df7e952b
 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
-EBUILD mpv-0.33.1-r1.ebuild 9708 BLAKE2B 2a49bb6094f262cdab4633f63f1bad8ea112ef8a5ea17bc2aeb7fcf0ecdf2074e13681bb0a1f371a0f990b43d0b44264f01eb085e403b0d9f172db39fa6a9be1 SHA512 4db16a6d1b8171c4899fbd6ee0e11c6a07de59f00c0c00e53223e37ad22c5df46abd09d02acfb6d86a6b4c78ec3ba90fb5792bbd848df66e04a591a32672b773
-EBUILD mpv-9999.ebuild 9708 BLAKE2B f1f05a09bfd494c320442b583f535f6660dd2f526ab403d7efe638d3c0cd046562c7ddfd8b72288efb38832e168dbde8741917912cdb8695107ce5eb7d390b67 SHA512 63672f84b435f0beda71aee594efd7d1b5fdad19c05d15bb21a78ddc54d849ebee9c1a62fb7e98b93503b17d2fd66bdf1bf1a3674032486517ce90f7ff350b72
+EBUILD mpv-0.33.1-r2.ebuild 9711 BLAKE2B 17210d955f7094943a593240070e6243133f7df704c2f15c07f29d0ffcf7d26ce8c1e6c8932340eaa24119149fd46392714bb9cdeee6aa1dd301702fb0f54c63 SHA512 1e8ce64678b3e133aea2ba356d398fe037a9164dc6c46c8b416982e4a57388ca0c4e80006aedfc20d9ecfd5e5445bfc8951135f436eef07cb9234c54d60bffa0
+EBUILD mpv-9999.ebuild 9711 BLAKE2B 9a98603fe5b9230ddaab263ddcaec980458dac78448e8b1c2fa5cd280cb53b1e7bd58e8bbde5323dd9023d0e51d356d546ed8e5106c37d45f85672f539e11b7b SHA512 de49b4bf2c7aec15b784705c288e72c554ca283694563ce6324d17d07f8bdc97c1c96e64dbd83a8c4160bda002cb26c42bfeeac8177005800341d7cf536c0301
 MISC metadata.xml 2211 BLAKE2B fe97872a6f1307d4522e803e62bb8d6da1da94b7fcebe5e114a49f51736f1a3ea7471ddd7570712f7dfce59ad761b395dcdf3cfa48f23eb4f57e99390963daf9 SHA512 941350cda9ad14cbd6c5f34f41b7f99bd80365d4ee6f5d4115547c96dea1c30d22e509473fe492efe24acc72612a2b55e864948a5ad0c952063a1a115d579935
diff --git a/media-video/mpv/mpv-0.33.1-r1.ebuild b/media-video/mpv/mpv-0.33.1-r2.ebuild
index dc6718aa3598..6dc6afe6bc87 100644
--- a/media-video/mpv/mpv-0.33.1-r1.ebuild
+++ b/media-video/mpv/mpv-0.33.1-r2.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 		>=media-libs/libdvdnav-4.2.0:=
 		>=media-libs/libdvdread-4.1.0:=
 	)
-	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] )
 	gamepad? ( media-libs/libsdl2 )
 	iconv? (
 		virtual/libiconv
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index f65aba458d62..6cfe318953d5 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -71,7 +71,7 @@ COMMON_DEPEND="
 		>=media-libs/libdvdnav-4.2.0:=
 		>=media-libs/libdvdread-4.1.0:=
 	)
-	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] )
 	gamepad? ( media-libs/libsdl2 )
 	iconv? (
 		virtual/libiconv