4b72b54fd3
Between 0.24.0 and 0.25.0, mpv has changed its logic around the
detection/usage of X11 (in upstream commit
927afa311d). Instead
of having fine grained option for x11, xext, xinerama, xscreensaver and
xrandr, mpv now requires all five libraries to be available in order to
enable X.org support.
Therefore, this commit adjusts the mpv packaging so that:
1. All necessary X11 libraries are selected if BR2_PACKAGE_XORG7 is
enabled. It would indeed be too cumbersome for the user to know that
all of x11, xext, xinerama, xscreensaver and xrandr are necessary in
order to have X.org support.
2. mpv.mk is simplified by enabling X.org support when
BR2_PACKAGE_XORG7 is enabled.
Fixes:
http://autobuild.buildroot.net/results/b470cfba451ce9ba648e3a2f3ae08429db8bdee9/
(--disable-xss was used to disable xscreensaver support, and this
option no longer exists)
[Peter: reword X11 comment in .mk]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
33 lines
1.3 KiB
Plaintext
33 lines
1.3 KiB
Plaintext
config BR2_PACKAGE_MPV
|
|
bool "mpv"
|
|
depends on BR2_TOOLCHAIN_HAS_THREADS
|
|
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
|
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
|
|
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
|
|
# ARC toolchain issue
|
|
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
|
|
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
|
select BR2_PACKAGE_FFMPEG
|
|
select BR2_PACKAGE_FFMPEG_SWSCALE
|
|
select BR2_PACKAGE_ZLIB
|
|
# Select xkbcommon for wayland to avoid being mysterious
|
|
select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
|
|
# Select all necessary X11 dependencies if X.org is enabled
|
|
select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
|
|
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
|
|
select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7
|
|
select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_XORG7
|
|
select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7
|
|
help
|
|
mpv is a fork of mplayer2 and MPlayer. It shares some features
|
|
with the former projects while introducing many more.
|
|
|
|
https://mpv.io/
|
|
|
|
comment "mpv needs a toolchain w/ threads, gcc >= 4.5"
|
|
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
|
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
|
|
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|
|
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
|
|
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
|