Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

{lib}[GCCcore/13.3.0] freeglut v3.6.0 #22059

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from

Conversation

stefan-wolfsheimer
Copy link
Contributor

(created using eb --new-pr)

Copy link

github-actions bot commented Dec 19, 2024

Updated software freeglut-3.6.0-GCCcore-13.3.0.eb

Diff against freeglut-3.4.0-GCCcore-12.3.0.eb

easybuild/easyconfigs/f/freeglut/freeglut-3.4.0-GCCcore-12.3.0.eb

diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-3.4.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/f/freeglut/freeglut-3.6.0-GCCcore-13.3.0.eb
index c583a0ee0a..fd7092a2e2 100644
--- a/easybuild/easyconfigs/f/freeglut/freeglut-3.4.0-GCCcore-12.3.0.eb
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-3.6.0-GCCcore-13.3.0.eb
@@ -1,38 +1,40 @@
 easyblock = 'CMakeMake'
 
 name = 'freeglut'
-version = '3.4.0'
+version = '3.6.0'
 
 homepage = 'http://freeglut.sourceforge.net/'
 description = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library."
 
-toolchain = {'name': 'GCCcore', 'version': '12.3.0'}
+toolchain = {'name': 'GCCcore', 'version': '13.3.0'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
-checksums = ['3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec']
+checksums = ['9c3d4d6516fbfa0280edc93c77698fb7303e443c1aaaf37d269e3288a6c3ea52']
 
 builddependencies = [
-    ('binutils', '2.40'),
-    ('CMake', '3.26.3'),
+    ('binutils', '2.42'),
+    ('CMake', '3.29.3'),
 ]
-
 dependencies = [
-    ('X11', '20230603'),
-    ('Mesa', '23.1.4'),
+    ('X11', '20240607'),
+    ('Mesa', '24.1.3'),
     ('libGLU', '9.0.3'),
 ]
 
-configopts = ' -DX11_X11_LIB="$EBROOTX11/lib/libX11.%s" ' % SHLIB_EXT
-configopts += ' -DX11_X11_INCLUDE_PATH="$EBROOTX11/include/X11" '
-configopts += ' -DX11_Xext_LIB="$EBROOTX11/lib/libXext.%s" ' % SHLIB_EXT
-configopts += ' -DX11_Xrandr_LIB="$EBROOTX11/lib/libXrandr.%s" ' % SHLIB_EXT
-configopts += ' -DX11_Xrandr_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/" '
-configopts += ' -DX11_Xi_LIB="$EBROOTX11/lib/libXrandr.%s" ' % SHLIB_EXT
-configopts += ' -DX11_Xi_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/" '
+configopts = ' '.join([
+    '-DX11_X11_LIB="$EBROOTX11/lib/libX11.so"',
+    '-DX11_X11_INCLUDE_PATH="$EBROOTX11/include/X11"',
+    '-DX11_Xext_LIB="$EBROOTX11/lib/libXext.so"',
+    '-DX11_Xrandr_LIB="$EBROOTX11/lib/libXrandr.so"',
+    '-DX11_Xrandr_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/"',
+    '-DX11_Xi_LIB="$EBROOTX11/lib/libXrandr.so"',
+    '-DX11_Xi_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/"',
+])
+
 
 sanity_check_paths = {
-    'files': [('lib/libglut.a', 'lib64/libglut.a'), ('lib/libglut.%s' % SHLIB_EXT, 'lib64/libglut.%s' % SHLIB_EXT)],
+    'files': ['lib/libglut.a', 'lib/libglut.%s' % SHLIB_EXT],
     'dirs': ['include/GL'],
 }
 
Diff against freeglut-3.4.0-GCCcore-12.2.0.eb

easybuild/easyconfigs/f/freeglut/freeglut-3.4.0-GCCcore-12.2.0.eb

diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-3.4.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/f/freeglut/freeglut-3.6.0-GCCcore-13.3.0.eb
index 0f9d2c5221..fd7092a2e2 100644
--- a/easybuild/easyconfigs/f/freeglut/freeglut-3.4.0-GCCcore-12.2.0.eb
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-3.6.0-GCCcore-13.3.0.eb
@@ -1,38 +1,40 @@
 easyblock = 'CMakeMake'
 
 name = 'freeglut'
-version = '3.4.0'
+version = '3.6.0'
 
 homepage = 'http://freeglut.sourceforge.net/'
 description = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library."
 
-toolchain = {'name': 'GCCcore', 'version': '12.2.0'}
+toolchain = {'name': 'GCCcore', 'version': '13.3.0'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
-checksums = ['3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec']
+checksums = ['9c3d4d6516fbfa0280edc93c77698fb7303e443c1aaaf37d269e3288a6c3ea52']
 
 builddependencies = [
-    ('binutils', '2.39'),
-    ('CMake', '3.24.3'),
+    ('binutils', '2.42'),
+    ('CMake', '3.29.3'),
 ]
-
 dependencies = [
-    ('X11', '20221110'),
-    ('Mesa', '22.2.4'),
-    ('libGLU', '9.0.2'),
+    ('X11', '20240607'),
+    ('Mesa', '24.1.3'),
+    ('libGLU', '9.0.3'),
 ]
 
-configopts = ' -DX11_X11_LIB="$EBROOTX11/lib/libX11.%s" ' % SHLIB_EXT
-configopts += ' -DX11_X11_INCLUDE_PATH="$EBROOTX11/include/X11" '
-configopts += ' -DX11_Xext_LIB="$EBROOTX11/lib/libXext.%s" ' % SHLIB_EXT
-configopts += ' -DX11_Xrandr_LIB="$EBROOTX11/lib/libXrandr.%s" ' % SHLIB_EXT
-configopts += ' -DX11_Xrandr_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/" '
-configopts += ' -DX11_Xi_LIB="$EBROOTX11/lib/libXrandr.%s" ' % SHLIB_EXT
-configopts += ' -DX11_Xi_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/" '
+configopts = ' '.join([
+    '-DX11_X11_LIB="$EBROOTX11/lib/libX11.so"',
+    '-DX11_X11_INCLUDE_PATH="$EBROOTX11/include/X11"',
+    '-DX11_Xext_LIB="$EBROOTX11/lib/libXext.so"',
+    '-DX11_Xrandr_LIB="$EBROOTX11/lib/libXrandr.so"',
+    '-DX11_Xrandr_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/"',
+    '-DX11_Xi_LIB="$EBROOTX11/lib/libXrandr.so"',
+    '-DX11_Xi_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/"',
+])
+
 
 sanity_check_paths = {
-    'files': [('lib/libglut.a', 'lib64/libglut.a'), ('lib/libglut.%s' % SHLIB_EXT, 'lib64/libglut.%s' % SHLIB_EXT)],
+    'files': ['lib/libglut.a', 'lib/libglut.%s' % SHLIB_EXT],
     'dirs': ['include/GL'],
 }
 
Diff against freeglut-3.2.2-GCCcore-11.3.0.eb

easybuild/easyconfigs/f/freeglut/freeglut-3.2.2-GCCcore-11.3.0.eb

diff --git a/easybuild/easyconfigs/f/freeglut/freeglut-3.2.2-GCCcore-11.3.0.eb b/easybuild/easyconfigs/f/freeglut/freeglut-3.6.0-GCCcore-13.3.0.eb
index 819686d9ba..fd7092a2e2 100644
--- a/easybuild/easyconfigs/f/freeglut/freeglut-3.2.2-GCCcore-11.3.0.eb
+++ b/easybuild/easyconfigs/f/freeglut/freeglut-3.6.0-GCCcore-13.3.0.eb
@@ -1,38 +1,40 @@
 easyblock = 'CMakeMake'
 
 name = 'freeglut'
-version = '3.2.2'
+version = '3.6.0'
 
 homepage = 'http://freeglut.sourceforge.net/'
 description = "freeglut is a completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library."
 
-toolchain = {'name': 'GCCcore', 'version': '11.3.0'}
+toolchain = {'name': 'GCCcore', 'version': '13.3.0'}
 
 source_urls = [SOURCEFORGE_SOURCE]
 sources = [SOURCE_TAR_GZ]
-checksums = ['c5944a082df0bba96b5756dddb1f75d0cd72ce27b5395c6c1dde85c2ff297a50']
+checksums = ['9c3d4d6516fbfa0280edc93c77698fb7303e443c1aaaf37d269e3288a6c3ea52']
 
 builddependencies = [
-    ('binutils', '2.38'),
-    ('CMake', '3.23.1'),
+    ('binutils', '2.42'),
+    ('CMake', '3.29.3'),
 ]
-
 dependencies = [
-    ('X11', '20220504'),
-    ('Mesa', '22.0.3'),
-    ('libGLU', '9.0.2'),
+    ('X11', '20240607'),
+    ('Mesa', '24.1.3'),
+    ('libGLU', '9.0.3'),
 ]
 
-configopts = ' -DX11_X11_LIB="$EBROOTX11/lib/libX11.%s" ' % SHLIB_EXT
-configopts += ' -DX11_X11_INCLUDE_PATH="$EBROOTX11/include/X11" '
-configopts += ' -DX11_Xext_LIB="$EBROOTX11/lib/libXext.%s" ' % SHLIB_EXT
-configopts += ' -DX11_Xrandr_LIB="$EBROOTX11/lib/libXrandr.%s" ' % SHLIB_EXT
-configopts += ' -DX11_Xrandr_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/" '
-configopts += ' -DX11_Xi_LIB="$EBROOTX11/lib/libXrandr.%s" ' % SHLIB_EXT
-configopts += ' -DX11_Xi_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/" '
+configopts = ' '.join([
+    '-DX11_X11_LIB="$EBROOTX11/lib/libX11.so"',
+    '-DX11_X11_INCLUDE_PATH="$EBROOTX11/include/X11"',
+    '-DX11_Xext_LIB="$EBROOTX11/lib/libXext.so"',
+    '-DX11_Xrandr_LIB="$EBROOTX11/lib/libXrandr.so"',
+    '-DX11_Xrandr_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/"',
+    '-DX11_Xi_LIB="$EBROOTX11/lib/libXrandr.so"',
+    '-DX11_Xi_INCLUDE_PATH="$EBROOTX11/include/X11/extensions/"',
+])
+
 
 sanity_check_paths = {
-    'files': [('lib/libglut.a', 'lib64/libglut.a'), ('lib/libglut.%s' % SHLIB_EXT, 'lib64/libglut.%s' % SHLIB_EXT)],
+    'files': ['lib/libglut.a', 'lib/libglut.%s' % SHLIB_EXT],
     'dirs': ['include/GL'],
 }
 

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants