[Buildroot] [PATCH 1/4] package/mpv: fix reproducible build issues

[Buildroot] [PATCH 1/4] package/mpv: fix reproducible build issues

[Bernd Kuhls]

Do not include the build date when creating reproducible builds.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mpv/mpv.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
index 25ac783b52..30f377054f 100644
--- a/package/mpv/mpv.mk
+++ b/package/mpv/mpv.mk
@@ -28,6 +28,10 @@ MPV_CONF_OPTS = \
 	--disable-uchardet \
 	--disable-vapoursynth
 
+ifeq ($(BR2_REPRODUCIBLE),y)
+MPV_CONF_OPTS += --disable-build-date
+endif
+
 ifeq ($(BR2_STATIC_LIBS),y)
 MPV_CONF_OPTS += --disable-libmpv-shared --enable-libmpv-static
 else
-- 
2.30.2

[Buildroot] [PATCH 2/4] package/mpv: Add optional support for OpenGLES

[Bernd Kuhls]

mpv also supports OpenGLES:
https://github.com/mpv-player/mpv/blob/master/video/out/opengl/egl_helpers.c#L98

Runtime-tested using mesa3d iris driver on a non-x11 system.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mpv/mpv.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
index 30f377054f..877b84f63a 100644
--- a/package/mpv/mpv.mk
+++ b/package/mpv/mpv.mk
@@ -140,6 +140,9 @@ endif
 ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
 MPV_CONF_OPTS += --enable-gl
 MPV_DEPENDENCIES += libgl
+else ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
+MPV_CONF_OPTS += --enable-gl
+MPV_DEPENDENCIES += libgles
 else
 MPV_CONF_OPTS += --disable-gl
 endif
-- 
2.30.2

[Buildroot] [PATCH 3/4] package/mpv: Add optional support for OpenGL DRM EGL Backend

[Bernd Kuhls]

Reference: https://github.com/mpv-player/mpv/blob/master/wscript#L571

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mpv/mpv.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
index 877b84f63a..4292abb876 100644
--- a/package/mpv/mpv.mk
+++ b/package/mpv/mpv.mk
@@ -50,8 +50,13 @@ endif
 ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
 MPV_CONF_OPTS += --enable-gbm
 MPV_DEPENDENCIES += mesa3d
+ifeq ($(BR2_PACKAGE_LIBDRM),y)
+MPV_CONF_OPTS += --enable-egl-drm
+else
+MPV_CONF_OPTS += --disable-egl-drm
+endif
 else
-MPV_CONF_OPTS += --disable-gbm
+MPV_CONF_OPTS += --disable-gbm --disable-egl-drm
 endif
 
 # jack support
-- 
2.30.2

[Buildroot] [PATCH 4/4] package/mpv: Add optional support for DRM/EGL-based vaapi acceleration

[Bernd Kuhls]

https://github.com/mpv-player/mpv/blob/master/wscript#L647

Runtime-tested using mesa3d iris driver on a non-x11 system.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mpv/Config.in |  6 ++++++
 package/mpv/mpv.mk    | 11 +++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/package/mpv/Config.in b/package/mpv/Config.in
index 812491e3a9..81b1e24b5f 100644
--- a/package/mpv/Config.in
+++ b/package/mpv/Config.in
@@ -1,3 +1,9 @@
+config BR2_PACKAGE_MPV_SUPPORTS_VAAPI
+	bool
+	default y if BR2_PACKAGE_LIBDRM && BR2_PACKAGE_MESA3D_OPENGL_EGL
+	default y if BR2_PACKAGE_WAYLAND
+	default y if BR2_PACKAGE_XORG7
+
 config BR2_PACKAGE_MPV
 	bool "mpv"
 	depends on BR2_INSTALL_LIBSTDCPP # libass
diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
index 4292abb876..d4d4d4811d 100644
--- a/package/mpv/mpv.mk
+++ b/package/mpv/mpv.mk
@@ -178,17 +178,16 @@ MPV_CONF_OPTS += --disable-rpi
 endif
 
 # va-api support
-# This requires one or more of the egl-drm, wayland, x11 backends
-# For now we support wayland and x11
-ifeq ($(BR2_PACKAGE_LIBVA),y)
-ifneq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_XORG7),)
+ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_MPV_SUPPORTS_VAAPI),yy)
 MPV_CONF_OPTS += --enable-vaapi
 MPV_DEPENDENCIES += libva
+ifeq ($(BR2_PACKAGE_LIBDRM),y)
+MPV_CONF_OPTS += --enable-vaapi-drm
 else
-MPV_CONF_OPTS += --disable-vaapi
+MPV_CONF_OPTS += --disable-vaapi-drm
 endif
 else
-MPV_CONF_OPTS += --disable-vaapi
+MPV_CONF_OPTS += --disable-vaapi --disable-vaapi-drm
 endif
 
 # wayland support
-- 
2.30.2

[Buildroot] [PATCH 1/4] package/mpv: fix reproducible build issues

[Thomas Petazzoni]

On Fri, 18 Jun 2021 21:22:34 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Do not include the build date when creating reproducible builds.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/mpv/mpv.mk | 4 ++++
>  1 file changed, 4 insertions(+)

Series applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [Buildroot] [PATCH 1/4] package/mpv: fix reproducible build issues

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Do not include the build date when creating reproducible builds.
 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed to 2021.02.x and 2021.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot