Diff mpv-0.36.0-r1 with a mpv-9999

/usr/portage/media-video/mpv/mpv-9999.ebuild 2023-10-09 14:52:31.828368409 +0300
12 12
	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
13 13
else
14 14
	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
15
	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
15
	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
16 16
fi
17 17

  
18 18
DESCRIPTION="Media player for the command line"
......
24 24
	+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
25 25
	dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
26 26
	+libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
27
	raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
28
	vaapi vdpau vulkan wayland xv zimg zlib"
27
	raspberry-pi rubberband sdl selinux sixel sndio test tools
28
	+uchardet vaapi vdpau vulkan wayland xv zimg zlib
29
"
29 30
REQUIRED_USE="
30 31
	${PYTHON_REQUIRED_USE}
31 32
	|| ( cli libmpv )
......
37 38
	test? ( cli )
38 39
	tools? ( cli )
39 40
	uchardet? ( iconv )
40
	vaapi? (
41
		|| ( X egl libplacebo wayland )
42
		wayland? ( drm )
43
	)
41
	vaapi? ( || ( X drm wayland ) )
44 42
	vdpau? ( X )
45 43
	vulkan? ( || ( X wayland ) libplacebo )
46
	xv? ( X )"
44
	xv? ( X )
45
"
47 46
RESTRICT="!test? ( test )"
48 47

  
49 48
# raspberry-pi: default to -bin given non-bin is known broken (bug #893422)
......
54 53
		x11-libs/libX11
55 54
		x11-libs/libXScrnSaver
56 55
		x11-libs/libXext
57
		x11-libs/libXinerama
58 56
		x11-libs/libXpresent
59 57
		x11-libs/libXrandr
60 58
		xv? ( x11-libs/libXv )
......
67 65
		dev-libs/libcdio:=
68 66
	)
69 67
	drm? (
70
		media-libs/mesa[gbm(+)]
71 68
		x11-libs/libdrm
69
		egl? ( media-libs/mesa[gbm(+)] )
72 70
	)
73 71
	dvd? (
74 72
		media-libs/libdvdnav
......
86 84
	lcms? ( media-libs/lcms:2 )
87 85
	libcaca? ( media-libs/libcaca )
88 86
	libplacebo? (
89
		>=media-libs/libplacebo-4.157:=[opengl?,vulkan?]
87
		>=media-libs/libplacebo-6.292:=[opengl?,vulkan?]
90 88
		egl? ( media-libs/libplacebo[opengl] )
91 89
	)
92 90
	lua? ( ${LUA_DEPS} )
......
116 114
		x11-libs/libxkbcommon
117 115
	)
118 116
	zimg? ( media-libs/zimg )
119
	zlib? ( sys-libs/zlib:= )"
117
	zlib? ( sys-libs/zlib:= )
118
"
120 119
RDEPEND="
121 120
	${COMMON_DEPEND}
122 121
	selinux? ( sec-policy/selinux-mplayer )
123
	tools? ( ${PYTHON_DEPS} )"
122
	tools? ( ${PYTHON_DEPS} )
123
"
124 124
DEPEND="
125 125
	${COMMON_DEPEND}
126 126
	X? ( x11-base/xorg-proto )
127 127
	dvb? ( virtual/linuxtv-dvb-headers )
128 128
	nvenc? ( media-libs/nv-codec-headers )
129
	wayland? ( dev-libs/wayland-protocols )"
129
	wayland? ( dev-libs/wayland-protocols )
130
"
130 131
BDEPEND="
131 132
	${PYTHON_DEPS}
132 133
	virtual/pkgconfig
133 134
	cli? ( dev-python/docutils )
134
	wayland? ( dev-util/wayland-scanner )"
135

  
136
PATCHES=(
137
	"${FILESDIR}"/${PN}-0.36.0-tests-odr.patch
138
	"${FILESDIR}"/${PN}-0.36.0-sub-match-audio.patch
139
)
135
	wayland? ( dev-util/wayland-scanner )
136
"
140 137

  
141 138
pkg_setup() {
142 139
	use lua && lua-single_pkg_setup
......
205 202
		$(meson_feature X x11)
206 203
		$(meson_feature aqua cocoa)
207 204
		$(meson_feature drm)
208
		$(meson_feature drm gbm)
209 205
		$(meson_feature jpeg)
210 206
		$(meson_feature libcaca caca)
211 207
		$(meson_feature libplacebo)
......
219 215
			echo enabled || echo disabled)
220 216
		$(meson_feature egl)
221 217
		$(mpv_feature_multi egl X egl-x11)
218
		$(mpv_feature_multi egl drm gbm) # gbm is only used by egl-drm
222 219
		$(mpv_feature_multi egl drm egl-drm)
223 220
		$(mpv_feature_multi egl wayland egl-wayland)
224 221
		$(meson_feature libmpv plain-gl)
......
235 232

  
236 233
		$(meson_feature vaapi)
237 234
		$(mpv_feature_multi vaapi X vaapi-x11)
238
		$(mpv_feature_multi 'vaapi X' egl vaapi-x-egl)
239
		$(mpv_feature_multi 'vaapi egl' drm vaapi-drm)
240
		$(mpv_feature_multi 'vaapi egl' wayland vaapi-wayland)
235
		$(mpv_feature_multi vaapi drm vaapi-drm)
236
		$(mpv_feature_multi vaapi wayland vaapi-wayland)
241 237

  
242 238
		$(meson_feature vdpau)
243 239
		$(mpv_feature_multi vdpau opengl vdpau-gl-x11)
......
246 242

  
247 243
		# notable options left to automagic
248 244
		#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
249
		#libplacebo-next: USE="libplacebo" + >=libplacebo-5.264
250 245
		#vulkan-interop: USE="libplacebo vulkan" + ffmpeg-9999 currently
251 246
		# TODO?: perhaps few more similar compound options should be left auto
252 247
	)
253 248

  
254
	has_version '>=media-libs/libplacebo-5.264' ||
255
		ewarn "${PN}'s gpu-next video output requires ${_} to be used"
256

  
257 249
	meson_src_configure
258 250
}
259 251

  
Thank you!