archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-17 23:34:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

community/mplayer2 to 20121128-2

Browse source
This commit is contained in:
Kevin Mihelich 2013-01-15 14:01:02 +00:00
parent ed2ec414ff
commit 86ea60d916
2 changed files with 58 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
community/mplayer2/PKGBUILD
View file

@ -8,14 +8,14 @@
pkgname=mplayer2
pkgver=20121128
pkgrel=1
pkgrel=2
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' 'libdca' 'libdvdcss'
'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')
@ -23,8 +23,10 @@ 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)
md5sums=('696adb2503b2202fe39de6c98b573cd6')
source=(ftp://mirrors.kernel.org/archlinux/other/community/$pkgname/$pkgname-$pkgver.tar.xz
cdio-api-fixes.patch)
md5sums=('696adb2503b2202fe39de6c98b573cd6'
'5ff5fa9d0fd50239ed3a1756b31e6a9d')
build() {
cd $srcdir/$pkgname-$pkgver
@ -32,6 +34,8 @@ 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-joystick \

50
community/mplayer2/cdio-api-fixes.patch Normal file
View file

@ -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);
}