[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-share Recognize cpu type on x86_64....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e38ee19a7a8c
branches:  trunk
changeset: 517128:e38ee19a7a8c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Aug 04 21:01:21 2006 +0000

description:
Recognize cpu type on x86_64. Patch from Rhialto in PR 33946.

diffstat:

 multimedia/mplayer-share/distinfo         |   4 ++--
 multimedia/mplayer-share/patches/patch-aa |  23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diffs (67 lines):

diff -r 8038e3a5fa95 -r e38ee19a7a8c multimedia/mplayer-share/distinfo
--- a/multimedia/mplayer-share/distinfo Fri Aug 04 20:52:27 2006 +0000
+++ b/multimedia/mplayer-share/distinfo Fri Aug 04 21:01:21 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.30 2006/06/15 21:58:55 dogcow Exp $
+$NetBSD: distinfo,v 1.31 2006/08/04 21:01:21 wiz Exp $
 
 SHA1 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 8a0929b84dcb37d47c062230ce693b64b3e30921
 RMD160 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0
 Size (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 8166628 bytes
-SHA1 (patch-aa) = 4b80c0d18f0c9ae3f65d572965222db709a2a6b3
+SHA1 (patch-aa) = 8792bc990acf1164650e07c4981bda077f2b0aff
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ad) = 4744bdb2ea6ffa1a18abaef5a9cf5756f3b8a645
diff -r 8038e3a5fa95 -r e38ee19a7a8c multimedia/mplayer-share/patches/patch-aa
--- a/multimedia/mplayer-share/patches/patch-aa Fri Aug 04 20:52:27 2006 +0000
+++ b/multimedia/mplayer-share/patches/patch-aa Fri Aug 04 21:01:21 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2006/06/13 17:25:00 drochner Exp $
+$NetBSD: patch-aa,v 1.15 2006/08/04 21:01:21 wiz Exp $
 
---- configure.orig     2006-06-11 20:35:47.000000000 +0200
-+++ configure
-@@ -493,7 +493,7 @@ for ac_option do
+--- configure.orig     2006-06-11 18:35:47.000000000 +0000
++++ configure  2006-07-08 11:17:13.000000000 +0000
+@@ -493,7 +493,7 @@
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
@@ -11,7 +11,7 @@
      ;;
    --enable-runtime-cpudetection)
      _runtime_cpudetection=yes
-@@ -694,11 +694,11 @@ if test "$_skip_cc_check" != yes ; then
+@@ -694,11 +694,11 @@
    esac
    echores "$cc_version"
   else
@@ -25,7 +25,16 @@
    if test "$?" -gt 0; then
      cc_version="not found"
    fi
-@@ -830,7 +830,7 @@ if x86 || x86_64 ; then
+@@ -819,7 +819,7 @@
+ elif aix; then
+   # use 'lsattr' on AIX
+   _cpuinfo="lsattr -E -l proc0 -a type"
+-elif x86; then
++elif x86 || x86_64; then
+   # all other OSes try to extract CPU information from a small helper
+   # program TOOLS/cpuinfo instead
+   $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
+@@ -830,7 +830,7 @@
    # gather more CPU information
    pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1`
    pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | _head 1`
@@ -34,7 +43,7 @@
    pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
    pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
  
-@@ -4136,7 +4136,7 @@ fi
+@@ -4136,7 +4136,7 @@
  if test "$_aa" = yes ; then
    _def_aa='#define HAVE_AA 1'
    if cygwin ; then