From 093049d8da39aa4f0224a8e761f1ec6e8ebebc3a Mon Sep 17 00:00:00 2001
From: biorn <biorn@openbsd.org>
Date: Fri, 13 May 2005 16:14:00 +0000
Subject: [PATCH] unbreak aa FLAVOR. Found and tested by Matthias Kilian

---
 x11/mplayer/patches/patch-configure | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/x11/mplayer/patches/patch-configure b/x11/mplayer/patches/patch-configure
index 6b4adc11aeb..ba3ed3cfb25 100644
--- a/x11/mplayer/patches/patch-configure
+++ b/x11/mplayer/patches/patch-configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.33 2005/05/09 12:24:38 biorn Exp $
+$OpenBSD: patch-configure,v 1.34 2005/05/13 16:14:00 biorn Exp $
 --- configure.orig	Wed Apr 13 13:46:35 2005
-+++ configure	Wed Apr 20 06:35:54 2005
++++ configure	Thu May 12 08:57:20 2005
 @@ -475,6 +475,9 @@ if test -z "$_target" ; then
          if [ "`$_cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
               -z "`echo $CFLAGS | grep -- -m32`"  ]; then
@@ -36,7 +36,16 @@ $OpenBSD: patch-configure,v 1.33 2005/05/09 12:24:38 biorn Exp $
    _iconv_tmp='#include <iconv.h>'
  
    cat > $TMPC << EOF
-@@ -4730,7 +4738,7 @@ echores "$_sgiaudio"
+@@ -3789,6 +3797,8 @@ if test "$_aa" = yes ; then
+   _def_aa='#define HAVE_AA 1'
+   if cygwin ; then
+     _ld_aa=`aalib-config --libs | cut -d " " -f 2,5,6`
++  else
++    _ld_aa="-laa"
+   fi
+   _vosrc="$_vosrc vo_aa.c"
+   _vomodules="aa $_vomodules"
+@@ -4730,7 +4740,7 @@ echores "$_sgiaudio"
  
  
  echocheck "VCD support"
@@ -45,7 +54,7 @@ $OpenBSD: patch-configure,v 1.33 2005/05/09 12:24:38 biorn Exp $
    _inputmodules="vcd $_inputmodules"
    _def_vcd='#define HAVE_VCD 1'
    echores "ok"
-@@ -6775,7 +6783,7 @@ CACA_LIB = $_ld_caca
+@@ -6775,7 +6785,7 @@ CACA_LIB = $_ld_caca
  # audio output
  ALSA_LIB = $_ld_alsa
  NAS_LIB = $_ld_nas
@@ -54,7 +63,7 @@ $OpenBSD: patch-configure,v 1.33 2005/05/09 12:24:38 biorn Exp $
  ARTS_INC = $_inc_arts
  ESD_LIB = $_ld_esd
  ESD_INC = $_inc_esd
-@@ -7041,7 +7049,7 @@ $_def_malloc
+@@ -7041,7 +7051,7 @@ $_def_malloc
  $_def_memalign
  #ifndef HAVE_MEMALIGN
  # define memalign(a,b) malloc(b)