alternative shortcuts; cd cinelerra-5.1; patch -p1 -i alt_shortcuts.patch
[goodguy/cinelerra.git] / cinelerra-5.1 / thirdparty / src / mjpegtools-2.1.0.patch1
1 --- a/cpuinfo.sh        2009-08-31 15:59:37.000000000 -0600
2 +++ b/cpuinfo.sh        2015-02-01 22:20:28.469910599 -0700
3 @@ -144,9 +144,6 @@
4                             # synonym for 'k8'
5                            proc=k8
6                            ;;
7 -                       16)
8 -                          proc=barcelona
9 -                          ;;
10                         *) proc=athlon-xp
11                            ;;
12                 esac
13 @@ -165,9 +162,7 @@
14                            fi
15                            ;;
16                         6) iproc=686
17 -                           if test "$pmodel" -ge 23; then
18 -                                proc=core2
19 -                           elif test "$pmodel" -ge 15; then
20 +                           if test "$pmodel" -ge 15; then
21                                  proc=nocona
22                             elif test "$pmodel" -ge 13; then
23                                  proc=pentium-m
24 @@ -228,11 +223,6 @@
25      fi
26  fi
27  
28 -# Seems some variants of gcc accept 'core2' instead of 'nocona'.
29 -if test "$proc" = "core2"; then
30 -        do_cc  -march=$proc $_opt_mcpu=$proc || proc=nocona
31 -fi
32 -
33  if test "$proc" = "pentium4" || test "$proc" = "pentium3" || test "$proc" = "pentium2" || test "$proc" = "athlon"; then
34         do_cc -march=$proc $_opt_mcpu=$proc || proc=i686
35  fi
36 @@ -249,7 +239,6 @@
37         do_cc -march=$proc $_opt_mcpu=$proc || proc=error
38  fi
39  if test "$proc" = "error" ; then
40 -       echo "Your $CC does not even support \"i386\" for '-march' and $_opt_mcpu."
41         _mcpu=""
42         _march=""
43  elif test "$proc" = "i586-i686"; then