From: EMMANUEL STREBY Date: Tue, 4 Jun 2019 13:00:56 +0000 (+0200) Subject: Add list patches for EDF X-Git-Tag: V9_4_0a2^2~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ffdf4fb7ca896bbe52fbd4c1ebb2f00a4e3c8517;p=tools%2Fconfiguration.git Add list patches for EDF --- diff --git a/config/patches/edf/README_V9_2_0.txt b/config/patches/edf/README_V9_2_0.txt new file mode 100644 index 0000000..b9038a8 --- /dev/null +++ b/config/patches/edf/README_V9_2_0.txt @@ -0,0 +1,12 @@ +In this directory you can find all the patch used for V9_2_0 building : + +CGAL 4.0 : cgal_cmake352.patch +FREEIMAGE 3.1.6 : +GL2PS 1.4.0-20170729 : gl2ps.patch +OCC 7.2.0p3 : OCCT-7.2.0.patch +OMNIORBPY 4.2.2 : omniORBpy-4.2.1-2-python3.patch +OPENTURNS_WRAPY 0.7 : otwrapy_0.7_py3.patch +PARAVIEW v5.6.0 : ParaView-5.4.0-463c0633-vtkXOpenGLRenderWindow.cxx.patch, patch_pv_b5c4c893_py_catalyst.patch +PILLOW 3.4.2 : pillow-py3.patch +SCOTCH 6.0.4 : scotch604_Make.inc.patch +SPHINX 1.2.3 : sphinx176_w_intl_napoleon.patch diff --git a/config/patches/edf/README_V9_3_0.txt b/config/patches/edf/README_V9_3_0.txt new file mode 100644 index 0000000..193b788 --- /dev/null +++ b/config/patches/edf/README_V9_3_0.txt @@ -0,0 +1,28 @@ +In this directory you can find all the patch used for V9_3_0 building : + + +CGAL 4.0 : cgal_cmake352.patch +> fix for a dobble / in a path + # For CGAL < 4.7 + # Patch if build with cmake > 3.5 + +FREEIMAGE 3.17 : freeimage_3170_sci9.patch and FreeImage3170_Make.patch +> patch to build freeimage + +GL2PS 1.4.0 : +> Patch for : if(GLUT_FOUND) + +HDF5 1.10.3 : patchHDF5Build.py +> Make links + +MATPLOTLIB 2.2.2 : setup_qt5.cfg +> Patch to build matplolib with Qt5 options + +OMNIORBPY 4.2.2 : omniORBpy-4.2.1-2-python3.patch +> To python3 version compatiblity + +SCOTCH 6.4.0 : scotch604_Make.inc.patch +> Fix esmumps management + +SPHINX 1.7.6 : sphinx176_w_intl_napoleon.patch +> Lowering the version number for the required software diff --git a/config/patches/edf/freeimage_3170_sci9.patch b/config/patches/edf/freeimage_3170_sci9.patch new file mode 100644 index 0000000..4aeeef5 --- /dev/null +++ b/config/patches/edf/freeimage_3170_sci9.patch @@ -0,0 +1,44 @@ +diff -Naur Freeimage-3170_orig/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c Freeimage-3170/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c +--- Freeimage-3170_orig/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c 2015-02-20 02:34:36.000000000 +0000 ++++ Freeimage-3170/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c 2018-10-24 11:19:31.058729145 +0000 +@@ -34,15 +34,15 @@ + G = G - t2 + kGCst; \ + B = B + kBCst; \ + __asm__ volatile ( \ +- "shll_s.w %["#R"], %["#R"], 9 \n\t" \ +- "shll_s.w %["#G"], %["#G"], 9 \n\t" \ +- "shll_s.w %["#B"], %["#B"], 9 \n\t" \ +- "precrqu_s.qb.ph %["#R"], %["#R"], $zero \n\t" \ +- "precrqu_s.qb.ph %["#G"], %["#G"], $zero \n\t" \ +- "precrqu_s.qb.ph %["#B"], %["#B"], $zero \n\t" \ +- "srl %["#R"], %["#R"], 24 \n\t" \ +- "srl %["#G"], %["#G"], 24 \n\t" \ +- "srl %["#B"], %["#B"], 24 \n\t" \ ++ "shll_s.w %[" #R "], %[" #R "], 9 \n\t" \ ++ "shll_s.w %[" #G "], %[" #G "], 9 \n\t" \ ++ "shll_s.w %[" #B "], %[" #B "], 9 \n\t" \ ++ "precrqu_s.qb.ph %[" #R "], %[" #R "], $zero \n\t" \ ++ "precrqu_s.qb.ph %[" #G "], %[" #G "], $zero \n\t" \ ++ "precrqu_s.qb.ph %[" #B "], %[" #B "], $zero \n\t" \ ++ "srl %[" #R "], %[" #R "], 24 \n\t" \ ++ "srl %[" #G "], %[" #G "], 24 \n\t" \ ++ "srl %[" #B "], %[" #B "], 24 \n\t" \ + : [R]"+r"(R), [G]"+r"(G), [B]"+r"(B) \ + : \ + ); \ +diff -Naur Freeimage-3170_orig/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c Freeimage-3170/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c +--- Freeimage-3170_orig/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c 2015-02-20 02:34:38.000000000 +0000 ++++ Freeimage-3170/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c 2018-10-24 11:20:37.854752080 +0000 +@@ -54,9 +54,9 @@ + "srl %[temp5], %[temp5], 24 \n\t" \ + "srl %[temp6], %[temp6], 24 \n\t" \ + "srl %[temp7], %[temp7], 24 \n\t" \ +- "sb %[temp5], "#R"(%[dst]) \n\t" \ +- "sb %[temp6], "#G"(%[dst]) \n\t" \ +- "sb %[temp7], "#B"(%[dst]) \n\t" \ ++ "sb %[temp5], " #R "(%[dst]) \n\t" \ ++ "sb %[temp6], " #G "(%[dst]) \n\t" \ ++ "sb %[temp7], " #B "(%[dst]) \n\t" \ + + #define ASM_CLOBBER_LIST() \ + : [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2), \ diff --git a/config/patches/edf/patchHDF5Build.py b/config/patches/edf/patchHDF5Build.py new file mode 100644 index 0000000..cab5be8 --- /dev/null +++ b/config/patches/edf/patchHDF5Build.py @@ -0,0 +1,18 @@ +import os + +li=[] +for root,dirs,fis in os.walk(os.getcwd()): + if "link.txt" in fis: + li.append(os.path.join(root,"link.txt")) + +for f in li: + with open(f,"r") as fid: + lines=fid.readlines() + for ii,st in enumerate(lines): + st=st.replace("-Wl,--export-dynamic;","-Wl,--export-dynamic") + st=st.replace("--enable-new-dtags;","--enable-new-dtags") + lines[ii]=st + pass + with open(f,"w") as fid: + fid.writelines(lines) + diff --git a/config/patches/edf/setup_qt5.cfg b/config/patches/edf/setup_qt5.cfg new file mode 100644 index 0000000..46fc465 --- /dev/null +++ b/config/patches/edf/setup_qt5.cfg @@ -0,0 +1,83 @@ +# Rename this file to setup.cfg to modify matplotlib's +# build options. + +[egg_info] +tag_svn_revision = 1 + +[directories] +# Uncomment to override the default basedir in setupext.py. +# This can be a single directory or a comma-delimited list of directories. +#basedirlist = /usr + +[status] +# To suppress display of the dependencies and their versions +# at the top of the build log, uncomment the following line: +#suppress = False + +[packages] +# There are a number of subpackages of matplotlib that are considered +# optional. They are all installed by default, but they may be turned +# off here. +# +tests = False +sample_data = False +toolkits = True + +[gui_support] +# Matplotlib supports multiple GUI toolkits, including Cocoa, +# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of +# these toolkits requires AGG, the Anti-Grain Geometry library, +# which is provided by matplotlib and built by default. +# +# Some backends are written in pure Python, and others require +# extension code to be compiled. By default, matplotlib checks for +# these GUI toolkits during installation and, if present, compiles the +# required extensions to support the toolkit. +# +# - GTK 2.x support of any kind requires the GTK runtime environment +# headers and PyGTK. +# - Tk support requires Tk development headers and Tkinter. +# - Mac OSX backend requires the Cocoa headers included with XCode. +# - Windowing is MS-Windows specific, and requires the "windows.h" +# header. +# +# The other GUI toolkits do not require any extension code, and can be +# used as long as the libraries are installed on your system -- +# therefore they are installed unconditionally. +# +# You can uncomment any the following lines to change this +# behavior. Acceptible values are: +# +# True: build the extension. Exits with a warning if the +# required dependencies are not available +# False: do not build the extension +# auto: build if the required dependencies are available, +# otherwise skip silently. This is the default +# behavior +# +#agg = auto +#cairo = auto +#gtk = auto +#gtk3agg = auto +#gtk3cairo = auto +#gtkagg = auto +#macosx = auto +#pyside = auto +qt5agg = auto +#tkagg = auto +#windowing = auto +#wxagg = auto + +[rc_options] +# User-configurable options +# +# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo, +# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg. +# +# The Agg, Ps, Pdf and SVG backends do not require external +# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, or TkAgg +# if you have disabled the relevent extension modules. Agg will be used +# by default. +# +backend = Qt5Agg +# diff --git a/config/patches/edf/sphinx176_w_intl_napoleon.patch b/config/patches/edf/sphinx176_w_intl_napoleon.patch new file mode 100644 index 0000000..13bbb9b --- /dev/null +++ b/config/patches/edf/sphinx176_w_intl_napoleon.patch @@ -0,0 +1,15 @@ +--- Sphinx-176-doc012-jin273-pyg202-py355-set3840/setup.py 2018-07-16 17:22:47.000000000 +0200 ++++ Sphinx-176-doc012-jin273-pyg202-py355-set3840_w_intl_nap/setup.py 2018-08-20 14:11:16.139399383 +0200 +@@ -17,8 +17,10 @@ + install_requires = [ + 'six>=1.5', + 'Jinja2>=2.3', +- 'Pygments>=2.0', +- 'docutils>=0.11', ++ 'Pygments>=1.2', ++ 'docutils>=0.7', ++ 'sphinxcontrib-napoleon==0.6.1', ++ 'sphinx-intl==0.9.10', + 'snowballstemmer>=1.1', + 'babel>=1.3,!=2.0', + 'alabaster>=0.7,<0.8',