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

[Bartłomiej Piotrowski]

    Date: Tuesday, January 7, 2014 @ 08:22:50
  Author: bpiotrowski
Revision: 103519

upgpkg: mpv 0.3.2-1

new upstream release

Modified:
  mpv/trunk/PKGBUILD
Deleted:
  mpv/trunk/mpv-0.3.1-always_respect_sector_size.patch

--------------------------------------------+
 PKGBUILD                                   |   15 +++--------
 mpv-0.3.1-always_respect_sector_size.patch |   34 ---------------------------
 2 files changed, 4 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-07 07:13:45 UTC (rev 103518)
+++ PKGBUILD	2014-01-07 07:22:50 UTC (rev 103519)
@@ -3,8 +3,8 @@
 # Contributor: Eivind Uggedal <eivind at uggedal.com>
 
 pkgname=mpv
-pkgver=0.3.1
-pkgrel=2
+pkgver=0.3.2
+pkgrel=1
 pkgdesc='Video player based on MPlayer/mplayer2'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,16 +17,9 @@
 makedepends=('mesa' 'python-docutils' 'waf')
 options=('!emptydirs' '!buildflags')
 install=mpv.install
-source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz
-        mpv-0.3.1-always_respect_sector_size.patch)
-md5sums=('f7e4091eb9ce058ce35b4bc1b6c4f3a2'
-         'afe01937e9bff1f241d37774eda39b7a')
+source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz)
+md5sums=('516f2eeec1d1f69905d11c1feec8166e')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../mpv-0.3.1-always_respect_sector_size.patch
-}
-
 build() {
   cd $pkgname-$pkgver
 

Deleted: mpv-0.3.1-always_respect_sector_size.patch
===================================================================
--- mpv-0.3.1-always_respect_sector_size.patch	2014-01-07 07:13:45 UTC (rev 103518)
+++ mpv-0.3.1-always_respect_sector_size.patch	2014-01-07 07:22:50 UTC (rev 103519)
@@ -1,34 +0,0 @@
-From b04b48fc10dabb1d1b26ff519f55dcafb320985e Mon Sep 17 00:00:00 2001
-From: wm4 <wm4 at nowhere>
-Date: Thu, 2 Jan 2014 00:39:14 +0100
-Subject: [PATCH] stream: always respect sector_size, fixes cdda://
-
-Streams like CDDA have special requirements in what quantities data can
-be read: you can only read a sector at once, not more and not less. The
-stream_peek() function didn't respect that and set less (used internal
-buffer size of 2048 bytes, instead of CD sector size of 2352 bytes), so
-no data was read and EOF was accidentally set, making playback with
-cdda:// fail.
-
-This is a regression since commit 9a723f, but that commit merely exposed
-the issue (the redundant seek would clear the EOF flag).
----
- stream/stream.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/stream/stream.c b/stream/stream.c
-index 3332e66..b48de57 100644
---- a/stream/stream.c
-+++ b/stream/stream.c
-@@ -562,7 +562,7 @@ struct bstr stream_peek(stream_t *s, int len)
-         while (buf_valid < len) {
-             int chunk = MPMAX(len - buf_valid, STREAM_BUFFER_SIZE);
-             if (s->sector_size)
--                chunk = STREAM_BUFFER_SIZE;
-+                chunk = s->sector_size;
-             assert(buf_valid + chunk <= TOTAL_BUFFER_SIZE);
-             int read = stream_read_unbuffered(s, &s->buffer[buf_valid], chunk);
-             if (read == 0)
--- 
-1.8.5.1
-