[arch-commits] Commit in mplayer-vaapi/repos (18 files)

Evangelos Foutras foutrelis at nymeria.archlinux.org
Tue May 14 19:55:29 EDT 2013


    Date: Wednesday, May 15, 2013 @ 01:55:29
  Author: foutrelis
Revision: 90857

archrelease: copy trunk to community-i686, community-x86_64

Added:
  mplayer-vaapi/repos/community-i686/PKGBUILD
    (from rev 90856, mplayer-vaapi/trunk/PKGBUILD)
  mplayer-vaapi/repos/community-i686/cdio-includes.patch
    (from rev 90856, mplayer-vaapi/trunk/cdio-includes.patch)
  mplayer-vaapi/repos/community-i686/mplayer-vaapi.install
    (from rev 90856, mplayer-vaapi/trunk/mplayer-vaapi.install)
  mplayer-vaapi/repos/community-i686/subreader-fix-srt-parsing.patch
    (from rev 90856, mplayer-vaapi/trunk/subreader-fix-srt-parsing.patch)
  mplayer-vaapi/repos/community-i686/tweak-desktop-file.patch
    (from rev 90856, mplayer-vaapi/trunk/tweak-desktop-file.patch)
  mplayer-vaapi/repos/community-x86_64/PKGBUILD
    (from rev 90856, mplayer-vaapi/trunk/PKGBUILD)
  mplayer-vaapi/repos/community-x86_64/cdio-includes.patch
    (from rev 90856, mplayer-vaapi/trunk/cdio-includes.patch)
  mplayer-vaapi/repos/community-x86_64/mplayer-vaapi.install
    (from rev 90856, mplayer-vaapi/trunk/mplayer-vaapi.install)
  mplayer-vaapi/repos/community-x86_64/subreader-fix-srt-parsing.patch
    (from rev 90856, mplayer-vaapi/trunk/subreader-fix-srt-parsing.patch)
  mplayer-vaapi/repos/community-x86_64/tweak-desktop-file.patch
    (from rev 90856, mplayer-vaapi/trunk/tweak-desktop-file.patch)
Deleted:
  mplayer-vaapi/repos/community-i686/PKGBUILD
  mplayer-vaapi/repos/community-i686/cdio-includes.patch
  mplayer-vaapi/repos/community-i686/mplayer-vaapi.install
  mplayer-vaapi/repos/community-i686/tweak-desktop-file.patch
  mplayer-vaapi/repos/community-x86_64/PKGBUILD
  mplayer-vaapi/repos/community-x86_64/cdio-includes.patch
  mplayer-vaapi/repos/community-x86_64/mplayer-vaapi.install
  mplayer-vaapi/repos/community-x86_64/tweak-desktop-file.patch

--------------------------------------------------+
 /PKGBUILD                                        |  174 +++++++++++++++++++++
 /cdio-includes.patch                             |   86 ++++++++++
 /mplayer-vaapi.install                           |   22 ++
 /tweak-desktop-file.patch                        |   28 +++
 community-i686/PKGBUILD                          |   77 ---------
 community-i686/cdio-includes.patch               |   43 -----
 community-i686/mplayer-vaapi.install             |   11 -
 community-i686/subreader-fix-srt-parsing.patch   |   60 +++++++
 community-i686/tweak-desktop-file.patch          |   14 -
 community-x86_64/PKGBUILD                        |   77 ---------
 community-x86_64/cdio-includes.patch             |   43 -----
 community-x86_64/mplayer-vaapi.install           |   11 -
 community-x86_64/subreader-fix-srt-parsing.patch |   60 +++++++
 community-x86_64/tweak-desktop-file.patch        |   14 -
 14 files changed, 430 insertions(+), 290 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-14 23:55:05 UTC (rev 90856)
+++ community-i686/PKGBUILD	2013-05-14 23:55:29 UTC (rev 90857)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgname=mplayer-vaapi
-pkgver=35107
-pkgrel=6
-pkgdesc="A movie player, compiled with vaapi support"
-arch=('i686' 'x86_64')
-url="http://gitorious.org/vaapi/mplayer"
-license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
-         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
-         'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2'
-         'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
-         'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
-         'libbluray' 'libva' 'libass' 'desktop-file-utils')
-makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa')
-provides=("mplayer=$pkgver")
-conflicts=('mplayer')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
-        cdio-includes.patch
-        tweak-desktop-file.patch)
-options=('!buildflags' '!emptydirs')
-install=mplayer-vaapi.install
-sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56'
-            '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
-            '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b')
-
-build() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
-
-  patch -Np0 -i "$srcdir/cdio-includes.patch"
-  patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-runtime-cpudetection \
-    --disable-gui \
-    --disable-arts \
-    --disable-liblzo \
-    --disable-speex \
-    --disable-cdparanoia \
-    --disable-openal \
-    --disable-libdv \
-    --disable-musepack \
-    --disable-esd \
-    --disable-mga \
-    --disable-ass-internal \
-    --enable-xvmc \
-    --enable-radio \
-    --enable-radio-capture \
-    --disable-vdpau \
-    --enable-vaapi \
-    --language=all \
-    --confdir=/etc/mplayer
-
-  [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak
-
-  make
-}
-
-package() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
-
-  make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
-  install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop"
-  install -d "$pkgdir/usr/share/mplayer/"
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
-  rm -rf "$pkgdir/usr/share/mplayer/font"
-  install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: mplayer-vaapi/repos/community-i686/PKGBUILD (from rev 90856, mplayer-vaapi/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-14 23:55:29 UTC (rev 90857)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=mplayer-vaapi
+pkgver=35107
+pkgrel=7
+pkgdesc="A movie player, compiled with vaapi support"
+arch=('i686' 'x86_64')
+url="http://gitorious.org/vaapi/mplayer"
+license=('GPL')
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
+         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
+         'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2'
+         'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
+         'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
+         'libbluray' 'libva' 'libass' 'desktop-file-utils')
+makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa')
+provides=("mplayer=$pkgver")
+conflicts=('mplayer')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
+        cdio-includes.patch
+        tweak-desktop-file.patch
+        subreader-fix-srt-parsing.patch)
+options=('!buildflags' '!emptydirs')
+install=mplayer-vaapi.install
+sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56'
+            '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
+            '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
+            '69127a5576e4f1f62f688215bd2ec0e052ddcb36292c7a1766c146ff122cb092')
+
+
+prepare() {
+  cd "$srcdir/mplayer-vaapi-$pkgver"
+
+  patch -Np0 -i "$srcdir/cdio-includes.patch"
+  patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
+
+  # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139
+  patch -Np1 -i "$srcdir/subreader-fix-srt-parsing.patch"
+}
+
+build() {
+  cd "$srcdir/mplayer-vaapi-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-runtime-cpudetection \
+    --disable-gui \
+    --disable-arts \
+    --disable-liblzo \
+    --disable-speex \
+    --disable-cdparanoia \
+    --disable-openal \
+    --disable-libdv \
+    --disable-musepack \
+    --disable-esd \
+    --disable-mga \
+    --disable-ass-internal \
+    --enable-xvmc \
+    --enable-radio \
+    --enable-radio-capture \
+    --disable-vdpau \
+    --enable-vaapi \
+    --language=all \
+    --confdir=/etc/mplayer
+
+  [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak
+
+  make
+}
+
+package() {
+  cd "$srcdir/mplayer-vaapi-$pkgver"
+
+  make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+  install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
+  install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop"
+  install -d "$pkgdir/usr/share/mplayer/"
+  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
+  rm -rf "$pkgdir/usr/share/mplayer/font"
+  install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/cdio-includes.patch
===================================================================
--- community-i686/cdio-includes.patch	2013-05-14 23:55:05 UTC (rev 90856)
+++ community-i686/cdio-includes.patch	2013-05-14 23:55:29 UTC (rev 90857)
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35421)
-+++ configure	(working copy)
-@@ -5968,8 +5968,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c	(revision 35421)
-+++ gui/win32/interface.c	(working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
-
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c	(revision 35421)
-+++ stream/stream_cdda.c	(working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>

Copied: mplayer-vaapi/repos/community-i686/cdio-includes.patch (from rev 90856, mplayer-vaapi/trunk/cdio-includes.patch)
===================================================================
--- community-i686/cdio-includes.patch	                        (rev 0)
+++ community-i686/cdio-includes.patch	2013-05-14 23:55:29 UTC (rev 90857)
@@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- configure	(revision 35421)
++++ configure	(working copy)
+@@ -5968,8 +5968,8 @@
+         cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+     void *test = cdda_verbose_set;
+     printf("%s\n", CDIO_VERSION);
+Index: gui/win32/interface.c
+===================================================================
+--- gui/win32/interface.c	(revision 35421)
++++ gui/win32/interface.c	(working copy)
+@@ -24,7 +24,7 @@
+ #include "config.h"
+
+ #if defined(CONFIG_LIBCDIO)
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #elif defined(CONFIG_CDDA)
+ #include <cdda_interface.h>
+ #endif
+Index: stream/stream_cdda.c
+===================================================================
+--- stream/stream_cdda.c	(revision 35421)
++++ stream/stream_cdda.c	(working copy)
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>

Deleted: community-i686/mplayer-vaapi.install
===================================================================
--- community-i686/mplayer-vaapi.install	2013-05-14 23:55:05 UTC (rev 90856)
+++ community-i686/mplayer-vaapi.install	2013-05-14 23:55:29 UTC (rev 90857)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-post_upgrade() {
-  post_install
-}
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: mplayer-vaapi/repos/community-i686/mplayer-vaapi.install (from rev 90856, mplayer-vaapi/trunk/mplayer-vaapi.install)
===================================================================
--- community-i686/mplayer-vaapi.install	                        (rev 0)
+++ community-i686/mplayer-vaapi.install	2013-05-14 23:55:29 UTC (rev 90857)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+post_upgrade() {
+  post_install
+}
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: mplayer-vaapi/repos/community-i686/subreader-fix-srt-parsing.patch (from rev 90856, mplayer-vaapi/trunk/subreader-fix-srt-parsing.patch)
===================================================================
--- community-i686/subreader-fix-srt-parsing.patch	                        (rev 0)
+++ community-i686/subreader-fix-srt-parsing.patch	2013-05-14 23:55:29 UTC (rev 90857)
@@ -0,0 +1,60 @@
+From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001
+From: wm4 <wm4 at nowhere>
+Date: Tue, 30 Apr 2013 00:09:31 +0200
+Subject: [PATCH] subreader: fix out of bound write access when parsing .srt
+
+This broke .srt subtitles on gcc-4.8. The breakage was relatively
+subtle: it set all hour components to 0, while everything else was
+parsed successfully.
+
+But the problem is really that sscanf wrote 1 byte past the sep
+variable (or more, for invalid/specially prepared input). The %[..]
+format specifier is unbounded. Fix that by letting sscanf drop the
+parsed contents with "*", and also make it skip only one input
+character by adding "1" (=> "%*1[...").
+
+The out of bound write could easily lead to security issues.
+
+Also, this change makes .srt subtitle parsing slightly more strict.
+Strictly speaking this is an unrelated change, but do it anyway. It's
+more correct.
+---
+ sub/subreader.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+ (foutrelis: adjusted variable names in first hunk to apply to mplayer)
+
+diff --git a/sub/subreader.c b/sub/subreader.c
+index 23da4c7..0f1b6c9 100644
+--- a/sub/subreader.c
++++ b/sub/subreader.c
+@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current,
+     int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0;
+ 
+     while (!current->text[0]) {
+-        char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep;
++        char line[LINE_LEN + 1], full_line[LINE_LEN + 1];
+         int i;
+ 
+         /* Parse SubRip header */
+         if (!stream_read_line(st, line, LINE_LEN, utf16))
+             return NULL;
+-        if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",
+-                     &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10)
++        if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",
++                     &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
+             continue;
+ 
+         current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10;
+@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current,
+         return sub_ass_read_line_subviewer(st, current, args);
+     while (!current->text[0]) {
+ 	if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
+-	if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
++	if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
+ 	    continue;
+ 	current->start = a1*360000+a2*6000+a3*100+a4/10;
+ 	current->end   = b1*360000+b2*6000+b3*100+b4/10;
+-- 
+1.8.1.6
+

Deleted: community-i686/tweak-desktop-file.patch
===================================================================
--- community-i686/tweak-desktop-file.patch	2013-05-14 23:55:05 UTC (rev 90856)
+++ community-i686/tweak-desktop-file.patch	2013-05-14 23:55:29 UTC (rev 90857)
@@ -1,14 +0,0 @@
---- mplayer.desktop.orig	2012-07-08 22:18:27.000000000 +0300
-+++ mplayer.desktop	2012-07-08 22:19:08.000000000 +0300
-@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques
- Comment[it]=Riproduce filmati e musica
- Comment[ja]=動画や音声のファイルを再生します
- Icon=mplayer
--TryExec=gmplayer
--Exec=gmplayer %F
-+TryExec=mplayer
-+Exec=mplayer -really-quiet %F
- Terminal=false
-+NoDisplay=true
- Categories=GTK;AudioVideo;Audio;Video;Player;TV;
- MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;

Copied: mplayer-vaapi/repos/community-i686/tweak-desktop-file.patch (from rev 90856, mplayer-vaapi/trunk/tweak-desktop-file.patch)
===================================================================
--- community-i686/tweak-desktop-file.patch	                        (rev 0)
+++ community-i686/tweak-desktop-file.patch	2013-05-14 23:55:29 UTC (rev 90857)
@@ -0,0 +1,14 @@
+--- mplayer.desktop.orig	2012-07-08 22:18:27.000000000 +0300
++++ mplayer.desktop	2012-07-08 22:19:08.000000000 +0300
+@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques
+ Comment[it]=Riproduce filmati e musica
+ Comment[ja]=動画や音声のファイルを再生します
+ Icon=mplayer
+-TryExec=gmplayer
+-Exec=gmplayer %F
++TryExec=mplayer
++Exec=mplayer -really-quiet %F
+ Terminal=false
++NoDisplay=true
+ Categories=GTK;AudioVideo;Audio;Video;Player;TV;
+ MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-14 23:55:05 UTC (rev 90856)
+++ community-x86_64/PKGBUILD	2013-05-14 23:55:29 UTC (rev 90857)
@@ -1,77 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgname=mplayer-vaapi
-pkgver=35107
-pkgrel=6
-pkgdesc="A movie player, compiled with vaapi support"
-arch=('i686' 'x86_64')
-url="http://gitorious.org/vaapi/mplayer"
-license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
-         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
-         'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2'
-         'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
-         'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
-         'libbluray' 'libva' 'libass' 'desktop-file-utils')
-makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa')
-provides=("mplayer=$pkgver")
-conflicts=('mplayer')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
-        cdio-includes.patch
-        tweak-desktop-file.patch)
-options=('!buildflags' '!emptydirs')
-install=mplayer-vaapi.install
-sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56'
-            '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
-            '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b')
-
-build() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
-
-  patch -Np0 -i "$srcdir/cdio-includes.patch"
-  patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-runtime-cpudetection \
-    --disable-gui \
-    --disable-arts \
-    --disable-liblzo \
-    --disable-speex \
-    --disable-cdparanoia \
-    --disable-openal \
-    --disable-libdv \
-    --disable-musepack \
-    --disable-esd \
-    --disable-mga \
-    --disable-ass-internal \
-    --enable-xvmc \
-    --enable-radio \
-    --enable-radio-capture \
-    --disable-vdpau \
-    --enable-vaapi \
-    --language=all \
-    --confdir=/etc/mplayer
-
-  [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak
-
-  make
-}
-
-package() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
-
-  make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
-  install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop"
-  install -d "$pkgdir/usr/share/mplayer/"
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
-  rm -rf "$pkgdir/usr/share/mplayer/font"
-  install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: mplayer-vaapi/repos/community-x86_64/PKGBUILD (from rev 90856, mplayer-vaapi/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-14 23:55:29 UTC (rev 90857)
@@ -0,0 +1,87 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=mplayer-vaapi
+pkgver=35107
+pkgrel=7
+pkgdesc="A movie player, compiled with vaapi support"
+arch=('i686' 'x86_64')
+url="http://gitorious.org/vaapi/mplayer"
+license=('GPL')
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
+         'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu'
+         'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2'
+         'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
+         'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
+         'libbluray' 'libva' 'libass' 'desktop-file-utils')
+makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa')
+provides=("mplayer=$pkgver")
+conflicts=('mplayer')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
+        cdio-includes.patch
+        tweak-desktop-file.patch
+        subreader-fix-srt-parsing.patch)
+options=('!buildflags' '!emptydirs')
+install=mplayer-vaapi.install
+sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56'
+            '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
+            '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
+            '69127a5576e4f1f62f688215bd2ec0e052ddcb36292c7a1766c146ff122cb092')
+
+
+prepare() {
+  cd "$srcdir/mplayer-vaapi-$pkgver"
+
+  patch -Np0 -i "$srcdir/cdio-includes.patch"
+  patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
+
+  # http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2139
+  patch -Np1 -i "$srcdir/subreader-fix-srt-parsing.patch"
+}
+
+build() {
+  cd "$srcdir/mplayer-vaapi-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-runtime-cpudetection \
+    --disable-gui \
+    --disable-arts \
+    --disable-liblzo \
+    --disable-speex \
+    --disable-cdparanoia \
+    --disable-openal \
+    --disable-libdv \
+    --disable-musepack \
+    --disable-esd \
+    --disable-mga \
+    --disable-ass-internal \
+    --enable-xvmc \
+    --enable-radio \
+    --enable-radio-capture \
+    --disable-vdpau \
+    --enable-vaapi \
+    --language=all \
+    --confdir=/etc/mplayer
+
+  [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak
+
+  make
+}
+
+package() {
+  cd "$srcdir/mplayer-vaapi-$pkgver"
+
+  make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+  install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
+  install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop"
+  install -d "$pkgdir/usr/share/mplayer/"
+  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
+  rm -rf "$pkgdir/usr/share/mplayer/font"
+  install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/cdio-includes.patch
===================================================================
--- community-x86_64/cdio-includes.patch	2013-05-14 23:55:05 UTC (rev 90856)
+++ community-x86_64/cdio-includes.patch	2013-05-14 23:55:29 UTC (rev 90857)
@@ -1,43 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 35421)
-+++ configure	(working copy)
-@@ -5968,8 +5968,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-Index: gui/win32/interface.c
-===================================================================
---- gui/win32/interface.c	(revision 35421)
-+++ gui/win32/interface.c	(working copy)
-@@ -24,7 +24,7 @@
- #include "config.h"
-
- #if defined(CONFIG_LIBCDIO)
--#include <cdio/cdda.h>
-+#include <cdio/paranoia/cdda.h>
- #elif defined(CONFIG_CDDA)
- #include <cdda_interface.h>
- #endif
-Index: stream/stream_cdda.c
-===================================================================
---- stream/stream_cdda.c	(revision 35421)
-+++ stream/stream_cdda.c	(working copy)
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>

Copied: mplayer-vaapi/repos/community-x86_64/cdio-includes.patch (from rev 90856, mplayer-vaapi/trunk/cdio-includes.patch)
===================================================================
--- community-x86_64/cdio-includes.patch	                        (rev 0)
+++ community-x86_64/cdio-includes.patch	2013-05-14 23:55:29 UTC (rev 90857)
@@ -0,0 +1,43 @@
+Index: configure
+===================================================================
+--- configure	(revision 35421)
++++ configure	(working copy)
+@@ -5968,8 +5968,8 @@
+         cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+     void *test = cdda_verbose_set;
+     printf("%s\n", CDIO_VERSION);
+Index: gui/win32/interface.c
+===================================================================
+--- gui/win32/interface.c	(revision 35421)
++++ gui/win32/interface.c	(working copy)
+@@ -24,7 +24,7 @@
+ #include "config.h"
+
+ #if defined(CONFIG_LIBCDIO)
+-#include <cdio/cdda.h>
++#include <cdio/paranoia/cdda.h>
+ #elif defined(CONFIG_CDDA)
+ #include <cdda_interface.h>
+ #endif
+Index: stream/stream_cdda.c
+===================================================================
+--- stream/stream_cdda.c	(revision 35421)
++++ stream/stream_cdda.c	(working copy)
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>

Deleted: community-x86_64/mplayer-vaapi.install
===================================================================
--- community-x86_64/mplayer-vaapi.install	2013-05-14 23:55:05 UTC (rev 90856)
+++ community-x86_64/mplayer-vaapi.install	2013-05-14 23:55:29 UTC (rev 90857)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-post_upgrade() {
-  post_install
-}
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: mplayer-vaapi/repos/community-x86_64/mplayer-vaapi.install (from rev 90856, mplayer-vaapi/trunk/mplayer-vaapi.install)
===================================================================
--- community-x86_64/mplayer-vaapi.install	                        (rev 0)
+++ community-x86_64/mplayer-vaapi.install	2013-05-14 23:55:29 UTC (rev 90857)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+post_upgrade() {
+  post_install
+}
+post_remove() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:

Copied: mplayer-vaapi/repos/community-x86_64/subreader-fix-srt-parsing.patch (from rev 90856, mplayer-vaapi/trunk/subreader-fix-srt-parsing.patch)
===================================================================
--- community-x86_64/subreader-fix-srt-parsing.patch	                        (rev 0)
+++ community-x86_64/subreader-fix-srt-parsing.patch	2013-05-14 23:55:29 UTC (rev 90857)
@@ -0,0 +1,60 @@
+From d98e61ea438db66323734ad1b6bea66411a3c97b Mon Sep 17 00:00:00 2001
+From: wm4 <wm4 at nowhere>
+Date: Tue, 30 Apr 2013 00:09:31 +0200
+Subject: [PATCH] subreader: fix out of bound write access when parsing .srt
+
+This broke .srt subtitles on gcc-4.8. The breakage was relatively
+subtle: it set all hour components to 0, while everything else was
+parsed successfully.
+
+But the problem is really that sscanf wrote 1 byte past the sep
+variable (or more, for invalid/specially prepared input). The %[..]
+format specifier is unbounded. Fix that by letting sscanf drop the
+parsed contents with "*", and also make it skip only one input
+character by adding "1" (=> "%*1[...").
+
+The out of bound write could easily lead to security issues.
+
+Also, this change makes .srt subtitle parsing slightly more strict.
+Strictly speaking this is an unrelated change, but do it anyway. It's
+more correct.
+---
+ sub/subreader.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+ (foutrelis: adjusted variable names in first hunk to apply to mplayer)
+
+diff --git a/sub/subreader.c b/sub/subreader.c
+index 23da4c7..0f1b6c9 100644
+--- a/sub/subreader.c
++++ b/sub/subreader.c
+@@ -386,14 +386,14 @@ static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current,
+     int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0;
+ 
+     while (!current->text[0]) {
+-        char line[LINE_LEN + 1], full_line[LINE_LEN + 1], sep;
++        char line[LINE_LEN + 1], full_line[LINE_LEN + 1];
+         int i;
+ 
+         /* Parse SubRip header */
+         if (!stream_read_line(st, line, LINE_LEN, utf16))
+             return NULL;
+-        if (sscanf(line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",
+-                     &h1, &m1, &s1, &sep, &ms1, &h2, &m2, &s2, &sep, &ms2) < 10)
++        if (sscanf(line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",
++                     &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
+             continue;
+ 
+         current->start = a1 * 360000 + a2 * 6000 + a3 * 100 + a4 / 10;
+@@ -450,7 +450,7 @@ static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current,
+         return sub_ass_read_line_subviewer(st, current, args);
+     while (!current->text[0]) {
+ 	if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
+-	if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)
++	if ((len=sscanf (line, "%d:%d:%d%*1[,.:]%d --> %d:%d:%d%*1[,.:]%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8)
+ 	    continue;
+ 	current->start = a1*360000+a2*6000+a3*100+a4/10;
+ 	current->end   = b1*360000+b2*6000+b3*100+b4/10;
+-- 
+1.8.1.6
+

Deleted: community-x86_64/tweak-desktop-file.patch
===================================================================
--- community-x86_64/tweak-desktop-file.patch	2013-05-14 23:55:05 UTC (rev 90856)
+++ community-x86_64/tweak-desktop-file.patch	2013-05-14 23:55:29 UTC (rev 90857)
@@ -1,14 +0,0 @@
---- mplayer.desktop.orig	2012-07-08 22:18:27.000000000 +0300
-+++ mplayer.desktop	2012-07-08 22:19:08.000000000 +0300
-@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques
- Comment[it]=Riproduce filmati e musica
- Comment[ja]=動画や音声のファイルを再生します
- Icon=mplayer
--TryExec=gmplayer
--Exec=gmplayer %F
-+TryExec=mplayer
-+Exec=mplayer -really-quiet %F
- Terminal=false
-+NoDisplay=true
- Categories=GTK;AudioVideo;Audio;Video;Player;TV;
- MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;

Copied: mplayer-vaapi/repos/community-x86_64/tweak-desktop-file.patch (from rev 90856, mplayer-vaapi/trunk/tweak-desktop-file.patch)
===================================================================
--- community-x86_64/tweak-desktop-file.patch	                        (rev 0)
+++ community-x86_64/tweak-desktop-file.patch	2013-05-14 23:55:29 UTC (rev 90857)
@@ -0,0 +1,14 @@
+--- mplayer.desktop.orig	2012-07-08 22:18:27.000000000 +0300
++++ mplayer.desktop	2012-07-08 22:19:08.000000000 +0300
+@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques
+ Comment[it]=Riproduce filmati e musica
+ Comment[ja]=動画や音声のファイルを再生します
+ Icon=mplayer
+-TryExec=gmplayer
+-Exec=gmplayer %F
++TryExec=mplayer
++Exec=mplayer -really-quiet %F
+ Terminal=false
++NoDisplay=true
+ Categories=GTK;AudioVideo;Audio;Video;Player;TV;
+ MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm;



More information about the arch-commits mailing list