From 6477c16298d734a8fb1f6ca759ccacc6e8904501 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 5 May 2009 11:40:08 +0000
Subject: [PATCH] make FLAVOR=DEBUG work better (the upstream configure script
 adds -O2 with DEBUG so that SSE can build; only -O1 is actually needed
 though, and is cleaner in GDB. -O0 builds fail with SSE; disabling SSE is not
 helpful for debugging real problems).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

from Valery Masiutsin with feedback from myself and Björn Sandell
(maintainer, who is ok with the diff).
---
 x11/mplayer/Makefile                |  4 ++--
 x11/mplayer/patches/patch-configure | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile
index 63f4394953b..5b1222ef425 100644
--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.149 2009/04/15 09:54:45 kili Exp $
+# $OpenBSD: Makefile,v 1.150 2009/05/05 11:40:08 sthen Exp $
 
 # May not be hard to add more.
 ONLY_FOR_ARCHS=		amd64 i386 powerpc sparc64 arm
@@ -9,7 +9,7 @@ V=			1.0rc2
 N=			mplayer
 DISTNAME=		MPlayer-${V}
 DIST_SUBDIR=		${N}
-PKGNAME=		${N}-${V}p23
+PKGNAME=		${N}-${V}p24
 CATEGORIES=		x11 multimedia
 EXTRACT_SUFX=		.tar.bz2
 
diff --git a/x11/mplayer/patches/patch-configure b/x11/mplayer/patches/patch-configure
index 875a7d869b4..a3eb024fa03 100644
--- a/x11/mplayer/patches/patch-configure
+++ b/x11/mplayer/patches/patch-configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.50 2009/02/08 20:25:09 naddy Exp $
---- configure.orig	Sun Oct  7 21:49:33 2007
-+++ configure	Sun Feb  8 19:48:58 2009
+$OpenBSD: patch-configure,v 1.51 2009/05/05 11:40:08 sthen Exp $
+--- configure.orig	Sun Oct  7 22:49:33 2007
++++ configure	Sun Apr 19 13:55:04 2009
 @@ -76,7 +76,7 @@ cc_check() {
  }
  
@@ -53,6 +53,15 @@ $OpenBSD: patch-configure,v 1.50 2009/02/08 20:25:09 naddy Exp $
    for ext in $pparam ; do
      eval test \"\$_$ext\" = auto 2>/dev/null && eval _$ext=kernel_check
    done
+@@ -2323,7 +2329,7 @@ fi # if darwin && test "$cc_vendor" = "gnu" ; then
+ # Checking for CFLAGS
+ _install_strip="-s"
+ if test "$_profile" != "" || test "$_debug" != "" ; then
+-  CFLAGS="-W -Wall -O2 $_march $_mcpu $_pipe $_debug $_profile"
++  CFLAGS="-W -Wall -O1 $_march $_mcpu $_pipe $_debug $_profile"
+   _install_strip=
+ elif test -z "$CFLAGS" ; then
+   if test "$cc_vendor" = "intel" ; then
 @@ -3065,7 +3071,7 @@ int main(void) { pthread_t tid; return pthread_create 
  EOF
  _pthreads=no