[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-share If the *mplayer* packages are...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9e9b41133493
branches:  trunk
changeset: 532994:9e9b41133493
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Sep 06 18:31:00 2007 +0000

description:
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.

diffstat:

 multimedia/mplayer-share/Makefile.cflags |  14 ++++++--------
 multimedia/mplayer-share/options.mk      |   6 +++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diffs (63 lines):

diff -r c4d9f2b64d09 -r 9e9b41133493 multimedia/mplayer-share/Makefile.cflags
--- a/multimedia/mplayer-share/Makefile.cflags  Thu Sep 06 18:11:57 2007 +0000
+++ b/multimedia/mplayer-share/Makefile.cflags  Thu Sep 06 18:31:00 2007 +0000
@@ -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 -r c4d9f2b64d09 -r 9e9b41133493 multimedia/mplayer-share/options.mk
--- a/multimedia/mplayer-share/options.mk       Thu Sep 06 18:11:57 2007 +0000
+++ b/multimedia/mplayer-share/options.mk       Thu Sep 06 18:31:00 2007 +0000
@@ -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+= 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 @@
 
 .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_}