[gentoo-commits] gentoo-x86 commit in sci-mathematics/freemat/files: freemat-4.1-fixes.patch freemat-4.1-portaudio.patch freemat-4.1-local_libffi.patch freemat-4.1-use_llvm.patch freemat-4.1-have_fftw.patch

[Andrey Grozin (grozin)]

grozin      12/04/05 20:43:04

  Added:                freemat-4.1-fixes.patch freemat-4.1-portaudio.patch
                        freemat-4.1-local_libffi.patch
                        freemat-4.1-use_llvm.patch
                        freemat-4.1-have_fftw.patch
  Log:
  Version bump, thanks to José Romildo Malaquias <j.romildo@×××××.com> for the ebuild. Closing #406509.
  
  (Portage version: 2.2.0_alpha99/cvs/Linux i686)

Revision  Changes    Path
1.1                  sci-mathematics/freemat/files/freemat-4.1-fixes.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.1-fixes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.1-fixes.patch?rev=1.1&content-type=text/plain

Index: freemat-4.1-fixes.patch
===================================================================
--- libs/libGraphics/VTKWindow.cpp.orig	2012-01-27 19:54:55.000000000 +0100
+++ libs/libGraphics/VTKWindow.cpp	2012-01-27 19:54:49.000000000 +0100
@@ -3,6 +3,7 @@
 #include "VTKWrap.hpp"
 #include "VTKWindow.hpp"
 
+#include <QObject>
 #include <QtCore/QString>
 #include <QtGui/QLabel>
 #include <QtGui/QMenu>
--- libs/libGraphics/GLRenderEngine.cpp.orig	2011-11-27 00:27:43.000000000 +0000
+++ libs/libGraphics/GLRenderEngine.cpp	2012-01-29 03:57:48.453433954 +0000
@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+
+#include <GL/glu.h>
 #include "GLRenderEngine.hpp"
 #include <qimage.h>
 #include <qpainter.h>



1.1                  sci-mathematics/freemat/files/freemat-4.1-portaudio.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.1-portaudio.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.1-portaudio.patch?rev=1.1&content-type=text/plain

Index: freemat-4.1-portaudio.patch
===================================================================
--- libs/thirdparty/portaudio/CMakeLists.txt.orig 2012-01-29 02:08:08.422664514 +0100
+++ libs/thirdparty/portaudio/CMakeLists.txt      2012-01-29 02:04:26.826460722 +0100
@@ -73,6 +73,7 @@ IF (NOT WIN32 AND NOT APPLE)
    ${CMAKE_CURRENT_SOURCE_DIR}/src/common/pa_stream.c
    ${CMAKE_CURRENT_SOURCE_DIR}/src/common/pa_trace.c
    ${CMAKE_CURRENT_SOURCE_DIR}/src/hostapi/oss/pa_unix_oss.c
+   ${CMAKE_CURRENT_SOURCE_DIR}/src/hostapi/skeleton/pa_hostapi_skeleton.c
    ${CMAKE_CURRENT_SOURCE_DIR}/src/os/unix/pa_unix_hostapis.c
    ${CMAKE_CURRENT_SOURCE_DIR}/src/os/unix/pa_unix_util.c )
 ENDIF (NOT WIN32 AND NOT APPLE)



1.1                  sci-mathematics/freemat/files/freemat-4.1-local_libffi.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.1-local_libffi.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.1-local_libffi.patch?rev=1.1&content-type=text/plain

Index: freemat-4.1-local_libffi.patch
===================================================================
--- CMakeLists.txt.orig	2011-11-27 01:27:11.116482600 +0100
+++ CMakeLists.txt	2012-01-29 17:09:54.072342306 +0100
@@ -160,8 +160,8 @@ if(MINGW)
     INCLUDE_DIRECTORIES(${FFI_INCLUDE_DIR})
     INSTALL(FILES ${FFI_LIBRARY_DLL} DESTINATION bin )
 else(MINGW)
-    FIND_LIBRARY(FFI_LIBRARY NAMES ffi DOC "Location of the FFI library" PATHS ${LOCAL_PATH})
-    FIND_PATH(FFI_INCLUDE_DIR ffi.h doc "Location of ffi.h" PATHS ${LOCAL_PATH} /usr/include/ffi /usr/lib64/libffi-3.0.9/include)
+    FIND_LIBRARY(FFI_LIBRARY NAMES ffi DOC "Location of the FFI library" PATHS ${LOCAL_PATH} ${PROJECT_SOURCE_DIR}/dependencies/libffi/build/.libs)
+    FIND_PATH(FFI_INCLUDE_DIR ffi.h doc "Location of ffi.h" PATHS ${LOCAL_PATH} /usr/include/ffi /usr/lib64/libffi-3.0.9/include ${PROJECT_SOURCE_DIR}/dependencies/libffi/build/include /mingw/include/ffi)
     SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} ${FFI_LIBRARY})
     INCLUDE_DIRECTORIES(${FFI_INCLUDE_DIR})
 endif(MINGW)



1.1                  sci-mathematics/freemat/files/freemat-4.1-use_llvm.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.1-use_llvm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.1-use_llvm.patch?rev=1.1&content-type=text/plain

Index: freemat-4.1-use_llvm.patch
===================================================================
--- libs/libMatC/CMakeLists.txt.orig	2011-11-27 01:27:43.000000000 +0100
+++ libs/libMatC/CMakeLists.txt		2012-01-29 14:39:19.842402326 +0100
@@ -1,10 +1,14 @@
 
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} )
 
+IF( USE_LLVM )
+  set(LLVM_SOURCES "CJitFuncClang.cpp")
+endif( USE_LLVM )
+
 ADD_LIBRARY( MatC 
 	JITFactory.cpp
 	CJitFunc.cpp
-	CJitFuncClang.cpp
+	${LLVM_SOURCES}
 	CArray.cpp
 )
 
--- libs/libMatC.orig/JITFactory.cpp	2011-11-27 01:27:43.000000000 +0100
+++ libs/libMatC/JITFactory.cpp		2012-01-29 14:53:17.296686846 +0100
@@ -1,5 +1,7 @@
 #include "JITFactory.hpp"
-#include "CJitFuncClang.hpp"
+#ifdef HAVE_LLVM
+# include "CJitFuncClang.hpp"
+#endif
 
 JITFuncBase* JITFactory::GetJITFunc(Interpreter *eval)
 {



1.1                  sci-mathematics/freemat/files/freemat-4.1-have_fftw.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.1-have_fftw.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/freemat/files/freemat-4.1-have_fftw.patch?rev=1.1&content-type=text/plain

Index: freemat-4.1-have_fftw.patch
===================================================================
diff -rupN libs/libCore.orig/FFT.cpp libs/libCore/FFT.cpp
--- libs/libCore.orig/FFT.cpp	2011-11-27 01:27:43.856779929 +0100
+++ libs/libCore/FFT.cpp	2012-01-30 00:14:18.682460150 +0100
@@ -104,6 +104,7 @@ public:
 #endif
 
 
+#if HAVE_FFTWF
 class OpVecFFT {
   WrapFFTWF fft_float;
   WrapFFTW  fft_double;
@@ -169,7 +170,9 @@ public:
     }
   }  
 };
+#endif
 
+#if HAVE_FFTWF
 class OpVecIFFT {
   WrapFFTWF fft_float;
   WrapFFTW fft_double;
@@ -228,6 +231,7 @@ public:
     }
   }
 };
+#endif
 
 //!
 //@Module FFT (Inverse) Fast Fourier Transform Function
@@ -350,6 +354,8 @@ public:
 //inputs x len dim
 //outputs y
 //!
+
+#if HAVE_FFTWF
 ArrayVector FFTFunction(int nargout, const ArrayVector& arg) {
   // Get the data argument
   if (arg.size() < 1)
@@ -384,7 +390,9 @@ ArrayVector FFTFunction(int nargout, con
   OpVecFFT op(FFTLength);
   return ArrayVector(VectorOpDynamic<OpVecFFT>(arg0,FFTLength,FFTDim,op));
 }
+#endif
 
+#if HAVE_FFTWF
 ArrayVector IFFTFunction(int nargout, const ArrayVector& arg) {
   // Get the data argument
   if (arg.size() < 1)
@@ -419,3 +427,4 @@ ArrayVector IFFTFunction(int nargout, co
   OpVecIFFT op(FFTLength);
   return ArrayVector(VectorOpDynamic<OpVecIFFT>(arg0,FFTLength,FFTDim,op));
 }
+#endif
diff -rupN libs/libCore.orig/Loader.cpp libs/libCore/Loader.cpp
--- libs/libCore.orig/Loader.cpp	2012-01-30 00:08:41.463155562 +0100
+++ libs/libCore/Loader.cpp	2012-01-30 00:12:24.422448304 +0100
@@ -43,8 +43,10 @@ ArrayVector FeofFunction(int, const Arra
 ArrayVector FseekFunction(int, const ArrayVector&);
 ArrayVector FgetlineFunction(int, const ArrayVector&);
 ArrayVector FscanfFunction(int, const ArrayVector&);
+#ifdef HAVE_FFTW
 ArrayVector FFTFunction(int, const ArrayVector&);
 ArrayVector IFFTFunction(int, const ArrayVector&);
+#endif
 ArrayVector StrCmpFunction(int, const ArrayVector&);
 ArrayVector StrCmpiFunction(int, const ArrayVector&);
 ArrayVector StrnCmpFunction(int, const ArrayVector&);
@@ -286,8 +288,10 @@ void LoadBuiltinFunctionsCore(Context *c
   context->addFunction("fseek",FseekFunction,0,3,0,"handle","offset","style",NULL);
   context->addFunction("fgetline",FgetlineFunction,0,1,1,"handle",NULL);
   context->addFunction("fscanf",FscanfFunction,0,-1,-1,NULL);
+#ifdef HAVE_FFTW
   context->addFunction("fft",FFTFunction,0,3,1,"x","len","dim",NULL);
   context->addFunction("ifft",IFFTFunction,0,3,1,"x","len","dim",NULL);
+#endif
   context->addFunction("strcmp",StrCmpFunction,0,2,1,"string1","string2",NULL);
   context->addFunction("strcmpi",StrCmpiFunction,0,2,1,"string1","string2",NULL);
   context->addFunction("strncmp",StrnCmpFunction,0,3,1,"string1","string2","len",NULL);