From b25b225297f8c8106d53d3b1e43cadf648979b17 Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Thu, 6 Sep 2007 18:31:00 +0000
Subject: If the *mplayer* packages are going to default to setting cflags to
 target a pentium pro if mplayer-runtime-cpudetection is enabled then at least
 put it under an option so it can be turned off:

	mplayer-default-cflags

For example, all of my machines are p3 or better, so I prefer to
use "-march=pentium3 -mfpmath=sse -msse2", but I still want
mplayer-runtime-cpudetection to handle amd64 / Intel core at runtime.
---
 multimedia/mplayer-share/Makefile.cflags | 14 ++++++--------
 multimedia/mplayer-share/options.mk      |  6 +++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/multimedia/mplayer-share/Makefile.cflags b/multimedia/mplayer-share/Makefile.cflags
index e417fc8dd62..f26821e55d2 100644
--- a/multimedia/mplayer-share/Makefile.cflags
+++ b/multimedia/mplayer-share/Makefile.cflags
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile.cflags,v 1.3 2006/06/27 21:51:21 wiz Exp $
+# $NetBSD: Makefile.cflags,v 1.4 2007/09/06 18:31:00 abs Exp $
 
 # This must be included after everything else to truly clear ${CFLAGS}
 # in the non-runtime-cpu-detection case. If ${CFLAGS} is non-empty, the
 # configure script refuses to add any optimizations at all.
 
-.if !empty(PKG_OPTIONS:Mmplayer-runtime-cpudetection)
+.if !empty(PKG_OPTIONS:Mmplayer-default-cflags)
 .  if ${MACHINE_ARCH} == i386
 # Schedule for the typical machine fast enough to run mplayer. This
-# is nearly optimal for K6-2 as well. Anything slowler will still run
+# is nearly optimal for K6-2 as well. Anything slower will still run
 # (but would probably benefit greatly from turning off the run-time
 # cpu detection).
 
 .    include "../../mk/compiler.mk"
 
 .    if !empty(CC_VERSION:Mgcc-4*)
-CFLAGS=		-O3 -ffast-math -fomit-frame-pointer -mtune=pentiumpro
+CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer -mtune=pentiumpro
 .    else
-CFLAGS=		-O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro
+CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer -mcpu=pentiumpro
 .    endif
 .  else
-CFLAGS=		-O3 -ffast-math -fomit-frame-pointer
+CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
 .  endif
-.else
-CFLAGS=		# Let "configure" do its thing.
 .endif
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index 58465d7ba13..6008ff71727 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2007/07/11 20:39:38 tron Exp $
+# $NetBSD: options.mk,v 1.22 2007/09/06 18:31:00 abs Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -48,7 +48,7 @@ PKG_SUPPORTED_OPTIONS+=	mlib
 PKG_SUPPORTED_OPTIONS+= mplayer-runtime-cpudetection xvid
 .endif
 .if ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS+= mplayer-win32
+PKG_SUPPORTED_OPTIONS+= mplayer-default-cflags mplayer-win32
 .endif
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE_ARCH} == "alpha"
@@ -61,7 +61,7 @@ PKG_SUPPORTED_OPTIONS+=	mplayer-real
 
 .for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
 	    lame mad mplayer-menu mplayer-real \
-	    mplayer-runtime-cpudetection mplayer-win32 \
+	    mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
 	    nas oss png sdl theora vorbis xvid
 .  if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
 PKG_SUGGESTED_OPTIONS+=	${_o_}
-- 
cgit v1.2.3