[arch-commits] Commit in mpv/trunk (2 files)

[Christian Hesse]

    Date: Sunday, October 6, 2019 @ 20:49:24
  Author: eworm
Revision: 513665

upgpkg: mpv 1:0.29.1-10

build: lower version requirement for EGL (FS#64017)

Added:
  mpv/trunk/0002-build-lower-version-requirement-for-EGL.patch
Modified:
  mpv/trunk/PKGBUILD

----------------------------------------------------+
 0002-build-lower-version-requirement-for-EGL.patch |   27 +++++++++++++++++++
 PKGBUILD                                           |    9 ++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

Added: 0002-build-lower-version-requirement-for-EGL.patch
===================================================================
--- 0002-build-lower-version-requirement-for-EGL.patch	                        (rev 0)
+++ 0002-build-lower-version-requirement-for-EGL.patch	2019-10-06 20:49:24 UTC (rev 513665)
@@ -0,0 +1,27 @@
+From f726b368da87024a0cfe82627e0730ffe4578716 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv at exherbo.org>
+Date: Wed, 18 Sep 2019 17:07:29 +0200
+Subject: [PATCH] build: lower version requirement for EGL
+
+`egl.pc` can be provided either by mesa or libglvnd. The latter doesn't
+follow the same version scheme as mesa but instead uses the API version
+that the library exposes, which is 1.5 for EGL[1]
+
+[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba#diff-b58a140c00ea99fb9a708e15afaade62R8
+---
+ wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 3569dbf060..97a4d9196b 100644
+--- a/wscript
++++ b/wscript
+@@ -636,7 +636,7 @@ video_output_features = [
+         'deps': 'wayland',
+         'groups': [ 'gl' ],
+         'func': check_pkg_config('wayland-egl', '>= 9.0.0',
+-                                 'egl',         '>= 9.0.0')
++                                 'egl',         '>= 1.5')
+     } , {
+         'name': '--gl-win32',
+         'desc': 'OpenGL Win32 Backend',

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-06 20:48:09 UTC (rev 513664)
+++ PKGBUILD	2019-10-06 20:49:24 UTC (rev 513665)
@@ -5,7 +5,7 @@
 pkgname=mpv
 epoch=1
 pkgver=0.29.1
-pkgrel=9
+pkgrel=10
 _waf_version=2.0.9
 pkgdesc='a free, open source, and cross-platform media player'
 arch=('x86_64')
@@ -24,15 +24,18 @@
 options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz"
         "https://waf.io/waf-${_waf_version}"
-        '0001-libarchive-add-fallback-for-systems-without-C-UTF-8.patch')
+        '0001-libarchive-add-fallback-for-systems-without-C-UTF-8.patch'
+        '0002-build-lower-version-requirement-for-EGL.patch')
 sha256sums=('f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623'
             '2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48'
-            '0f8a1ba2628a50a8637137dfff8f66fdf1e7beb6ff159309842dcb6f39363d5e')
+            '0f8a1ba2628a50a8637137dfff8f66fdf1e7beb6ff159309842dcb6f39363d5e'
+            'aede2f87fc0871128f04e4d8d7cdccb9f9f71b0525f9158c784af3bde5e5fb34')
 
 prepare() {
   cd ${pkgname}-${pkgver}
 
   patch -Np1 < ../0001-libarchive-add-fallback-for-systems-without-C-UTF-8.patch
+  patch -Np1 < ../0002-build-lower-version-requirement-for-EGL.patch
 
   install -m755 "${srcdir}"/waf-${_waf_version} waf
 }