[arch-commits] Commit in mplayer/trunk (PKGBUILD fix_building.patch)

Ionut Biru ibiru at archlinux.org
Tue Jan 12 13:17:19 UTC 2010


    Date: Tuesday, January 12, 2010 @ 08:17:19
  Author: ibiru
Revision: 62795

upgpkg: mplayer 30286-1
    update to the latest revision, added vdpau, opencore-amr, xvmc and enca support, fixed live-media and added .desktop for file association. Closing FS#16736,15936,15744,151407,14770,13265,11277

Added:
  mplayer/trunk/fix_building.patch
Modified:
  mplayer/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   47 +++++++++++++++++++++++++++++++++++------------
 fix_building.patch |   14 ++++++++++++++
 2 files changed, 49 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-12 13:16:53 UTC (rev 62794)
+++ PKGBUILD	2010-01-12 13:17:19 UTC (rev 62795)
@@ -2,34 +2,54 @@
 # Maintainer: Hugo Doria <hugo at archlinux.org>
 
 pkgname=mplayer
-pkgver=29776
+pkgver=30286
 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' 'live-media'
+         'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss'
          'libgl' 'smbclient' 'aalib' 'jack-audio-connection-kit' 'libcaca'
-         'x264>=20090416' 'faac' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'libjpeg>=7')
+         'x264>=20100107' 'faac' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'libjpeg>=7'
+	 'enca' 'libvdpau>=0.3' 'opencore-amr' 'a52dec' 'libdca')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
-makedepends=('unzip' 'live-media' 'libdca' 'mesa')
+makedepends=('unzip' 'mesa' 'live-media>=2010.01.11')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2 liba52_gcc_bug.patch)
-md5sums=('3d78ec46b011da9866b4e6cffd092bc0' 'ac53c73dd6f69d91ab0ea0591df4a653')
+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'
+         'f91b1be03ed301cc15142f49455c1b88'
+         'd00874ccc644b7f43d6ef1c942fcef28'
+         '294c9c6af43c0453da7dd8de1a188f8a')
 
 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 
+  # 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 --disable-gui --disable-arts \
-      --confdir=/etc/mplayer --disable-liblzo --disable-speex \
-      --disable-openal --disable-fribidi --disable-libdv --disable-musepack \
-      --language=all --disable-esd --disable-mga --extra-cflags=-fno-strict-aliasing || return 1
+  ./configure --prefix=/usr \
+  	--enable-runtime-cpudetection \
+	--disable-gui \
+	--disable-arts \
+	--disable-liblzo \
+	--disable-speex \
+      	--disable-openal \
+	--disable-fribidi \
+	--disable-libdv \
+	--disable-musepack \
+	--disable-esd \
+	--disable-mga \
+	--enable-xvmc \
+	--language=all \
+      	--confdir=/etc/mplayer \
+	--extra-cflags="-fno-strict-aliasing" || return 1
 
   [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
@@ -39,4 +59,7 @@
   install -dm755 ${pkgdir}/usr/share/mplayer/
   ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf || return 1
   rm -rf ${pkgdir}/usr/share/mplayer/font
+  #desktop file  FS#14770
+  install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop || return 1
+  install -Dm644 ${srcdir}/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png || return 1
 }

Added: fix_building.patch
===================================================================
--- fix_building.patch	                        (rev 0)
+++ fix_building.patch	2010-01-12 13:17:19 UTC (rev 62795)
@@ -0,0 +1,14 @@
+--- 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>
+




More information about the arch-commits mailing list