pkg/33946: mplayer fails to detect cpu type on amd64 [with patch]

[Rhialto <rhialto%falu.nl@localhost>]

>Number:         33946
>Category:       pkg
>Synopsis:       mplayer fails to detect cpu type on amd64
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jul 08 11:55:00 +0000 2006
>Originator:     Rhialto
>Release:        NetBSD 3.0
>Organization:
        
>Environment:
        
        
System: NetBSD radl.falu.nl 3.0 NetBSD 3.0 (Radls Doordringend Onjuiste 
Akkoord) #0: Sat Jan 28 16:44:07 CET 2006 
root%radl.falu.nl@localhost:/usr/src/sys/arch/amd64/compile/RADL amd64
Architecture: x86_64
Machine: amd64
>Description:
        mplayer fails to detect cpu type on amd64.
        The same is true for mencoder.

        ===> configure-message [mplayer-1.0rc8nb1] ===> Configuring for 
mplayer-1.0rc8nb1
        Detected operating system: NetBSD
        Detected host architecture: x86_64
        Checking for cc version ... 3.3.3, ok 
        Checking for host cc ... cc 
        Checking for cross compilation ... no 
        Checking for CPU vendor ...  (::) 
        Checking for CPU type ...  
        Checking for GCC & CPU optimization abilities ... CPU optimization 
disabled. CPU not recognized or your compiler is too old. 
        error 

>How-To-Repeat:
        cd /usr/pkgsrc/multimedia/mplayer && make
>Fix:
        In the configure script, change an occurrence
        of "x86" to "x86 || x86_64".

         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

cvs diff: Diffing .
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/mplayer-share/patches/patch-aa,v
retrieving revision 1.14
diff -u -r1.14 patch-aa
--- patches/patch-aa    13 Jun 2006 17:25:00 -0000      1.14
+++ patches/patch-aa    8 Jul 2006 11:47:15 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-aa,v 1.14 2006/06/13 17:25:00 drochner 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

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert      -- You author it, and I'll reader it.
\X/ rhialto/at/xs4all.nl        -- Cetero censeo "authored" delendum esse.

>Unformatted: