[arch-commits] Commit in mplayer/repos (3 files)

[Ionut Biru]

    Date: Saturday, January 16, 2010 @ 12:27:47
  Author: ibiru
Revision: 63226

Merged revisions 63225 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/mplayer/trunk

........
  r63225 | ibiru | 2010-01-16 19:27:07 +0200 (Sat, 16 Jan 2010) | 2 lines
  
  upgpkg: mplayer 30325-1
      update to the latest revision to fix playing rmvb video files
........

Modified:
  mplayer/repos/extra-i686/	(properties)
  mplayer/repos/extra-i686/PKGBUILD
Deleted:
  mplayer/repos/extra-i686/fix_building.patch

--------------------+
 PKGBUILD           |   18 +++++-------------
 fix_building.patch |   14 --------------
 2 files changed, 5 insertions(+), 27 deletions(-)


Property changes on: mplayer/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mplayer/trunk:1-62803
   + /mplayer/trunk:1-63225

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-01-16 17:27:07 UTC (rev 63225)
+++ extra-i686/PKGBUILD	2010-01-16 17:27:47 UTC (rev 63226)
@@ -2,7 +2,7 @@
 # Maintainer: Hugo Doria <hugo at archlinux.org>
 
 pkgname=mplayer
-pkgver=30286
+pkgver=30325
 pkgrel=1
 pkgdesc="A movie player for linux"
 arch=('i686' 'x86_64')
@@ -13,26 +13,18 @@
 	 'enca' 'libvdpau>=0.3' 'opencore-amr' 'a52dec' 'libdca')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
-makedepends=('unzip' 'mesa' 'live-media>=2010.01.11')
+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 liba52_gcc_bug.patch
-	mplayer.desktop mplayer.png fix_building.patch )
-md5sums=('bbfbe6651c09324756322f7ff7b23dbe'
-         'ac53c73dd6f69d91ab0ea0591df4a653'
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mplayer.desktop mplayer.png)
+md5sums=('f325e67b25b784f2e61983b32318aa9c'
          'f91b1be03ed301cc15142f49455c1b88'
-         'd00874ccc644b7f43d6ef1c942fcef28'
-         '294c9c6af43c0453da7dd8de1a188f8a')
+         'd00874ccc644b7f43d6ef1c942fcef28')
 
 build() {
   # Custom CFLAGS break the mplayer build
   unset CFLAGS LDFLAGS
 
-  # Needed to compile using gcc 4.4.0
-#  patch -p0 < ${srcdir}/liba52_gcc_bug.patch || return 1 
-
   cd ${srcdir}/${pkgname}
-  #bad revision
-  patch -p0 < ${srcdir}/fix_building.patch || return 1
 
   ./configure --prefix=/usr \
   	--enable-runtime-cpudetection \

Deleted: extra-i686/fix_building.patch
===================================================================
--- extra-i686/fix_building.patch	2010-01-16 17:27:07 UTC (rev 63225)
+++ extra-i686/fix_building.patch	2010-01-16 17:27:47 UTC (rev 63226)
@@ -1,14 +0,0 @@
---- libavformat/network.h	(revision 21153)
-+++ libavformat/network.h	(working copy)
-@@ -23,6 +23,10 @@
- 
- #include "config.h"
- 
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
-+#define HAVE_STRUCT_ADDRINFO 1
-+#define HAVE_GETADDRINFO 1
-+
- #if HAVE_WINSOCK2_H
- #include <winsock2.h>
- #include <ws2tcpip.h>
-