[arch-commits] Commit in mpv/repos (10 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Thu Jan 2 08:50:55 UTC 2014
Date: Thursday, January 2, 2014 @ 09:50:55
Author: bpiotrowski
Revision: 103275
archrelease: copy trunk to community-i686, community-x86_64
Added:
mpv/repos/community-i686/PKGBUILD
(from rev 103274, mpv/trunk/PKGBUILD)
mpv/repos/community-i686/mpv-0.3.1-always_respect_sector_size.patch
(from rev 103274, mpv/trunk/mpv-0.3.1-always_respect_sector_size.patch)
mpv/repos/community-i686/mpv.install
(from rev 103274, mpv/trunk/mpv.install)
mpv/repos/community-x86_64/PKGBUILD
(from rev 103274, mpv/trunk/PKGBUILD)
mpv/repos/community-x86_64/mpv-0.3.1-always_respect_sector_size.patch
(from rev 103274, mpv/trunk/mpv-0.3.1-always_respect_sector_size.patch)
mpv/repos/community-x86_64/mpv.install
(from rev 103274, mpv/trunk/mpv.install)
Deleted:
mpv/repos/community-i686/PKGBUILD
mpv/repos/community-i686/mpv.install
mpv/repos/community-x86_64/PKGBUILD
mpv/repos/community-x86_64/mpv.install
-------------------------------------------------------------+
/PKGBUILD | 114 ++++++++++
/mpv.install | 24 ++
community-i686/PKGBUILD | 50 ----
community-i686/mpv-0.3.1-always_respect_sector_size.patch | 34 ++
community-i686/mpv.install | 12 -
community-x86_64/PKGBUILD | 50 ----
community-x86_64/mpv-0.3.1-always_respect_sector_size.patch | 34 ++
community-x86_64/mpv.install | 12 -
8 files changed, 206 insertions(+), 124 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-01-02 08:50:45 UTC (rev 103274)
+++ community-i686/PKGBUILD 2014-01-02 08:50:55 UTC (rev 103275)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Eivind Uggedal <eivind at uggedal.com>
-
-pkgname=mpv
-pkgver=0.3.1
-pkgrel=1
-pkgdesc='Video player based on MPlayer/mplayer2'
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://mpv.io'
-depends=(
- 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libquvi'
- 'libxinerama' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils'
- 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua' 'libdvdnav'
- )
-makedepends=('mesa' 'python-docutils' 'waf')
-options=('!emptydirs' '!buildflags')
-install=mpv.install
-source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz)
-md5sums=('f7e4091eb9ce058ce35b4bc1b6c4f3a2')
-
-build() {
- cd $pkgname-$pkgver
-
- waf configure --prefix=/usr \
- --confdir=/etc/mpv \
- --enable-joystick \
- --enable-wayland \
- --disable-radio \
- --disable-radio-capture \
- --disable-radio-v4l2 \
- --disable-libbs2b \
- --disable-direct3d \
- --disable-corevideo \
- --disable-cocoa \
- --disable-coreaudio
- waf build
-}
-
-package() {
- cd $pkgname-$pkgver
- waf install --destdir="$pkgdir"
-
- install -d "$pkgdir"/usr/share/doc/mpv/examples
- install -m644 etc/{input,example}.conf \
- "$pkgdir"/usr/share/doc/mpv/examples
- install -m644 DOCS/{encoding.rst,tech-overview.txt} \
- "$pkgdir"/usr/share/doc/mpv
-}
Copied: mpv/repos/community-i686/PKGBUILD (from rev 103274, mpv/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-01-02 08:50:55 UTC (rev 103275)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Eivind Uggedal <eivind at uggedal.com>
+
+pkgname=mpv
+pkgver=0.3.1
+pkgrel=2
+pkgdesc='Video player based on MPlayer/mplayer2'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://mpv.io'
+depends=(
+ 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libquvi'
+ 'libxinerama' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils'
+ 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua' 'libdvdnav'
+ )
+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')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../mpv-0.3.1-always_respect_sector_size.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ waf configure --prefix=/usr \
+ --confdir=/etc/mpv \
+ --enable-joystick \
+ --enable-wayland \
+ --disable-radio \
+ --disable-radio-capture \
+ --disable-radio-v4l2 \
+ --disable-libbs2b \
+ --disable-direct3d \
+ --disable-corevideo \
+ --disable-cocoa \
+ --disable-coreaudio
+ waf build
+}
+
+package() {
+ cd $pkgname-$pkgver
+ waf install --destdir="$pkgdir"
+
+ install -d "$pkgdir"/usr/share/doc/mpv/examples
+ install -m644 etc/{input,example}.conf \
+ "$pkgdir"/usr/share/doc/mpv/examples
+ install -m644 DOCS/{encoding.rst,tech-overview.txt} \
+ "$pkgdir"/usr/share/doc/mpv
+}
Copied: mpv/repos/community-i686/mpv-0.3.1-always_respect_sector_size.patch (from rev 103274, mpv/trunk/mpv-0.3.1-always_respect_sector_size.patch)
===================================================================
--- community-i686/mpv-0.3.1-always_respect_sector_size.patch (rev 0)
+++ community-i686/mpv-0.3.1-always_respect_sector_size.patch 2014-01-02 08:50:55 UTC (rev 103275)
@@ -0,0 +1,34 @@
+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
+
Deleted: community-i686/mpv.install
===================================================================
--- community-i686/mpv.install 2014-01-02 08:50:45 UTC (rev 103274)
+++ community-i686/mpv.install 2014-01-02 08:50:55 UTC (rev 103275)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mpv/repos/community-i686/mpv.install (from rev 103274, mpv/trunk/mpv.install)
===================================================================
--- community-i686/mpv.install (rev 0)
+++ community-i686/mpv.install 2014-01-02 08:50:55 UTC (rev 103275)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-01-02 08:50:45 UTC (rev 103274)
+++ community-x86_64/PKGBUILD 2014-01-02 08:50:55 UTC (rev 103275)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Eivind Uggedal <eivind at uggedal.com>
-
-pkgname=mpv
-pkgver=0.3.1
-pkgrel=1
-pkgdesc='Video player based on MPlayer/mplayer2'
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://mpv.io'
-depends=(
- 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libquvi'
- 'libxinerama' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils'
- 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua' 'libdvdnav'
- )
-makedepends=('mesa' 'python-docutils' 'waf')
-options=('!emptydirs' '!buildflags')
-install=mpv.install
-source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz)
-md5sums=('f7e4091eb9ce058ce35b4bc1b6c4f3a2')
-
-build() {
- cd $pkgname-$pkgver
-
- waf configure --prefix=/usr \
- --confdir=/etc/mpv \
- --enable-joystick \
- --enable-wayland \
- --disable-radio \
- --disable-radio-capture \
- --disable-radio-v4l2 \
- --disable-libbs2b \
- --disable-direct3d \
- --disable-corevideo \
- --disable-cocoa \
- --disable-coreaudio
- waf build
-}
-
-package() {
- cd $pkgname-$pkgver
- waf install --destdir="$pkgdir"
-
- install -d "$pkgdir"/usr/share/doc/mpv/examples
- install -m644 etc/{input,example}.conf \
- "$pkgdir"/usr/share/doc/mpv/examples
- install -m644 DOCS/{encoding.rst,tech-overview.txt} \
- "$pkgdir"/usr/share/doc/mpv
-}
Copied: mpv/repos/community-x86_64/PKGBUILD (from rev 103274, mpv/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-01-02 08:50:55 UTC (rev 103275)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Eivind Uggedal <eivind at uggedal.com>
+
+pkgname=mpv
+pkgver=0.3.1
+pkgrel=2
+pkgdesc='Video player based on MPlayer/mplayer2'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://mpv.io'
+depends=(
+ 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libquvi'
+ 'libxinerama' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils'
+ 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua' 'libdvdnav'
+ )
+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')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../mpv-0.3.1-always_respect_sector_size.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ waf configure --prefix=/usr \
+ --confdir=/etc/mpv \
+ --enable-joystick \
+ --enable-wayland \
+ --disable-radio \
+ --disable-radio-capture \
+ --disable-radio-v4l2 \
+ --disable-libbs2b \
+ --disable-direct3d \
+ --disable-corevideo \
+ --disable-cocoa \
+ --disable-coreaudio
+ waf build
+}
+
+package() {
+ cd $pkgname-$pkgver
+ waf install --destdir="$pkgdir"
+
+ install -d "$pkgdir"/usr/share/doc/mpv/examples
+ install -m644 etc/{input,example}.conf \
+ "$pkgdir"/usr/share/doc/mpv/examples
+ install -m644 DOCS/{encoding.rst,tech-overview.txt} \
+ "$pkgdir"/usr/share/doc/mpv
+}
Copied: mpv/repos/community-x86_64/mpv-0.3.1-always_respect_sector_size.patch (from rev 103274, mpv/trunk/mpv-0.3.1-always_respect_sector_size.patch)
===================================================================
--- community-x86_64/mpv-0.3.1-always_respect_sector_size.patch (rev 0)
+++ community-x86_64/mpv-0.3.1-always_respect_sector_size.patch 2014-01-02 08:50:55 UTC (rev 103275)
@@ -0,0 +1,34 @@
+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
+
Deleted: community-x86_64/mpv.install
===================================================================
--- community-x86_64/mpv.install 2014-01-02 08:50:45 UTC (rev 103274)
+++ community-x86_64/mpv.install 2014-01-02 08:50:55 UTC (rev 103275)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mpv/repos/community-x86_64/mpv.install (from rev 103274, mpv/trunk/mpv.install)
===================================================================
--- community-x86_64/mpv.install (rev 0)
+++ community-x86_64/mpv.install 2014-01-02 08:50:55 UTC (rev 103275)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list