diff options
author | Grégory Salvan <apieum@gmail.com> | 2016-03-07 06:19:31 +0100 |
---|---|---|
committer | Grégory Salvan <apieum@gmail.com> | 2016-03-22 14:55:12 +0100 |
commit | e93aea35f5392272ade15fc3df09441cc411d457 (patch) | |
tree | 858209a3c6112031fec2df7d634a367b4a9fc9fa | |
parent | dev-python/ffnet: Add new ffnet and ffnetui ebuilds (diff) | |
download | sci-e93aea35f5392272ade15fc3df09441cc411d457.tar.gz sci-e93aea35f5392272ade15fc3df09441cc411d457.tar.bz2 sci-e93aea35f5392272ade15fc3df09441cc411d457.zip |
sci-libs/calculix-ccx-2.10 sci-libs/calculix-cgx-2.10 version bump (ref #602)
10 files changed, 98 insertions, 135 deletions
diff --git a/sci-libs/calculix-ccx/Manifest b/sci-libs/calculix-ccx/Manifest index 2876cf2b3..2ac382c59 100644 --- a/sci-libs/calculix-ccx/Manifest +++ b/sci-libs/calculix-ccx/Manifest @@ -1,3 +1,3 @@ -DIST ccx_2.8p2.ps.tar.bz2 2404566 SHA256 8dda526c5b7911446ecadb3ded32e3d2b3daa7f232bfc88a2ad69d807acacc61 SHA512 abfe8d76e2c4fa55dea43c9a819e84dd4f8511bdb1f97c2862eb8faaa5bf314f88efabf1d8507db45d10e698cf0da0e546e108919bf4e82099f817237c1f08de WHIRLPOOL 635d5def9ae884bd2407c062afb727ab0235b64e844f6d5c302bea2fcd8e6798b930bba68c855b77ea4b4276c151bb0588e4132cd583d097908ceffa49ade4c4 -DIST ccx_2.8p2.src.tar.bz2 919489 SHA256 a21feb1a498b5925ddc9f7f58cb486d930435db4a47d5c583dd73f5160431eb2 SHA512 0ec53027ec7b072da33432b903048c5932cc51d43f5156a1ae64daf08924ed68f6bc70ea4b7fa4db9ad750bccd64c347fc7aec24418c67acaaf75c05a5988ab3 WHIRLPOOL 80587ca75690e7252303950e68b4071f14ce224d32297870589841ea1cbc7a3ad1ca257e87d84ef5ad47d688623b8cf950f2f508f4b8b9b235c9493657ada5a7 -DIST ccx_2.8p2.test.tar.bz2 9014544 SHA256 a859389cb1405a6130e06215715d4aac93b7877825d7d30a78ef3ab1f3df3662 SHA512 3d96041307b36fe342bf8ca63b041357ba818c0f72ff6217d07e0e72613aec1322a797ff2c03ecdf9cbd853f0bb79fb2e32868dc4a8ed2f20dc936a9142f9c2f WHIRLPOOL 7c859d25b3f8a9595b65bc6bb5a5f5fd8c7cd4fd0857a29b114cc0bcafc17aaf3c0c487a81ff4521ec70b2e076c4119e4913649507ea6db7900cfcf6fc79f052 +DIST ccx_2.10.ps.tar.bz2 2421249 SHA256 e7f5278b8a6efd92ca97b022afb1964792e9256b42ef9b26eb966d496a60db43 SHA512 9578d358255331045dfb3d5eccb6281f3cbaf7fdb4d0cef5cd0c19d622cba857216c7d5cba95146a1396b940a0131508509c830200c82e8c7e5ea558907aac43 WHIRLPOOL 4d1510f3ae5d327b5826753badef2671c959b2b43477f5c151ca528b0a88f66a21ab243ef6aebdcd973a723d6aa3dc7c2e75a637ab3a0cf30b58d183e15fed0c +DIST ccx_2.10.src.tar.bz2 1005712 SHA256 693497d19d8dd2a5376e64e038d5c248d87f0e2df46d409a83bf976596b319f5 SHA512 bdd852a7fa5e327ed248058370bfaa5f029e4d98c9ee7d0e0a12f2bca480e5fc402a228e23c45f94149b2de427ebff32805f9c2a4ddbb223ff6333c26076743b WHIRLPOOL 56fb794fc8250e96ca53300ee7b4f10d7703a11a0a5e51dfe1504e320e39516e146050775a5c373180c77fdec0b090c65225e5dbac12f4a6ce5066bcbf4402e9 +DIST ccx_2.10.test.tar.bz2 9083192 SHA256 a5e00abc7f9b2a5a5f1a4f7b414617dc65cd0be9b2a66c93e20b5a25c1392a75 SHA512 9dac892b5d3d2070cc266ceeceec2aba205a81db6bb3b688a803f7768d0223c10c545cbd617628ed3ca39b13d154834eab3529a43f360991ad41d6a7771446f2 WHIRLPOOL 757fcadbb6356d9a904973ff0e6fb5644d2ec0c36ac15a0f058d310eb43c2cb91f0c34d7bfd62e0da2d8c44a4cf6ea963975e5a247a173cf80afdad78ba326b7 diff --git a/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild b/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild index f643dc931..c9eb261f8 100644 --- a/sci-libs/calculix-ccx/calculix-ccx-2.8_p2.ebuild +++ b/sci-libs/calculix-ccx/calculix-ccx-2.10.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils toolchain-funcs flag-o-matic fortran-2 @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="arpack doc examples threads" +IUSE="arpack doc examples openmp threads" RDEPEND=" arpack? ( >=sci-libs/arpack-3.1.3 ) @@ -31,9 +31,9 @@ DEPEND="${RDEPEND} S=${WORKDIR}/CalculiX/${MY_P}/src -src_prepare (){ - epatch "${FILESDIR}/01_${MY_P}_Makefile_custom_cc_flags_spooles_arpack.patch" -} +PATCHES=( + "${FILESDIR}/01_${MY_P}_Makefile_custom_cc_flags_spooles_arpack.patch" +) src_configure() { # Technically we currently only need this when arpack is not used. @@ -44,6 +44,11 @@ src_configure() { if use threads; then append-cflags "-DUSE_MT" fi + + if use openmp; then + append-fflags "-fopenmp" + append-cflags "-fopenmp" + fi if use arpack; then export ARPACKLIB=$($(tc-getPKG_CONFIG) --libs arpack) diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.10_Makefile_custom_cc_flags_spooles_arpack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.10_Makefile_custom_cc_flags_spooles_arpack.patch new file mode 100644 index 000000000..83caf80f9 --- /dev/null +++ b/sci-libs/calculix-ccx/files/01_ccx_2.10_Makefile_custom_cc_flags_spooles_arpack.patch @@ -0,0 +1,35 @@ +Fix Makefile to make it use custom CFLAGS and system libraries. + +diff -uwrN ccx_2.10.ORIG/src/Makefile ccx_2.10/src/Makefile +--- src/Makefile 2016-03-07 04:57:09.462878788 +0100 ++++ ccx_2.10/src/Makefile 2016-03-07 06:05:44.150786978 +0100 +@@ -1,9 +1,6 @@ + +-CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE +-FFLAGS = -Wall -O3 -fopenmp +- +-CC=cc +-FC=gfortran ++CFLAGS := -Wall -DARCH="Linux" -DMATRIXSTORAGE $(CFLAGS) ++FFLAGS := -Wall $(FFLAGS) + + .c.o : + $(CC) $(CFLAGS) -c $< +@@ -18,15 +15,10 @@ + OCCXC = $(SCCXC:.c=.o) + OCCXMAIN = $(SCCXMAIN:.c=.o) + +-DIR=../../../SPOOLES.2.2 +- +-LIBS = \ +- $(DIR)/spooles.a \ +- ../../../ARPACK/libarpack_INTEL.a \ +- -lpthread -lm -lc ++LIBS = $(ARPACKLIB) $(LAPACK) -lm -lc -lspooles -lpthread + + ccx_2.10: $(OCCXMAIN) ccx_2.10.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS) ++ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS) + + ccx_2.10.a: $(OCCXF) $(OCCXC) + ar vr $@ $? diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch deleted file mode 100644 index b04263492..000000000 --- a/sci-libs/calculix-ccx/files/01_ccx_2.7_Makefile_custom_cc_flags_spooles_arpack.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -rupN CalculiX/ccx_2.7/src/Makefile CalculiX.patched/ccx_2.7/src/Makefile ---- CalculiX/ccx_2.7/src/Makefile 2014-03-02 09:33:28.000000000 -0500 -+++ CalculiX.patched/ccx_2.7/src/Makefile 2014-09-04 16:49:28.456612880 -0400 -@@ -1,9 +1,8 @@ -+CFLAGS := -Wall -O3 -DARCH="Linux" -DMATRIXSTORAGE $(CFLAGS) -+FFLAGS := -Wall -O3 $(FFLAGS) - --CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE --FFLAGS = -Wall -O3 -- --CC=cc --FC=gfortran -+#CC:=cc -+#FC:=gfortran - - .c.o : - $(CC) $(CFLAGS) -c $< -@@ -18,12 +17,7 @@ OCCXF = $(SCCXF:.f=.o) - OCCXC = $(SCCXC:.c=.o) - OCCXMAIN = $(SCCXMAIN:.c=.o) - --DIR=../../../SPOOLES.2.2 -- --LIBS = \ -- $(DIR)/spooles.a \ -- ../../../ARPACK/libarpack_INTEL.a \ -- -lpthread -lm -lc -+LIBS = $(ARPACKLIB) $(LAPACK) -lm -lc -lspooles -lpthread - - ccx_2.7: $(OCCXMAIN) ccx_2.7.a $(LIBS) - ./date.pl; $(CC) $(CFLAGS) -c ccx_2.7.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.7.a $(LIBS) diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.7_lapack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.7_lapack.patch deleted file mode 100644 index cc83fca94..000000000 --- a/sci-libs/calculix-ccx/files/01_ccx_2.7_lapack.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN CalculiX/ccx_2.7/src/Makefile.inc CalculiX.patch/ccx_2.7/src/Makefile.inc ---- CalculiX/ccx_2.7/src/Makefile.inc 2014-03-02 09:33:27.000000000 -0500 -+++ CalculiX.patch/ccx_2.7/src/Makefile.inc 2014-08-30 11:18:14.914823360 -0400 -@@ -128,7 +128,6 @@ depvars.f \ - deuldlag.f \ - dflux.f \ - dfluxs.f \ --dgesv.f \ - distattach.f \ - distattach_3d.f \ - distattachline.f \ diff --git a/sci-libs/calculix-ccx/files/01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch b/sci-libs/calculix-ccx/files/01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch deleted file mode 100644 index a47fdc6f1..000000000 --- a/sci-libs/calculix-ccx/files/01_ccx_2.8p2_Makefile_custom_cc_flags_spooles_arpack.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix Makefile to make it use custom CFLAGS and system libraries. - ---- CalculiX.orig/ccx_2.8p2/src/Makefile 2015-05-21 11:04:58.125111330 +0300 -+++ CalculiX/ccx_2.8p2/src/Makefile 2015-05-21 11:08:26.848130631 +0300 -@@ -1,9 +1,9 @@ - --CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE --FFLAGS = -Wall -O3 -fopenmp -+CFLAGS := -Wall -O3 -DARCH="Linux" -DMATRIXSTORAGE $(CFLAGS) -+FFLAGS := -Wall -O3 $(FFLAGS) - --CC=cc --FC=gfortran -+#CC=cc -+#FC=gfortran - - .c.o : - $(CC) $(CFLAGS) -c $< -@@ -18,12 +18,7 @@ - OCCXC = $(SCCXC:.c=.o) - OCCXMAIN = $(SCCXMAIN:.c=.o) - --DIR=../../../SPOOLES.2.2 -- --LIBS = \ -- $(DIR)/spooles.a \ -- ../../../ARPACK/libarpack_INTEL.a \ -- -lpthread -lm -lc -+LIBS = $(ARPACKLIB) $(LAPACK) -lm -lc -lspooles -lpthread - - ccx_2.8p2: $(OCCXMAIN) ccx_2.8p2.a $(LIBS) - ./date.pl; $(CC) $(CFLAGS) -c ccx_2.8p2.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.8p2.a $(LIBS) diff --git a/sci-libs/calculix-cgx/Manifest b/sci-libs/calculix-cgx/Manifest index 4faa77e9d..b5d231084 100644 --- a/sci-libs/calculix-cgx/Manifest +++ b/sci-libs/calculix-cgx/Manifest @@ -1,2 +1,2 @@ -DIST cgx_2.7.all.tar.bz2 1660205 SHA256 5378a664b52e64910afb896885fe63e1a2e639f3b4e0256eef4e71e96c6a10d2 SHA512 2e0fb80d4bb2d1a8f0ce5d04e542b42d3a616702fa176eaf533959f8e968a181877c79f5bb9f88980684004a766c3eb91fb9e393511ee787efe6632308004ced WHIRLPOOL ac57eeba70a8999014650f4360699bf671b71b3d402d297653d893aad45b5bbe89f363fe07fde8bdf999324af81fa5f0a699eddf0412040a71c97f6e57d88074 -DIST cgx_2.7.pdf 1082452 SHA256 8af937b79236085e6caf5b9b399cafaebda7a9dda0193522cd00ed5a09d18363 SHA512 49ff74be3ccf68f10a240093cf9fae2bcabaeb8acfe3511926df7fe3523f0ff66a130b2fa727504ff4787589ba6ee65ced76d229c315ad7306cbc665bc055c60 WHIRLPOOL 981890f2c7ee5e00de65f8a13a2eae097689bdc5f58956a2864c525950c68683794952f92149334a2e6538dcde47ff369194c644f5371cce4b9be9f6d27fec41 +DIST cgx_2.10.all.tar.bz2 1701663 SHA256 b2ea974003374c28b8e24f76f8a6c142db470a8c2a53013e3735efe78e98e84d SHA512 ac4dce3ffee63aa7be7ee441b7ae31a3839e6322175b70449e3c72bff3ed0bf3ade66170dd47f00d6ef488729f987f622a7db9cde3e69ad7cf38b9b096c931fd WHIRLPOOL a5186a8667e6272c669ed1f5214028235ca2179eb59f08abaa09ded64875aaeae6ab2541da6fbd6494b16b489ca2f1e68185e726fc3bc5be6bf03ed1df9d1b40 +DIST cgx_2.10.pdf 1178710 SHA256 b9bc56222496283948e151e3b1e07e4295cefba20ff9a567221bfbdb2c68b654 SHA512 cedf7556e85f631aa475d25325587aea2ecad650c325762080524dd056ba1e247d677c9ae2bcb2736b9c0a402a9060dbdebff834d8c10e3d127ecc3af9106385 WHIRLPOOL a10b68ec7772a0f98aa620b70c17b6293bf6a44647ee0a293b0629f5db6488a232b2c32cb632d77550b756293e307c4dfcd52fc3f3ccb8f73ec8ef9c6c4a4aef diff --git a/sci-libs/calculix-cgx/calculix-cgx-2.7-r1.ebuild b/sci-libs/calculix-cgx/calculix-cgx-2.10.ebuild index d00703657..0535bb835 100644 --- a/sci-libs/calculix-cgx/calculix-cgx-2.7-r1.ebuild +++ b/sci-libs/calculix-cgx/calculix-cgx-2.10.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils @@ -20,35 +20,36 @@ KEYWORDS="~amd64 ~x86" IUSE="doc examples" RDEPEND="media-libs/mesa[nptl] - >=media-libs/freeglut-1.0" + >=media-libs/freeglut-1.0 + virtual/opengl + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libXi + x11-libs/libXext + x11-libs/libXt + x11-libs/libSM + x11-libs/libICE" DEPEND="${RDEPEND} doc? ( app-text/ghostscript-gpl )" S=${WORKDIR}/CalculiX/${MY_P}/src/ -src_unpack() { - default - cp "${DISTDIR}/${MY_P}.pdf" "${S}" -} -src_prepare() { - epatch "${FILESDIR}"/01_${MY_P}_Makefile_custom_cxx_flags.patch - epatch "${FILESDIR}"/02_${MY_P}_menu_fix-freeglut_2.8.1.patch -} +PATCHES=( + "${FILESDIR}"/01_${MY_P}_Makefile_custom_cxx_flags.patch + "${FILESDIR}"/02_${MY_P}_menu_fix-freeglut_2.8.1.patch +) src_configure () { # Does not compile without -lpthread - #if use nptl; then export PTHREAD="-lpthread" - #else - # export PTHREAD="" - #fi + export LFLAGS="-L/usr/$(get_libdir) ${LFLAGS}" } src_install () { dobin cgx if use doc; then - dodoc ${MY_P}.pdf + dodoc "${DISTDIR}/${MY_P}.pdf" fi if use examples; then diff --git a/sci-libs/calculix-cgx/files/01_cgx_2.7_Makefile_custom_cxx_flags.patch b/sci-libs/calculix-cgx/files/01_cgx_2.10_Makefile_custom_cxx_flags.patch index 0c97613a0..d6e22f9c9 100644 --- a/sci-libs/calculix-cgx/files/01_cgx_2.7_Makefile_custom_cxx_flags.patch +++ b/sci-libs/calculix-cgx/files/01_cgx_2.10_Makefile_custom_cxx_flags.patch @@ -1,30 +1,30 @@ -diff -rupN CalculiX/cgx_2.7/src/Makefile CalculiX.patched/cgx_2.7/src/Makefile ---- CalculiX/cgx_2.7/src/Makefile 2014-02-18 13:47:05.000000000 -0500 -+++ CalculiX.patched/cgx_2.7/src/Makefile 2014-09-04 17:08:58.043266103 -0400 +diff -uwrN cgx_2.10.ORIG/src/Makefile cgx_2.10/src/Makefile +--- src/Makefile 2016-01-13 12:41:40.398930000 +0100 ++++ cgx_2.10/src/Makefile 2016-03-08 11:02:59.591853482 +0100 @@ -1,15 +1,15 @@ -CFLAGS = -O3 -Wall \ -+CFLAGS := -O3 -Wall \ ++CFLAGS += -Wall \ -I./ \ -I/usr/include \ -I/usr/include/GL \ -I../../libSNL/src \ -I../../glut-3.5/src \ - -I/usr/X11/include -+ -I/usr/X11/include $(CFLAGS) ++ -I/usr/include/X11 -LFLAGS = \ - -L/usr/lib64 -lGL -lGLU \ - -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \ - -lm -lpthread -lrt -+LFLAGS := \ -+ -L/usr/lib -lGL -lGLU -lglut \ -+ -L/usr/X11R6/lib -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \ -+ -lm $(PTHREAD) -lrt $(LFLAGS) ++LFLAGS += \ ++ -lGL -lGLU -lglut\ ++ -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \ ++ -lm $(PTHREAD) -lrt # on 32bit systems change lib64 to lib -@@ -19,41 +19,6 @@ LFLAGS = \ - include Makefile.inc +@@ -22,41 +22,6 @@ + userFunction.c SUTIL = \ - ../../glut-3.5/src/layerutil.c \ @@ -65,12 +65,9 @@ diff -rupN CalculiX/cgx_2.7/src/Makefile CalculiX.patched/cgx_2.7/src/Makefile uselibSNL.cpp \ generateTet.cpp \ ../../libSNL/src/*.cpp -@@ -62,7 +27,7 @@ OLIB = $(SLIB:.c=.o) +@@ -66,7 +31,7 @@ OUTIL = $(SUTIL:.c=.o) - cgx: $(OLIB) $(OUTIL) -- g++ $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@ -+ $(CXX) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@ - - - + cgx: $(OLIB) $(OUTIL) $(OULIB) +- g++ $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@ ++ $(CXX) $(OULIB) $(OLIB) $(OUTIL) $(CFLAGS) $(LFLAGS) -o $@ diff --git a/sci-libs/calculix-cgx/files/02_cgx_2.7_menu_fix-freeglut_2.8.1.patch b/sci-libs/calculix-cgx/files/02_cgx_2.10_menu_fix-freeglut_2.8.1.patch index 8f304afac..ff440b44e 100644 --- a/sci-libs/calculix-cgx/files/02_cgx_2.7_menu_fix-freeglut_2.8.1.patch +++ b/sci-libs/calculix-cgx/files/02_cgx_2.10_menu_fix-freeglut_2.8.1.patch @@ -1,7 +1,7 @@ -diff -rupN CalculiX/cgx_2.7/src/cgx.c CalculiX.patched/cgx_2.7/src/cgx.c ---- CalculiX/cgx_2.7/src/cgx.c 2014-02-18 13:43:53.000000000 -0500 -+++ CalculiX.patched/cgx_2.7/src/cgx.c 2014-09-07 10:59:21.396969109 -0400 -@@ -240,6 +240,9 @@ int subsubmenu_entity=-1, subsubmenu_p +diff -uwrN cgx_2.10.ORIG/src/cgx.c cgx_2.10/src/cgx.c +--- src/cgx.c 2016-03-04 20:40:43.429549000 +0100 ++++ cgx_2.10/src/cgx.c 2016-03-08 10:53:56.816865592 +0100 +@@ -242,6 +242,9 @@ int subsubmenu_animTune=-1, subsubmenu_animSteps=-1; int subsubmenu_animPeriod=-1; @@ -11,20 +11,20 @@ diff -rupN CalculiX/cgx_2.7/src/cgx.c CalculiX.patched/cgx_2.7/src/cgx.c GLfloat lmodel_twoside[] = { GL_TRUE }; GLfloat lmodel_oneside[] = { GL_FALSE }; double dx ,dy; /* Mauskoordinaten im bereich +-1*/ -@@ -397,6 +400,12 @@ void allocUtilityData(void) +@@ -400,7 +403,11 @@ + #endif } - +- +void queueRecompileEntitiesInMenu(int lc) +{ + recompileFlag = 1; + recompileMenu = lc; +} -+ - - #if INX_MODE -@@ -3105,7 +3114,7 @@ void selectDataset( int selection ) + /* the node pointer must not be changed inside the function. Since that is the case the *node is changed to *node_dummy + and the global *node is used which is always correct so far */ +@@ -3201,7 +3208,7 @@ seqLC[2]=anz->l-1; }/* no sequence until a new entity is selected and all data are prepared */ @@ -33,7 +33,7 @@ diff -rupN CalculiX/cgx_2.7/src/cgx.c CalculiX.patched/cgx_2.7/src/cgx.c } -@@ -3133,7 +3142,15 @@ void createNewMainMenu(void) +@@ -3229,7 +3236,15 @@ glutSetWindow( activWindow); } @@ -50,7 +50,7 @@ diff -rupN CalculiX/cgx_2.7/src/cgx.c CalculiX.patched/cgx_2.7/src/cgx.c void recompileEntitiesInMenu(int lc) { -@@ -5486,6 +5503,7 @@ int main ( int argc, char **argv ) +@@ -5918,6 +5933,7 @@ glutSpecialFunc ( specialKeyboard ); glutEntryFunc ( entryfunktion ); glutPassiveMotionFunc ( Mouse ); @@ -58,16 +58,15 @@ diff -rupN CalculiX/cgx_2.7/src/cgx.c CalculiX.patched/cgx_2.7/src/cgx.c glDisable(GL_DITHER); glLightModelfv(GL_LIGHT_MODEL_TWO_SIDE, lmodel_oneside); glCullFace ( GL_BACK ); -diff -rupN CalculiX/cgx_2.7/src/extUtil.h CalculiX.patched/cgx_2.7/src/extUtil.h ---- CalculiX/cgx_2.7/src/extUtil.h 2014-02-18 13:44:22.000000000 -0500 -+++ CalculiX.patched/cgx_2.7/src/extUtil.h 2014-09-07 10:54:05.816962047 -0400 -@@ -34,7 +34,8 @@ void printf_fflush(const char *fmt,...); +diff -uwrN cgx_2.10.ORIG/src/extUtil.h cgx_2.10/src/extUtil.h +--- src/extUtil.h 2016-02-13 02:21:44.342442000 +0100 ++++ cgx_2.10/src/extUtil.h 2016-03-08 10:55:36.194863375 +0100 +@@ -34,7 +34,7 @@ } #endif #else - #include <GL/glut_cgx.h> -+ //#include <GL/glut_cgx.h> + #include <GL/glut.h> #endif - #define PI 3.14159265358979323846264338327950288 + #define PI 3.14159265358979323846264338327950288
\ No newline at end of file |