diff options
| author | salo <salo@pkgsrc.org> | 2004-04-06 18:33:10 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2004-04-06 18:33:10 +0000 |
| commit | c7a9c233059a9fea8b1972ab81212e96afcba79d (patch) | |
| tree | 1abca9de8ff67ac2de122216e3d5d24552d4346d /multimedia/mplayer-share | |
| parent | 481d14a0d9bcf491931011b24005ea0369139437 (diff) | |
| download | pkgsrc-c7a9c233059a9fea8b1972ab81212e96afcba79d.tar.gz | |
Fix CPU family detection on NetBSD with /proc mounted with "-o linux".
For more information see also PR kern/25076
Diffstat (limited to 'multimedia/mplayer-share')
| -rw-r--r-- | multimedia/mplayer-share/distinfo | 5 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-aa | 21 |
2 files changed, 18 insertions, 8 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 4007275bd06..d80134b9bb0 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/01/26 12:06:41 jmmv Exp $ +$NetBSD: distinfo,v 1.2 2004/04/06 18:33:10 salo Exp $ SHA1 (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432 Size (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = 4714725 bytes @@ -8,7 +8,8 @@ SHA1 (mplayer-1.0rc3/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f9 Size (mplayer-1.0rc3/font-arial-iso-8859-2.tar.bz2) = 222208 bytes SHA1 (mplayer-1.0rc3/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 Size (mplayer-1.0rc3/font-arial-cp1250.tar.bz2) = 249705 bytes -SHA1 (patch-aa) = 51722c503120b0771102a0ca48c9817271666b81 +SHA1 (patch-aa) = 3ab26e41524bee01fba4002f0f827eb5b1b390d7 SHA1 (patch-ab) = a0f80f7d44b41509d215bb9cf6c1266c836efd1b +SHA1 (patch-ac) = 8d28e03ef054dfe8e7f62d31631727616a87d4ed SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b SHA1 (patch-ae) = 61fec8b2ace8bd507df57102ff72c98cd6b194d7 diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index 0e25c94f57a..c49e8271e80 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2004/04/06 18:33:10 salo Exp $ --- configure.orig 2003-12-08 22:33:31.000000000 +0100 -+++ configure -@@ -367,8 +367,8 @@ for ac_option do ++++ configure 2004-04-06 20:22:24.000000000 +0200 +@@ -367,8 +367,8 @@ _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` ;; --with-extralibdir=*) @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $ ;; --enable-runtime-cpudetection) _runtime_cpudetection=yes -@@ -431,7 +431,7 @@ if test -z "$_target" ; then +@@ -431,7 +431,7 @@ case "`( uname -m ) 2>&1`" in i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; ia64) host_arch=ia64 ;; @@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $ ppc) host_arch=ppc ;; alpha) host_arch=alpha ;; sparc*) host_arch=sparc ;; -@@ -499,7 +499,7 @@ if test "$_skip_cc_check" != yes ; then +@@ -499,7 +499,7 @@ for _cc in "$_cc" gcc gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do echocheck "$_cc version" cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1` @@ -31,7 +31,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $ if test "$?" -gt 0; then cc_version="not found" fi -@@ -819,7 +819,7 @@ EOF +@@ -610,7 +610,7 @@ + + 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` +- pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` ++ pfamily=`$_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` + 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` + +@@ -819,7 +819,7 @@ _optimizing='' ;; |