From 0d2eb91c9855a109227647427db88173a30de321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Wed, 17 Dec 2025 00:46:05 +0100 Subject: [PATCH 1/2] Remove commented out line in libvpx + backport --- .../l/libvpx/libvpx-1.15.2-GCCcore-13.2.0.eb | 32 +++++++++++++++++++ .../l/libvpx/libvpx-1.15.2-GCCcore-13.3.0.eb | 32 +++++++++++++++++++ .../l/libvpx/libvpx-1.15.2-GCCcore-14.2.0.eb | 32 +++++++++++++++++++ .../l/libvpx/libvpx-1.15.2-GCCcore-14.3.0.eb | 1 - 4 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.2.0.eb create mode 100644 easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.3.0.eb create mode 100644 easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.2.0.eb diff --git a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.2.0.eb new file mode 100644 index 000000000000..1d9a683b7c38 --- /dev/null +++ b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.2.0.eb @@ -0,0 +1,32 @@ +easyblock = 'ConfigureMake' + +name = 'libvpx' +version = '1.15.2' + +homepage = 'http://www.webmproject.org' +description = """VPx are open and royalty free video compression formats owned by Google. +""" + +toolchain = {'name': 'GCCcore', 'version': '13.2.0'} +toolchainopts = {'pic': True} + +source_urls = ['https://github.com/webmproject/libvpx/archive/refs/tags'] +sources = ['v%(version)s.tar.gz'] +checksums = ['26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa'] + +builddependencies = [ + ('binutils', '2.40'), + ('pkgconf', '2.0.3'), + ('NASM', '2.16.01'), +] + +configopts = '--enable-pic --enable-shared ' +# https://github.com/Xpra-org/xpra/issues/3082 +configopts += '--enable-vp9-highbitdepth' + +sanity_check_paths = { + 'files': ['bin/vpxdec', 'bin/vpxenc', 'include/vpx/vpx_codec.h', 'lib/libvpx.a'], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.3.0.eb b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.3.0.eb new file mode 100644 index 000000000000..2343d759d9fa --- /dev/null +++ b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.3.0.eb @@ -0,0 +1,32 @@ +easyblock = 'ConfigureMake' + +name = 'libvpx' +version = '1.15.2' + +homepage = 'http://www.webmproject.org' +description = """VPx are open and royalty free video compression formats owned by Google. +""" + +toolchain = {'name': 'GCCcore', 'version': '13.3.0'} +toolchainopts = {'pic': True} + +source_urls = ['https://github.com/webmproject/libvpx/archive/refs/tags'] +sources = ['v%(version)s.tar.gz'] +checksums = ['26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa'] + +builddependencies = [ + ('binutils', '2.42'), + ('pkgconf', '2.2.0'), + ('NASM', '2.16.03'), +] + +configopts = '--enable-pic --enable-shared ' +# https://github.com/Xpra-org/xpra/issues/3082 +configopts += '--enable-vp9-highbitdepth' + +sanity_check_paths = { + 'files': ['bin/vpxdec', 'bin/vpxenc', 'include/vpx/vpx_codec.h', 'lib/libvpx.a'], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.2.0.eb b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.2.0.eb new file mode 100644 index 000000000000..5932ab1ea165 --- /dev/null +++ b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.2.0.eb @@ -0,0 +1,32 @@ +easyblock = 'ConfigureMake' + +name = 'libvpx' +version = '1.15.2' + +homepage = 'http://www.webmproject.org' +description = """VPx are open and royalty free video compression formats owned by Google. +""" + +toolchain = {'name': 'GCCcore', 'version': '14.2.0'} +toolchainopts = {'pic': True} + +source_urls = ['https://github.com/webmproject/libvpx/archive/refs/tags'] +sources = ['v%(version)s.tar.gz'] +checksums = ['26fcd3db88045dee380e581862a6ef106f49b74b6396ee95c2993a260b4636aa'] + +builddependencies = [ + ('binutils', '2.42'), + ('pkgconf', '2.3.0'), + ('NASM', '2.16.03'), +] + +configopts = '--enable-pic --enable-shared ' +# https://github.com/Xpra-org/xpra/issues/3082 +configopts += '--enable-vp9-highbitdepth' + +sanity_check_paths = { + 'files': ['bin/vpxdec', 'bin/vpxenc', 'include/vpx/vpx_codec.h', 'lib/libvpx.a'], + 'dirs': [], +} + +moduleclass = 'vis' diff --git a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.3.0.eb b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.3.0.eb index cb0b0163e9f8..3793b076cee7 100644 --- a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.3.0.eb +++ b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.3.0.eb @@ -25,7 +25,6 @@ configopts = '--enable-pic --enable-shared ' configopts += '--enable-vp9-highbitdepth' sanity_check_paths = { - # 'lib/libvpx.%s' % SHLIB_EXT], 'files': ['bin/vpxdec', 'bin/vpxenc', 'include/vpx/vpx_codec.h', 'lib/libvpx.a'], 'dirs': [], } From 462b08f3b5dc670d4b56e923140a32b26f787aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Thu, 18 Dec 2025 10:58:22 +0100 Subject: [PATCH 2/2] Drop extra flag --- easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.2.0.eb | 2 +- easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.3.0.eb | 2 +- easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.2.0.eb | 2 +- easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.3.0.eb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.2.0.eb b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.2.0.eb index 1d9a683b7c38..18f8fe7e9a43 100644 --- a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.2.0.eb +++ b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.2.0.eb @@ -20,7 +20,7 @@ builddependencies = [ ('NASM', '2.16.01'), ] -configopts = '--enable-pic --enable-shared ' +configopts = '--enable-shared ' # https://github.com/Xpra-org/xpra/issues/3082 configopts += '--enable-vp9-highbitdepth' diff --git a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.3.0.eb b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.3.0.eb index 2343d759d9fa..506eb657ecbd 100644 --- a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.3.0.eb +++ b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-13.3.0.eb @@ -20,7 +20,7 @@ builddependencies = [ ('NASM', '2.16.03'), ] -configopts = '--enable-pic --enable-shared ' +configopts = '--enable-shared ' # https://github.com/Xpra-org/xpra/issues/3082 configopts += '--enable-vp9-highbitdepth' diff --git a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.2.0.eb b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.2.0.eb index 5932ab1ea165..70a36060131e 100644 --- a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.2.0.eb +++ b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.2.0.eb @@ -20,7 +20,7 @@ builddependencies = [ ('NASM', '2.16.03'), ] -configopts = '--enable-pic --enable-shared ' +configopts = '--enable-shared ' # https://github.com/Xpra-org/xpra/issues/3082 configopts += '--enable-vp9-highbitdepth' diff --git a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.3.0.eb b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.3.0.eb index 3793b076cee7..c3db68251e26 100644 --- a/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.3.0.eb +++ b/easybuild/easyconfigs/l/libvpx/libvpx-1.15.2-GCCcore-14.3.0.eb @@ -20,7 +20,7 @@ builddependencies = [ ('NASM', '2.16.03'), ] -configopts = '--enable-pic --enable-shared ' +configopts = '--enable-shared ' # https://github.com/Xpra-org/xpra/issues/3082 configopts += '--enable-vp9-highbitdepth'