Diff vlc-3.0.9999 with a vlc-9999

/usr/portage/media-video/vlc/vlc-9999.ebuild 2023-10-09 14:52:31.836368409 +0300
20 20
	else
21 21
		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
22 22
	fi
23
	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
23
	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86"
24 24
fi
25 25
inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
26 26

  
......
28 28
HOMEPAGE="https://www.videolan.org/vlc/"
29 29

  
30 30
LICENSE="LGPL-2.1 GPL-2"
31
SLOT="0/5-9" # vlc - vlccore
31
SLOT="0/12-9" # vlc - vlccore
32 32

  
33 33
IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus
34 34
	dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
35
	fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate
36
	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
37
	macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg
38
	omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image
39
	sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame
40
	udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi
41
	cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
35
	fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate kms
36
	libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live
37
	loudness lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
38
	nfs ogg omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba
39
	sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype
40
	twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf
41
	zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
42 42
"
43 43
REQUIRED_USE="
44 44
	chromecast? ( encode )
......
61 61
	wayland? ( dev-util/wayland-scanner )
62 62
	x86? ( dev-lang/yasm )
63 63
"
64
# <ffmpeg-5 dep for USE="ffmpeg vaapi" for bug #864721
65 64
RDEPEND="
66 65
	media-libs/libvorbis
67 66
	net-dns/libidn:=
......
86 85
		>=dev-libs/protobuf-2.5.0:=
87 86
		>=net-libs/libmicrodns-0.1.2:=
88 87
	)
89
	dav1d? ( media-libs/dav1d:= )
88
	dav1d? ( >=media-libs/dav1d-0.5.0:= )
90 89
	dbus? ( sys-apps/dbus )
91 90
	dc1394? (
92 91
		media-libs/libdc1394:2
......
131 130
	jack? ( virtual/jack )
132 131
	jpeg? ( media-libs/libjpeg-turbo:0 )
133 132
	kate? ( media-libs/libkate )
133
	kms? ( x11-libs/libdrm )
134 134
	libass? (
135 135
		media-libs/fontconfig:1.0
136 136
		media-libs/libass:=
......
139 139
	libnotify? (
140 140
		dev-libs/glib:2
141 141
		x11-libs/gdk-pixbuf:2
142
		x11-libs/gtk+:3
143 142
		x11-libs/libnotify
144 143
	)
144
	libplacebo? ( media-libs/libplacebo:= )
145 145
	libsamplerate? ( media-libs/libsamplerate )
146 146
	libtar? ( dev-libs/libtar )
147 147
	libtiger? ( media-libs/libtiger )
148 148
	linsys? ( media-libs/zvbi )
149 149
	lirc? ( app-misc/lirc )
150 150
	live? ( media-plugins/live:= )
151
	loudness? ( >=media-libs/libebur128-1.2.4:= )
151 152
	lua? ( ${LUA_DEPS} )
152 153
	mad? ( media-libs/libmad )
153 154
	matroska? (
......
203 204
	udev? ( virtual/udev )
204 205
	upnp? ( net-libs/libupnp:=[ipv6(+)] )
205 206
	v4l? ( media-libs/libv4l:= )
206
	vaapi? (
207
		<media-video/ffmpeg-5
208
		media-libs/libva:=[drm(+),wayland?,X?]
209
	)
207
	vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] )
210 208
	vdpau? ( x11-libs/libvdpau )
211 209
	vnc? ( net-libs/libvncserver )
212 210
	vpx? ( media-libs/libvpx:= )
213 211
	wayland? (
214 212
		>=dev-libs/wayland-1.15
215
		dev-libs/wayland-protocols
213
		>=dev-libs/wayland-protocols-1.12
216 214
	)
217 215
	X? (
218 216
		x11-libs/libX11
219 217
		x11-libs/libxcb
218
		x11-libs/libXcursor
219
		x11-libs/libxkbcommon[X]
220 220
		x11-libs/xcb-util
221 221
		x11-libs/xcb-util-keysyms
222 222
	)
......
231 231
"
232 232

  
233 233
PATCHES=(
234
	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
235
	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
236
	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
237
	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
238
	"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
234
	"${FILESDIR}"/${PN}-9999-fix-libtremor-libs.patch # build system
235
	"${FILESDIR}"/${PN}-9999-configure-lua-version.patch
239 236
)
240 237

  
241
DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
238
DOCS=( AUTHORS THANKS NEWS README.md doc/fortunes.txt )
242 239

  
243 240
S="${WORKDIR}/${MY_P}"
244 241

  
......
255 252
	xdg_environment_reset
256 253

  
257 254
	has_version 'net-libs/libupnp:1.8' && \
258
		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
255
		eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
259 256

  
260 257
	# Bootstrap when we are on a git checkout.
261 258
	if [[ ${PV} = *9999 ]] ; then
......
290 287
	local -x BUILDCC="$(tc-getBUILD_CC)"
291 288

  
292 289
	local myeconfargs=(
293
		--disable-aa
294 290
		--disable-optimizations
295 291
		--disable-rpath
296 292
		--disable-update-check
......
347 343
		$(use_enable jack)
348 344
		$(use_enable jpeg)
349 345
		$(use_enable kate)
346
		$(use_enable kms)
350 347
		$(use_enable libass)
351 348
		$(use_enable libcaca caca)
352 349
		$(use_enable libnotify notify)
350
		$(use_enable libplacebo)
353 351
		$(use_enable libsamplerate samplerate)
354 352
		$(use_enable libtar)
355 353
		$(use_enable libtiger tiger)
356 354
		$(use_enable linsys)
357 355
		$(use_enable lirc)
358 356
		$(use_enable live live555)
357
		$(use_enable loudness ebur128)
359 358
		$(use_enable lua)
360 359
		$(use_enable macosx-notifications osx-notifications)
361 360
		$(use_enable mad)
......
369 368
		$(use_enable nfs)
370 369
		$(use_enable ogg)
371 370
		$(use_enable omxil)
372
		$(use_enable omxil omxil-vout)
373 371
		$(use_enable optimisememory optimize-memory)
374 372
		$(use_enable opus)
375 373
		$(use_enable png)
......
403 401
		$(use_enable wayland)
404 402
		$(use_with X x)
405 403
		$(use_enable X xcb)
406
		$(use_enable X xvideo)
407 404
		$(use_enable x264)
408 405
		$(use_enable x264 x26410b)
409 406
		$(use_enable x265)
......
415 412
		--disable-asdcp
416 413
		--disable-coverage
417 414
		--disable-cprof
418
		--disable-crystalhd
419 415
		--disable-decklink
420 416
		--disable-gles2
421 417
		--disable-goom
422 418
		--disable-kai
423 419
		--disable-kva
424
		--disable-libplacebo
425 420
		--disable-maintainer-mode
426 421
		--disable-merge-ffmpeg
427 422
		--disable-mfx
......
436 431
		--disable-spatialaudio
437 432
		--disable-vsxu
438 433
		--disable-wasapi
439
		--disable-wma-fixed
440 434
	)
441 435
	# ^ We don't have these disabled libraries in the Portage tree yet.
442 436

  
......
498 492
}
499 493

  
500 494
pkg_postinst() {
501
	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
502
		einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
503
		"${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
495
	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}"/usr/libexec/vlc/vlc-cache-gen ]] ; then
496
		einfo "Running ${EPREFIX}/usr/libexec/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
497
		"${EPREFIX}"/usr/libexec/vlc/vlc-cache-gen "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
504 498
	else
505 499
		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
506
		ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
500
		ewarn "Please run ${EPREFIX}/usr/libexec/vlc/vlc-cache-gen manually"
507 501
		ewarn "If you do not do it, vlc will take a long time to load."
508 502
	fi
509 503

  
Thank you!