* [Buildroot] [PATCH 3/3] mpv: add support for Raspberry Pi "rpi" output
2017-09-14 15:02 [Buildroot] [PATCH 2/3] mpv: bump version to 0.27.0 Mahyar Koshkouei
@ 2017-09-14 15:02 ` Mahyar Koshkouei
2017-09-24 13:06 ` Arnout Vandecappelle
2017-09-24 13:05 ` [Buildroot] [PATCH 2/3] mpv: bump version to 0.27.0 Arnout Vandecappelle
1 sibling, 1 reply; 6+ messages in thread
From: Mahyar Koshkouei @ 2017-09-14 15:02 UTC (permalink / raw)
To: buildroot
mpv now compiles with the "rpi" video driver that provides hardware
acceleration on the Raspberry Pi.
Tested working on a Raspberry Pi 1 Model B+.
Signed-off-by: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
---
.../mpv/0003-rpi-build-Fix-linking-errors.patch | 43 ++++++++++++++++++++++
package/mpv/mpv.mk | 9 ++++-
2 files changed, 51 insertions(+), 1 deletion(-)
create mode 100644 package/mpv/0003-rpi-build-Fix-linking-errors.patch
diff --git a/package/mpv/0003-rpi-build-Fix-linking-errors.patch b/package/mpv/0003-rpi-build-Fix-linking-errors.patch
new file mode 100644
index 0000000000..1f09d73e8e
--- /dev/null
+++ b/package/mpv/0003-rpi-build-Fix-linking-errors.patch
@@ -0,0 +1,43 @@
+From d2ed64023a992be0b2cf2563a086006f5073446b Mon Sep 17 00:00:00 2001
+From: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
+Date: Thu, 14 Sep 2017 09:40:47 +0100
+Subject: [PATCH] rpi build: Fix linking errors
+
+Fixed an issue whereby libbcm_host, libvchostif and libbrcmGLESv2
+libraries were not being linked to, causing undefined references during
+configuration and build stages.
+
+This issue may be reproduced by cross compiling mpv with rpi video
+output enabled "--enable-rpi", using buildroot.
+
+Tested working by compiling and playing 1080p h264 encoded video on a
+Raspberry Pi 1 Model B+.
+
+Signed-off-by: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
+---
+Status: pull request https://github.com/mpv-player/mpv/pull/4869
+
+ wscript | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/wscript b/wscript
+index 9d885884d7..e8513d87c9 100644
+--- a/wscript
++++ b/wscript
+@@ -745,10 +745,11 @@ video_output_features = [
+ "-fgnu89-inline",
+ linkflags="-L/opt/vc/lib",
+ header_name="bcm_host.h",
+- lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']),
++ lib=['mmal_core', 'mmal_util', 'mmal_vc_client',
++ 'bcm_host', 'vchostif']),
+ # We still need all OpenGL symbols, because the vo_opengl code is
+ # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
+- check_cc(lib="EGL"),
++ check_cc(linkflags="-lbrcmGLESv2", lib="EGL"),
+ check_cc(lib="GLESv2"),
+ ),
+ } , {
+--
+2.14.1
+
diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
index 730ced6c64..dfc3fa8f3b 100644
--- a/package/mpv/mpv.mk
+++ b/package/mpv/mpv.mk
@@ -26,7 +26,6 @@ MPV_CONF_OPTS = \
--disable-cuda-hwaccel \
--disable-libv4l2 \
--disable-opensles \
- --disable-rpi \
--disable-rsound \
--disable-rubberband \
--disable-uchardet \
@@ -169,6 +168,14 @@ else
MPV_CONF_OPTS += --disable-sdl1 --disable-sdl2
endif
+# Raspberry Pi support
+ifeq ($(BR2_PACKAGE_RPI_FIRMWARE)$(BR2_PACKAGE_RPI_USERLAND),yy)
+MPV_CONF_OPTS += --enable-rpi --enable-gl
+FFMPEG_DEPENDENCIES += rpi-firmware rpi-userland
+else
+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
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/3] mpv: bump version to 0.27.0
2017-09-14 15:02 [Buildroot] [PATCH 2/3] mpv: bump version to 0.27.0 Mahyar Koshkouei
2017-09-14 15:02 ` [Buildroot] [PATCH 3/3] mpv: add support for Raspberry Pi "rpi" output Mahyar Koshkouei
@ 2017-09-24 13:05 ` Arnout Vandecappelle
1 sibling, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2017-09-24 13:05 UTC (permalink / raw)
To: buildroot
On 14-09-17 17:02, Mahyar Koshkouei wrote:
> Includes some fixes for the Raspberry Pi, amongst many others.
>
> Signed-off-by: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> package/mpv/mpv.hash | 2 +-
> package/mpv/mpv.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash
> index 10a91cfb2c..60fb84335e 100644
> --- a/package/mpv/mpv.hash
> +++ b/package/mpv/mpv.hash
> @@ -1,2 +1,2 @@
> # Locally calculated
> -sha256 07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce v0.25.0.tar.gz
> +sha256 341d8bf18b75c1f78d5b681480b5b7f5c8b87d97a0d4f53a5648ede9c219a49c v0.27.0.tar.gz
> diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk
> index 37548c9074..730ced6c64 100644
> --- a/package/mpv/mpv.mk
> +++ b/package/mpv/mpv.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -MPV_VERSION = 0.25.0
> +MPV_VERSION = 0.27.0
> MPV_SITE = https://github.com/mpv-player/mpv/archive
> MPV_SOURCE = v$(MPV_VERSION).tar.gz
> MPV_DEPENDENCIES = \
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 6+ messages in thread