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

[Christian Hesse]

    Date: Friday, October 25, 2019 @ 13:54:32
  Author: eworm
Revision: 518890

upgpkg: mpv 1:0.30.0-1

new upstream release

Modified:
  mpv/trunk/PKGBUILD
Deleted:
  mpv/trunk/0001-libarchive-add-fallback-for-systems-without-C-UTF-8.patch
  mpv/trunk/0002-build-lower-version-requirement-for-EGL.patch

----------------------------------------------------------------+
 0001-libarchive-add-fallback-for-systems-without-C-UTF-8.patch |   40 ----------
 0002-build-lower-version-requirement-for-EGL.patch             |   27 ------
 PKGBUILD                                                       |   19 +---
 3 files changed, 6 insertions(+), 80 deletions(-)

Deleted: 0001-libarchive-add-fallback-for-systems-without-C-UTF-8.patch
===================================================================
--- 0001-libarchive-add-fallback-for-systems-without-C-UTF-8.patch	2019-10-25 13:49:15 UTC (rev 518889)
+++ 0001-libarchive-add-fallback-for-systems-without-C-UTF-8.patch	2019-10-25 13:54:32 UTC (rev 518890)
@@ -1,40 +0,0 @@
-From 037cbacb8c5081313ea65024d4305d29a47165e0 Mon Sep 17 00:00:00 2001
-From: dudemanguy <random342 at airmail.cc>
-Date: Fri, 3 May 2019 11:54:31 -0500
-Subject: [PATCH] libarchive: add fallback for systems without C.UTF-8
-
----
- osdep/io.h                 | 1 +
- stream/stream_libarchive.c | 7 +++++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/osdep/io.h b/osdep/io.h
-index 7e8a267541..2f04337288 100644
---- a/osdep/io.h
-+++ b/osdep/io.h
-@@ -196,6 +196,7 @@ int msync(void *addr, size_t length, int flags);
- // These are stubs since there is not anything that helps with this on Windows.
- #define locale_t int
- #define LC_ALL_MASK 0
-+#define LC_CTYPE_MASK 0
- locale_t newlocale(int, const char *, locale_t);
- locale_t uselocale(locale_t);
- void freelocale(locale_t);
-diff --git a/stream/stream_libarchive.c b/stream/stream_libarchive.c
-index e5acad016b..ae06efb890 100644
---- a/stream/stream_libarchive.c
-+++ b/stream/stream_libarchive.c
-@@ -244,8 +244,11 @@ struct mp_archive *mp_archive_new(struct mp_log *log, struct stream *src,
-     struct mp_archive *mpa = talloc_zero(NULL, struct mp_archive);
-     mpa->log = log;
-     mpa->locale = newlocale(LC_ALL_MASK, "C.UTF-8", (locale_t)0);
--    if (!mpa->locale)
--        goto err;
-+    if (!mpa->locale) {
-+        mpa->locale = newlocale(LC_CTYPE_MASK, "", (locale_t)0);
-+        if (!mpa->locale)
-+            goto err;
-+    }
-     mpa->arch = archive_read_new();
-     mpa->primary_src = src;
-     if (!mpa->arch)

Deleted: 0002-build-lower-version-requirement-for-EGL.patch
===================================================================
--- 0002-build-lower-version-requirement-for-EGL.patch	2019-10-25 13:49:15 UTC (rev 518889)
+++ 0002-build-lower-version-requirement-for-EGL.patch	2019-10-25 13:54:32 UTC (rev 518890)
@@ -1,27 +0,0 @@
-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-25 13:49:15 UTC (rev 518889)
+++ PKGBUILD	2019-10-25 13:54:32 UTC (rev 518890)
@@ -4,8 +4,8 @@
 
 pkgname=mpv
 epoch=1
-pkgver=0.29.1
-pkgrel=11
+pkgver=0.30.0
+pkgrel=1
 _waf_version=2.0.9
 pkgdesc='a free, open source, and cross-platform media player'
 arch=('x86_64')
@@ -23,20 +23,13 @@
 optdepends=('youtube-dl: for video-sharing websites playback')
 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'
-        '0002-build-lower-version-requirement-for-EGL.patch')
-sha256sums=('f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623'
-            '2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48'
-            '0f8a1ba2628a50a8637137dfff8f66fdf1e7beb6ff159309842dcb6f39363d5e'
-            'aede2f87fc0871128f04e4d8d7cdccb9f9f71b0525f9158c784af3bde5e5fb34')
+        "https://waf.io/waf-${_waf_version}")
+sha256sums=('33a1bcb7e74ff17f070e754c15c52228cf44f2cefbfd8f34886ae81df214ca35'
+            '2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48')
 
 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 -m0755 "${srcdir}"/waf-${_waf_version} waf
 }
 
@@ -52,7 +45,7 @@
     --enable-libmpv-shared \
     --enable-libsmbclient \
     --enable-tv \
-    --enable-zsh-comp
+    --disable-tvos
 
   ./waf build
 }