From patchwork Sun Apr 16 12:21:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 751135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w5VrR0xvkz9s0m for ; Sun, 16 Apr 2017 22:21:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 93E5730201; Sun, 16 Apr 2017 12:21:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6ZE+07eBZcEb; Sun, 16 Apr 2017 12:21:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 566963016E; Sun, 16 Apr 2017 12:21:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D9A681C1FFC for ; Sun, 16 Apr 2017 12:21:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D57958A4B1 for ; Sun, 16 Apr 2017 12:21:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3i+fWbJ6l5Hp for ; Sun, 16 Apr 2017 12:21:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by hemlock.osuosl.org (Postfix) with ESMTPS id C59048A4B0 for ; Sun, 16 Apr 2017 12:21:48 +0000 (UTC) Received: from fwd18.aul.t-online.de (fwd18.aul.t-online.de [172.20.26.244]) by mailout02.t-online.de (Postfix) with SMTP id 6499741B2229; Sun, 16 Apr 2017 14:21:46 +0200 (CEST) Received: from fli4l.lan.fli4l (VgFN8qZXZhAdF0LioHKQznsh1ct7YZa2rqD0ljxzXCsLWIJQ8i29HxsFQjXAiTWgi4@[79.228.23.181]) by fwd18.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1czjBZ-16XIlU0; Sun, 16 Apr 2017 14:21:45 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:45522 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.89) (envelope-from ) id 1czjBY-00083q-A5; Sun, 16 Apr 2017 14:21:44 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 16 Apr 2017 14:21:44 +0200 Message-Id: <20170416122144.7459-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 X-ID: VgFN8qZXZhAdF0LioHKQznsh1ct7YZa2rqD0ljxzXCsLWIJQ8i29HxsFQjXAiTWgi4 X-TOI-MSGID: 4641ecfd-7f0e-4ec0-9b12-8b03aacbfb62 Subject: [Buildroot] [PATCH 1/1] package/mpv: bump version to 0.24.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Bernd Kuhls --- package/mpv/0003-fix-build-with-have-gl.patch | 39 +++++++++++++++++++++++++++ package/mpv/mpv.hash | 2 +- package/mpv/mpv.mk | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 package/mpv/0003-fix-build-with-have-gl.patch diff --git a/package/mpv/0003-fix-build-with-have-gl.patch b/package/mpv/0003-fix-build-with-have-gl.patch new file mode 100644 index 000000000..0934bc895 --- /dev/null +++ b/package/mpv/0003-fix-build-with-have-gl.patch @@ -0,0 +1,39 @@ +From 212f6c8206bd4dcc7d8970c5f1632823ae4e783a Mon Sep 17 00:00:00 2001 +From: Michael Forney +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 +--- + 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) diff --git a/package/mpv/mpv.hash b/package/mpv/mpv.hash index 0e7aab707..e0644a3c5 100644 --- a/package/mpv/mpv.hash +++ b/package/mpv/mpv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 8aeefe5970587dfc454d2b89726b603f156bd7a9ae427654eef0d60c68d94998 v0.23.0.tar.gz +sha256 a41854fa0ac35b9c309ad692aaee67c8d4495c3546f11cb4cdd0a124195d3f15 v0.24.0.tar.gz diff --git a/package/mpv/mpv.mk b/package/mpv/mpv.mk index a21ddeb1d..6191821e2 100644 --- a/package/mpv/mpv.mk +++ b/package/mpv/mpv.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPV_VERSION = 0.23.0 +MPV_VERSION = 0.24.0 MPV_SITE = https://github.com/mpv-player/mpv/archive MPV_SOURCE = v$(MPV_VERSION).tar.gz MPV_DEPENDENCIES = \