rename mplayer-vaapi-libre to mplayer-libre-vaapi and rebuild against libx264.so.142

5 files changed, 203 insertions, 0 deletions

diff --git a/libre/mplayer-libre-vaapi/PKGBUILD b/libre/mplayer-libre-vaapi/PKGBUILD
new file mode 100644
index 000000000..68873d749
--- /dev/null
+++ b/libre/mplayer-libre-vaapi/PKGBUILD
@@ -0,0 +1,95 @@
+# $Id: PKGBUILD 108189 2014-03-24 13:39:00Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+
+_pkgname=mplayer-vaapi
+pkgname=mplayer-libre-vaapi
+pkgver=36265
+pkgrel=9
+pkgdesc="A movie player, compiled with vaapi support, without nonfree faac 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' 'speex' '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" "mplayer-vaapi=$pkgver" 'mplayer-vaapi-libre')
+conflicts=('mplayer' 'mplayer-vaapi' 'mplayer-vaapi-libre')
+replaces=('mplayer-vaapi' 'mplayer-vaapi-libre')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+source=(http://pkgbuild.com/~foutrelis/sources/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig}
+        cdio-includes.patch
+        tweak-desktop-file.patch
+        subreader-fix-srt-parsing.patch)
+options=('!buildflags' '!emptydirs')
+install=mplayer-vaapi.install
+sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a'
+            'SKIP'
+            '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
+            '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
+            '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3')
+
+
+prepare() {
+  cd "$srcdir/$_pkgname-$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 -Np0 -i "$srcdir/subreader-fix-srt-parsing.patch"
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-runtime-cpudetection \
+    --disable-gui \
+    --disable-arts \
+    --disable-gif \
+    --disable-liblzo \
+    --enable-speex \
+    --disable-cdparanoia \
+    --disable-openal \
+    --disable-libdv \
+    --disable-musepack \
+    --disable-esd \
+    --disable-mga \
+    --disable-ass-internal \
+    --disable-faac \
+    --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/$_pkgname-$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:
diff --git a/libre/mplayer-libre-vaapi/cdio-includes.patch b/libre/mplayer-libre-vaapi/cdio-includes.patch
new file mode 100644
index 000000000..894650717
--- /dev/null
+++ b/libre/mplayer-libre-vaapi/cdio-includes.patch
@@ -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>
diff --git a/libre/mplayer-libre-vaapi/mplayer-vaapi.install b/libre/mplayer-libre-vaapi/mplayer-vaapi.install
new file mode 100644
index 000000000..a44f19aef
--- /dev/null
+++ b/libre/mplayer-libre-vaapi/mplayer-vaapi.install
@@ -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:
diff --git a/libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch b/libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch
new file mode 100644
index 000000000..f1c087377
--- /dev/null
+++ b/libre/mplayer-libre-vaapi/subreader-fix-srt-parsing.patch
@@ -0,0 +1,40 @@
+Index: sub/subreader.c
+===================================================================
+--- sub/subreader.c	(revision 36284)
++++ sub/subreader.c	(revision 36285)
+@@ -378,14 +378,14 @@
+     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%*[,.:]%d --> %d:%d:%d%*[,.:]%d",
++                     &h1, &m1, &s1, &ms1, &h2, &m2, &s2, &ms2) < 8)
+             continue;
+ 
+         current->start = h1 * 360000 + m1 * 6000 + s1 * 100 + ms1 / 10;
+@@ -442,7 +442,7 @@
+ #endif
+     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%*[,.:]%d --> %d:%d:%d%*[,.:]%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;
+@@ -1123,7 +1123,7 @@
+ 		{*uses_time=1;return SUB_MPL2;}
+ 	if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",     &i, &i, &i, &i, &i, &i, &i, &i)==8)
+ 		{*uses_time=1;return SUB_SUBRIP;}
+-	if (sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d", &i, &i, &i, (char *)&i, &i, &i, &i, &i, (char *)&i, &i)==10)
++	if (sscanf (line, "%d:%d:%d%*[,.:]%d --> %d:%d:%d%*[,.:]%d", &i, &i, &i, &i, &i, &i, &i, &i)==8)
+ 		{*uses_time=1;return SUB_SUBVIEWER;}
+ 	if (sscanf (line, "{T %d:%d:%d:%d",&i, &i, &i, &i)==4)
+ 		{*uses_time=1;return SUB_SUBVIEWER2;}
diff --git a/libre/mplayer-libre-vaapi/tweak-desktop-file.patch b/libre/mplayer-libre-vaapi/tweak-desktop-file.patch
new file mode 100644
index 000000000..606e356b0
--- /dev/null
+++ b/libre/mplayer-libre-vaapi/tweak-desktop-file.patch
@@ -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;