mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 06:06:32 +00:00
mpv: bump version to 0.25.0
Remove 0003-fix-build-with-have-gl.patch which is already included in this release. Remove --{enable|disable}-standard-gl configure option because it doesn't exist. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
bc41dbe658
commit
c10724093a
@ -1,39 +0,0 @@
|
|||||||
From 212f6c8206bd4dcc7d8970c5f1632823ae4e783a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Forney <mforney@mforney.org>
|
|
||||||
Date: Sun, 12 Feb 2017 23:01:21 -0800
|
|
||||||
Subject: [PATCH] Fix build with HAVE_GL==0
|
|
||||||
|
|
||||||
video/out/opengl/hwdec.h includes video/out/opengl/common.h, which tries
|
|
||||||
to include opengl headers.
|
|
||||||
|
|
||||||
Downloaded from upstream commit:
|
|
||||||
https://github.com/mpv-player/mpv/commit/212f6c8206bd4dcc7d8970c5f1632823ae4e783a
|
|
||||||
|
|
||||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
||||||
---
|
|
||||||
options/options.c | 5 ++++-
|
|
||||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/options/options.c b/options/options.c
|
|
||||||
index b711156..0bb36ad 100644
|
|
||||||
--- a/options/options.c
|
|
||||||
+++ b/options/options.c
|
|
||||||
@@ -40,7 +40,6 @@
|
|
||||||
#include "stream/stream.h"
|
|
||||||
#include "video/csputils.h"
|
|
||||||
#include "video/hwdec.h"
|
|
||||||
-#include "video/out/opengl/hwdec.h"
|
|
||||||
#include "video/image_writer.h"
|
|
||||||
#include "sub/osd.h"
|
|
||||||
#include "audio/filter/af.h"
|
|
||||||
@@ -53,6 +52,10 @@
|
|
||||||
#include "video/out/drm_common.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if HAVE_GL
|
|
||||||
+#include "video/out/opengl/hwdec.h"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
extern const char mp_help_text[];
|
|
||||||
|
|
||||||
static void print_version(struct mp_log *log)
|
|
@ -1,2 +1,2 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 a41854fa0ac35b9c309ad692aaee67c8d4495c3546f11cb4cdd0a124195d3f15 v0.24.0.tar.gz
|
sha256 07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce v0.25.0.tar.gz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
MPV_VERSION = 0.24.0
|
MPV_VERSION = 0.25.0
|
||||||
MPV_SITE = https://github.com/mpv-player/mpv/archive
|
MPV_SITE = https://github.com/mpv-player/mpv/archive
|
||||||
MPV_SOURCE = v$(MPV_VERSION).tar.gz
|
MPV_SOURCE = v$(MPV_VERSION).tar.gz
|
||||||
MPV_DEPENDENCIES = \
|
MPV_DEPENDENCIES = \
|
||||||
@ -134,10 +134,10 @@ endif
|
|||||||
|
|
||||||
# OpenGL support
|
# OpenGL support
|
||||||
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
|
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
|
||||||
MPV_CONF_OPTS += --enable-gl --enable-standard-gl
|
MPV_CONF_OPTS += --enable-gl
|
||||||
MPV_DEPENDENCIES += libgl
|
MPV_DEPENDENCIES += libgl
|
||||||
else
|
else
|
||||||
MPV_CONF_OPTS += --disable-gl --disable-standard-gl
|
MPV_CONF_OPTS += --disable-gl
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# pulseaudio support
|
# pulseaudio support
|
||||||
|
Loading…
x
Reference in New Issue
Block a user