From dd9a0f88c5b954676dfb2d768d26bbfac0c2be69 Mon Sep 17 00:00:00 2001
From: Aldas Nabazas <aldas@opensde.net>
Date: Wed, 27 Aug 2008 21:37:55 +0200
Subject: [PATCH] mplayer: Updated (1.0rc2 -> 1.0-2008-08-26)

---
 multimedia/mplayer/mplayer.desc           |  6 ++--
 multimedia/mplayer/ppc64.patch            | 40 -----------------------
 multimedia/mplayer/vf-crop-relative.patch |  3 +-
 3 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 multimedia/mplayer/ppc64.patch

diff --git a/multimedia/mplayer/mplayer.desc b/multimedia/mplayer/mplayer.desc
index a7d7c7450..8a3d4f364 100644
--- a/multimedia/mplayer/mplayer.desc
+++ b/multimedia/mplayer/mplayer.desc
@@ -1,4 +1,3 @@
-
 [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
@@ -33,9 +32,10 @@
 
 [L] GPL
 [S] Beta
-[V] 1.0rc2
+[V] 1.0-2008-08-26
 [P] X -----5---9 179.600
 
-[D] 38036116 MPlayer-1.0rc2.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
+[D] X mplayer-1.0-2008-08-26.tar.bz2 svn://svn.mplayerhq.hu/mplayer/trunk mplayer -r {2008-08-26}
+#[D] 38036116 MPlayer-1.0rc2.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/
 [D] 319348111 Blue-1.7.tar.bz2 http://www.mplayerhq.hu/MPlayer/Skin/
 [D] 1728761670 font-arial-iso-8859-1.tar.bz2 http://www.mplayerhq.hu/MPlayer/releases/fonts/
diff --git a/multimedia/mplayer/ppc64.patch b/multimedia/mplayer/ppc64.patch
deleted file mode 100644
index 958032b30..000000000
--- a/multimedia/mplayer/ppc64.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../mplayer/ppc64.patch
-# Copyright (C) 2008 The OpenSDE Project
-# Copyright (C) 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-Allow compilation for PPC target when using a toolchain defined as ppc64 or
-powerpc64.
-
---- MPlayer-1.0rc2/configure.orig	2007-10-07 22:49:33.000000000 +0300
-+++ MPlayer-1.0rc2/configure	2008-01-06 20:22:36.000000000 +0200
-@@ -139,7 +139,7 @@
- 
- ppc() {
-   case "$host_arch" in
--    ppc|powerpc) return 0;;
-+    ppc|powerpc|ppc64|powerpc64) return 0;;
-     *) return 1;;
-   esac
- }
-@@ -2014,7 +2014,7 @@
-     _optimizing=''
-     ;;
- 
--  ppc|powerpc)
-+  ppc|powerpc|ppc64|powerpc64)
-     _arch='POWERPC PPC'
-     _def_dcbzl='#define NO_DCBZL 1'
-     _target_arch='ARCH_POWERPC = yes'
diff --git a/multimedia/mplayer/vf-crop-relative.patch b/multimedia/mplayer/vf-crop-relative.patch
index 9c6ac0c52..b0f5403ad 100644
--- a/multimedia/mplayer/vf-crop-relative.patch
+++ b/multimedia/mplayer/vf-crop-relative.patch
@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../mplayer/vf-crop-relative.patch
+# Copyright (C) 2008 The OpenSDE Project
 # Copyright (C) 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -54,7 +55,7 @@ Allow relative cuts using negative values, e.g. crop="20:82:-20:-82".
 @@ -166,10 +173,10 @@
  
  #define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f)
- static m_option_t vf_opts_fields[] = {
+ static const m_option_t vf_opts_fields[] = {
 -  {"w", ST_OFF(crop_w), CONF_TYPE_INT, M_OPT_MIN,0 ,0, NULL},
 -  {"h", ST_OFF(crop_h), CONF_TYPE_INT, M_OPT_MIN,0 ,0, NULL},
 -  {"x", ST_OFF(crop_x), CONF_TYPE_INT, M_OPT_MIN,-1 ,0, NULL},