update to 6.1.0 [release 6.1.0-1mamba;Sun Apr 11 2021]

This commit is contained in:
Silvan Calarco 2024-01-05 17:39:52 +01:00
parent 8adc3edbf2
commit fcd68fee17
17 changed files with 1204 additions and 853 deletions

View File

@ -1,403 +0,0 @@
--- modules/core/src/c/getmodules.c 2010-12-15 08:13:13.000000000 +0100
+++ modules/core/src/c/getmodules_new-d613ebf3b0679abd199bb02be44cc964753783db.c 2011-02-08 14:58:38.000000000 +0100
@@ -37,208 +37,215 @@
/*--------------------------------------------------------------------------*/
struct MODULESLIST *getmodules(void)
{
- if (ScilabModules==NULL)
- {
- ScilabModules=(struct MODULESLIST *)MALLOC(sizeof(struct MODULESLIST));
- ReadModulesFile();
- }
- return ScilabModules;
+ if (ScilabModules==NULL)
+ {
+ ScilabModules=(struct MODULESLIST *)MALLOC(sizeof(struct MODULESLIST));
+ ReadModulesFile();
+ }
+ return ScilabModules;
}
/*--------------------------------------------------------------------------*/
BOOL DisposeModulesInfo(void)
{
- BOOL bOK=FALSE;
- if (ScilabModules)
- {
- int i=0;
- for (i=0;i<ScilabModules->numberofModules;i++)
- {
- if (ScilabModules->ModuleList[i])
- {
- FREE(ScilabModules->ModuleList[i]);
- ScilabModules->ModuleList[i]=NULL;
- }
- }
- if (ScilabModules->ModuleList)
- {
- FREE(ScilabModules->ModuleList);
- ScilabModules->ModuleList=NULL;
- }
- ScilabModules->numberofModules=0;
- FREE(ScilabModules);
- ScilabModules=NULL;
- }
+ BOOL bOK=FALSE;
+ if (ScilabModules)
+ {
+ int i=0;
+ for (i=0;i<ScilabModules->numberofModules;i++)
+ {
+ if (ScilabModules->ModuleList[i])
+ {
+ FREE(ScilabModules->ModuleList[i]);
+ ScilabModules->ModuleList[i]=NULL;
+ }
+ }
+ if (ScilabModules->ModuleList)
+ {
+ FREE(ScilabModules->ModuleList);
+ ScilabModules->ModuleList=NULL;
+ }
+ ScilabModules->numberofModules=0;
+ FREE(ScilabModules);
+ ScilabModules=NULL;
+ }
- return bOK;
+ return bOK;
}
/*--------------------------------------------------------------------------*/
static BOOL ReadModulesFile(void)
{
- BOOL bOK=FALSE;
- char *ModulesFilename=NULL;
- char *SciPath=NULL;
-
- SciPath=getSCIpath();
- if (SciPath==NULL)
- {
- sciprint(_("The SCI environment variable is not set.\n"));
- return FALSE;
- }
-
- ModulesFilename=(char*)MALLOC((strlen(SciPath)+strlen("/")+strlen(basenamemodulesfile)+1)*sizeof(char));
- sprintf(ModulesFilename,"%s/%s",SciPath,basenamemodulesfile);
- FREE(SciPath);
- SciPath=NULL;
-
- if (FileExist(ModulesFilename))
- {
- AppendModules(ModulesFilename);
- FREE(ModulesFilename);
- ModulesFilename=NULL;
- }
- else
- {
- sciprint(_("Cannot load the module declaration file: %s.\n"),ModulesFilename);
- FREE(ModulesFilename);
- ModulesFilename=NULL;
- return FALSE;
- }
- return bOK;
+ BOOL bOK=FALSE;
+ char *ModulesFilename=NULL;
+ char *SciPath=NULL;
+
+ SciPath=getSCIpath();
+ if (SciPath==NULL)
+ {
+ sciprint(_("The SCI environment variable is not set.\n"));
+ return FALSE;
+ }
+
+ ModulesFilename=(char*)MALLOC((strlen(SciPath)+strlen("/")+strlen(basenamemodulesfile)+1)*sizeof(char));
+ sprintf(ModulesFilename,"%s/%s",SciPath,basenamemodulesfile);
+ FREE(SciPath);
+ SciPath=NULL;
+
+ if (FileExist(ModulesFilename))
+ {
+ AppendModules(ModulesFilename);
+ FREE(ModulesFilename);
+ ModulesFilename=NULL;
+ }
+ else
+ {
+ sciprint(_("Cannot load the module declaration file: %s.\n"),ModulesFilename);
+ FREE(ModulesFilename);
+ ModulesFilename=NULL;
+ return FALSE;
+ }
+ return bOK;
}
/*--------------------------------------------------------------------------*/
static BOOL VerifyModule(char *ModuleName)
{
- BOOL bOK=FALSE;
- char *SciPath=NULL;
- char *FullPathModuleName=NULL;
-
-
- SciPath=getSCIpath();
- if (SciPath==NULL)
- {
- sciprint(_("The SCI environment variable is not set.\n"));
- return FALSE;
- }
-
- FullPathModuleName=(char*)MALLOC((strlen(SciPath)+strlen("%s/modules/%s/etc/%s.start")+(strlen(ModuleName)*2)+1)*sizeof(char));
- sprintf(FullPathModuleName,"%s/modules/%s/etc/%s.start",SciPath,ModuleName,ModuleName);
- FREE(SciPath);
- SciPath=NULL;
-
- /* ajouter d'autres tests d'existences */
-
- if (FileExist(FullPathModuleName))
- {
- bOK=TRUE;
- }
- FREE(FullPathModuleName);
- FullPathModuleName=NULL;
+ BOOL bOK=TRUE;
+ char *SciPath=NULL;
+ char *FullPathModuleName=NULL;
+
+
+ SciPath=getSCIpath();
+ if (SciPath==NULL)
+ {
+ sciprint(_("The SCI environment variable is not set.\n"));
+ return FALSE;
+ }
+
+ FullPathModuleName=(char*)MALLOC((strlen(SciPath)+strlen("%s/modules/%s/etc/%s.start")+(strlen(ModuleName)*2)+1)*sizeof(char));
+ sprintf(FullPathModuleName,"%s/modules/%s/etc/%s.start",SciPath,ModuleName,ModuleName);
+ FREE(SciPath);
+ SciPath=NULL;
+
+ /* @TODO add more checks (missing files for example) */
+
+ if (!FileExist(FullPathModuleName))
+ {
+ fprintf(stderr,_("Warning: Could not find %s\n"),FullPathModuleName);
+ bOK=FALSE;
+ }
+ FREE(FullPathModuleName);
+ FullPathModuleName=NULL;
- return bOK;
+ return bOK;
}
/*--------------------------------------------------------------------------*/
static BOOL AppendModules(char *xmlfilename)
{
- BOOL bOK = FALSE;
- if ( FileExist(xmlfilename) )
- {
- char *encoding = GetXmlFileEncoding(xmlfilename);
-
- /* Don't care about line return / empty line */
- xmlKeepBlanksDefault(0);
- /* check if the XML file has been encoded with utf8 (unicode) or not */
- if (stricmp("utf-8", encoding)==0)
- {
- xmlDocPtr doc = NULL;
- xmlXPathContextPtr xpathCtxt = NULL;
- xmlXPathObjectPtr xpathObj = NULL;
- char *name=NULL;
- int activate=0;
-
- int indice=0;
- BOOL bConvert = FALSE;
- char *shortxmlfilename = getshortpathname(xmlfilename,&bConvert);
-
- if (shortxmlfilename)
- {
- doc = xmlParseFile (shortxmlfilename);
- FREE(shortxmlfilename);
- shortxmlfilename = NULL;
- }
-
- if (doc == NULL)
- {
- printf(_("Error: Could not parse file %s.\n"), xmlfilename);
- if (encoding) {FREE(encoding);encoding=NULL;}
- return bOK;
- }
-
- xpathCtxt = xmlXPathNewContext(doc);
- xpathObj = xmlXPathEval((const xmlChar*)"//modules/module", xpathCtxt);
-
- if(xpathObj && xpathObj->nodesetval->nodeMax)
- {
- /* the Xpath has been understood and there are node */
- int i;
- for(i = 0; i < xpathObj->nodesetval->nodeNr; i++)
- {
-
- xmlAttrPtr attrib=xpathObj->nodesetval->nodeTab[i]->properties;
- /* Get the properties of <module> */
- while (attrib != NULL)
- {
- /* loop until when have read all the attributes */
- if (xmlStrEqual (attrib->name, (const xmlChar*) "name"))
- {
- /* we found the tag name */
- const char *str=(const char*)attrib->children->content;
- name = strdup(str);
- }
- else if (xmlStrEqual (attrib->name, (const xmlChar*) "activate"))
- {
- /* we found the tag activate */
- const char *str=(const char*)attrib->children->content;
- if (stricmp(str,"yes")==0 || strcmp(str,"1")==0) {
- activate=1;
- }
- }
- attrib = attrib->next;
- }
-
- if ( (name) && (strlen(name) > 0) && (activate) )
- {
- if ( VerifyModule(name) )
- {
- if (indice==0) ScilabModules->ModuleList=(char**)MALLOC(sizeof(char*)*(indice+1));
- else ScilabModules->ModuleList=(char**)REALLOC(ScilabModules->ModuleList,sizeof(char*)*(indice+1));
-
- ScilabModules->numberofModules=indice+1;
-
- ScilabModules->ModuleList[indice]= strdup(name);
- indice++;
- }
- else
- {
- sciprint(_("%s module not found.\n"),name);
- }
- }
- if (name) {FREE(name);name = NULL;}
- activate = 0;
- }
- bOK = TRUE;
- }
-
- if(xpathObj) xmlXPathFreeObject(xpathObj);
- if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
- xmlFreeDoc (doc);
-
- }
- else
- {
- printf(_("Error: Not a valid module file %s (encoding not '%s') Encoding '%s' found.\n"), xmlfilename, "utf-8", encoding);
- }
- if (encoding) {FREE(encoding);encoding=NULL;}
- }
- return bOK;
+ BOOL bOK = FALSE;
+ if ( FileExist(xmlfilename) )
+ {
+ char *encoding = GetXmlFileEncoding(xmlfilename);
+
+ /* Don't care about line return / empty line */
+ xmlKeepBlanksDefault(0);
+ /* check if the XML file has been encoded with utf8 (unicode) or not */
+ if (stricmp("utf-8", encoding)==0)
+ {
+ xmlDocPtr doc = NULL;
+ xmlXPathContextPtr xpathCtxt = NULL;
+ xmlXPathObjectPtr xpathObj = NULL;
+ char *name=NULL;
+ int activate=0;
+
+ int indice=0;
+ BOOL bConvert = FALSE;
+ char *shortxmlfilename = getshortpathname(xmlfilename,&bConvert);
+
+ if (shortxmlfilename)
+ {
+ doc = xmlParseFile (shortxmlfilename);
+ FREE(shortxmlfilename);
+ shortxmlfilename = NULL;
+ }
+
+ if (doc == NULL)
+ {
+ printf(_("Error: Could not parse file %s.\n"), xmlfilename);
+ if (encoding) {FREE(encoding);encoding=NULL;}
+ return bOK;
+ }
+
+ xpathCtxt = xmlXPathNewContext(doc);
+ xpathObj = xmlXPathEval((const xmlChar*)"//modules/module", xpathCtxt);
+
+ if(xpathObj && xpathObj->nodesetval->nodeMax)
+ {
+ /* the Xpath has been understood and there are node */
+ int i;
+ for(i = 0; i < xpathObj->nodesetval->nodeNr; i++)
+ {
+
+ xmlAttrPtr attrib=xpathObj->nodesetval->nodeTab[i]->properties;
+ /* Get the properties of <module> */
+ while (attrib != NULL)
+ {
+ /* loop until when have read all the attributes */
+ if (xmlStrEqual (attrib->name, (const xmlChar*) "name"))
+ {
+ /* we found the tag name */
+ const char *str=(const char*)attrib->children->content;
+ name = strdup(str);
+ }
+ else if (xmlStrEqual (attrib->name, (const xmlChar*) "activate"))
+ {
+ /* we found the tag activate */
+ const char *str=(const char*)attrib->children->content;
+ if (stricmp(str,"yes")==0 || strcmp(str,"1")==0) {
+ activate=1;
+ }
+ }
+ attrib = attrib->next;
+ }
+
+ if ( (name) && (strlen(name) > 0) && (activate) )
+ {
+ if ( VerifyModule(name) )
+ {
+ if (indice==0)
+ {
+ ScilabModules->ModuleList=(char**)MALLOC(sizeof(char*)*(indice+1));
+ }
+ else
+ {
+ ScilabModules->ModuleList=(char**)REALLOC(ScilabModules->ModuleList,sizeof(char*)*(indice+1));
+ }
+
+ ScilabModules->numberofModules=indice+1;
+
+ ScilabModules->ModuleList[indice]= strdup(name);
+ indice++;
+ }
+ else
+ {
+ sciprint(_("%s module not found.\n"),name);
+ }
+ }
+ if (name) {FREE(name);name = NULL;}
+ activate = 0;
+ }
+ bOK = TRUE;
+ }
+
+ if(xpathObj) xmlXPathFreeObject(xpathObj);
+ if(xpathCtxt) xmlXPathFreeContext(xpathCtxt);
+ xmlFreeDoc (doc);
+
+ }
+ else
+ {
+ printf(_("Error: Not a valid module file %s (encoding not '%s') Encoding '%s' found.\n"), xmlfilename, "utf-8", encoding);
+ }
+ if (encoding) {FREE(encoding);encoding=NULL;}
+ }
+ return bOK;
}
/*--------------------------------------------------------------------------*/

View File

@ -1,11 +0,0 @@
--- configure.ac 2011-02-08 09:03:22.000000000 +0100
+++ configure.ac-gil 2011-02-08 09:07:03.000000000 +0100
@@ -170,6 +170,8 @@
#####################################################
PKG_PROG_PKG_CONFIG
+with_gui="no"
+
#####################################################
## check if options are correct (or not)
#####################################################

View File

@ -1,20 +0,0 @@
--- configure.ac 2011-02-05 11:40:17.000000000 +0100
+++ configure.ac-gil 2011-02-05 11:41:06.000000000 +0100
@@ -655,11 +655,12 @@
HDF5_ENABLE=no
-if test "$with_hdf5" != no; then
- AC_HDF5()
-# TODO: check if the JNI JHDF5 library are available
- HDF5_ENABLE=yes
-fi
+with_hdf5=no
+#if test "$with_hdf5" != no; then
+# AC_HDF5()
+## TODO: check if the JNI JHDF5 library are available
+# HDF5_ENABLE=yes
+#fi
AC_SUBST(HDF5_ENABLE)
AM_CONDITIONAL(HDF5, test "$with_hdf5" != no)

View File

@ -1,29 +0,0 @@
--- configure.ac 2010-12-15 08:13:09.000000000 +0100
+++ configure.ac-gil 2011-02-05 11:36:52.000000000 +0100
@@ -1786,16 +1786,16 @@
# http://directory.fsf.org/project/chrpath/
# to remove it before the make install
-#case ${host} in
-# *-pc-linux-gnu)
-# AC_MSG_RESULT([Fixing libtool for -rpath problems.])
-# sed < libtool > libtool-2 \
-# 's/^hardcode_libdir_flag_spec.*$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
-# mv libtool-2 libtool
-# chmod 755 libtool
-# ;;
-#esac
-#
+case ${host} in
+ *-pc-linux-gnu)
+ AC_MSG_RESULT([Fixing libtool for -rpath problems.])
+ sed < libtool > libtool-2 \
+ 's/^hardcode_libdir_flag_spec.*$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/'
+ mv libtool-2 libtool
+ chmod 755 libtool
+ ;;
+esac
+
echo ""

View File

@ -1,29 +0,0 @@
--- configure.ac 2011-02-05 12:09:09.000000000 +0100
+++ configure.ac-gil 2011-02-05 12:10:20.000000000 +0100
@@ -839,7 +839,7 @@
AC_SUBST(XMLGRAPHICS_COMMONS)
# Avalon Framework (PDF)
- AC_JAVA_CHECK_PACKAGE([avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
+ AC_JAVA_CHECK_PACKAGE([excalibur/avalon-framework],[org.apache.avalon.framework.configuration.ConfigurationException],[Common framework for Java server application])
AVALON_FRAMEWORK=$PACKAGE_JAR_FILE
AC_SUBST(AVALON_FRAMEWORK)
@@ -889,7 +889,7 @@
AC_SUBST(ANTLR)
# Test NG (java unitary test)
- AC_JAVA_CHECK_PACKAGE([testng],[org.testng.TestNG],[TestNG - Unit tests],"yes")
+ AC_JAVA_CHECK_PACKAGE([testng-jdk15],[org.testng.TestNG],[TestNG - Unit tests],"yes")
TESTNG=$PACKAGE_JAR_FILE
AC_SUBST(TESTNG)
@@ -899,7 +899,7 @@
AC_SUBST(QDOX)
# bsh (Java scripting environment) - dependency of TestNG
- AC_JAVA_CHECK_PACKAGE([bsh],[bsh.Console],[Java scripting environment],"yes")
+ AC_JAVA_CHECK_PACKAGE([bsh2/bsh],[bsh.Console],[Java scripting environment],"yes")
BSH=$PACKAGE_JAR_FILE
AC_SUBST(BSH)

View File

@ -1,11 +0,0 @@
--- m4/java.m4 2010-12-15 08:13:10.000000000 +0100
+++ m4/java.m4-gil 2011-02-05 11:33:03.000000000 +0100
@@ -832,7 +832,7 @@
PACKAGE_JAR_FILE=
found_jar=no
saved_ac_java_classpath=$ac_java_classpath
- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null) $(ls -d /usr/share/*/lib/ 2>/dev/null)"
+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java /usr/lib/jni $(ls -d /usr/share/java/*/ 2>/dev/null) $(ls -d /usr/lib64/*/ 2>/dev/null) $(ls -d /usr/lib/*/ 2>/dev/null) $(ls -d /usr/share/*/lib/ 2>/dev/null)"
for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
# jar=`echo $jar|sed -e 's/ /\\ /'`

View File

@ -1,10 +0,0 @@
--- modules/javasci/src/java/javasci/Scilab.java 2010-12-15 08:13:26.000000000 +0100
+++ modules/javasci/src/java/javasci/Scilab.java-gil 2011-02-08 18:07:03.000000000 +0100
@@ -110,6 +110,7 @@
static
{
try {
+ System.setProperty("java.library.path", System.getProperty("java.library.path") + ":/usr/lib/java/");
System.loadLibrary("javasci");
Scilab.Initialize();
} catch (SecurityException e) {

View File

@ -1,20 +0,0 @@
--- configure.ac 2011-02-08 09:17:35.000000000 +0100
+++ configure.ac-gil 2011-02-08 09:17:51.000000000 +0100
@@ -747,7 +747,7 @@
else
LDFLAGS_save=$LDFLAGS
# Provide known paths where distribs/OS can store JNI libs
- LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
+ LDFLAGS="-L/usr/lib/java -L/usr/lib64/java/ -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
AC_CHECK_LIB([jogl], [glTexParameterf], [JOGL_LIBS="-ljogl"],[AC_MSG_WARN([Could not link against -ljogl. Will try against -ljogl -lGL])])
if test -z "$JOGL_LIBS"; then # The previous test failed add more options to the LDFLAGS
# the space after "jogl" in the following line is on
@@ -775,7 +775,7 @@
else
LDFLAGS_save=$LDFLAGS
# Provide known paths where distribs/OS can store JNI libs
- LDFLAGS="-L/usr/lib/jni -L/usr/lib64/jni/ -ldl -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
+ LDFLAGS="-L/usr/lib/java -L/usr/lib64/java/ -ldl -L$SCI_SRCDIR/thirdparty/ -L$SCI_SRCDIR/bin/"
symbol="Java_com_sun_gluegen_runtime_UnixDynamicLinkerImpl_dlclose__J"
AC_CHECK_LIB([gluegen-rt], [$symbol], [GLUEGEN_RT_LIBS="-lgluegen-rt"],
[AC_MSG_ERROR([libgluegen-rt: Library missing (Cannot find symbol glTexParameterf). Check if libgluegen-rt - C/Java (JNI) interface for GLUEGEN - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries.])],

View File

@ -0,0 +1,30 @@
--- scilab-6.1.0/modules/core/Makefile.am.orig 2021-05-16 12:15:27.242176556 +0200
+++ scilab-6.1.0/modules/core/Makefile.am 2021-05-16 12:15:38.414362002 +0200
@@ -130,7 +130,6 @@
sci_gateway/cpp/sci_fieldnames.cpp \
sci_gateway/cpp/sci_checkNamedArguments.cpp
-if ENABLE_DEBUG
GATEWAY_CPP_SOURCES += \
sci_gateway/cpp/sci_inspectorDeleteUnreferencedItems.cpp \
sci_gateway/cpp/sci_inspectorGetItem.cpp \
@@ -139,7 +138,6 @@
sci_gateway/cpp/sci_inspectorShowItem.cpp \
sci_gateway/cpp/sci_inspectorShowUnreferencedItem.cpp \
sci_gateway/cpp/sci_inspectorGetFunctionList.cpp
-endif
libscicore_la_CPPFLAGS = \
-I$(srcdir)/includes/ \
--- scilab-6.1.0/modules/ast/Makefile.am.orig 2021-05-16 13:07:04.254552724 +0200
+++ scilab-6.1.0/modules/ast/Makefile.am 2021-05-16 13:07:15.439752622 +0200
@@ -253,9 +253,7 @@
src/cpp/analysis/check_acos.cpp \
src/cpp/analysis/check_____dottimes____.cpp
-if ENABLE_DEBUG
libsciast_la_SOURCES += src/cpp/types/inspector.cpp
-endif
libsciast_la_CPPFLAGS = \

View File

@ -0,0 +1,81 @@
diff -Naur orig/scilab-6.1.0/modules/hdf5/Makefile.am scilab-6.1.0/modules/hdf5/Makefile.am
--- orig/scilab-6.1.0/modules/hdf5/Makefile.am 2020-02-25 10:59:56.000000000 +0100
+++ scilab-6.1.0/modules/hdf5/Makefile.am 2020-06-16 17:11:11.934227935 +0200
@@ -103,8 +103,7 @@
-DH5Gopen_vers=2 \
-DH5Tget_array_dims_vers=2 \
-DH5Acreate_vers=2 \
- -DH5Rdereference_vers=2 \
- -DNO_DEPRECATED_SYMBOLS
+ -DH5Rdereference_vers=2
libscihdf5_la_CPPFLAGS = \
diff -Naur orig/scilab-6.1.0/modules/hdf5/Makefile.in scilab-6.1.0/modules/hdf5/Makefile.in
--- orig/scilab-6.1.0/modules/hdf5/Makefile.in 2020-02-25 10:59:56.000000000 +0100
+++ scilab-6.1.0/modules/hdf5/Makefile.in 2020-06-16 17:11:23.374128670 +0200
@@ -788,8 +788,7 @@
-DH5Gopen_vers=2 \
-DH5Tget_array_dims_vers=2 \
-DH5Acreate_vers=2 \
- -DH5Rdereference_vers=2 \
- -DNO_DEPRECATED_SYMBOLS
+ -DH5Rdereference_vers=2
libscihdf5_la_CPPFLAGS = \
-I$(srcdir)/includes/ \
diff -Naur orig/scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h
--- orig/scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h 2020-02-25 10:59:56.000000000 +0100
+++ scilab-6.1.0/modules/hdf5/includes/HDF5Objects.h 2020-06-16 17:07:00.129746134 +0200
@@ -16,14 +16,12 @@
#ifndef __HDF5OBJECTS_H__
#define __HDF5OBJECTS_H__
-#define H5_NO_DEPRECATED_SYMBOLS
#undef H5_USE_16_API
+#define H5_USE_18_API
-#define H5Eset_auto_vers 2
#include <hdf5.h>
#include <hdf5_hl.h>
-#undef H5_NO_DEPRECATED_SYMBOLS
//#define __HDF5OBJECTS_DEBUG__
//#define __HDF5ERROR_PRINT__
diff -Naur orig/scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp
--- orig/scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2020-02-25 10:59:56.000000000 +0100
+++ scilab-6.1.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2020-06-16 17:15:08.605507554 +0200
@@ -13,6 +13,8 @@
*
*/
+#define H5_USE_18_API
+
#include <vector>
#include "function.hxx"
#include "string.hxx"
diff -Naur orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c
--- orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c 2020-02-25 10:59:56.000000000 +0100
+++ scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile.c 2020-06-16 17:13:05.759906899 +0200
@@ -13,7 +13,7 @@
*
*/
-#define H5_NO_DEPRECATED_SYMBOLS
+#define H5_USE_18_API
#ifndef _MSC_VER
#include <sys/time.h>
diff -Naur orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c
--- orig/scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2020-02-25 10:59:56.000000000 +0100
+++ scilab-6.1.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2020-06-16 17:13:20.183115080 +0200
@@ -13,7 +13,7 @@
*
*/
-#define H5_NO_DEPRECATED_SYMBOLS
+#define H5_USE_18_API
#ifndef _MSC_VER
#include <sys/time.h>

View File

@ -0,0 +1,550 @@
From 1364c083acb58a55fcf2c5ca8d244313dfe9bbcb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Cl=C3=A9ment=20DAVID?= <clement.david@scilab-enterprises.com>
Date: Wed, 2 Dec 2015 15:09:07 +0100
Subject: [PATCH] Update to JoGL 2.3.2
Change-Id: Ic188bb392d1dd8441d1a4132004f77b63a3353df
---
scilab/configure | 16 +++++++-------
scilab/configure.ac | 4 ++--
.../src/java/org/scilab/modules/gui/SwingView.java | 8 +++----
.../scilab/modules/gui/bridge/ScilabBridge.java | 2 +-
.../gui/bridge/canvas/SwingScilabCanvas.java | 4 ++--
.../gui/bridge/canvas/SwingScilabCanvasImpl.java | 12 +++++------
.../java/org/scilab/modules/gui/canvas/Canvas.java | 2 +-
.../scilab/modules/gui/canvas/ScilabCanvas.java | 2 +-
.../modules/gui/canvas/ScilabCanvasBridge.java | 2 +-
.../scilab/modules/gui/canvas/SimpleCanvas.java | 2 +-
.../scirenderer/scirenderer-libs.properties | 4 ++--
.../implementation/jogl/JoGLCanvas.java | 22 ++++++++++----------
.../implementation/jogl/JoGLCanvasFactory.java | 2 +-
.../implementation/jogl/JoGLCapacity.java | 2 +-
.../implementation/jogl/JoGLDrawingTools.java | 2 +-
.../implementation/jogl/JoGLParameters.java | 4 ++--
.../jogl/buffers/JoGLBuffersManager.java | 2 +-
.../jogl/buffers/JoGLDataBuffer.java | 2 +-
.../jogl/buffers/JoGLElementsBuffer.java | 2 +-
.../jogl/buffers/JoGLIndicesBuffer.java | 2 +-
.../jogl/clipping/JoGLClippingManager.java | 2 +-
.../jogl/clipping/JoGLClippingPlane.java | 2 +-
.../jogl/drawer/JoGLShapeDrawer.java | 2 +-
.../implementation/jogl/lightning/JoGLLight.java | 2 +-
.../jogl/lightning/JoGLLightManager.java | 2 +-
.../jogl/picking/GLPickingManager.java | 2 +-
.../jogl/picking/JoGLPickingTools.java | 2 +-
.../implementation/jogl/renderer/JoGLRenderer.java | 2 +-
.../jogl/renderer/JoGLRendererManager.java | 2 +-
.../jogl/texture/JoGLTextureManager.java | 10 ++++-----
.../implementation/jogl/utils/GLShortCuts.java | 2 +-
31 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/scilab/configure b/scilab/configure
index 192bb93..ef8699d 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -16245,7 +16245,7 @@ EOF
CLASSPATH=$ac_java_classpath
export CLASSPATH
echo "CLASSPATH="$CLASSPATH >&5
- cmd="$JAVA conftestSharedChecker \"jogl2\" \"javax.media.opengl.glu.GLUnurbs\" \"$jar_resolved\" \"\" \"2.2\" \"\""
+ cmd="$JAVA conftestSharedChecker \"jogl2\" \"jogamp.opengl.x11.glx.GLX\" \"$jar_resolved\" \"\" \"2.3\" \"\""
if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then
read PACKAGE_JAR_FILE PACKAGE_JAR_VERSION << EOF
$(tail -n 1 conftestSharedChecker.java.output)
@@ -16259,10 +16259,10 @@ $as_echo " $PACKAGE_JAR_FILE $PACKAGE_JAR_VERSION " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if test "" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.3 (looking for package jogamp.opengl.x11.glx.GLX)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.3 (looking for package jogamp.opengl.x11.glx.GLX)" >&2;}
else
- as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" "$LINENO" 5
+ as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.3 (looking for package jogamp.opengl.x11.glx.GLX)" "$LINENO" 5
fi
fi
if test -f conftestSharedChecker.java.output; then
@@ -16585,7 +16585,7 @@ EOF
CLASSPATH=$ac_java_classpath
export CLASSPATH
echo "CLASSPATH="$CLASSPATH >&5
- cmd="$JAVA conftestSharedChecker \"gluegen2-rt\" \"jogamp.common.os.MachineDescriptionRuntime\" \"$jar_resolved\" \"\" \"\" \"\""
+ cmd="$JAVA conftestSharedChecker \"gluegen2-rt\" \"com.jogamp.common.os.Platform\" \"$jar_resolved\" \"\" \"\" \"\""
if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then
read PACKAGE_JAR_FILE PACKAGE_JAR_VERSION << EOF
$(tail -n 1 conftestSharedChecker.java.output)
@@ -16599,10 +16599,10 @@ $as_echo " $PACKAGE_JAR_FILE $PACKAGE_JAR_VERSION " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if test "" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package com.jogamp.common.os.Platform)" >&5
+$as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package com.jogamp.common.os.Platform)" >&2;}
else
- as_fn_error $? "Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package jogamp.common.os.MachineDescriptionRuntime)" "$LINENO" 5
+ as_fn_error $? "Could not find or use the Java package/jar gluegen2-rt used by Scilab 3D rendering (looking for package com.jogamp.common.os.Platform)" "$LINENO" 5
fi
fi
if test -f conftestSharedChecker.java.output; then
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 49d9281..eba2c3d 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -951,7 +951,7 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
AC_SUBST(SKINLF)
# JOGL 2
- AC_JAVA_CHECK_JAR([jogl2],[javax.media.opengl.glu.GLUnurbs],[Scilab 3D rendering - Version 2.0], [], [], [2.2])
+ AC_JAVA_CHECK_JAR([jogl2],[jogamp.opengl.x11.glx.GLX],[Scilab 3D rendering - Version 2.3], [], [], 2.3)
JOGL2=$PACKAGE_JAR_FILE
AC_SUBST(JOGL2)
@@ -980,7 +980,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
fi
# JoGL Native <=> Java connector
- AC_JAVA_CHECK_JAR([gluegen2-rt],[jogamp.common.os.MachineDescriptionRuntime],[Scilab 3D rendering])
+ AC_JAVA_CHECK_JAR([gluegen2-rt],[com.jogamp.common.os.Platform],[Scilab 3D rendering])
GLUEGEN2_RT=$PACKAGE_JAR_FILE
AC_SUBST(GLUEGEN2_RT)
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
index ea28e4c..50704af 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
@@ -88,10 +88,10 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import javax.media.opengl.GL;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.awt.GLCanvas;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.awt.GLCanvas;
import javax.swing.JComponent;
import javax.swing.JSeparator;
import javax.swing.SwingUtilities;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
index 112a904..d1a2438 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
@@ -23,7 +23,7 @@ import java.awt.Cursor;
import java.awt.Font;
import java.awt.image.BufferedImage;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import org.scilab.modules.gui.canvas.Canvas;
import org.scilab.modules.gui.canvas.ScilabCanvas;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
index 477fa3f..9e969b4 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
@@ -35,8 +35,8 @@ import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.image.BufferedImage;
-import javax.media.opengl.GL;
-import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLAutoDrawable;
import javax.swing.JPanel;
import org.scilab.forge.scirenderer.Canvas;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
index f27ea69..68b7613 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
@@ -22,12 +22,12 @@ import java.awt.HeadlessException;
import java.util.Calendar;
import java.util.StringTokenizer;
-import javax.media.opengl.GL;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.awt.GLCanvas;
-import javax.media.opengl.awt.GLJPanel;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.awt.GLCanvas;
+import com.jogamp.opengl.awt.GLJPanel;
import org.scilab.modules.action_binding.InterpreterManagement;
import org.scilab.modules.commons.OS;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
index 03e7b5b..c84b257 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
@@ -17,7 +17,7 @@ package org.scilab.modules.gui.canvas;
import java.awt.image.BufferedImage;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import org.scilab.modules.gui.dockable.Dockable;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
index 6fb2ef9..ce0f1a9 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
@@ -19,7 +19,7 @@ package org.scilab.modules.gui.canvas;
import java.awt.image.BufferedImage;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import org.scilab.modules.gui.bridge.ScilabBridge;
import org.scilab.modules.gui.dockable.ScilabDockable;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
index 2d7e304..56c4ee4 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
@@ -17,7 +17,7 @@ package org.scilab.modules.gui.canvas;
import java.awt.image.BufferedImage;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas;
import org.scilab.modules.gui.utils.Position;
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
index 307486a..91a40b0 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
@@ -18,7 +18,7 @@ package org.scilab.modules.gui.canvas;
import org.scilab.modules.gui.utils.Position;
import org.scilab.modules.gui.utils.Size;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import java.awt.image.BufferedImage;
/**
diff --git a/scilab/modules/scirenderer/scirenderer-libs.properties b/scilab/modules/scirenderer/scirenderer-libs.properties
index 4d1636d..0ea2197 100644
--- a/scilab/modules/scirenderer/scirenderer-libs.properties
+++ b/scilab/modules/scirenderer/scirenderer-libs.properties
@@ -1,7 +1,7 @@
; Define all libs needed by scirenderer
; Uncomment this line and declare path to jogl2.jar gluegen2-rt.jar jlatexmath.jar and native libraries
-jogl2.jar = /usr/share/java/jogl2.jar
-gluegen2.jar = /usr/share/java/gluegen2-rt.jar
+jogl2.jar = /usr/lib/java/jogl2.jar
+gluegen2.jar = /usr/lib/java/gluegen2-rt.jar
jlatexmath.jar = /usr/share/java/jlatexmath.jar
jni.path = /usr/lib/jni
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
index a823629..8a776a0 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
@@ -1,7 +1,7 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
* Copyright (C) 2009-2011 - DIGITEO - Pierre Lando
- * Copyright (C) 2019 - Stéphane MOTTELET
+ * Copyright (C) 2019 - Stephane MOTTELET
*
* Copyright (C) 2012 - 2016 - Scilab Enterprises
*
@@ -20,17 +20,17 @@ import java.awt.image.BufferedImage;
import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.Semaphore;
-import javax.media.opengl.DebugGL2;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLAutoDrawable;
-import javax.media.opengl.awt.GLJPanel;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLContext;
-import javax.media.opengl.GLDrawableFactory;
-import javax.media.opengl.GLEventListener;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLOffscreenAutoDrawable;
-import javax.media.opengl.GLProfile;
+import com.jogamp.opengl.DebugGL2;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.awt.GLJPanel;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLContext;
+import com.jogamp.opengl.GLDrawableFactory;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.GLOffscreenAutoDrawable;
+import com.jogamp.opengl.GLProfile;
import javax.swing.SwingUtilities;
import org.scilab.forge.scirenderer.Canvas;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
index 4fec356..6de9267 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.implementation.jogl;
import org.scilab.forge.scirenderer.Canvas;
-import javax.media.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLAutoDrawable;
/**
* @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
index 4597be3..4ed3220 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
@@ -14,7 +14,7 @@
package org.scilab.forge.scirenderer.implementation.jogl;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* This class store current OpenGl context capacity.
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
index 623cc1e..161f9ca 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
@@ -34,7 +34,7 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManagerImpl;
import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener;
import org.scilab.forge.scirenderer.tranformations.Vector3d;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
*
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
index 429e1a3..c26d5a2 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
@@ -14,8 +14,8 @@
package org.scilab.forge.scirenderer.implementation.jogl;
-import javax.media.opengl.GL;
-import javax.media.opengl.glu.GLU;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.glu.GLU;
/**
* @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
index d5f1f06..99e6854 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
@@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.buffers.DataBuffer;
import org.scilab.forge.scirenderer.buffers.ElementsBuffer;
import org.scilab.forge.scirenderer.buffers.IndicesBuffer;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
index 25d3a3e..b56c9d7 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.buffers;
import org.scilab.forge.scirenderer.buffers.DataBuffer;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import java.nio.Buffer;
/**
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
index 5206566..5d01b87 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.buffers;
import org.scilab.forge.scirenderer.buffers.ElementsBuffer;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
import java.nio.Buffer;
import java.nio.FloatBuffer;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
index 2a14656..f7f019f 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.buffers;
import org.scilab.forge.scirenderer.buffers.IndicesBuffer;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
import java.nio.Buffer;
import java.nio.IntBuffer;
import java.util.Collection;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
index 22d28b2..57885f0 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.clipping.ClippingManager;
import org.scilab.forge.scirenderer.clipping.ClippingPlane;
import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
index cf3ed8b..a5a5770 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
@@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.tranformations.Transformation;
import org.scilab.forge.scirenderer.tranformations.TransformationFactory;
import org.scilab.forge.scirenderer.tranformations.Vector4d;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
index 2b1066c..c1549b4 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
@@ -26,7 +26,7 @@ import org.scilab.forge.scirenderer.texture.Texture;
import org.scilab.forge.scirenderer.lightning.LightManager;
import org.scilab.forge.scirenderer.shapes.appearance.Material;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
index f06809e..9e89b7c 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
@@ -14,7 +14,7 @@
package org.scilab.forge.scirenderer.implementation.jogl.lightning;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
import org.scilab.forge.scirenderer.implementation.jogl.utils.GLShortCuts;
import org.scilab.forge.scirenderer.lightning.Light;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
index 0c8ae45..42d1e32 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
@@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.lightning.Light;
import org.scilab.forge.scirenderer.lightning.LightManager;
import org.scilab.forge.scirenderer.shapes.appearance.Material;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* JoGL implementation of {@link LightManager}
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
index 11c4b3f..6895a53 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
@@ -14,7 +14,7 @@
package org.scilab.forge.scirenderer.implementation.jogl.picking;
-import javax.media.opengl.GL;
+import com.jogamp.opengl.GL;
/**
* @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
index f9fe5a8..9ac3537 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
@@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools;
import org.scilab.forge.scirenderer.picking.PickingTools;
import org.scilab.forge.scirenderer.tranformations.Vector3d;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
import java.awt.Point;
import java.nio.FloatBuffer;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
index 3f4b47d..9f9f856 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.Drawer;
import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools;
import org.scilab.forge.scirenderer.renderer.Renderer;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
* @author Pierre Lando
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
index 4b4dd17..440750f 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools;
import org.scilab.forge.scirenderer.renderer.Renderer;
import org.scilab.forge.scirenderer.renderer.RendererManager;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
import java.util.HashSet;
import java.util.Set;
import java.util.Stack;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
index 659f37f..25d3bc3 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
@@ -32,11 +32,11 @@ import org.scilab.forge.scirenderer.tranformations.TransformationManager;
import org.scilab.forge.scirenderer.tranformations.Vector3d;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GL2ES1;
-import javax.media.opengl.GL2GL3;
-import javax.media.opengl.GLProfile;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GL2ES1;
+import com.jogamp.opengl.GL2GL3;
+import com.jogamp.opengl.GLProfile;
import java.awt.Dimension;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
diff --git a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
index 1d799e9..8a493fb 100644
--- a/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
+++ b/scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
@@ -17,7 +17,7 @@ package org.scilab.forge.scirenderer.implementation.jogl.utils;
import org.scilab.forge.scirenderer.shapes.appearance.Appearance;
import org.scilab.forge.scirenderer.shapes.appearance.Color;
-import javax.media.opengl.GL2;
+import com.jogamp.opengl.GL2;
/**
*
--
1.7.9.5

View File

@ -0,0 +1,308 @@
--- scilab-6.0.0.orig/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-14 12:40:34.000000000 +0100
+++ scilab-6.0.0/modules/hdf5/src/cpp/H5ReferenceData.cpp 2017-02-15 20:08:00.761619371 +0100
@@ -42,7 +42,11 @@
for (int i = 0; i < totalSize; i++)
{
void * ref = &(((void **)cdata)[i]);
- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+ hid_t obj = H5Rdereference(file,
+ #if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+ #endif
+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
H5O_info_t info;
H5Oget_info(obj, &info);
H5Oclose(obj);
@@ -84,7 +88,11 @@
file = getFile().getH5Id();
ref = &(((void **)cdata)[0]);
- obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+ obj = H5Rdereference(file,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
if (obj < 0)
{
throw H5Exception(__LINE__, __FILE__, _("Cannot open object at the given position."));
@@ -126,7 +134,11 @@
for (int i = 0; i < totalSize; i++)
{
void * ref = &(((void **)cdata)[i]);
- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+ hid_t obj = H5Rdereference(file,
+ #if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+ #endif
+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
objs[i] = &H5Object::getObject(getParent(), obj);
}
@@ -181,7 +193,11 @@
char * cdata = static_cast<char *>(data) + offset + pos * (stride ? stride : dataSize);
void ** ref = &(((void **)cdata)[0]);
hid_t file = getFile().getH5Id();
- hid_t obj = H5Rdereference(file, datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
+ hid_t obj = H5Rdereference(file,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ datasetReference ? H5R_DATASET_REGION : H5R_OBJECT, ref);
if (obj < 0)
{
os << "NULL";
--- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-14 12:40:34.000000000 +0100
+++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile_v1.c 2017-02-15 20:08:00.758286029 +0100
@@ -474,7 +474,11 @@
}
//Open the referenced object, get its name and type.
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &Ref);
+ obj = H5Rdereference(_iDatasetId,
+ #if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+ #endif
+ H5R_OBJECT, &Ref);
readDouble_v1(obj, _iRows, _iCols, _pdblData);
}
@@ -501,14 +505,22 @@
}
//Open the referenced object, get its name and type.
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[0]);
status = readDouble_v1(obj, _iRows, _iCols, _pdblReal);
if (status < 0)
{
return -1;
}
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[1]);
status = readDouble_v1(obj, _iRows, _iCols, _pdblImg);
if (status < 0)
{
@@ -834,7 +846,11 @@
/*
* Open the referenced object, get its name and type.
*/
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]);
+ obj = H5Rdereference(_iDatasetId,
+ #if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+ #endif
+ H5R_OBJECT, &pData[i]);
if (_iComplex)
{
status = readComplexPoly_v1(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
@@ -1069,7 +1085,11 @@
}
//read Row data
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[0]);
status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
if (status < 0)
{
@@ -1077,7 +1097,11 @@
}
//read cols data
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[1]);
status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
if (status < 0)
{
@@ -1085,7 +1109,11 @@
}
//read sparse data
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[2]);
if (_iComplex)
{
@@ -1131,7 +1159,11 @@
}
//read Row data
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[0]);
status = readInteger32Matrix_v1(obj, 1, _iRows, _piNbItemRow);
if (status < 0)
{
@@ -1139,7 +1171,11 @@
}
//read cols data
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[1]);
status = readInteger32Matrix_v1(obj, 1, _iNbItem, _piColPos);
if (status < 0)
{
@@ -1234,7 +1270,11 @@
{
hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef);
+ *_piItemDataset = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &poRef);
if (*_piItemDataset == 0)
{
--- scilab-6.0.0.orig/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-14 12:40:34.000000000 +0100
+++ scilab-6.0.0/modules/hdf5/src/c/h5_readDataFromFile.c 2017-02-15 20:08:00.758286029 +0100
@@ -742,7 +742,11 @@
/*
* Open the referenced object, get its name and type.
*/
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]);
+ obj = H5Rdereference(_iDatasetId,
+ #if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+ #endif
+ H5R_OBJECT, &pData[i]);
if (_iComplex)
{
status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]);
@@ -976,7 +980,11 @@
}
//read Row data
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[0]);
status = readInteger32Matrix(obj, _piNbItemRow);
if (status < 0)
{
@@ -984,7 +992,11 @@
}
//read cols data
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[1]);
status = readInteger32Matrix(obj, _piColPos);
if (status < 0)
{
@@ -992,7 +1004,11 @@
}
//read sparse data
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[2]);
if (_iComplex)
{
@@ -1043,7 +1059,11 @@
}
//read Row data
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]);
+ obj = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &pRef[0]);
status = readInteger32Matrix(obj, _piNbItemRow);
if (status < 0)
{
@@ -1053,7 +1073,11 @@
if (_iNbItem != 0)
{
//read cols data
- obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]);
+ obj = H5Rdereference(_iDatasetId,
+ #if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+ #endif
+ H5R_OBJECT, &pRef[1]);
status = readInteger32Matrix(obj, _piColPos);
if (status < 0)
{
@@ -1154,7 +1178,11 @@
{
hobj_ref_t poRef = ((hobj_ref_t *) _piItemRef)[_iItemPos];
- *_piItemDataset = H5Rdereference(_iDatasetId, H5R_OBJECT, &poRef);
+ *_piItemDataset = H5Rdereference(_iDatasetId,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &poRef);
if (*_piItemDataset == 0)
{
--- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp 2017-02-14 12:40:34.000000000 +0100
+++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp 2017-02-15 20:11:46.775525827 +0100
@@ -648,7 +648,11 @@
//import field
for (int j = 0; j < refcount; ++j)
{
- int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]);
+ int data = H5Rdereference(refs,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &vrefs[j]);
if (data < 0)
{
freeStringMatrix(dfield, fields.data());
--- scilab-6.0.0.orig/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2017-02-14 12:40:34.000000000 +0100
+++ scilab-6.0.0/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp 2017-02-15 20:11:36.838833848 +0100
@@ -735,7 +735,11 @@
//import field
for (int j = 0; j < refcount; ++j)
{
- int data = H5Rdereference(refs, H5R_OBJECT, &vrefs[j]);
+ int data = H5Rdereference(refs,
+#if H5_VERSION_GE(1,10,0)
+ H5P_DATASET_ACCESS_DEFAULT,
+#endif
+ H5R_OBJECT, &vrefs[j]);
if (data < 0)
{
return false;

View File

@ -0,0 +1,20 @@
--- scilab-6.1.0/modules/matio/src/cpp/GetSparseVariable.cpp.orig 2021-05-15 20:35:23.779949805 +0200
+++ scilab-6.1.0/modules/matio/src/cpp/GetSparseVariable.cpp 2021-05-15 20:36:43.336525958 +0200
@@ -65,7 +65,7 @@
int* itemsRow = new int[pSparse->getRows()];
pSparse->getNbItemByRow(itemsRow);
- int* colIndexes = (int*)MALLOC(sizeof(int) * (pSparse->getRows() + 1));
+ mat_uint32_t* colIndexes = (mat_uint32_t*)MALLOC(sizeof(mat_uint32_t) * (pSparse->getRows() + 1));
if (colIndexes == NULL)
{
FREE(sparseData);
@@ -82,7 +82,7 @@
colIndexes[K + 1] = colIndexes[K] + itemsRow[K];
}
- int* rowIndexes = (int*)MALLOC(sizeof(int) * nonZeros);
+ mat_uint32_t* rowIndexes = (mat_uint32_t*)MALLOC(sizeof(mat_uint32_t) * nonZeros);
if (rowIndexes == NULL)
{
FREE(sparseData);

View File

@ -0,0 +1,15 @@
--- modules/scicos/Makefile.in.orig 2018-02-22 20:48:50.382685100 +0100
+++ modules/scicos/Makefile.in 2018-02-21 23:01:04.547956702 +0100
@@ -794,10 +794,10 @@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
-OCAMLC = @OCAMLC@
+OCAMLC = ocamlfind @OCAMLC@ -package num
OCAMLDEP = @OCAMLDEP@
OCAMLLEX = @OCAMLLEX@
-OCAMLOPT = @OCAMLOPT@
+OCAMLOPT = ocamlfind @OCAMLOPT@ -package num
OCAMLYACC = @OCAMLYACC@
OPENMPI_CC = @OPENMPI_CC@
OPENMPI_CFLAGS = @OPENMPI_CFLAGS@

30
scilab-6.1.0-ocaml.patch Normal file
View File

@ -0,0 +1,30 @@
--- a/modules/scicos/src/modelica_compiler/optimization.ml
+++ b/modules/scicos/src/modelica_compiler/optimization.ml
@@ -20,6 +20,7 @@
*
*)
+open Num
open SymbolicExpression
@@ -162,8 +163,7 @@ let num_of_float f =
let num_of_positive_float f =
let m, e = frexp f in
let sm = string_of_float m in
- let s = String.make 16 '0' in
- String.blit sm 2 s 0 (String.length sm - 2);
+ let s = String.sub sm 2 (String.length sm - 2) in
let e' = Num.power_num (Num.Int 2) (Num.num_of_int e) in
Num.div_num (Num.mult_num (Num.num_of_string s) e') scaling_factor
in
--- a/modules/scicos/src/modelica_compiler/xMLCodeGeneration.ml
+++ b/modules/scicos/src/modelica_compiler/xMLCodeGeneration.ml
@@ -20,6 +20,7 @@
*
*)
+open Num
type 'a tree = Leaf of (string * 'a) | Node of string * 'a tree list
(* function used to hide XML special characters *)

View File

@ -0,0 +1,29 @@
--- configure.old 2016-04-24 14:32:13.301199078 +0200
+++ configure 2016-04-24 14:34:47.821731712 +0200
@@ -17159,7 +17159,7 @@
DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/"
- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'fop.jar' -or -name 'libfop.jar' -or -name 'libfop-java.jar' -or -name 'fop*.jar' \) 2>/dev/null |tr '\n' ':')."
+ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'fop.jar' -or -name 'libfop.jar' -or -name 'libfop-java.jar' \) 2>/dev/null |tr '\n' ':')."
if test ! -f conftestSharedChecker.class ; then
@@ -19139,7 +19139,7 @@
DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/"
- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'xmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons-java.jar' -or -name 'xmlgraphics-commons*.jar' \) 2>/dev/null |tr '\n' ':')."
+ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'xmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons-java.jar' \) 2>/dev/null |tr '\n' ':')."
if test ! -f conftestSharedChecker.class ; then
@@ -20019,7 +20019,7 @@
DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/"
- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'commons-logging.jar' -or -name 'libcommons-logging.jar' -or -name 'libcommons-logging-java.jar' -or -name 'commons-logging*.jar' \) 2>/dev/null |tr '\n' ':')."
+ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'commons-logging.jar' -or -name 'libcommons-logging.jar' -or -name 'libcommons-logging-java.jar' \) 2>/dev/null |tr '\n' ':')."
if test ! -f conftestSharedChecker.class ; then

View File

@ -1,272 +1,193 @@
%define javahome %{_jvmdir}/jdk
%define with_hdf5 1
%define with_giws 1
%define with_swig 1
%define with_gui 1
Name: scilab
Version: 5.3.0
Release: 5mamba
Version: 6.1.0
Release: 1mamba
Summary: A scientific software package for numerical computations
Group: Graphical Desktop/Applications/Scientific
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.scilab.org/
URL: https://www.scilab.org/
Source0: http://www.scilab.org/download/%{version}/scilab-%{version}-src.tar.gz
Source1: scilab.desktop
Source2: scilab_256x256x32.png
Patch0: scilab-5.3.0-javadefaultdir.patch
Patch1: scilab-5.3.0-disable-rpath.patch
# disable hdf5, as we do not have jhdf5
Patch2: scilab-5.3.0-disable-hdf5.patch
Patch3: scilab-5.3.0-jarnames.patch
# disable the GUI. require jogl/gluegen == 1.1.1
Patch5: scilab-5.3.0-disable-gui.patch
Patch6: scilab-5.3.0-jogl-jnidir.patch
Patch7: scilab-5.3.0-core-getmodules.patch
# from debian http://patch-tracker.debian.org/patch/series/view/scilab/5.3.0-beta-4-2
Patch8: scilab-5.3.0-javasci-Scilab.patch
Patch0: scilab-6.1.0-jogl-2.3.2.patch
Patch1: scilab-6.1.0-strict-jar.patch
Patch2: scilab-6.1.0-libhdf5-1.8.10.patch
Patch3: scilab-6.1.0-hdf5_18_api.patch
Patch4: scilab-6.1.0-matio-fix-uint32_t-type.patch
Patch5: scilab-6.1.0-ocaml-num.patch
Patch6: scilab-6.1.0-ocaml.patch
Patch7: scilab-6.1.0-fix-core-link.patch
License: CeCILL, GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: gcc-fortran
BuildRequires: glibc-devel
BuildRequires: libatlas-devel
BuildRequires: libblas-devel
BuildRequires: java-openjdk8-runtime
BuildRequires: libarpack-devel
BuildRequires: libbrotli-devel
BuildRequires: libcares-devel
BuildRequires: libcurl-devel
BuildRequires: libe2fs-devel
BuildRequires: libevent-devel
BuildRequires: libfftw-devel
BuildRequires: libgcc
BuildRequires: libgomp-devel
BuildRequires: libgsasl-devel
BuildRequires: libgss-devel
BuildRequires: libhdf5-devel
BuildRequires: libhwloc-devel
BuildRequires: libicu-devel
BuildRequires: libidn-devel
BuildRequires: libidn2-devel
BuildRequires: libkrb5-devel
BuildRequires: liblzma-devel
BuildRequires: libmatio-devel
BuildRequires: libmpi-devel
BuildRequires: libncurses-devel
BuildRequires: libnghttp2-devel
BuildRequires: libntlm-devel
BuildRequires: libopenblas-devel
BuildRequires: libopenldap-devel
BuildRequires: libopenssl-devel
BuildRequires: libpcre-devel
BuildRequires: libpsl-devel
BuildRequires: libquadmath-devel
BuildRequires: librtmp-devel
BuildRequires: libsasl2-devel
BuildRequires: libssh2-devel
BuildRequires: libstdc++6-devel
BuildRequires: libsuitesparse-devel
BuildRequires: libtcl-devel
BuildRequires: libtk-devel
BuildRequires: libudev-devel
BuildRequires: libunistring-devel
BuildRequires: libxml2-devel
BuildRequires: libz-devel
BuildRequires: pvm
BuildRequires: libzstd-devel
## AUTOBUILDREQ-END
BuildRequires: ocaml
BuildRequires: ocaml-num
BuildRequires: libarpack-devel
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
# java stuff
BuildRequires: antlr
BuildRequires: java-openjdk8
BuildRequires: apache-ant
BuildRequires: apache-batik
BuildRequires: apache-fop == 0.95
BuildRequires: jakarta-commons-beanutils == 1.7.0
BuildRequires: jakarta-commons-io == 1.4
BuildRequires: jakarta-commons-logging == 1.1.1
BuildRequires: java-bsh2
BuildRequires: java-checkstyle
BuildRequires: java-excalibur-avalon-framework
BuildRequires: java-flexdock
BuildRequires: java-graphx
BuildRequires: java-jeuclid
BuildRequires: java-jlatexmath
BuildRequires: java-junit3
BuildRequires: java-openjdk
BuildRequires: java-qdox
BuildRequires: java-rosetta
BuildRequires: java-saxon6
BuildRequires: java-skinlf
BuildRequires: java-testng
BuildRequires: javahelp2
BuildRequires: java-flexdock
BuildRequires: java-jogl
BuildRequires: jgoodies-looks
BuildRequires: xml-commons-apis
BuildRequires: jpackage-utils
BuildRequires: xmlgraphics-commons == 1.3.1
%if %with_gui
BuildRequires: java-gluegen1 == 1.1.1
BuildRequires: java-jogl1 == 1.1.1
%endif
%if %with_hdf5
BuildRequires: java-hdf5
BuildRequires: libhdf5-devel
%endif
BuildRequires: libmpi-devel
BuildRequires: libsablotron-devel
BuildRequires: libXaw3d-devel
BuildRequires: ocaml
BuildRequires: perl-devel
Requires: docbook-dtds-5-schemas
BuildRequires: java-skinlf
BuildRequires: javahelp2
BuildRequires: java-lucene
BuildRequires: java-rosetta
BuildRequires: apache-batik
BuildRequires: java-jeuclid
BuildRequires: apache-fop
BuildRequires: jakarta-commons-io
BuildRequires: java-excalibur-avalon-framework-api
BuildRequires: jakarta-commons-logging
BuildRequires: java-xmlgraphics-commons
BuildRequires: java-jlatexmath
BuildRequires: java-junit48
Requires: docbook-xsl
Requires: antlr
Requires: apache-batik
Requires: apache-fop == 0.95
Requires: jakarta-commons-beanutils == 1.7.0
Requires: jakarta-commons-io == 1.4
Requires: jakarta-commons-logging == 1.1.1
Requires: java-bsh2
Requires: apache-fop
Requires: jakarta-commons-beanutils
Requires: jakarta-commons-io
Requires: jakarta-commons-logging
Requires: java-xmlgraphics-commons
Requires: java-checkstyle
Requires: java-excalibur-avalon-framework
Requires: java-flexdock
Requires: java-graphx
Requires: java-jeuclid
%if %with_hdf5
Requires: java-hdf5
%endif
%if %with_gui
Requires: java-gluegen1 == 1.1.1
Requires: java-jogl1 == 1.1.1
%endif
%if %with_swig
BuildRequires: swig
%endif
%if %with_giws
BuildRequires: giws
%endif
BuildRequires: libsuitesparse-devel
Requires: java-jlatexmath
Requires: java-junit3
Requires: java-openjdk
Requires: java-junit48
Requires: java-openjdk8
Requires: java-qdox
Requires: java-rosetta
Requires: java-saxon6
Requires: java-saxon9
Requires: java-skinlf
Requires: java-testng
Requires: javahelp2
Requires: jgoodies-looks
Requires: libatlas
Requires: ocaml
Requires: xml-commons-apis
#Requires: ElectricFence
#Requires: kdbg
#Requires: libtool
#Requires: valgrind
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
%description
Scilab is a scientific software package for numerical computations providing a powerful open computing environment for engineering and scientific applications.
Scilab includes hundreds of mathematical functions with the possibility to add interactively programs from various languages (C, Fortran...). It has sophisticated data structures (including lists, polynomials, rational functions, linear systems...), an interpreter and a high level programming language.
Scilab has been designed to be an open system where the user can define new data types and operations on these data types by using overloading.
%package devel
%package -n lib%{name}
Group: System/Libraries
Summary: Shared libraries provided by Scilab
%description -n lib%{name}
Scilab - A scientific software package for numerical computations.
This package contains the shared libraries provided by Scilab.
%package -n lib%{name}-devel
Group: Development/Libraries
Summary: Development files for Scilab
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
Provides: scilab-devel
Obsoletes: scilab-devel < 6.1.0
%description devel
%description -n lib%{name}-devel
Scilab - A scientific software package for numerical computations.
This package contains development files for with Scilab.
#% debug_package
%prep
%setup -q
#-D -T
#:<< _EOF
%patch0 -p2
#%patch1 -p0
%patch3 -p1
#%patch2 -p1
%patch4 -p1
%patch6 -p1
%patch7 -p1
autoreconf -f -i
%patch0 -p0
%patch1 -p0
%if ! %with_hdf5
%patch2 -p0
%endif
%patch3 -p0
%if ! %with_gui
%patch5 -p0
%else
%patch6 -p0
%endif
%patch7 -p0
%patch8 -p0
sed -i "s|%{_libdir}/jni|%{_jnidir}|" etc/librarypath.xml
for j in $(find . -name "*.jar"); do
mv $j $j.no
done
for c in $(find . -name "*.class"); do
rm -rf $c
done
for o in $(find . -name "*.so"); do
rm -rf $o
done
for e in $(find . -name "*.exe"); do
rm -rf $e
done
for d in $(find . -name "*.dll"); do
rm -rf $d
done
%build
#:<< _EOF
autoreconf
%if %with_hdf5
export JHDF5=%{_jnidir}/jhdf5.jar JHDF5_LIBS=%{_jnidir}
%endif
%if %with_gui
export JOGL=%{_javadir}/jogl.jar GLUEGEN_RT=%{_javadir}/gluegen-rt.jar
%endif
# build without -rpath
SCILAB_LIB_RPATH=$PWD/libs/blas/.libs:$PWD/libs/doublylinkedlist/.libs:$PWD/libs/dynamiclibrary/.libs:$PWD/libs/hashtable/.libs:$PWD/libs/lapack/.libs:$PWD/libs/libst/.libs:$PWD/libs/MALLOC/.libs:$PWD/modules/action_binding/.libs:$PWD/modules/api_scilab/.libs:$PWD/modules/arnoldi/.libs:$PWD/modules/boolean/.libs:$PWD/modules/cacsd/.libs:$PWD/modules/call_scilab/.libs:$PWD/modules/commons/.libs:$PWD/modules/completion/.libs:$PWD/modules/console/.libs:$PWD/modules/core/.libs:$PWD/modules/data_structures/.libs:$PWD/modules/differential_equations/.libs:$PWD/modules/double/.libs:$PWD/modules/dynamic_link/.libs:$PWD/modules/elementary_functions/.libs:$PWD/modules/fftw/.libs:$PWD/modules/fileio/.libs:$PWD/modules/functions/.libs:$PWD/modules/graph/.libs:$PWD/modules/graphic_export/.libs:$PWD/modules/graphics/.libs:$PWD/modules/gui/.libs:$PWD/modules/helptools/.libs:$PWD/modules/history_browser/.libs:$PWD/modules/history_manager/.libs:$PWD/modules/integer/.libs:$PWD/modules/interpolation/.libs:$PWD/modules/intersci/.libs:$PWD/modules/io/.libs:$PWD/modules/javasci/.libs:$PWD/modules/jvm/.libs:$PWD/modules/.libs:$PWD/modules/linear_algebra/.libs:$PWD/modules/localization/.libs:$PWD/modules/matio/.libs:$PWD/modules/mexlib/.libs:$PWD/modules/optimization/.libs:$PWD/modules/output_stream/.libs:$PWD/modules/parallel/.libs:$PWD/modules/parameters/.libs:$PWD/modules/polynomials/.libs:$PWD/modules/pvm/.libs:$PWD/modules/randlib/.libs:$PWD/modules/renderer/.libs:$PWD/modules/scicos_blocks/.libs:$PWD/modules/scicos/.libs:$PWD/modules/scinotes/.libs:$PWD/modules/shell/.libs:$PWD/modules/signal_processing/.libs:$PWD/modules/sound/.libs:$PWD/modules/sparse/.libs:$PWD/modules/special_functions/.libs:$PWD/modules/spreadsheet/.libs:$PWD/modules/statistics/.libs:$PWD/modules/string/.libs:$PWD/modules/symbolic/.libs:$PWD/modules/tclsci/.libs:$PWD/modules/time/.libs:$PWD/modules/types/.libs:$PWD/modules/ui_data/.libs:$PWD/modules/umfpack/.libs:$PWD/modules/windows_tools/.libs:file:$PWD/modules/xcos/.libs:
%if %with_hdf5
SCILAB_LIB_RPATH=$SCILAB_LIB_RPATH:$PWD/modules/hdf5/.libs:
%endif
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SCILAB_LIB_RPATH
%configure \
--with-jdk=%javahome \
--with-ant=$ANT_HOME \
LDFLAGS="-L/usr/lib/atlas -lgfortran" \
%if %with_giws
--enable-build-giws \
%endif
%if %with_swig
--enable-build-swig \
%endif
--enable-build-help \
--with-fftw \
--with-gcc \
--with-gfortran \
--with-mpi \
--with-matio \
--with-pvm \
--disable-static \
--enable-shared \
%if ! %with_gui
--without-gui\
%endif
--without-scicos \
%if ! %with_hdf5
--without-hdf5
%endif
--with-umfpack \
--with-fftw \
--with-modelica \
--without-emf \
--with-install-help-xml \
--enable-build-help \
--enable-build-localization \
--disable-static-system-lib \
--with-jdk=%{_jvmdir}/java-8-openjdk/ \
FFLAGS="-fallow-argument-mismatch" \
CFLAGS="%{optflags} -fcommon" \
CXXFLAGS="%{optflags} -fcommon"
%make all
# --without-scicos Disable Scicos http://www.scicoslab.org/
%make
make doc
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
make install DESTDIR=%{buildroot}
%makeinstall
rm -rf %{buildroot}%{_libdir}/scilab/*.la
chmod 755 %{buildroot}%{_datadir}/scilab/modules/helptools/bin/manrev2sci
chmod 755 %{buildroot}%{_datadir}/scilab/modules/helptools/bin/man2sci
chmod 755 %{buildroot}%{_datadir}/scilab/modules/helptools/bin/scivalid
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --mode=644 --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
for png in 16 22 24 32 48 64 128; do
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${png}x${png}/apps/
convert -resize ${png}x${png} %{SOURCE2} \
%{buildroot}%{_datadir}/icons/hicolor/${png}x${png}/apps/scilab.png
done
mkdir -p %{buildroot}%{_datadir}/pixmaps
convert -resize 32x32 %{SOURCE2} \
%{buildroot}%{_datadir}/pixmaps/scilab.png
rm -rf %{buildroot}%{_datadir}/.directory
rm -rf %{buildroot}%{_datadir}/scilab/.directory
make DESTDIR=%{buildroot} install-data install-html
%find_lang scilab
@ -289,154 +210,54 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f scilab.lang
%defattr(-,root,root)
%{_bindir}/intersci
%{_bindir}/XML2Modelica
%{_bindir}/modelicac
%{_bindir}/modelicat
%{_bindir}/scilab
%{_bindir}/scilab-adv-cli
%{_bindir}/scilab-bin
%{_bindir}/scilab-cli
%{_bindir}/scilab-cli-bin
%dir %{_libdir}/scilab
%{_libdir}/scilab/libjavasci.so.*
%{_libdir}/scilab/libjavasci2.so.*
%{_libdir}/scilab/libmat.so.*
%{_libdir}/scilab/libmex.so.*
%{_libdir}/scilab/libmx.so.*
%{_libdir}/scilab/libsci*.so.*
%{_libdir}/scilab/*.so
%{_bindir}/scinotes
%{_bindir}/xcos
%dir %{_datadir}/scilab
%{_datadir}/scilab/ACKNOWLEDGEMENTS
%{_datadir}/scilab/CHANGES_*
%{_datadir}/scilab/CHANGES.md
%{_datadir}/scilab/COPYING*
%{_datadir}/scilab/README_*
%{_datadir}/scilab/RELEASE_NOTES_*
%{_datadir}/scilab/Readme_Visual.txt
%{_datadir}/scilab/README.md
%{_datadir}/scilab/Version.incl
%{_datadir}/scilab/contrib
%{_datadir}/scilab/etc
%{_datadir}/scilab/icons
#%{_datadir}/scilab/icons
%{_datadir}/scilab/tools
%dir %{_datadir}/scilab/modules
%{_datadir}/scilab/modules/action_binding
%{_datadir}/scilab/modules/api_scilab
%{_datadir}/scilab/modules/arnoldi
%{_datadir}/scilab/modules/atoms
%{_datadir}/scilab/modules/boolean
%{_datadir}/scilab/modules/cacsd
%{_datadir}/scilab/modules/call_scilab
%dir %{_datadir}/scilab/modules/commons
%{_datadir}/scilab/modules/commons/*.txt
%{_datadir}/scilab/modules/commons/version.xml
%{_datadir}/scilab/modules/commons/etc
%{_datadir}/scilab/modules/commons/jar
%{_datadir}/scilab/modules/commons/macros
#%dir %{_datadir}/scilab/modules/commons/sci_gateway
%{_datadir}/scilab/modules/compatibility_functions
%{_datadir}/scilab/modules/completion
%{_datadir}/scilab/modules/console
%{_datadir}/scilab/modules/core
%{_datadir}/scilab/modules/data_structures
%{_datadir}/scilab/modules/demo_tools
%{_datadir}/scilab/modules/development_tools
%{_datadir}/scilab/modules/differential_equations
%{_datadir}/scilab/modules/double
%dir %{_datadir}/scilab/modules/doublylinkedlist
%dir %{_datadir}/scilab/modules/doublylinkedlist/macros
%{_datadir}/scilab/modules/dynamic_link
%dir %{_datadir}/scilab/modules/dynamiclibrary
%dir %{_datadir}/scilab/modules/dynamiclibrary/macros
%{_datadir}/scilab/modules/elementary_functions
%{_datadir}/scilab/modules/fftw
%{_datadir}/scilab/modules/fileio
%{_datadir}/scilab/modules/functions
%{_datadir}/scilab/modules/genetic_algorithms
%dir %{_datadir}/scilab/modules/graph
%{_datadir}/scilab/modules/graph/*.txt
%{_datadir}/scilab/modules/graph/version.xml
%{_datadir}/scilab/modules/graph/etc
%{_datadir}/scilab/modules/graph/jar
%{_datadir}/scilab/modules/graph/macros
%{_datadir}/scilab/modules/graph/tests
#%dir %{_datadir}/scilab/modules/graph/sci_gateway
%{_datadir}/scilab/modules/graphic_export
%{_datadir}/scilab/modules/graphics
%{_datadir}/scilab/modules/gui
%dir %{_datadir}/scilab/modules/hashtable
%dir %{_datadir}/scilab/modules/hashtable/macros
%{_datadir}/scilab/modules/hdf5
%{_datadir}/scilab/modules/helptools
%dir %{_datadir}/scilab/modules/history_browser
%{_datadir}/scilab/modules/history_browser/*.txt
%{_datadir}/scilab/modules/history_browser/*.xml
%{_datadir}/scilab/modules/history_browser/etc
%{_datadir}/scilab/modules/history_browser/jar
%{_datadir}/scilab/modules/history_browser/macros
%{_datadir}/scilab/modules/history_browser/tests
#%dir %{_datadir}/scilab/modules/history_browser/sci_gateway
%{_datadir}/scilab/modules/history_manager
%{_datadir}/scilab/modules/integer
%{_datadir}/scilab/modules/interpolation
%{_datadir}/scilab/modules/intersci
%{_datadir}/scilab/modules/io
%{_datadir}/scilab/modules/javasci
%{_datadir}/scilab/modules/jvm
%dir %{_datadir}/scilab/modules/libst
%dir %{_datadir}/scilab/modules/libst/macros
%{_datadir}/scilab/modules/linear_algebra
%{_datadir}/scilab/modules/localization
%{_datadir}/scilab/modules/m2sci
%dir %{_datadir}/scilab/modules/malloc
%dir %{_datadir}/scilab/modules/malloc/macros
%{_datadir}/scilab/modules/maple2scilab
%{_datadir}/scilab/modules/matio
%{_datadir}/scilab/modules/mexlib
%{_datadir}/scilab/modules/modules_manager
%{_datadir}/scilab/modules/optimization
%{_datadir}/scilab/modules/output_stream
%{_datadir}/scilab/modules/overloading
%{_datadir}/scilab/modules/parallel
%{_datadir}/scilab/modules/parameters
%{_datadir}/scilab/modules/polynomials
%{_datadir}/scilab/modules/pvm
%{_datadir}/scilab/modules/randlib
%{_datadir}/scilab/modules/renderer
%{_datadir}/scilab/modules/scicos
%{_datadir}/scilab/modules/scinotes
%{_datadir}/scilab/modules/shell
%{_datadir}/scilab/modules/signal_processing
%{_datadir}/scilab/modules/simulated_annealing
%{_datadir}/scilab/modules/sound
%{_datadir}/scilab/modules/sparse
%{_datadir}/scilab/modules/special_functions
%{_datadir}/scilab/modules/spreadsheet
%{_datadir}/scilab/modules/statistics
%{_datadir}/scilab/modules/string
%{_datadir}/scilab/modules/symbolic
%{_datadir}/scilab/modules/tclsci
%{_datadir}/scilab/modules/texmacs
%{_datadir}/scilab/modules/time
%dir %{_datadir}/scilab/modules/types
%{_datadir}/scilab/modules/types/*.txt
%{_datadir}/scilab/modules/types/*.xml
%{_datadir}/scilab/modules/types/etc
%{_datadir}/scilab/modules/types/jar
%{_datadir}/scilab/modules/types/macros
#%dir %{_datadir}/scilab/modules/types/sci_gateway
%{_datadir}/scilab/modules/types/tests
%{_datadir}/scilab/modules/ui_data
%{_datadir}/scilab/modules/umfpack
%{_datadir}/scilab/modules/windows_tools
%{_datadir}/scilab/modules/xcos
%{_datadir}/applications/scilab.desktop
%{_datadir}/icons/hicolor/*x*/apps/scilab.png
%{_datadir}/pixmaps/scilab.png
%doc license.txt
%{_datadir}/scilab/modules/*
%{_datadir}/appdata/scilab.appdata.xml
%{_datadir}/applications/*.desktop
%{_datadir}/mime/packages/scilab.xml
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/*/mimetypes/*.png
#%{_datadir}/pixmaps/scilab.png
#%doc license.txt
%files devel
%files -n lib%{name}
%defattr(-,root,root)
%dir %{_libdir}/scilab
%{_libdir}/scilab/libjavasci2.so.*
%{_libdir}/scilab/libsci*.so.*
%{_libdir}/scilab/*.so
%{_libdir}/scilab/*.la
%files -n lib%{name}-devel
%defattr(-,root,root)
%dir %{_includedir}/scilab
%{_includedir}/scilab/*.h
%{_exec_prefix}/lib/pkgconfig/scilab.pc
%{_includedir}/scilab/*
%{_libdir}/pkgconfig/scilab.pc
%changelog
* Sun Apr 11 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 6.1.0-1mamba
- update to 6.1.0
* Sat Aug 03 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 5.3.0-5mamba
- rebuilt with libhdf5 1.8.10