casa-mp-base

diff -ru ../py-PyCg-0.14.1.orig/cg.i ./cg.i

--- ../py-PyCg-0.14.1.orig/cg.i 2012-10-03 15:33:18.000000000 -0700

+++ ./cg.i  2012-10-03 15:34:14.000000000 -0700

@@ -2,7 +2,7 @@

 %{

 #include "Cg/cg.h"

 #include "Cg/cgGL.h"

-#include <Numeric/arrayobject.h>

+#include <numpy/arrayobject.h>

 %}

 %init %{

@@ -134,9 +134,9 @@

     return NULL;

   }

-  if ( array = (PyArrayObject*)PyArray_ContiguousFromObject( $input, PyArray_DOUBLE, 1, 2 ) ) {

+  if ( ( array = (PyArrayObject*)PyArray_ContiguousFromObject( $input, PyArray_DOUBLE, 1, 2 ) ) ) {

     $1 = (double*)array->data;

-  } else if ( array = (PyArrayObject*)PyArray_ContiguousFromObject( $input, PyArray_FLOAT, 1, 2 ) ) {

+  } else if ( ( array = (PyArrayObject*)PyArray_ContiguousFromObject( $input, PyArray_FLOAT, 1, 2 ) ) ) {

     $1 = (float*)array->data;

   } else {

     PyErr_SetString(PyExc_ValueError, "CALLE: could not cast!" );

@@ -145,9 +145,8 @@

 }

-%include "types.i"

-%include "constants.i"

-%include "funcs.i"

+%include "cg.h"

+%include "cgGL.h"

 /* Error handling function */

@@ -183,7 +182,7 @@

 }

 %}

-%name(cgSetErrorCallback) void _cgSetErrorCallback(PyObject * pyfunc);

+%rename(cgSetErrorCallback) _cgSetErrorCallback(PyObject * pyfunc);

 %{

 PyObject *_cgGetErrorCallback()

@@ -191,5 +190,5 @@

    return errorCallback;

 }

 %}

-%name(cgGetErrorCallback) PyObject *_cgGetErrorCallback();

+%rename(cgGetErrorCallback) _cgGetErrorCallback();

diff -ru ../py-PyCg-0.14.1.orig/cg_datatypes.i ./cg_datatypes.i

--- ../py-PyCg-0.14.1.orig/cg_datatypes.i   2012-10-03 15:33:18.000000000 -0700

+++ ./cg_datatypes.i    2012-10-03 15:34:00.000000000 -0700

@@ -1,148 +0,0 @@

-/*

- *

- * Copyright (c) 2002, NVIDIA Corporation.

- * 

- *  

- * 

- * NVIDIA Corporation("NVIDIA") supplies this software to you in consideration