Сравнение vlc-3.0.9999 с vlc-4.0.0_pre20260215

/usr/portage/media-video/vlc/vlc-4.0.0_pre20260215.ebuild 2026-02-19 11:18:07.444646761 +0300
15 15
	EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git"
16 16
	inherit git-r3
17 17
else
18
	COMMIT=
18
	COMMIT=50fca9d25c78dffc00cef24cae467fc202d19466
19 19
	if [[ -n ${COMMIT} ]] ; then
20 20
		SRC_URI="https://code.videolan.org/videolan/vlc/-/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz"
21 21
		S="${WORKDIR}/${PN}-${COMMIT}"
......
35 35
HOMEPAGE="https://www.videolan.org/vlc/"
36 36

  
37 37
LICENSE="LGPL-2.1 GPL-2"
38
SLOT="0/5-9" # vlc - vlccore
38
SLOT="0/12-9" # vlc - vlccore
39 39

  
40 40
IUSE="alsa aom archive aribsub bidi bluray chromaprint chromecast dav1d dbus
41 41
	dc1394 debug directx +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
42
	fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate
43
	libass libcaca libnotify +libsamplerate libtiger linsys lirc live lua
44
	macosx-notifications mad matroska modplug mp3 mtp musepack ncurses nfs ogg
45
	omxil optimisememory opus png projectm pulseaudio run-as-root samba
46
	sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame
47
	udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi
48
	cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
42
	fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate libass
43
	libcaca libdrm libnotify libplacebo +libsamplerate libtiger linsys lirc live
44
	loudness lua macosx-notifications mad matroska modplug mp3 mtp musepack ncurses
45
	nfs ogg omxil optimisememory opus png projectm pulseaudio run-as-root samba
46
	sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype
47
	twolame udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf
48
	zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_sse
49 49
"
50 50
REQUIRED_USE="
51 51
	chromecast? ( encode )
......
54 54
	libcaca? ( X )
55 55
	libtiger? ( kate )
56 56
	lua? ( ${LUA_REQUIRED_USE} )
57
	skins? ( archive gui truetype X xml )
57
	skins? ( gui truetype X xml )
58 58
	ssl? ( gcrypt )
59 59
	vaapi? ( ffmpeg X )
60 60
	vdpau? ( ffmpeg X )
......
71 71
	x86? ( dev-lang/yasm )
72 72
"
73 73
# depends on abseil-cpp via protobuf targets
74
RDEPEND="
74
COMMON_DEPEND="
75 75
	media-libs/libvorbis
76 76
	net-dns/libidn:=
77 77
	virtual/zlib:=
......
94 94
		>=dev-libs/protobuf-2.5.0:=
95 95
		>=net-libs/libmicrodns-0.1.2:=
96 96
	)
97
	dav1d? ( media-libs/dav1d:= )
97
	dav1d? ( >=media-libs/dav1d-0.5.0:= )
98 98
	dbus? ( sys-apps/dbus )
99 99
	dc1394? (
100 100
		media-libs/libdc1394:2
......
122 122
	keyring? ( app-crypt/libsecret )
123 123
	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
124 124
	gui? (
125
		dev-qt/qtcore:5
126
		dev-qt/qtgui:5
127
		dev-qt/qtsvg:5
128
		dev-qt/qtwidgets:5
125
		dev-qt/qt5compat:6[qml]
126
		dev-qt/qtbase:6=[gui,widgets]
127
		dev-qt/qtdeclarative:6
128
		dev-qt/qtsvg:6
129
		kde-frameworks/kwindowsystem:6
129 130
		X? (
130
			dev-qt/qtx11extras:5
131
			dev-qt/qtbase:6[X]
131 132
			x11-libs/libX11
132 133
		)
133 134
	)
......
143 144
		media-libs/libass:=
144 145
	)
145 146
	libcaca? ( media-libs/libcaca )
147
	libdrm? ( x11-libs/libdrm )
146 148
	libnotify? (
147 149
		dev-libs/glib:2
148 150
		x11-libs/gdk-pixbuf:2
149
		x11-libs/gtk+:3
150 151
		x11-libs/libnotify
151 152
	)
153
	libplacebo? ( media-libs/libplacebo:= )
152 154
	libsamplerate? ( media-libs/libsamplerate )
153 155
	libtiger? ( media-libs/libtiger )
154 156
	linsys? ( media-libs/zvbi )
155 157
	lirc? ( app-misc/lirc )
156 158
	live? ( media-plugins/live:= )
159
	loudness? ( >=media-libs/libebur128-1.2.4:= )
157 160
	lua? ( ${LUA_DEPS} )
158 161
	mad? ( media-libs/libmad )
159 162
	matroska? (
......
212 215
	vpx? ( media-libs/libvpx:= )
213 216
	wayland? (
214 217
		>=dev-libs/wayland-1.15
215
		dev-libs/wayland-protocols
218
		>=dev-libs/wayland-protocols-1.12
216 219
	)
217 220
	X? (
218 221
		x11-libs/libX11
219 222
		x11-libs/libxcb
223
		x11-libs/libXcursor
224
		x11-libs/libxkbcommon[X]
220 225
		x11-libs/xcb-util
221 226
		x11-libs/xcb-util-keysyms
222 227
	)
......
226 231
	zeroconf? ( net-dns/avahi[dbus] )
227 232
	zvbi? ( media-libs/zvbi )
228 233
"
229
DEPEND="${RDEPEND}
234
DEPEND="${COMMON_DEPEND}
230 235
	X? ( x11-base/xorg-proto )
231 236
"
237
RDEPEND="${COMMON_DEPEND}
238
	kde-frameworks/qqc2-desktop-style:6
239
"
232 240

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

  
235 243
PATCHES=(
236
	"${FILESDIR}"/${PN}-3.0.22-gettext-version.patch # bug 766549
237
	"${FILESDIR}"/${PN}-3.0.22-no-vlc-cache-gen.patch # bugs 564842, 608256
238
	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
239
	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
240
	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
241
	"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
244
	"${FILESDIR}"/${PN}-9999-gettext-version.patch # bug 766549
245
	"${FILESDIR}"/${PN}-9999-no-vlc-cache-gen.patch # bugs 564842, 608256
246
	"${FILESDIR}"/${PN}-9999-fix-libtremor-libs.patch # build system
247
	"${FILESDIR}"/${PN}-9999-configure-lua-version.patch
248
	"${FILESDIR}"/${P}-force-x11.patch # crashes w/ wayland platform plugin
242 249
)
243 250

  
244 251
pkg_setup() {
......
254 261
	xdg_environment_reset
255 262

  
256 263
	# Bootstrap when we are on a git checkout.
257
	if [[ ${PV} == *9999* || ${PV} == *_p[0-9]* ]] ; then
264
	if [[ ${PV} == *9999* || ${PV} == *_p[0-9]* || ${PV} == *_pre[0-9]* ]] ; then
258 265
		./bootstrap
259 266
	fi
260 267

  
......
279 286
	local -x BUILDCC="$(tc-getBUILD_CC)"
280 287

  
281 288
	local myeconfargs=(
282
		--disable-aa
283 289
		--disable-amf-frc # DirectX specific
284 290
		--disable-freerdp # bug 921096
285 291
		--disable-optimizations
......
303 309
		$(use_enable chromecast microdns)
304 310
		$(use_enable cpu_flags_arm_neon neon)
305 311
		$(use_enable cpu_flags_ppc_altivec altivec)
306
		$(use_enable cpu_flags_x86_mmx mmx)
307 312
		$(use_enable cpu_flags_x86_sse sse)
308 313
		$(use_enable dav1d)
309 314
		$(use_enable dbus)
......
335 340
		$(use_enable jack)
336 341
		$(use_enable jpeg)
337 342
		$(use_enable kate)
343
		$(use_enable libdrm)
338 344
		$(use_enable libass)
339 345
		$(use_enable libcaca caca)
340 346
		$(use_enable libnotify notify)
347
		$(use_enable libplacebo)
341 348
		$(use_enable libsamplerate samplerate)
342 349
		$(use_enable libtiger tiger)
343 350
		$(use_enable linsys)
344 351
		$(use_enable lirc)
345 352
		$(use_enable live live555)
353
		$(use_enable loudness ebur128)
346 354
		$(use_enable lua)
347 355
		$(use_enable macosx-notifications osx-notifications)
348 356
		$(use_enable mad)
......
355 363
		$(use_enable nfs)
356 364
		$(use_enable ogg)
357 365
		$(use_enable omxil)
358
		$(use_enable omxil omxil-vout)
359 366
		$(use_enable optimisememory optimize-memory)
360 367
		$(use_enable opus)
361 368
		$(use_enable png)
......
387 394
		$(use_enable wayland)
388 395
		$(use_with X x)
389 396
		$(use_enable X xcb)
390
		$(use_enable X xvideo)
391 397
		$(use_enable x264)
392 398
		$(use_enable x264 x26410b)
393 399
		$(use_enable x265)
......
396 402
		$(use_enable zvbi)
397 403
		$(use_enable !zvbi telx)
398 404
		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
399
		--disable-a52 # not officially supported anymore (avcodec takes priority)
400 405
		--disable-asdcp
401 406
		--disable-coverage
402 407
		--disable-cprof
403
		--disable-crystalhd
404 408
		--disable-decklink
405
		--disable-dca # not officially supported anymore (avcodec takes priority)
406 409
		--disable-gles2
407 410
		--disable-goom
408 411
		--disable-kai
409 412
		--disable-kva
410
		--disable-libcddb # not officially supported anymore
411
		--disable-libmpeg2 # not officially supported anymore (avcodec takes priority)
412
		--disable-libplacebo
413 413
		--disable-maintainer-mode
414 414
		--disable-merge-ffmpeg
415
		--disable-mfx
415
		--disable-vpl # TODO: packaged, only keyworded amd64
416 416
		--disable-mmal
417 417
		--disable-opencv
418 418
		--disable-opensles
419 419
		--disable-oss
420 420
		--disable-rpi-omxil
421
		--disable-schroedinger
422
		--disable-sdl-image # not officially supported anymore
423 421
		--disable-shine
424 422
		--disable-sndio
425 423
		--disable-spatialaudio
426 424
		--disable-vsxu
427 425
		--disable-wasapi
428
		--disable-wma-fixed
429 426
	)
430 427
	# ^ We don't have these disabled libraries in the Portage tree yet.
431 428

  
......
482 479
src_install() {
483 480
	default
484 481
	find "${ED}" -name '*.la' -delete || die
485

  
486
	if ! use gui; then
487
		rm "${ED}"/usr/share/applications/*desktop || die
488
	fi
489 482
}
490 483

  
491 484
pkg_postinst() {
492
	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
493
		einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
494
		"${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
485
	if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}"/usr/libexec/vlc/vlc-cache-gen ]] ; then
486
		einfo "Running ${EPREFIX}/usr/libexec/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/"
487
		"${EPREFIX}"/usr/libexec/vlc/vlc-cache-gen "${EROOT}/usr/$(get_libdir)/vlc/plugins/"
495 488
	else
496 489
		ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)"
497
		ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually"
490
		ewarn "Please run ${EPREFIX}/usr/libexec/vlc/vlc-cache-gen manually"
498 491
		ewarn "If you do not do it, vlc will take a long time to load."
499 492
	fi
500 493

  
501
	use gui && xdg_pkg_postinst
494
	xdg_pkg_postinst
502 495
}
503 496

  
504 497
pkg_postrm() {
......
506 499
		rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
507 500
	fi
508 501

  
509
	use gui && xdg_pkg_postrm
502
	xdg_pkg_postrm
510 503
}
Спасибо!