diff options
| author | wiz <wiz@pkgsrc.org> | 2006-08-04 21:01:21 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2006-08-04 21:01:21 +0000 |
| commit | 999dbdb5ab72bb1bec4e9ff34c6a7362cbeb4401 (patch) | |
| tree | 2d420e334ee84ad490f593e23bf1ca91efbf9dc4 /multimedia/mplayer-share/patches | |
| parent | a5c5777ae52d24f0f96c81e099485eb4ba8513c3 (diff) | |
| download | pkgsrc-999dbdb5ab72bb1bec4e9ff34c6a7362cbeb4401.tar.gz | |
Recognize cpu type on x86_64. Patch from Rhialto in PR 33946.
Diffstat (limited to 'multimedia/mplayer-share/patches')
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-aa | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index 317f314b224..d757b2a89d9 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.14 2006/06/13 17:25:00 drochner Exp $ ;; --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 @@ $NetBSD: patch-aa,v 1.14 2006/06/13 17:25:00 drochner Exp $ 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 @@ $NetBSD: patch-aa,v 1.14 2006/06/13 17:25:00 drochner Exp $ 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 |