From 5e1bf6d96c6812fa9f96b0f7a61ed4268e82aee2 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@kiwwwi.com.ar>
Date: Sat, 29 Jan 2011 17:58:40 -0300
Subject: mplayer-vaapi-libre-32825-1

---
 libre/mplayer-vaapi-libre/PKGBUILD          | 20 +++++++-------------
 libre/mplayer-vaapi-libre/patch-fixes.patch | 26 --------------------------
 2 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 libre/mplayer-vaapi-libre/patch-fixes.patch

(limited to 'libre/mplayer-vaapi-libre')

diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 0cc1756df..82b38d6a8 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=mplayer-vaapi-libre
-pkgver=32669
-_vaapi_version=20101115
+pkgver=32825
+_vaapi_version=20110127
 pkgrel=1
 pkgdesc="A movie player, compiled with vaapi support, without faac dependency, added speex support"
 arch=('i686' 'x86_64')
@@ -25,13 +25,7 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz
         http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2
         mplayer.desktop
-        mplayer.png
-        patch-fixes.patch)
-md5sums=('6da7103785e69ac25163e9570185c8b4'
-         '372ba02746404d3fa2b3aa94657a2efd'
-         '647b9f4ab5284a7fef3f84f992214e77'
-         'd00874ccc644b7f43d6ef1c942fcef28'
-         'cbddc2d8b1140e274a2784bdbb1f9b04')
+        mplayer.png)
 
 build() {
   cd "$srcdir/mplayer-$pkgver"
@@ -39,10 +33,6 @@ build() {
   # Custom CFLAGS break the mplayer build
   unset CFLAGS LDFLAGS
 
-  # Update vaapi patches for changes introduced in mplayer
-  patch -d "$srcdir/mplayer-vaapi-$_vaapi_version" -p1 -i \
-    "$srcdir/patch-fixes.patch"
-
   for patch in mplayer-{vaapi{,-{gma500-workaround,0.29}},vdpau}; do
     patch -Np1 -i "$srcdir/mplayer-vaapi-$_vaapi_version/patches/$patch.patch"
   done
@@ -79,3 +69,7 @@ build() {
 }
 
 # vim:set ts=2 sw=2 et:
+md5sums=('997a869feaa2fa3376407ee344fa280e'
+         'b39bd73ae8241dcb21dd1a8fa5eb87eb'
+         '647b9f4ab5284a7fef3f84f992214e77'
+         'd00874ccc644b7f43d6ef1c942fcef28')
diff --git a/libre/mplayer-vaapi-libre/patch-fixes.patch b/libre/mplayer-vaapi-libre/patch-fixes.patch
deleted file mode 100644
index 99df9e267..000000000
--- a/libre/mplayer-vaapi-libre/patch-fixes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -upr mplayer-vaapi-20101115.orig/patches/mplayer-vaapi.patch mplayer-vaapi-20101115/patches/mplayer-vaapi.patch
---- mplayer-vaapi-20101115.orig/patches/mplayer-vaapi.patch	2010-11-15 11:14:06.000000000 +0200
-+++ mplayer-vaapi-20101115/patches/mplayer-vaapi.patch	2010-11-18 05:14:41.000000000 +0200
-@@ -3688,10 +3688,10 @@ index 0000000..f920d91
- +    enable_osd();
- +}
- +
--+static void draw_eosd(EOSD_ImageList *imgs)
-++static void draw_eosd(struct mp_eosd_image_list *imgs)
- +{
--+    ASS_Image *img = imgs->imgs;
--+    ASS_Image *i;
-++    struct mp_eosd_image_list *img = eosd_image_first(imgs);
-++    struct mp_eosd_image *i;
- +    VAStatus status;
- +
- +    if (!va_eosd_draw_alpha)
-@@ -3717,7 +3717,7 @@ index 0000000..f920d91
- +
- +    memset(va_eosd_image_data, 0, va_eosd_image.data_size);
- +
--+    for (i = img; i; i = i->next)
-++    for (i = img; i; i = eosd_image_next(imgs))
- +        va_eosd_draw_alpha(i->bitmap, i->w, i->h, i->stride,
- +                           i->dst_x, i->dst_y, i->color);
- +
-- 
cgit v1.2.3-54-g00ecf