From 5e497fccf50ae7f728ececdcccc75004f38114fa Mon Sep 17 00:00:00 2001 From: Jakub Kropacek Date: Tue, 23 Aug 2022 09:34:56 +0200 Subject: [PATCH] new file: b/bwidget/bwidget-1.9.15-GCCcore-11.3.0.eb modified: l/libmad/libmad-0.15.1b-GCCcore-11.3.0.eb new file: t/Togl/Togl-2.0-GCCcore-11.3.0.eb new file: x/XCrySDen/XCrySDen-1.6.2-intel-2022a.eb new file: x/XCrySDen/XCrysDen-1.6.2-no-bwidget-tcl-download.patch deleted: l/libmad/libmad-0.15.1b-GCCcore-11.3.0-remove-depreciated-gcc-options.patch deleted: t/Togl/Togl-2.0-GCCcore-10.2.0.eb --- b/bwidget/bwidget-1.9.15-GCCcore-11.3.0.eb | 26 +++++++++++++ ...1.3.0-remove-depreciated-gcc-options.patch | 22 ----------- l/libmad/libmad-0.15.1b-GCCcore-11.3.0.eb | 20 +++++----- ...e-10.2.0.eb => Togl-2.0-GCCcore-11.3.0.eb} | 14 +++---- x/XCrySDen/XCrySDen-1.6.2-intel-2022a.eb | 39 +++++++++++++++++++ ...rysDen-1.6.2-no-bwidget-tcl-download.patch | 12 ++++++ 6 files changed, 95 insertions(+), 38 deletions(-) create mode 100644 b/bwidget/bwidget-1.9.15-GCCcore-11.3.0.eb delete mode 100644 l/libmad/libmad-0.15.1b-GCCcore-11.3.0-remove-depreciated-gcc-options.patch rename t/Togl/{Togl-2.0-GCCcore-10.2.0.eb => Togl-2.0-GCCcore-11.3.0.eb} (84%) create mode 100644 x/XCrySDen/XCrySDen-1.6.2-intel-2022a.eb create mode 100644 x/XCrySDen/XCrysDen-1.6.2-no-bwidget-tcl-download.patch diff --git a/b/bwidget/bwidget-1.9.15-GCCcore-11.3.0.eb b/b/bwidget/bwidget-1.9.15-GCCcore-11.3.0.eb new file mode 100644 index 00000000..cec51692 --- /dev/null +++ b/b/bwidget/bwidget-1.9.15-GCCcore-11.3.0.eb @@ -0,0 +1,26 @@ +easyblock = 'Tarball' + +name = 'bwidget' +version = '1.9.15' + +homepage = 'https://core.tcl-lang.org/bwidget/home' +description = 'The BWidget Toolkit is a high-level Widget Set for Tcl/Tk built using native Tcl/Tk 8.x namespaces.' + +toolchain = {'name': 'GCCcore', 'version': '11.3.0'} + +source_urls = ['https://downloads.sourceforge.net/project/tcllib/BWidget/%(version)s/'] +sources = [SOURCELOWER_TAR_BZ2] +checksums = ['9c4dd648fdfd31de7cb5af44b392a1916f949dd195820684d940edcd8485ac13'] + +builddependencies = [('binutils', '2.38')] + +dependencies = [('Tk', '8.6.12')] + +modextrapaths = {'TCLLIBPATH': '.'} + +sanity_check_paths = { + 'files': ['button.tcl'], + 'dirs': ['BWman', 'demo', 'images', 'lang', 'tests'], +} + +moduleclass = 'vis' diff --git a/l/libmad/libmad-0.15.1b-GCCcore-11.3.0-remove-depreciated-gcc-options.patch b/l/libmad/libmad-0.15.1b-GCCcore-11.3.0-remove-depreciated-gcc-options.patch deleted file mode 100644 index 0387456d..00000000 --- a/l/libmad/libmad-0.15.1b-GCCcore-11.3.0-remove-depreciated-gcc-options.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nru libmad-0.15.1b.orig/configure libmad-0.15.1b/configure ---- libmad-0.15.1b.orig/configure 2022-08-19 11:44:53.156998000 +0200 -+++ libmad-0.15.1b/configure 2022-08-19 11:45:31.855629909 +0200 -@@ -19099,7 +19099,6 @@ - case "$optimize" in - -O|"-O "*) - optimize="-O" -- optimize="$optimize -fforce-mem" - optimize="$optimize -fforce-addr" - : #x optimize="$optimize -finline-functions" - : #- optimize="$optimize -fstrength-reduce" -diff -Nru libmad-0.15.1b.orig/configure.ac libmad-0.15.1b/configure.ac ---- libmad-0.15.1b.orig/configure.ac 2022-08-19 11:44:53.172288000 +0200 -+++ libmad-0.15.1b/configure.ac 2022-08-19 11:45:43.617447388 +0200 -@@ -140,7 +140,6 @@ - case "$optimize" in - -O|"-O "*) - optimize="-O" -- optimize="$optimize -fforce-mem" - optimize="$optimize -fforce-addr" - : #x optimize="$optimize -finline-functions" - : #- optimize="$optimize -fstrength-reduce" diff --git a/l/libmad/libmad-0.15.1b-GCCcore-11.3.0.eb b/l/libmad/libmad-0.15.1b-GCCcore-11.3.0.eb index 02a6dce2..e5a93337 100644 --- a/l/libmad/libmad-0.15.1b-GCCcore-11.3.0.eb +++ b/l/libmad/libmad-0.15.1b-GCCcore-11.3.0.eb @@ -1,5 +1,7 @@ -# IT4Innovations 2022 -# JK +# Institution: IT4Innovations National Supercomputing Center, Czech Republic +# Author: Jakub Kropacek +# License: GPLv3 +# Year: 2022 easyblock = 'ConfigureMake' @@ -7,24 +9,24 @@ name = 'libmad' version = '0.15.1b' homepage = 'https://www.underbit.com/products/mad/' -description = """MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 and the MPEG-2 extension to lower sampling frequencies, as well as the de facto MPEG 2.5 format. All three audio layers — Layer I, Layer II, and Layer III (i.e. MP3) — are fully implemented.""" +description = """MAD is a high-quality MPEG audio decoder.""" toolchain = {'name': 'GCCcore', 'version': '11.3.0'} -source_urls = ['https://sourceforge.net/projects/mad/files/libmad/%(version)s'] +source_urls = ['https://sourceforge.net/projects/mad/files/%(name)s/%(version)s/'] sources = [SOURCELOWER_TAR_GZ] -patches = ['libmad-0.15.1b-GCCcore-11.3.0-remove-depreciated-gcc-options.patch'] +patches = ['libmad-0.15.1b-remove-depreciated-gcc-option.patch'] checksums = [ 'bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690', # libmad-0.15.1b.tar.gz - # libmad-0.15.1b-GCCcore-11.3.0-remove-depreciated-gcc-options.patch - 'c7dc07f0d502e31a09ddb82b30827a71d8dfacd39053ee2107d4fc4b0470d2c3', + # libmad-0.15.1b-remove-depreciated-gcc-option.patch + '8f96a23a22ba66e62f32e20064d01f4c7f6a18ba0aab85d3be9ce63794b2c678', ] builddependencies = [('binutils', '2.38')] sanity_check_paths = { - 'files': [], - 'dirs': ["."] + 'files': ['include/mad.h', 'lib/libmad.a', 'lib/libmad.la', 'lib/libmad.%s' % SHLIB_EXT], + 'dirs': ['include', 'lib', 'lib64'] } moduleclass = 'lib' diff --git a/t/Togl/Togl-2.0-GCCcore-10.2.0.eb b/t/Togl/Togl-2.0-GCCcore-11.3.0.eb similarity index 84% rename from t/Togl/Togl-2.0-GCCcore-10.2.0.eb rename to t/Togl/Togl-2.0-GCCcore-11.3.0.eb index aa385116..a3ff3f8b 100644 --- a/t/Togl/Togl-2.0-GCCcore-10.2.0.eb +++ b/t/Togl/Togl-2.0-GCCcore-11.3.0.eb @@ -1,5 +1,5 @@ -# IT4Innovations 2021 -# JK, LK +# IT4Innovations 2022 +# JK easyblock = 'ConfigureMake' @@ -9,7 +9,7 @@ version = '2.0' homepage = 'https://sourceforge.net/projects/togl/' description = """A Tcl/Tk widget for OpenGL rendering.""" -toolchain = {'name': 'GCCcore', 'version': '10.2.0'} +toolchain = {'name': 'GCCcore', 'version': '11.3.0'} source_urls = ['https://downloads.sourceforge.net/project/togl/Togl/2.0/'] sources = ['%(name)s%(version)s-src.tar.gz'] @@ -23,12 +23,12 @@ checksums = [ '05db6b3ca5139f60616d074903883a3070fcfb1eb8c965b0938779b4f9a6ec6a', # Togl-2.0_decl.patch ] -builddependencies = [('binutils', '2.35')] +builddependencies = [('binutils', '2.38')] dependencies = [ - ('Mesa', '20.2.1'), - ('Tk', '8.6.11'), - ('Tcl', '8.6.11'), + ('Mesa', '22.0.3'), + ('Tk', '8.6.12'), + ('Tcl', '8.6.12'), ] preconfigopts = 'export CFLAGS="$CFLAGS -DTOGL_USE_FONTS=0" && ' diff --git a/x/XCrySDen/XCrySDen-1.6.2-intel-2022a.eb b/x/XCrySDen/XCrySDen-1.6.2-intel-2022a.eb new file mode 100644 index 00000000..3b86c813 --- /dev/null +++ b/x/XCrySDen/XCrySDen-1.6.2-intel-2022a.eb @@ -0,0 +1,39 @@ +# IT4Innovations 2022 +# JK + +name = 'XCrySDen' +version = '1.6.2' + +homepage = "http://www.xcrysden.org/" +description = """ +XCrySDen is a crystalline and molecular structure visualisation program aiming +at display of isosurfaces and contours, which can be superimposed on +crystalline structures and interactively rotated and manipulated. +""" +docurls = "http://www.xcrysden.org/Documentation.html" + +toolchain = {'name': 'intel', 'version': '2022a'} + +source_urls = ["http://www.xcrysden.org/download/"] +sources = [SOURCELOWER_TAR_GZ] +patches = ['XCrysDen-1.6.2-no-bwidget-tcl-download.patch'] +checksums = [ + '811736ee598bec1a5b427fd10e4e063a30dd7cadae96a43a50b36ce90a4f503f', # xcrysden-1.6.2.tar.gz + '4e2aaf0daa4b80f71bed3061d61e8490694f60cf511275282d77c1fd8be4a812', # XCrysDen-1.6.2-no-bwidget-tcl-download.patch +] + +dependencies = [ + ('Togl', '2.0'), + ('Mesa', '22.0.3'), + ('libGLU', '9.0.2'), + ('bwidget', '1.9.15'), +] + +sanity_check_commands = [ + 'xcrysden --help', + # requires DISPLAY + 'xcrysden --xsf $EBROOTXCRYSDEN/share/%(namelower)s-%(version)s/examples/XSF_Files/GaAsH.xsf --print output.png \ + && rm output.png ', +] + +moduleclass = 'vis' diff --git a/x/XCrySDen/XCrysDen-1.6.2-no-bwidget-tcl-download.patch b/x/XCrySDen/XCrysDen-1.6.2-no-bwidget-tcl-download.patch new file mode 100644 index 00000000..18cfa4f8 --- /dev/null +++ b/x/XCrySDen/XCrysDen-1.6.2-no-bwidget-tcl-download.patch @@ -0,0 +1,12 @@ +diff -Nru xcrysden-1.6.2.orig/Makefile xcrysden-1.6.2/Makefile +--- xcrysden-1.6.2.orig/Makefile 2022-08-23 08:23:59.130921000 +0200 ++++ xcrysden-1.6.2/Makefile 2022-08-23 08:39:27.632777181 +0200 +@@ -18,7 +18,7 @@ + + all: tcl tk mesa togl fftw xcrysden + # meschach +-xcrysden: usage bwidget bindir src-C src-F src-Tcl ++xcrysden: usage bindir src-C src-F + + usage: $(TOPDIR)/docs/xcrysden.1 + man $(TOPDIR)/docs/xcrysden.1 | awk 'BEGIN {lprint=0; print "## do not edit changes will be lost (file automatically generated)\n"; } /SYNOPSIS/ { lprint=1; } /SEE ALSO/ { lprint=0; } /a*/ { if (lprint) print; }' > usage