From 9bce0f91d3855bf6768d8f66a03d3e81772c0bd3 Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@xtuple.com>
Date: Thu, 7 Aug 2014 12:27:22 -0400
Subject: [PATCH] extra/mplayer to 37224-2

---
 extra/mplayer/PKGBUILD | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/extra/mplayer/PKGBUILD b/extra/mplayer/PKGBUILD
index 8f0e23393..0f3a51abc 100644
--- a/extra/mplayer/PKGBUILD
+++ b/extra/mplayer/PKGBUILD
@@ -11,28 +11,28 @@
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
 pkgver=37224
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=(
   'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
   'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
-  'x264-dev' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
+  'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
   'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
   'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
-  'libcdio-paranoia' 'opus' 'subversion'
+  'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264'
 )
 license=('GPL')
 url='http://www.mplayerhq.hu/'
 options=('!buildflags' '!emptydirs')
 source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver
-        http://ffmpeg.org/releases/ffmpeg-2.2.3.tar.bz2
+        http://ffmpeg.org/releases/ffmpeg-2.2.5.tar.bz2
         mplayer.desktop
         cdio-includes.patch
         include-samba-4.0.patch
         giflib51.patch
         revert-icl-fixes.patch)
 md5sums=('SKIP'
-         'dbb5b6b69bd010916f17df0ae596e0b1'
+         'a91dbd963f0ed16bf0eacaba98439d00'
          '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
          '868a92bdef148df7f38bfa992b26ce9d'
@@ -46,7 +46,7 @@ pkgver() {
 
 prepare() {
   cd $pkgbase-$pkgver
-  mv ../ffmpeg-2.2.3 ./ffmpeg
+  mv ../ffmpeg-2.2.5 ./ffmpeg
 
   patch -p0 -i ../cdio-includes.patch
   patch -p1 -i ../include-samba-4.0.patch
@@ -89,7 +89,7 @@ package_mplayer() {
   backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
   depends=(
     'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
-    'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
+    'lirc-utils' 'libx264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
     'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
     'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
     'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
@@ -112,7 +112,7 @@ package_mplayer() {
 package_mencoder() {
   pkgdesc='Free command line video decoding, encoding and filtering tool'
   depends=(
-    'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
+    'enca' 'a52dec' 'libvpx' 'libx264' 'libmng' 'libdca' 'bzip2' 'lame'
     'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
     'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
     'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'