gentoo auto-resync : 17:12:2023 - 02:56:05

3 files changed, 47 insertions, 1 deletions

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 3736cbea02b3..f2caea8fe060 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,8 +1,9 @@
 AUX mpv-0.36.0-sub-match-audio.patch 1621 BLAKE2B aa774960703d3b5f2f5a8c3dc327bba0fa8865fdc676c68fdaf79cf46f7209fd629db5e523f4f845ce0aaf17d0a8c910c6c1c2c8fabe98340e5c61a31d8c4d36 SHA512 c260ad68a7e003f43b0b4525fb7eff5f5784851beba303a934b90b0e69476c5912cc75217a78820884d1fdcc1e7431574bdb6b55cb9e434735cdfbdeadfb3a0e
 AUX mpv-0.36.0-tests-odr.patch 1118 BLAKE2B 8a87385922af6ee08adc3972ce2271f1f700842dba8415ac27f04ba7147b070b665279c7b4d50e06b85d258a9ab47db23a82a9f9a4db444efb97a677ef2f6317 SHA512 8ccec2ce0108468c8fc048d3e892b1c8f177f434809d899f38a00526515b1453e0cb5cd2bfd5843568a025fda314fd172c94c548c8e144514353904066b917f3
+AUX mpv-0.37.0-drm-fix.patch 1444 BLAKE2B e0645e9b12ebbd0088b10aed34cabadbdb1b06d9cab14c40e9108c09d068c1ccba133dd91ba4c1d0735c67d0a8010003c77b85466343504cb220498fa24ac964 SHA512 8ce946f6043abb274b3051e787f5445ad40a3ea404cb2effcf9a4415a589483861381e54762e31f72d03c4975d01b67b662b6fb8a8a9194d7cd7d8acb4cab084
 DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B 7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1 SHA512 51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
 DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B 31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68 SHA512 a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
 EBUILD mpv-0.36.0-r1.ebuild 7515 BLAKE2B 4803c6c650526632de3cb55ebaf1fe20c4f427c3890135e0c2a43a2787fb381cf872a0fee551b152ce6dc5318650d399a57e51ad27e4ed840e6ada0ecd51f08c SHA512 f6319c75533f9285dba3c69687ab313c4e0dbb18e6e36f4449072d434fb5da94f9c41d384b4e22c1270cac46d7872f92d95b25e66e79ab7a834227bdb3ef2404
-EBUILD mpv-0.37.0.ebuild 7031 BLAKE2B cbab37b63e7084940e955b8219ec0ed82e69c0cab488010fd40d4cb516232454fc153225b57657ca5756e932a55dcdfd5f6d26a6c847a6bb18d36300d141fd61 SHA512 ffdbd0938646c66d9023c3d4f814d4034585c694c98103250bfe4ad02d3cf6f067a164341562c39881ba2d8d105ffb683b1e3729b400cef8071dc1af5fbb0ea4
+EBUILD mpv-0.37.0.ebuild 7086 BLAKE2B d2596f1b39498e24458c9cda74c02d06e0ed0d24c9f2617542400b63c9405ffa585de82a6ba1fbd645442b39afca54f18fc4c5074f6da44585bf406fe8079637 SHA512 5cd4ec83b393f157bf6740005b32d91e85baaab2575b7708176f5959300971c8934c2f3024d72845386ff1979c7a32b40b1bdbfefdff914e6886bf0105169982
 EBUILD mpv-9999.ebuild 6988 BLAKE2B f5d21ef9e426a8289c2db8e4c390b1e9e46a9063927b5c46bb088ee34a1ce3fdf04e6fa6cfff4fd3aaef08d22094cf47987bc95effba76d8ff33d1603de7128f SHA512 e3a31d09eaa2c71f8a6f82fb6e22bdb69609520cc268d0eec449bf613c5b8d316c44d325cd4295f1f81ced39e530004173f920ca893a128f063906192906c48a
 MISC metadata.xml 2324 BLAKE2B 6fe57270fef9275f47b0d7f282fbf4ff5c4a76c74e43820a8e0a4d56348eb72dc89dfdb06a9ff9a2b6f73d35102f861200d6c8c6f4dc41cfb4e42ff69d70da8a SHA512 0418e3315b4ded29714099d80075f61f6d1b38d9109bbb3bc372abbaceb14f705d5798eac2c14ef0fd0e1c557785291a4acb5e773dffb46f0b7f7962bf38d041
diff --git a/media-video/mpv/files/mpv-0.37.0-drm-fix.patch b/media-video/mpv/files/mpv-0.37.0-drm-fix.patch
new file mode 100644
index 000000000000..7e10c07eebc1
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.37.0-drm-fix.patch
@@ -0,0 +1,41 @@
+From e575ec4fc3654387c7358bd3640877ef32628d2c Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Wed, 22 Nov 2023 19:44:13 +0100
+Subject: [PATCH] meson: also expose present_sync for VT-only after
+ a96d04f19d73
+
+$ meson setup --auto-features=disabled -Ddrm=enabled -Degl=enabled -Dgbm=enabled -Degl-drm=enabled /tmp/mpv_build
+$ meson compile -C /tmp/mpv_build
+[...]
+ld: error: undefined symbol: mp_present_initialize
+>>> referenced by drm_common.c
+>>>               libmpv.so.2.2.0.p/video_out_drm_common.c.o:(vo_drm_init)
+
+ld: error: undefined symbol: present_sync_update_values
+>>> referenced by drm_common.c
+>>>               libmpv.so.2.2.0.p/video_out_drm_common.c.o:(drm_pflip_cb)
+
+ld: error: undefined symbol: present_sync_swap
+>>> referenced by drm_common.c
+>>>               libmpv.so.2.2.0.p/video_out_drm_common.c.o:(drm_pflip_cb)
+
+ld: error: undefined symbol: present_sync_get_info
+>>> referenced by vo_drm.c
+>>>               libmpv.so.2.2.0.p/video_out_vo_drm.c.o:(get_vsync)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a3c3430dd47b..6fd5afa5122a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1049,7 +1049,7 @@ if features['xv']
+     sources += files('video/out/vo_xv.c')
+ endif
+ 
+-if features['wayland'] or features['x11']
++if features['wayland'] or features['x11'] or features['drm']
+     sources += ('video/out/present_sync.c')
+ endif
+ 
diff --git a/media-video/mpv/mpv-0.37.0.ebuild b/media-video/mpv/mpv-0.37.0.ebuild
index 8e95724ccf24..36d77d771326 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -134,6 +134,10 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.37.0-drm-fix.patch
+)
+
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 	python-single-r1_pkg_setup