Date: Friday, February 5, 2010 @ 19:28:59 Author: ibiru Revision: 67285
Merged revisions 67284 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mplayer/trunk ........ r67284 | ibiru | 2010-02-06 02:28:23 +0200 (Sat, 06 Feb 2010) | 2 lines upgpkg: mplayer 30519-1 bump to new revision ........ Modified: mplayer/repos/extra-i686/ (properties) mplayer/repos/extra-i686/PKGBUILD Deleted: mplayer/repos/extra-i686/liba52_gcc_bug.patch ----------------------+ PKGBUILD | 11 ++++++----- liba52_gcc_bug.patch | 10 ---------- 2 files changed, 6 insertions(+), 15 deletions(-) Property changes on: mplayer/repos/extra-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /mplayer/trunk:1-63430 + /mplayer/trunk:1-67284 Modified: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2010-02-06 00:28:23 UTC (rev 67284) +++ extra-i686/PKGBUILD 2010-02-06 00:28:59 UTC (rev 67285) @@ -1,22 +1,23 @@ # $Id$ -# Maintainer: Hugo Doria <h...@archlinux.org> +# Maintainer : Ionut Biru <io...@archlinux.ro> +# Contributor: Hugo Doria <h...@archlinux.org> pkgname=mplayer -pkgver=30325 -pkgrel=2 +pkgver=30519 +pkgrel=1 pkgdesc="A movie player for linux" arch=('i686' 'x86_64') depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit' 'libcaca' 'x264>=20100107' 'faac' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'libjpeg>=8' - 'enca' 'libvdpau>=0.3' 'opencore-amr' 'a52dec' 'libdca') + 'enca' 'libvdpau>=0.4' 'opencore-amr' 'a52dec' 'libdca') license=('GPL') url="http://www.mplayerhq.hu/" makedepends=('unzip' 'mesa' 'live-media>=2010.01.13') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mplayer.desktop mplayer.png) -md5sums=('f325e67b25b784f2e61983b32318aa9c' +md5sums=('86c675752225118e2c156960378fc64b' 'f91b1be03ed301cc15142f49455c1b88' 'd00874ccc644b7f43d6ef1c942fcef28') Deleted: extra-i686/liba52_gcc_bug.patch =================================================================== --- extra-i686/liba52_gcc_bug.patch 2010-02-06 00:28:23 UTC (rev 67284) +++ extra-i686/liba52_gcc_bug.patch 2010-02-06 00:28:59 UTC (rev 67285) @@ -1,10 +0,0 @@ ---- mplayer/configure.old 2009-04-16 12:02:10.000000000 +0200 -+++ mplayer/configure 2009-05-22 15:23:38.000000000 +0200 -@@ -6410,6 +6410,7 @@ - def_liba52='#undef CONFIG_LIBA52' - def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL" - if test "$_liba52_internal" = yes ; then -+ test "$cc_vendor" = gnu && test "$cc_version" = 4.4.0 && CFLAGS=$(echo $CFLAGS|sed "s/ *-O4 */ -O2 /") - _liba52=yes - def_liba52_internal="#define CONFIG_LIBA52_INTERNAL 1" - _res_comment="internal"