From 6d0de1b3a84cd31f36d53965d25d76ae737deee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:08:55 -0300 Subject: [PATCH 01/15] gsl: update to 2.7.1, adopt. --- common/shlibs | 2 +- srcpkgs/gsl/template | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index e1a175684656..4fcf5434d0e9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -830,7 +830,7 @@ libgiblib.so.1 giblib-1.2.4_1 libgc.so.1 gc-7.6.4_1 libcord.so.1 gc-7.4_1 libgslcblas.so.0 gsl-1.15_1 -libgsl.so.25 gsl-2.6_1 +libgsl.so.27 gsl-2.7.1_1 liblua5.1.so.5.1 lua51-5.1.5_1 liblua5.2.so.5.2 lua52-5.2.4_2 liblua5.3.so.5.3 lua53-5.3.5_4 diff --git a/srcpkgs/gsl/template b/srcpkgs/gsl/template index ef355472eff7..854dbe8d795c 100644 --- a/srcpkgs/gsl/template +++ b/srcpkgs/gsl/template @@ -1,14 +1,15 @@ # Template file for 'gsl' pkgname=gsl -version=2.7 +version=2.7.1 revision=1 build_style=gnu-configure short_desc="Numerical library for C and C++ programmers" -maintainer="Orphaned " +maintainer="Gonzalo Tornaría " license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/gsl/gsl.html" +changelog="http://git.savannah.gnu.org/cgit/gsl.git/plain/NEWS" distfiles="${GNU_SITE}/gsl/${pkgname}-${version}.tar.gz" -checksum=efbbf3785da0e53038be7907500628b466152dbc3c173a87de1b5eba2e23602b +checksum=dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b case $XBPS_TARGET_MACHINE in # avoid numerical noise caused by extended-precision of registers From dfee9194515ef649d9b5074f79e497287b988804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:44 -0300 Subject: [PATCH 02/15] Clight: revbump for gsl-2.7.1 --- srcpkgs/Clight/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template index e8acf81bca2e..e70d25d173dd 100644 --- a/srcpkgs/Clight/template +++ b/srcpkgs/Clight/template @@ -1,7 +1,7 @@ # Template file for 'Clight' pkgname=Clight version=4.7 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config" makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion From c816e7c327b1438fd915e16c2b22e7dac739e08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:44 -0300 Subject: [PATCH 03/15] bogofilter: revbump for gsl-2.7.1 --- srcpkgs/bogofilter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bogofilter/template b/srcpkgs/bogofilter/template index 82e2d38c53e9..32e283f57aad 100644 --- a/srcpkgs/bogofilter/template +++ b/srcpkgs/bogofilter/template @@ -1,7 +1,7 @@ # Template file for 'bogofilter' pkgname=bogofilter version=1.2.5 -revision=2 +revision=3 build_style=gnu-configure configure_args="--sysconfdir=/etc/${pkgname} --with-database=sqlite" hostmakedepends="perl" From d8a0845951721bd87d3f03db73882e2ce813f408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:44 -0300 Subject: [PATCH 04/15] calligra: revbump for gsl-2.7.1 --- srcpkgs/calligra/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template index fba5f1f16ee5..89d0b1648e9e 100644 --- a/srcpkgs/calligra/template +++ b/srcpkgs/calligra/template @@ -1,7 +1,7 @@ # Template file for 'calligra' pkgname=calligra version=3.2.1 -revision=5 +revision=6 build_style=cmake configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON -DBUILD_TESTING=OFF" From 2f0c0aa4a0fdf001fc8705a49fa80d9788592f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:44 -0300 Subject: [PATCH 05/15] dieharder: revbump for gsl-2.7.1 Also fix URLs --- srcpkgs/dieharder/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dieharder/template b/srcpkgs/dieharder/template index eaa5ab38c16a..bff9f12db8af 100644 --- a/srcpkgs/dieharder/template +++ b/srcpkgs/dieharder/template @@ -1,14 +1,14 @@ # Template file for 'dieharder' pkgname=dieharder version=3.31.1 -revision=7 +revision=8 build_style=gnu-configure makedepends="gsl-devel" short_desc="Testing and benchmarking tool for random number generators" maintainer="Leah Neukirchen " license="GPL-2.0-only" -homepage="http://www.phy.duke.edu/~rgb/General/dieharder.php" -distfiles="http://www.phy.duke.edu/~rgb/General/dieharder/${pkgname}-${version}.tgz" +homepage="http://webhome.phy.duke.edu/~rgb/General/dieharder.php" +distfiles="http://webhome.phy.duke.edu/~rgb/General/dieharder/${pkgname}-${version}.tgz" checksum=6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f disable_parallel_build=yes From 5401500b5599cf61d9f1fe6354d81114532ad0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:44 -0300 Subject: [PATCH 06/15] enblend-enfuse: revbump for gsl-2.7.1 --- srcpkgs/enblend-enfuse/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/enblend-enfuse/template b/srcpkgs/enblend-enfuse/template index 9401bc3544be..783bc4a693f4 100644 --- a/srcpkgs/enblend-enfuse/template +++ b/srcpkgs/enblend-enfuse/template @@ -1,7 +1,7 @@ # Template file for 'enblend-enfuse' pkgname=enblend-enfuse version=4.2 -revision=6 +revision=7 build_style=gnu-configure configure_args="--enable-openmp --with-tcmalloc" hostmakedepends="pkg-config perl automake" From 91d4a9ad7a53ec2c3ef21a0397c544b75e262ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:45 -0300 Subject: [PATCH 07/15] giac: update to 1.7.0.43. --- srcpkgs/giac/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template index 4ca28fa53647..4e4bdbd45350 100644 --- a/srcpkgs/giac/template +++ b/srcpkgs/giac/template @@ -1,6 +1,6 @@ # Template file for 'giac' pkgname=giac -version=1.7.0.39 +version=1.7.0.43 revision=1 wrksrc="giac-${version%.*}" build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Gonzalo Tornaría " license="GPL-3.0-or-later" homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz" -checksum=234645e33284969fac5901e6172756ac925a6b93362fa24e86e647a82cfcad56 +checksum=85f724270c813ae26d665fe2c1b42c271a6d29ecfb75f038efb16e1d0d284a7f # need more than 4*65536 stack, see try_parse() in gen.cc line 11812 LDFLAGS="-Wl,-z,stack-size=2097152" From f4f335c0f8cc1ec021c2b96029ace6e4f71865ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:45 -0300 Subject: [PATCH 08/15] gnuradio: revbump for gsl-2.7.1 Also fix do_check() step: - add python3-scipy to checkdepends, required by some tests - add two patches from upstream that fix some other tests --- ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 +++++++++++++++++ ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 +++++++++++++++++++ srcpkgs/gnuradio/template | 3 +- 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch create mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch new file mode 100644 index 000000000000..c49a047427e8 --- /dev/null +++ b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch @@ -0,0 +1,28 @@ +From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001 +From: John Sallay +Date: Sat, 23 Oct 2021 08:26:42 -0400 +Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error. + +The number of input elements needs to be disivible by volk_alignment, which it wasn't +for machines with 512-bit registers. + +Signed-off-by: John Sallay +--- + gr-analog/python/analog/qa_agc.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py +index a5a8ea47b6a..9368dd5d2a8 100644 +--- a/gr-analog/python/analog/qa_agc.py ++++ b/gr-analog/python/analog/qa_agc.py +@@ -454,7 +454,9 @@ def test_006(self): + tb = self.tb + + sampling_freq = 100 +- N = int(5*sampling_freq) ++ # N must by a multiple of the volk_alignment of the system for this test to work. ++ # For a machine with 512-bit registers, that would be 8 complex-floats. ++ N = int(8 * sampling_freq) + src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE, + sampling_freq * 0.10, 100) + dst1 = blocks.vector_sink_c() diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch new file mode 100644 index 000000000000..4faa3468140a --- /dev/null +++ b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch @@ -0,0 +1,31 @@ +From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001 +From: alekhgupta1441 +Date: Sun, 12 Apr 2020 03:48:14 +0530 +Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py + +--- + gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py +index 4503c4fea7b..84f6de66e45 100644 +--- a/gr-digital/python/digital/soft_dec_lut_gen.py ++++ b/gr-digital/python/digital/soft_dec_lut_gen.py +@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1): + + ''' + +- npts = 2.0**prec ++ npts = int(2.0**prec) + maxd = Es*numpy.sqrt(2.0)/2.0 + yrng = numpy.linspace(-maxd, maxd, npts) + xrng = numpy.linspace(-maxd, maxd, npts) +@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1): + re_max = max(numpy.array(constel).real) + im_max = max(numpy.array(constel).imag) + +- npts = 2.0**prec ++ npts = int(2.0**prec) + yrng = numpy.linspace(im_min, im_max, npts) + xrng = numpy.linspace(re_min, re_max, npts) + diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index d41d253fa77b..c950b53e8bea 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio version=3.8.0.0 -revision=8 +revision=9 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}" @@ -12,6 +12,7 @@ makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel python3-gobject-devel log4cpp-devel gmpxx-devel mpir-devel" depends="python3-cheetah3 python3-numpy python3-Mako python3-gobject python3-yaml" +checkdepends="python3-scipy" short_desc="Framework for software defined radio" maintainer="Andrew Benson " license="GPL-3.0-or-later" From 07d66114be7b8ef8df4fbec5e47954b2bb1ac853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:45 -0300 Subject: [PATCH 09/15] guvcview: revbump for gsl-2.7.1 Also fix do_check() step --- srcpkgs/guvcview/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template index 447b27aecf50..2696fc7007bc 100644 --- a/srcpkgs/guvcview/template +++ b/srcpkgs/guvcview/template @@ -1,7 +1,7 @@ # Template file for 'guvcview' pkgname=guvcview version=2.0.6 -revision=2 +revision=3 wrksrc="${pkgname}-src-${version}" build_style=gnu-configure configure_args="--disable-static --disable-debian-menu" @@ -18,4 +18,6 @@ checksum=95381cef5ee139e15f90b79d1425cc22bbaae43f87452cdce6674636aff37e85 post_extract() { sed '31a#include ' -i guvcview/guvcview.c + # add missing EOL in this file to fix do_check() + echo >> po/POTFILES.in } From d71cfca3ec71a3229fb23495805d03e00fea5efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:45 -0300 Subject: [PATCH 10/15] igt-gpu-tools: revbump for gsl-2.7.1 --- srcpkgs/igt-gpu-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template index 3f8b4e2b6166..e5865e11a57f 100644 --- a/srcpkgs/igt-gpu-tools/template +++ b/srcpkgs/igt-gpu-tools/template @@ -1,7 +1,7 @@ # Template file for 'igt-gpu-tools' pkgname=igt-gpu-tools version=1.25 -revision=4 +revision=5 build_style=meson configure_args="-Db_ndebug=false -Db_lto=false" # b_lto=true makes the build hang at a random point From c06d50d8c669b72b51657d826eef8a32edc4b256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:45 -0300 Subject: [PATCH 11/15] inkscape: revbump for gsl-2.7.1 --- srcpkgs/inkscape/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index e53c0b378e71..f8e8dd7bd9c1 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -1,7 +1,7 @@ # Template file for 'inkscape' pkgname=inkscape version=1.1.1 -revision=1 +revision=2 wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25" build_style=cmake # builds executables then runs checks From 253b8c2bb08b705112deab0e85b9dd4d526c8a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:45 -0300 Subject: [PATCH 12/15] ipe: revbump for gsl-2.7.1 --- srcpkgs/ipe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template index f18ebfc42572..fbd500a3dc94 100644 --- a/srcpkgs/ipe/template +++ b/srcpkgs/ipe/template @@ -1,7 +1,7 @@ # Template file for 'ipe' pkgname=ipe version=7.2.24 -revision=4 +revision=5 _tools_commit=v7.2.20.1 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools" makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel From c12aea53d9e1cc76dbf2a69fccdf4dd51c704766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:45 -0300 Subject: [PATCH 13/15] krita: revbump for gsl-2.7.1 --- srcpkgs/krita/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template index 835ed0cfa749..c3af7aa4efbc 100644 --- a/srcpkgs/krita/template +++ b/srcpkgs/krita/template @@ -1,7 +1,7 @@ # Template file for 'krita' pkgname=krita version=5.0.0 -revision=1 +revision=2 build_style=cmake configure_args="-Wno-dev -DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules gettext pkg-config python3 From 7562895b3a420f9a30fcdcfc37fc6fa42db5e937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 5 Dec 2021 18:34:46 -0300 Subject: [PATCH 14/15] siril: revbump for gsl-2.7.1 Also fix do_check() step --- srcpkgs/siril/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template index 5dd0cf48d12e..7e524d988a80 100644 --- a/srcpkgs/siril/template +++ b/srcpkgs/siril/template @@ -1,7 +1,7 @@ # Template file for 'siril' pkgname=siril version=0.9.12 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="pkg-config intltool autoconf automake gettext-devel" makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel @@ -21,6 +21,11 @@ fi CFLAGS="-fcommon" +post_extract() { + # add missing check target in this subdir to fix do_check() + echo 'check:' >> deps/kplot/Makefile +} + pre_configure() { NOCONFIGURE=1 ./autogen.sh } From c8d70c7766d771c0e527043f233a48f222eddcd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 27 Dec 2021 21:50:46 -0300 Subject: [PATCH 15/15] DO NOT MERGE: workaround for #31055 (siril) --- srcpkgs/siril/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template index 7e524d988a80..a06f3352243d 100644 --- a/srcpkgs/siril/template +++ b/srcpkgs/siril/template @@ -6,7 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config intltool autoconf automake gettext-devel" makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel gsl-devel libraw-devel tiff-devel libpng-devel libcurl-devel - ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel" + ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel libgomp-devel" depends="gnuplot" short_desc="Free astronomical image processing software" maintainer="Andreas Kempe "