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

gsl: update to 2.8 (with some other minor updates) #50565

Closed
wants to merge 22 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,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.27 gsl-2.7.1_1
libgsl.so.28 gsl-2.8_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
Expand Down Expand Up @@ -3311,28 +3311,28 @@ libarcan_a12.so.0.1 arcan-0.6.1.1_1
liblwipv6.so.2 lwipv6-1.5a_1
libpipewire-0.3.so.0 libpipewire-0.3.6_1
libvolk.so.3.1 volk-3.1.0_1
libgnuradio-runtime.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-pmt.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-blocks.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-audio.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-fec.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-fft.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-filter.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-analog.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-digital.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-dtv.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-channels.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-trellis.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-video-sdl.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-vocoder.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-wavelet.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-uhd.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-network.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-soapy.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-qtgui.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-zeromq.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-iio.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-pdu.so.3.10.8 gnuradio-3.10.8.0_1
libgnuradio-runtime.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-pmt.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-blocks.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-audio.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-fec.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-fft.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-filter.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-analog.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-digital.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-dtv.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-channels.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-trellis.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-video-sdl.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-vocoder.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-wavelet.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-uhd.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-network.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-soapy.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-qtgui.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-zeromq.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-iio.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-pdu.so.3.10.10 gnuradio-3.10.10.0_1
libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/Clight/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'Clight'
pkgname=Clight
version=4.11
revision=1
revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="popt-devel gsl-devel libconfig-devel elogind-devel bash-completion
Expand Down
21 changes: 21 additions & 0 deletions srcpkgs/bogofilter/patches/test-musl.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The reason this won't affect glibc is that the default locale is `C`
so this is a no-op, but on musl the default locale is `C.UTF-8`.

The actual test failure is some `grep` is piped some binary that is
not valid utf8. This can be seen in glibc with:

$ echo -e 'A\xa4' | LC_ALL=C.UTF-8 grep A
grep: (standard input): binary file matches

--- a/src/tests/t.frame 2019-10-10 17:04:33.000000000 -0300
+++ b/src/tests/t.frame 2024-06-10 22:46:07.546991269 -0300
@@ -88,6 +88,9 @@
unset LANG || :
unset LC_COLLATE || :
unset LC_ALL || :
+# we set LC_ALL=C because this is what is really wanted; on musl libc,
+# the default is C.UTF-8 which breaks t.dump.load and t.nonascii.replace
+export LC_ALL=C
i=0
INSERT=.
while [ $i -lt 3 ] ; do
2 changes: 1 addition & 1 deletion srcpkgs/bogofilter/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'bogofilter'
pkgname=bogofilter
version=1.2.5
revision=3
revision=4
build_style=gnu-configure
configure_args="--sysconfdir=/etc/${pkgname} --with-database=sqlite"
hostmakedepends="perl"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/calligra/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'calligra'
pkgname=calligra
version=3.2.1
revision=22
revision=23
build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DMEINPROC5_EXECUTABLE=/usr/bin/meinproc5 -DBUILD_TESTING=OFF"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/dieharder/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'dieharder'
pkgname=dieharder
version=3.31.1
revision=8
revision=9
build_style=gnu-configure
makedepends="gsl-devel"
short_desc="Testing and benchmarking tool for random number generators"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/easyeffects/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=7.1.7
revision=1
revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel desktop-file-utils
gtk4-update-icon-cache"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/enblend-enfuse/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'enblend-enfuse'
pkgname=enblend-enfuse
version=4.2
revision=9
revision=10
build_style=gnu-configure
configure_args="--enable-openmp --with-tcmalloc --with-latex=false HELP2MAN=:"
hostmakedepends="pkg-config perl automake perl-TimeDate"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/gnuradio-nrsc5/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-nrsc5'
pkgname=gnuradio-nrsc5
version=2.0.0
revision=6
revision=7
build_style=cmake
make_cmd=make
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/gnuradio-osmosdr/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.4
revision=5
revision=6
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/gnuradio-rds/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
revision=10
revision=11
build_style=cmake
configure_args="-Dpybind11_DIR=${XBPS_CROSS_BASE}/${py3_sitelib}/pybind11/share/cmake/pybind11"
hostmakedepends="pkg-config gnuradio python3"
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/gnuradio/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.8.0
version=3.10.10.0
revision=1
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
Expand All @@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
checksum=a66709939b28f5919e804ba0ff7b8791f7f02180954cc2218367e9f22d262f95
checksum=4202a486bee49ae97672acae559c133b1337e0e89f2d192332e4381d7c6682da
python_version=3

if [ "$CROSS_BUILD" ]; then
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/gqrx/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'gqrx'
pkgname=gqrx
version=2.17.5
revision=1
revision=2
build_style=cmake
configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio)
$(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)"
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/gsl/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'gsl'
pkgname=gsl
version=2.7.1
version=2.8
revision=1
build_style=gnu-configure
short_desc="Numerical library for C and C++ programmers"
Expand All @@ -9,7 +9,7 @@ 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=dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b
checksum=6a99eeed15632c6354895b1dd542ed5a855c0f15d9ad1326c6fe2b2c9e423190

case $XBPS_TARGET_MACHINE in
# avoid numerical noise caused by extended-precision of registers
Expand Down
7 changes: 3 additions & 4 deletions srcpkgs/guvcview/template
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Template file for 'guvcview'
pkgname=guvcview
version=2.0.7
revision=2
create_wrksrc=yes
version=2.1.0
revision=1
build_style=gnu-configure
configure_args="--disable-static --disable-debian-menu"
hostmakedepends="pkg-config intltool autoconf automake libtool glib-devel"
Expand All @@ -14,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://guvcview.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-src-${version}.tar.bz2"
checksum=f47d51fbd06e44eeaa1a82f4a153c927527c90d94514197a70b2956028cc8ad4
checksum=3d93e4c9fab8d1a7a9bde1a6dbbf04d6cf9d347c134b5128b4586a1d90b63cfb

post_patch() {
sed '31a#include <locale.h>' -i guvcview/guvcview.c
Expand Down
Loading
Loading