[arch-commits] Commit in mplayer2/repos (8 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Thu Feb 7 17:38:46 UTC 2013
Date: Thursday, February 7, 2013 @ 18:38:46
Author: bpiotrowski
Revision: 83968
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
mplayer2/repos/community-staging-i686/
mplayer2/repos/community-staging-i686/PKGBUILD
(from rev 83967, mplayer2/trunk/PKGBUILD)
mplayer2/repos/community-staging-i686/cdio-api-fixes.patch
(from rev 83967, mplayer2/trunk/cdio-api-fixes.patch)
mplayer2/repos/community-staging-i686/mplayer2.install
(from rev 83967, mplayer2/trunk/mplayer2.install)
mplayer2/repos/community-staging-x86_64/
mplayer2/repos/community-staging-x86_64/PKGBUILD
(from rev 83967, mplayer2/trunk/PKGBUILD)
mplayer2/repos/community-staging-x86_64/cdio-api-fixes.patch
(from rev 83967, mplayer2/trunk/cdio-api-fixes.patch)
mplayer2/repos/community-staging-x86_64/mplayer2.install
(from rev 83967, mplayer2/trunk/mplayer2.install)
-----------------------------------------------+
community-staging-i686/PKGBUILD | 57 ++++++++++++++++++++++++
community-staging-i686/cdio-api-fixes.patch | 50 +++++++++++++++++++++
community-staging-i686/mplayer2.install | 11 ++++
community-staging-x86_64/PKGBUILD | 57 ++++++++++++++++++++++++
community-staging-x86_64/cdio-api-fixes.patch | 50 +++++++++++++++++++++
community-staging-x86_64/mplayer2.install | 11 ++++
6 files changed, 236 insertions(+)
Copied: mplayer2/repos/community-staging-i686/PKGBUILD (from rev 83967, mplayer2/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-02-07 17:38:46 UTC (rev 83968)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Martin Panter <vadmium+aur at gmail.com>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=mplayer2
+pkgver=20121128
+pkgrel=3
+pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project'
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.mplayer2.org/"
+install=$pkgname.install
+depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig'
+ 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss'
+ 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
+ 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+makedepends=('mesa' 'unzip' 'yasm' 'python' 'python-docutils')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+provides=('mplayer')
+conflicts=('mplayer')
+options=(!emptydirs)
+source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
+ cdio-api-fixes.patch)
+md5sums=('696adb2503b2202fe39de6c98b573cd6'
+ '5ff5fa9d0fd50239ed3a1756b31e6a9d')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
+ find -type f -exec sed -e 's/python3/python/' -i {} \;
+
+ patch -Np1 -i $srcdir/cdio-api-fixes.patch
+
+ ./configure --prefix=/usr --confdir=/etc/mplayer \
+ --enable-translation --language=all \
+ --enable-runtime-cpudetection \
+ --enable-joystick \
+ --disable-speex \
+ --disable-openal \
+ --disable-libdv \
+ --disable-musepack
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/
+ install -dm755 $pkgdir/usr/share/mplayer/
+ ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf
+
+ install -dm755 $pkgdir/usr/share/applications/
+ install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/
+}
Copied: mplayer2/repos/community-staging-i686/cdio-api-fixes.patch (from rev 83967, mplayer2/trunk/cdio-api-fixes.patch)
===================================================================
--- community-staging-i686/cdio-api-fixes.patch (rev 0)
+++ community-staging-i686/cdio-api-fixes.patch 2013-02-07 17:38:46 UTC (rev 83968)
@@ -0,0 +1,50 @@
+diff -upr mplayer2-20121128.orig/stream/stream_cdda.c mplayer2-20121128/stream/stream_cdda.c
+--- mplayer2-20121128.orig/stream/stream_cdda.c 2013-01-10 19:37:31.000000000 +0200
++++ mplayer2-20121128/stream/stream_cdda.c 2013-01-10 20:23:25.000000000 +0200
+@@ -17,8 +17,8 @@
+ */
+
+ #include "config.h"
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #include <cdio/cdio.h>
+
+ #include <stdio.h>
+@@ -116,25 +116,25 @@ const m_option_t cdda_opts[] = {
+ };
+
+ static const char *cdtext_name[] = {
+- [CDTEXT_ARRANGER] = "Arranger",
+- [CDTEXT_COMPOSER] = "Composer",
+- [CDTEXT_MESSAGE] = "Message",
+- [CDTEXT_ISRC] = "ISRC",
+- [CDTEXT_PERFORMER] = "Performer",
+- [CDTEXT_SONGWRITER] = "Songwriter",
+- [CDTEXT_TITLE] = "Title",
+- [CDTEXT_UPC_EAN] = "UPC_EAN",
++ [CDTEXT_FIELD_ARRANGER] = "Arranger",
++ [CDTEXT_FIELD_COMPOSER] = "Composer",
++ [CDTEXT_FIELD_MESSAGE] = "Message",
++ [CDTEXT_FIELD_ISRC] = "ISRC",
++ [CDTEXT_FIELD_PERFORMER] = "Performer",
++ [CDTEXT_FIELD_SONGWRITER] = "Songwriter",
++ [CDTEXT_FIELD_TITLE] = "Title",
++ [CDTEXT_FIELD_UPC_EAN] = "UPC_EAN",
+ };
+
+ static bool print_cdtext(stream_t *s, int track)
+ {
+ cdda_priv* p = (cdda_priv*)s->priv;
+- cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track);
++ cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio);
+ if (text) {
+ mp_msg(MSGT_SEEK, MSGL_INFO, "CD-Text (%s):\n", track ? "track" : "CD");
+ for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) {
+ const char *name = cdtext_name[i];
+- const char *value = cdtext_get_const(i, text);
++ const char *value = cdtext_get_const(text, i, track);
+ if (name && value)
+ mp_msg(MSGT_SEEK, MSGL_INFO, " %s: '%s'\n", name, value);
+ }
Copied: mplayer2/repos/community-staging-i686/mplayer2.install (from rev 83967, mplayer2/trunk/mplayer2.install)
===================================================================
--- community-staging-i686/mplayer2.install (rev 0)
+++ community-staging-i686/mplayer2.install 2013-02-07 17:38:46 UTC (rev 83968)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: mplayer2/repos/community-staging-x86_64/PKGBUILD (from rev 83967, mplayer2/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-02-07 17:38:46 UTC (rev 83968)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Martin Panter <vadmium+aur at gmail.com>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=mplayer2
+pkgver=20121128
+pkgrel=3
+pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project'
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.mplayer2.org/"
+install=$pkgname.install
+depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig'
+ 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss'
+ 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
+ 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
+makedepends=('mesa' 'unzip' 'yasm' 'python' 'python-docutils')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+provides=('mplayer')
+conflicts=('mplayer')
+options=(!emptydirs)
+source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
+ cdio-api-fixes.patch)
+md5sums=('696adb2503b2202fe39de6c98b573cd6'
+ '5ff5fa9d0fd50239ed3a1756b31e6a9d')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
+ find -type f -exec sed -e 's/python3/python/' -i {} \;
+
+ patch -Np1 -i $srcdir/cdio-api-fixes.patch
+
+ ./configure --prefix=/usr --confdir=/etc/mplayer \
+ --enable-translation --language=all \
+ --enable-runtime-cpudetection \
+ --enable-joystick \
+ --disable-speex \
+ --disable-openal \
+ --disable-libdv \
+ --disable-musepack
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/
+ install -dm755 $pkgdir/usr/share/mplayer/
+ ln -s /usr/share/fonts/TTF/DejaVuSans.ttf $pkgdir/usr/share/mplayer/subfont.ttf
+
+ install -dm755 $pkgdir/usr/share/applications/
+ install -m 644 etc/mplayer.desktop $pkgdir/usr/share/applications/
+}
Copied: mplayer2/repos/community-staging-x86_64/cdio-api-fixes.patch (from rev 83967, mplayer2/trunk/cdio-api-fixes.patch)
===================================================================
--- community-staging-x86_64/cdio-api-fixes.patch (rev 0)
+++ community-staging-x86_64/cdio-api-fixes.patch 2013-02-07 17:38:46 UTC (rev 83968)
@@ -0,0 +1,50 @@
+diff -upr mplayer2-20121128.orig/stream/stream_cdda.c mplayer2-20121128/stream/stream_cdda.c
+--- mplayer2-20121128.orig/stream/stream_cdda.c 2013-01-10 19:37:31.000000000 +0200
++++ mplayer2-20121128/stream/stream_cdda.c 2013-01-10 20:23:25.000000000 +0200
+@@ -17,8 +17,8 @@
+ */
+
+ #include "config.h"
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #include <cdio/cdio.h>
+
+ #include <stdio.h>
+@@ -116,25 +116,25 @@ const m_option_t cdda_opts[] = {
+ };
+
+ static const char *cdtext_name[] = {
+- [CDTEXT_ARRANGER] = "Arranger",
+- [CDTEXT_COMPOSER] = "Composer",
+- [CDTEXT_MESSAGE] = "Message",
+- [CDTEXT_ISRC] = "ISRC",
+- [CDTEXT_PERFORMER] = "Performer",
+- [CDTEXT_SONGWRITER] = "Songwriter",
+- [CDTEXT_TITLE] = "Title",
+- [CDTEXT_UPC_EAN] = "UPC_EAN",
++ [CDTEXT_FIELD_ARRANGER] = "Arranger",
++ [CDTEXT_FIELD_COMPOSER] = "Composer",
++ [CDTEXT_FIELD_MESSAGE] = "Message",
++ [CDTEXT_FIELD_ISRC] = "ISRC",
++ [CDTEXT_FIELD_PERFORMER] = "Performer",
++ [CDTEXT_FIELD_SONGWRITER] = "Songwriter",
++ [CDTEXT_FIELD_TITLE] = "Title",
++ [CDTEXT_FIELD_UPC_EAN] = "UPC_EAN",
+ };
+
+ static bool print_cdtext(stream_t *s, int track)
+ {
+ cdda_priv* p = (cdda_priv*)s->priv;
+- cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track);
++ cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio);
+ if (text) {
+ mp_msg(MSGT_SEEK, MSGL_INFO, "CD-Text (%s):\n", track ? "track" : "CD");
+ for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) {
+ const char *name = cdtext_name[i];
+- const char *value = cdtext_get_const(i, text);
++ const char *value = cdtext_get_const(text, i, track);
+ if (name && value)
+ mp_msg(MSGT_SEEK, MSGL_INFO, " %s: '%s'\n", name, value);
+ }
Copied: mplayer2/repos/community-staging-x86_64/mplayer2.install (from rev 83967, mplayer2/trunk/mplayer2.install)
===================================================================
--- community-staging-x86_64/mplayer2.install (rev 0)
+++ community-staging-x86_64/mplayer2.install 2013-02-07 17:38:46 UTC (rev 83968)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list