diff options
Diffstat (limited to 'community/mplayer2')
| -rw-r--r-- | community/mplayer2/PKGBUILD | 24 | ||||
| -rw-r--r-- | community/mplayer2/cdio-api-fixes.patch | 50 |
2 files changed, 11 insertions, 63 deletions
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index f76002d37..04ae93478 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 84357 2013-02-16 22:50:35Z ioni $ +# $Id: PKGBUILD 84620 2013-02-20 18:43:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 -pkgver=20121128 -pkgrel=3 +pkgver=20130126 +pkgrel=1 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') +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') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('53faf18a1bedb76e980255410b56e59ea4cd5f69984832fc5e942e15dc89622b') build() { cd $srcdir/$pkgname-$pkgver @@ -31,8 +31,6 @@ build() { 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 \ diff --git a/community/mplayer2/cdio-api-fixes.patch b/community/mplayer2/cdio-api-fixes.patch deleted file mode 100644 index eeb9f0589..000000000 --- a/community/mplayer2/cdio-api-fixes.patch +++ /dev/null @@ -1,50 +0,0 @@ -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); - } |